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 | |
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')
-rw-r--r-- | meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch | 27 | ||||
-rw-r--r-- | meta/recipes-graphics/xcb/libxcb_1.9.1.bb | 13 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb (renamed from meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb.inc (renamed from meta/recipes-graphics/xcb/libxcb.inc) | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch (renamed from meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb_1.9.3.bb | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb_git.bb (renamed from meta/recipes-graphics/xcb/libxcb_git.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb (renamed from meta/recipes-graphics/xcb/xcb-util-image_0.3.9.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb (renamed from meta/recipes-graphics/xcb/xcb-util-keysyms_0.3.9.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.8.bb (renamed from meta/recipes-graphics/xcb/xcb-util-renderutil_0.3.8.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-wm_0.3.9.bb (renamed from meta/recipes-graphics/xcb/xcb-util-wm_0.3.9.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util.inc (renamed from meta/recipes-graphics/xcb/xcb-util.inc) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb (renamed from meta/recipes-graphics/xcb/xcb-util_0.3.9.bb) | 0 |
13 files changed, 15 insertions, 41 deletions
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_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/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb index ad046d19c8..ad046d19c8 100644 --- a/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb +++ b/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 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 \ | |||
22 | libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ | 22 | libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ |
23 | libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ | 23 | libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ |
24 | libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc \ | 24 | libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc \ |
25 | libxcb-dri2" | 25 | libxcb-dri2 libxcb-dri3 libxcb-present" |
26 | 26 | ||
27 | FILES_${PN} = "${libdir}/libxcb.so.*" | 27 | FILES_${PN} = "${libdir}/libxcb.so.*" |
28 | #FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" | 28 | #FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" |
29 | FILES_libxcb-dri2 = "${libdir}/libxcb-dri2.so.*" | 29 | FILES_libxcb-dri2 = "${libdir}/libxcb-dri2.so.*" |
30 | FILES_libxcb-dri3 = "${libdir}/libxcb-dri3.so.*" | ||
30 | FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" | 31 | FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" |
31 | FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" | 32 | FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" |
32 | FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" | 33 | FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" |
@@ -48,6 +49,7 @@ FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" | |||
48 | FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" | 49 | FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" |
49 | FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" | 50 | FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" |
50 | FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" | 51 | FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" |
52 | FILES_libxcb-present = "${libdir}/libxcb-present.so.*" | ||
51 | 53 | ||
52 | inherit autotools pkgconfig pythonnative | 54 | inherit autotools pkgconfig pythonnative |
53 | 55 | ||
diff --git a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch index d858a63b72..d858a63b72 100644 --- a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch +++ b/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 @@ | |||
1 | include libxcb.inc | ||
2 | |||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" | ||
5 | |||
6 | |||
7 | DEPENDS += "libxdmcp" | ||
8 | |||
9 | PACKAGES =+ "libxcb-xinerama" | ||
10 | |||
11 | SRC_URI[md5sum] = "1ca999ca94f760d917ef2d8466a88742" | ||
12 | SRC_URI[sha256sum] = "aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b" | ||
diff --git a/meta/recipes-graphics/xcb/libxcb_git.bb b/meta/recipes-graphics/xorg-lib/libxcb_git.bb index 1482b7af5b..1482b7af5b 100644 --- a/meta/recipes-graphics/xcb/libxcb_git.bb +++ b/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 index 1d36893f93..1d36893f93 100644 --- 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 | |||
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 index 39ead34e92..39ead34e92 100644 --- 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 | |||
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 index 93b34e8402..93b34e8402 100644 --- 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 | |||
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 index 944e0d88b1..944e0d88b1 100644 --- 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 | |||
diff --git a/meta/recipes-graphics/xcb/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc index 7dad545c33..7dad545c33 100644 --- a/meta/recipes-graphics/xcb/xcb-util.inc +++ b/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 index c5d8858115..c5d8858115 100644 --- a/meta/recipes-graphics/xcb/xcb-util_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb | |||