diff options
Diffstat (limited to 'package/libxcb')
| -rw-r--r-- | package/libxcb/Makefile | 22 | ||||
| -rw-r--r-- | package/libxcb/patches/patch-ltmain_sh | 11 |
2 files changed, 5 insertions, 28 deletions
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index cf292f384..f394cc10f 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -4,23 +4,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libxcb -PKG_VERSION:= 1.7 +PKG_VERSION:= 1.9.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= f715e53c9c1b25f856d14d6123663d96 +PKG_MD5SUM:= 324c76024a73dba8a902638696ba87de PKG_DESCR:= X11 keyboard library PKG_SECTION:= x11/libs PKG_BUILDDEP:= python2 libpthread-stubs libxslt libXau xcb-proto -PKG_SITES:= ${MASTER_SITE_XORG} - -PKG_SUBPKGS:= LIBXCB LIBXCB_DEV -PKGSD_LIBXCB_DEV:= XML-XCB protocol headers -PKGSS_LIBXCB_DEV:= libxcb -PKGSC_LIBXCB_DEV:= x11/devel +PKG_SITES:= http://xcb.freedesktop.org/dist/ +PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBXCB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXCB_DEV},${PKGSD_LIBXCB_DEV},${PKGSC_LIBXCB_DEV})) +$(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) include $(TOPDIR)/mk/python.mk @@ -31,11 +26,4 @@ libxcb-install: ${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib ${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib -libxcb-dev-install: - ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/xcb ${IDIR_LIBXCB_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ - ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxcb/patches/patch-ltmain_sh b/package/libxcb/patches/patch-ltmain_sh deleted file mode 100644 index c3b2b8713..000000000 --- a/package/libxcb/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libxcb-1.7.orig/ltmain.sh 2010-08-13 13:46:48.000000000 +0200 -+++ libxcb-1.7/ltmain.sh 2011-01-30 18:41:38.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" |