diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-11-25 15:51:04 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-27 11:51:25 +0000 |
| commit | 46610941705ee59a7755f705a0a014b3422a40ab (patch) | |
| tree | 297e28c64783f6a3ad533170a2e19affc6e58370 /meta/recipes-graphics/xcb | |
| parent | 3be9e2492c88fb4681fa8d1d3136e463457e6899 (diff) | |
| download | poky-46610941705ee59a7755f705a0a014b3422a40ab.tar.gz | |
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)
(From OE-Core rev: 657ffd8bd6115fa2d61a918a67d6b8f162d50c5a)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xcb')
| -rw-r--r-- | meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb | 24 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/libxcb.inc | 62 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/libxcb_1.9.1.bb | 13 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/libxcb_git.bb | 12 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-util-image_0.3.9.bb | 11 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-util-keysyms_0.3.9.bb | 10 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-util-renderutil_0.3.8.bb | 13 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-util-wm_0.3.9.bb | 11 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-util.inc | 23 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-util_0.3.9.bb | 8 |
12 files changed, 0 insertions, 227 deletions
diff --git a/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb deleted file mode 100644 index ad046d19c8..0000000000 --- a/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | SUMMARY = "Library that provides weak aliases for pthread functions" | ||
| 2 | DESCRIPTION = "This library provides weak aliases for pthread functions \ | ||
| 3 | not provided in libc or otherwise available by default." | ||
| 4 | HOMEPAGE = "http://xcb.freedesktop.org" | ||
| 5 | BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=XCB" | ||
| 6 | SECTION = "x11/libs" | ||
| 7 | LICENSE = "MIT" | ||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" | ||
| 9 | |||
| 10 | PARALLEL_MAKE = "" | ||
| 11 | #DEPENDS = "xcb-proto xproto libxau libxslt-native" | ||
| 12 | # DEPENDS += "xsltproc-native gperf-native" | ||
| 13 | |||
| 14 | SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" | ||
| 15 | |||
| 16 | SRC_URI[md5sum] = "e8fa31b42e13f87e8f5a7a2b731db7ee" | ||
| 17 | SRC_URI[sha256sum] = "35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299" | ||
| 18 | |||
| 19 | inherit autotools pkgconfig | ||
| 20 | |||
| 21 | RDEPENDS_${PN}-dev = "" | ||
| 22 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | ||
| 23 | |||
| 24 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-graphics/xcb/libxcb.inc b/meta/recipes-graphics/xcb/libxcb.inc deleted file mode 100644 index 124fe3d426..0000000000 --- a/meta/recipes-graphics/xcb/libxcb.inc +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | SUMMARY = "XCB: The X protocol C binding library" | ||
| 2 | DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \ | ||
| 3 | for Xlib featuring a small footprint, latency hiding, direct access to \ | ||
| 4 | the protocol, improved threading support, and extensibility." | ||
| 5 | HOMEPAGE = "http://xcb.freedesktop.org" | ||
| 6 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" | ||
| 7 | |||
| 8 | BBCLASSEXTEND = "native nativesdk" | ||
| 9 | |||
| 10 | SECTION = "x11/libs" | ||
| 11 | LICENSE = "MIT-X" | ||
| 12 | |||
| 13 | PARALLEL_MAKE = "" | ||
| 14 | DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native libpthread-stubs" | ||
| 15 | # DEPENDS += "xsltproc-native gperf-native" | ||
| 16 | |||
| 17 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" | ||
| 18 | # file://xcbincludedir.patch" | ||
| 19 | |||
| 20 | PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ | ||
| 21 | libxcb-randr libxcb-record libxcb-render libxcb-res \ | ||
| 22 | libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ | ||
| 23 | libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ | ||
| 24 | libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc \ | ||
| 25 | libxcb-dri2" | ||
| 26 | |||
| 27 | FILES_${PN} = "${libdir}/libxcb.so.*" | ||
| 28 | #FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" | ||
| 29 | FILES_libxcb-dri2 = "${libdir}/libxcb-dri2.so.*" | ||
| 30 | FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" | ||
| 31 | FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" | ||
| 32 | FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" | ||
| 33 | FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" | ||
| 34 | FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" | ||
| 35 | FILES_libxcb-record = "${libdir}/libxcb-record.so.*" | ||
| 36 | FILES_libxcb-render = "${libdir}/libxcb-render.so.*" | ||
| 37 | FILES_libxcb-res = "${libdir}/libxcb-res.so.*" | ||
| 38 | FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" | ||
| 39 | FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" | ||
| 40 | FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*" | ||
| 41 | FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*" | ||
| 42 | FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*" | ||
| 43 | FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*" | ||
| 44 | FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*" | ||
| 45 | FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*" | ||
| 46 | FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" | ||
| 47 | FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" | ||
| 48 | FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" | ||
| 49 | FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" | ||
| 50 | FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" | ||
| 51 | |||
| 52 | inherit autotools pkgconfig pythonnative | ||
| 53 | |||
| 54 | # XCBPROTO_XCBINCLUDEDIR is set based on `pkg-config --variable=xcbincludedir xcb-proto` | ||
| 55 | # but the xcbincludedir variable doesn't point into the staging area, so it needs some | ||
| 56 | # tweaking here: | ||
| 57 | do_configure_prepend () { | ||
| 58 | sed -i "s|XCBPROTO_XCBINCLUDEDIR=\`|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/\`|" \ | ||
| 59 | ${S}/configure.ac | ||
| 60 | sed -i "s|XCBPROTO_XCBPYTHONDIR=\`|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/\`|" \ | ||
| 61 | ${S}/configure.ac | ||
| 62 | } | ||
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 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | |||
| 3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
| 4 | diff -Nurd libxcb-1.9.1/configure.ac libxcb-1.9.1/configure.ac | ||
| 5 | --- libxcb-1.9.1/configure.ac 2013-05-30 18:38:01.000000000 +0300 | ||
| 6 | +++ libxcb-1.9.1/configure.ac 2013-10-24 23:15:10.542507543 +0300 | ||
| 7 | @@ -7,15 +7,16 @@ | ||
| 8 | 1.9.1, | ||
| 9 | [xcb@lists.freedesktop.org]) | ||
| 10 | AC_CONFIG_SRCDIR([xcb.pc.in]) | ||
| 11 | -# Set common system defines for POSIX extensions, such as _GNU_SOURCE | ||
| 12 | -# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) | ||
| 13 | -# to avoid autoconf errors. | ||
| 14 | -AC_USE_SYSTEM_EXTENSIONS | ||
| 15 | |||
| 16 | # Initialize Automake | ||
| 17 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
| 18 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
| 19 | |||
| 20 | +# Set common system defines for POSIX extensions, such as _GNU_SOURCE | ||
| 21 | +# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) | ||
| 22 | +# to avoid autoconf errors. | ||
| 23 | +AC_USE_SYSTEM_EXTENSIONS | ||
| 24 | + | ||
| 25 | AM_PATH_PYTHON([2.6]) | ||
| 26 | |||
| 27 | PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) | ||
diff --git a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch deleted file mode 100644 index d858a63b72..0000000000 --- a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | --- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000 | ||
| 4 | +++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100 | ||
| 5 | @@ -50,7 +50,7 @@ | ||
| 6 | |||
| 7 | # Find the xcb-proto protocol descriptions | ||
| 8 | AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) | ||
| 9 | -XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` | ||
| 10 | +XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto` | ||
| 11 | AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) | ||
| 12 | AC_SUBST(XCBPROTO_XCBINCLUDEDIR) | ||
| 13 | |||
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 @@ | |||
| 1 | include libxcb.inc | ||
| 2 | |||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" | ||
| 5 | |||
| 6 | SRC_URI += "file://automake_1.14_fix.patch" | ||
| 7 | |||
| 8 | DEPENDS += "libxdmcp" | ||
| 9 | |||
| 10 | PACKAGES =+ "libxcb-xinerama" | ||
| 11 | |||
| 12 | SRC_URI[md5sum] = "ed632cb0dc31b6fbd7ea5c0f931cf5a4" | ||
| 13 | SRC_URI[sha256sum] = "d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f" | ||
diff --git a/meta/recipes-graphics/xcb/libxcb_git.bb b/meta/recipes-graphics/xcb/libxcb_git.bb deleted file mode 100644 index 1482b7af5b..0000000000 --- a/meta/recipes-graphics/xcb/libxcb_git.bb +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | DEFAULT_PREFERENCE = "-1" | ||
| 2 | |||
| 3 | include libxcb.inc | ||
| 4 | |||
| 5 | SRCREV = "625ed596cae6dd8175aeb6cb6f26784928042f22" | ||
| 6 | PV = "1.1.90.1+gitr${SRCPV}" | ||
| 7 | PR = "r1" | ||
| 8 | |||
| 9 | SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb" | ||
| 10 | S = "${WORKDIR}/git" | ||
| 11 | |||
| 12 | PACKAGES =+ "libxcb-xinerama" | ||
diff --git a/meta/recipes-graphics/xcb/xcb-util-image_0.3.9.bb b/meta/recipes-graphics/xcb/xcb-util-image_0.3.9.bb deleted file mode 100644 index 1d36893f93..0000000000 --- a/meta/recipes-graphics/xcb/xcb-util-image_0.3.9.bb +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | require xcb-util.inc | ||
| 2 | |||
| 3 | DEPENDS += "xcb-util" | ||
| 4 | |||
| 5 | LICENSE = "MIT" | ||
| 6 | LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ | ||
| 7 | file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" | ||
| 8 | |||
| 9 | SRC_URI[md5sum] = "fabb80b36490b00fc91289e2c7f66770" | ||
| 10 | SRC_URI[sha256sum] = "d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df" | ||
| 11 | |||
diff --git a/meta/recipes-graphics/xcb/xcb-util-keysyms_0.3.9.bb b/meta/recipes-graphics/xcb/xcb-util-keysyms_0.3.9.bb deleted file mode 100644 index 39ead34e92..0000000000 --- a/meta/recipes-graphics/xcb/xcb-util-keysyms_0.3.9.bb +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | require xcb-util.inc | ||
| 2 | |||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \ | ||
| 5 | " | ||
| 6 | |||
| 7 | SRC_URI[md5sum] = "64e4aad2d48cd4a92e2da13b9f35bfd2" | ||
| 8 | SRC_URI[sha256sum] = "7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e" | ||
| 9 | |||
| 10 | |||
diff --git a/meta/recipes-graphics/xcb/xcb-util-renderutil_0.3.8.bb b/meta/recipes-graphics/xcb/xcb-util-renderutil_0.3.8.bb deleted file mode 100644 index 93b34e8402..0000000000 --- a/meta/recipes-graphics/xcb/xcb-util-renderutil_0.3.8.bb +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | require xcb-util.inc | ||
| 2 | |||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://renderutil/glyph.c;endline=24;md5=c517c483b8d726234ec94f9169236661 \ | ||
| 5 | file://renderutil/util.c;endline=20;md5=6e0bfc44fb13298c0f4694eb70dc80d4 \ | ||
| 6 | file://renderutil/xcb_renderutil.h;md5=c8732d30d204d3b55e956489f635cefb \ | ||
| 7 | " | ||
| 8 | |||
| 9 | SRC_URI[md5sum] = "b346ff598ee093c141f836fbc0f8f721" | ||
| 10 | SRC_URI[sha256sum] = "9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452" | ||
| 11 | |||
| 12 | |||
| 13 | |||
diff --git a/meta/recipes-graphics/xcb/xcb-util-wm_0.3.9.bb b/meta/recipes-graphics/xcb/xcb-util-wm_0.3.9.bb deleted file mode 100644 index 944e0d88b1..0000000000 --- a/meta/recipes-graphics/xcb/xcb-util-wm_0.3.9.bb +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | require xcb-util.inc | ||
| 2 | |||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://ewmh/ewmh.c;endline=27;md5=63fd80552d7dc886f4eb267610d5bb9d \ | ||
| 5 | file://ewmh/xcb_ewmh.h;beginline=4;endline=30;md5=73b589f90ef90b4a43998955daad5cd8 \ | ||
| 6 | file://icccm/icccm.c;endline=28;md5=e2b3240a0c197e8977adde2a5cf18d50 \ | ||
| 7 | file://icccm/xcb_icccm.h;beginline=4;endline=31;md5=393772b7b07b9868d479d538238c1d8a \ | ||
| 8 | " | ||
| 9 | |||
| 10 | SRC_URI[md5sum] = "c612aae7ffe2e70fe743efab9c5548e9" | ||
| 11 | SRC_URI[sha256sum] = "038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030" | ||
diff --git a/meta/recipes-graphics/xcb/xcb-util.inc b/meta/recipes-graphics/xcb/xcb-util.inc deleted file mode 100644 index 7dad545c33..0000000000 --- a/meta/recipes-graphics/xcb/xcb-util.inc +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | SUMMARY = "XCB: The X protocol C binding utilities" | ||
| 2 | DESCRIPTION = "The xcb-util module provides a number of libraries which \ | ||
| 3 | sit on top of libxcb, the core X protocol library, and some of the \ | ||
| 4 | extension libraries. These experimental libraries provide convenience \ | ||
| 5 | functions and interfaces which make the raw X protocol more usable. Some \ | ||
| 6 | of the libraries also provide client-side code which is not strictly \ | ||
| 7 | part of the X protocol but which have traditionally been provided by \ | ||
| 8 | Xlib." | ||
| 9 | HOMEPAGE = "http://xcb.freedesktop.org/XcbUtil/" | ||
| 10 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" | ||
| 11 | |||
| 12 | LICENSE = "MIT" | ||
| 13 | |||
| 14 | SECTION = "x11/libs" | ||
| 15 | |||
| 16 | DEPENDS = "libxcb" | ||
| 17 | DEPENDS += "gperf-native" | ||
| 18 | |||
| 19 | PARALLEL_MAKE = "" | ||
| 20 | |||
| 21 | SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" | ||
| 22 | |||
| 23 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-graphics/xcb/xcb-util_0.3.9.bb b/meta/recipes-graphics/xcb/xcb-util_0.3.9.bb deleted file mode 100644 index c5d8858115..0000000000 --- a/meta/recipes-graphics/xcb/xcb-util_0.3.9.bb +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | require xcb-util.inc | ||
| 2 | |||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \ | ||
| 5 | file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9" | ||
| 6 | |||
| 7 | SRC_URI[md5sum] = "01dcc7a16d5020530552712710646ea2" | ||
| 8 | SRC_URI[sha256sum] = "c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4" | ||
