From: Laurentiu Palcu Date: Mon, 25 Nov 2013 13:51:04 +0000 (+0200) Subject: libxcb: upgrade to 1.9.3 X-Git-Tag: 2015-4~4485 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=657ffd8bd6115fa2d61a918a67d6b8f162d50c5a;p=openembedded-core.git libxcb: upgrade to 1.9.3 Added 2 new extensions: dri3 and present. Moved libxcb and xcb-util recipes to xorg-lib directory. Removed the following patch(es): * automake_1.14_fix.patch (backport) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch b/meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch deleted file mode 100644 index 0f1fc546d2..0000000000 --- a/meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist -diff -Nurd libxcb-1.9.1/configure.ac libxcb-1.9.1/configure.ac ---- libxcb-1.9.1/configure.ac 2013-05-30 18:38:01.000000000 +0300 -+++ libxcb-1.9.1/configure.ac 2013-10-24 23:15:10.542507543 +0300 -@@ -7,15 +7,16 @@ - 1.9.1, - [xcb@lists.freedesktop.org]) - AC_CONFIG_SRCDIR([xcb.pc.in]) --# Set common system defines for POSIX extensions, such as _GNU_SOURCE --# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) --# to avoid autoconf errors. --AC_USE_SYSTEM_EXTENSIONS - - # Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -+# Set common system defines for POSIX extensions, such as _GNU_SOURCE -+# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) -+# to avoid autoconf errors. -+AC_USE_SYSTEM_EXTENSIONS -+ - AM_PATH_PYTHON([2.6]) - - PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) diff --git a/meta/recipes-graphics/xcb/libxcb_1.9.1.bb b/meta/recipes-graphics/xcb/libxcb_1.9.1.bb deleted file mode 100644 index b6548003de..0000000000 --- a/meta/recipes-graphics/xcb/libxcb_1.9.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -include libxcb.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - -SRC_URI += "file://automake_1.14_fix.patch" - -DEPENDS += "libxdmcp" - -PACKAGES =+ "libxcb-xinerama" - -SRC_URI[md5sum] = "ed632cb0dc31b6fbd7ea5c0f931cf5a4" -SRC_URI[sha256sum] = "d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f" diff --git a/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb similarity index 100% rename from meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb rename to meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb diff --git a/meta/recipes-graphics/xcb/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc similarity index 94% rename from meta/recipes-graphics/xcb/libxcb.inc rename to meta/recipes-graphics/xorg-lib/libxcb.inc index 124fe3d426..91df1be8c5 100644 --- a/meta/recipes-graphics/xcb/libxcb.inc +++ b/meta/recipes-graphics/xorg-lib/libxcb.inc @@ -22,11 +22,12 @@ PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc \ - libxcb-dri2" + libxcb-dri2 libxcb-dri3 libxcb-present" FILES_${PN} = "${libdir}/libxcb.so.*" #FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" FILES_libxcb-dri2 = "${libdir}/libxcb-dri2.so.*" +FILES_libxcb-dri3 = "${libdir}/libxcb-dri3.so.*" FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" @@ -48,6 +49,7 @@ FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" +FILES_libxcb-present = "${libdir}/libxcb-present.so.*" inherit autotools pkgconfig pythonnative diff --git a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch similarity index 100% rename from meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch rename to meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.9.3.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.9.3.bb new file mode 100644 index 0000000000..7374f10a4e --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.9.3.bb @@ -0,0 +1,12 @@ +include libxcb.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" + + +DEPENDS += "libxdmcp" + +PACKAGES =+ "libxcb-xinerama" + +SRC_URI[md5sum] = "1ca999ca94f760d917ef2d8466a88742" +SRC_URI[sha256sum] = "aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b" diff --git a/meta/recipes-graphics/xcb/libxcb_git.bb b/meta/recipes-graphics/xorg-lib/libxcb_git.bb similarity index 100% rename from meta/recipes-graphics/xcb/libxcb_git.bb rename to meta/recipes-graphics/xorg-lib/libxcb_git.bb diff --git a/meta/recipes-graphics/xcb/xcb-util-image_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb similarity index 100% rename from meta/recipes-graphics/xcb/xcb-util-image_0.3.9.bb rename to meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb diff --git a/meta/recipes-graphics/xcb/xcb-util-keysyms_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb similarity index 100% rename from meta/recipes-graphics/xcb/xcb-util-keysyms_0.3.9.bb rename to meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb diff --git a/meta/recipes-graphics/xcb/xcb-util-renderutil_0.3.8.bb b/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.8.bb similarity index 100% rename from meta/recipes-graphics/xcb/xcb-util-renderutil_0.3.8.bb rename to meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.8.bb diff --git a/meta/recipes-graphics/xcb/xcb-util-wm_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.3.9.bb similarity index 100% rename from meta/recipes-graphics/xcb/xcb-util-wm_0.3.9.bb rename to meta/recipes-graphics/xorg-lib/xcb-util-wm_0.3.9.bb diff --git a/meta/recipes-graphics/xcb/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc similarity index 100% rename from meta/recipes-graphics/xcb/xcb-util.inc rename to meta/recipes-graphics/xorg-lib/xcb-util.inc diff --git a/meta/recipes-graphics/xcb/xcb-util_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb similarity index 100% rename from meta/recipes-graphics/xcb/xcb-util_0.3.9.bb rename to meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb