Commit 862e1221 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Peter Korsgaard
Browse files

xorg: Bump xcb-proto & libxcb version to 1.10 



These have to be bumped together as new libxcb requires new xcb-proto, and
old libxcb doesn't build with new xcb-proto.

[Peter: fixup xcb-proto.pc instead of playing tricks with --define-variable]
Signed-off-by: default avatarBernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 6d08fec8

package/x11r7/libxcb/libxcb.mk

+2 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



LIBXCB_VERSION = 1.8.1

LIBXCB_VERSION = 1.10

LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2

LIBXCB_SITE = http://xcb.freedesktop.org/dist/

LIBXCB_LICENSE = MIT
@@ -15,12 +15,8 @@ LIBXCB_INSTALL_STAGING = YES 
LIBXCB_DEPENDENCIES = \

	host-libxslt xlib_libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \

	host-xcb-proto host-python host-pkgconf

LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"

LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \

	XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages

LIBXCB_CONF_OPT = --disable-build-docs



HOST_LIBXCB_CONF_OPT = --disable-build-docs

LIBXCB_CONF_OPT = --disable-build-docs



$(eval $(autotools-package))

$(eval $(host-autotools-package))

package/x11r7/xcb-proto/xcb-proto.mk

+11 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



XCB_PROTO_VERSION = 1.7.1

XCB_PROTO_VERSION = 1.10

XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2

XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/

XCB_PROTO_LICENSE = MIT
@@ -14,5 +14,15 @@ XCB_PROTO_INSTALL_STAGING = YES 


XCB_PROTO_DEPENDENCIES = host-python



# xcbincludedir/pythondir is used by E.G. libxcb at build time to find the

# xml / python files, so ensure these expand to their full (host) paths

define XCB_PROTO_FIXUP_PC_FILE

	$(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_DIR)|' \

	    -e 's|^\(pythondir=\)|\1$(STAGING_DIR)|' \

		$(STAGING_DIR)/usr/lib/pkgconfig/xcb-proto.pc

endef



XCB_PROTO_POST_INSTALL_STAGING_HOOKS += XCB_PROTO_FIXUP_PC_FILE



$(eval $(autotools-package))

$(eval $(host-autotools-package))