summaryrefslogtreecommitdiff
path: root/package/x11r7/libxcb
diff options
context:
space:
mode:
Diffstat (limited to 'package/x11r7/libxcb')
-rw-r--r--package/x11r7/libxcb/libxcb-1.0-xcbproto-xml-dir.patch11
-rw-r--r--package/x11r7/libxcb/libxcb.mk5
2 files changed, 3 insertions, 13 deletions
diff --git a/package/x11r7/libxcb/libxcb-1.0-xcbproto-xml-dir.patch b/package/x11r7/libxcb/libxcb-1.0-xcbproto-xml-dir.patch
deleted file mode 100644
index 5159459ff..000000000
--- a/package/x11r7/libxcb/libxcb-1.0-xcbproto-xml-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac.orig 2007-06-04 12:56:16.000000000 +0200
-+++ a/configure.ac 2007-06-04 12:55:58.000000000 +0200
-@@ -50,7 +50,7 @@
-
- # Find the xcb-proto protocol descriptions
- AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
--XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
-+XCBPROTO_XCBINCLUDEDIR=$STAGING_DIR`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
- AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
- AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
-
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index a0581625a..b79addd20 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -3,15 +3,16 @@
# libxcb
#
#############################################################
-LIBXCB_VERSION = 1.0
+LIBXCB_VERSION = 1.1
LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
LIBXCB_SITE = http://xcb.freedesktop.org/dist/
LIBXCB_INSTALL_STAGING = YES
-LIBXCB_AUTORECONF = YES
+LIBXCB_AUTORECONF = NO
LIBXCB_DEPENDENCIES = pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau
LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
+LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XSLTPROC=/usr/bin/xsltproc
$(eval $(call AUTOTARGETS,package/x11r7,libxcb))