Package Updates
cover Package Updates
Nothing really suprising here, I am doing a glib update and will have some other changes pending after that is complete.
I am also testing an update to pkgconfig, which now carries a mini glib to prevent circular issues, the first to was to move patches from the .inc to the .bb file.
Sau!
The following changes since commit 395b90054eccddc1c9062a9a8657ed4482b7710a:
glib-2.0: disable tests for native builds, and respect ptest for LSB (2013-04-22 15:48:57 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/updates
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates
Saul Wold (18):
less: Update to 458
lsbinitscripts: Update to 9.46
sysstat: Update to 10.1.5
sqlite: Update to 3071602
dhcp: Update to 4.2.5-P1
resolvconf: Update to 1.71
dpkg: Update to 1.16.10
file: Update to 5.14
libffi: Update to 3.0.13
nspr: Update to 4.9.6
libgcrypt: Update to 1.5.1
pkgconfig: Move patches in prep for 0.28 update
libxkbcommon: Update to 0.3.0
glew: fix generation of glew.pc needed by mesa-demos
mesa-demos: Update to 8.1.0
glib-2.0: Update to 2.36
glib-networking: Update to 2.36
build-appliance: Add version info
.../dhcp-3.0.3-dhclient-dbus.patch | 0
.../{dhcp-4.2.5 => dhcp}/fix-client-path.patch | 0
.../{dhcp-4.2.5 => dhcp}/fix-external-bind.patch | 0
.../dhcp/{dhcp-4.2.5 => dhcp}/fixincludes.patch | 0
.../dhcp/{dhcp-4.2.5 => dhcp}/fixsepbuild.patch | 0
.../{dhcp-4.2.5 => dhcp}/link-with-lcrypto.patch | 0
.../dhcp/{dhcp-4.2.5 => dhcp}/noattrmode.patch | 0
.../dhcp/{dhcp-4.2.5 => dhcp}/site.h | 0
.../dhcp/{dhcp_4.2.5.bb => dhcp_4.2.5-P1.bb} | 4 +-
.../{resolvconf_1.70.bb => resolvconf_1.71.bb} | 5 +-
.../glib-2.0/obsolete_automake_macros.patch | 13 -
.../{glib-2.0_2.34.3.bb => glib-2.0_2.36.0.bb} | 12 +-
meta/recipes-core/glib-2.0/glib.inc | 2 +-
...working_2.28.7.bb => glib-networking_2.36.0.bb} | 10 +-
...iance-image.bb => build-appliance-image_8.0.bb} | 0
.../dpkg/{dpkg_1.16.9.bb => dpkg_1.16.10.bb} | 4 +-
.../file/{file_5.13.bb => file_5.14.bb} | 4 +-
meta/recipes-devtools/pkgconfig/pkgconfig.inc | 8 +-
meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 7 +
.../less/{less_457.bb => less_458.bb} | 5 +-
...binitscripts_9.45.bb => lsbinitscripts_9.46.bb} | 7 +-
.../{sysstat_10.1.4.bb => sysstat_10.1.5.bb} | 4 +-
.../libffi/0001-libffi-update-for-3.0.11.patch | 171 --
.../libffi/aarch64-adding-build-support.patch | 63 -
.../libffi/libffi/add-aarch64-support.patch | 2672 --------------------
.../libffi/libffi/fix-libffi.la-location.patch | 18 +
.../libffi/{libffi_3.0.11.bb => libffi_3.0.13.bb} | 11 +-
.../glew/files/fix-glew.pc-install.patch | 44 +
meta/recipes-graphics/glew/glew_1.9.0.bb | 1 +
...glgears-Make-EGL_KHR_image-usage-portable.patch | 95 -
.../mesa-demos/dso_linking_change_build_fix.patch | 24 -
.../mesa/mesa-demos/gles2-info.patch | 21 -
.../{mesa-demos_8.0.1.bb => mesa-demos_8.1.0.bb} | 11 +-
...libxkbcommon_0.2.0.bb => libxkbcommon_0.3.0.bb} | 11 +-
.../libgcrypt-1.5.0/obsolete_automake_macros.patch | 15 -
meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb | 9 -
meta/recipes-support/libgcrypt/libgcrypt_1.5.1.bb | 4 +
.../nspr/{nspr_4.9.5.bb => nspr_4.9.6.bb} | 7 +-
.../{sqlite3_3071502.bb => sqlite3_3071602.bb} | 9 +-
39 files changed, 118 insertions(+), 3153 deletions(-)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/dhcp-3.0.3-dhclient-dbus.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fix-client-path.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fix-external-bind.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fixincludes.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fixsepbuild.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/link-with-lcrypto.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/noattrmode.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/site.h (100%)
rename meta/recipes-connectivity/dhcp/{dhcp_4.2.5.bb => dhcp_4.2.5-P1.bb} (66%)
rename meta/recipes-connectivity/resolvconf/{resolvconf_1.70.bb => resolvconf_1.71.bb} (87%)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.34.3.bb => glib-2.0_2.36.0.bb} (85%)
rename meta/recipes-core/glib-networking/{glib-networking_2.28.7.bb => glib-networking_2.36.0.bb} (71%)
rename meta/recipes-core/images/{build-appliance-image.bb => build-appliance-image_8.0.bb} (100%)
rename meta/recipes-devtools/dpkg/{dpkg_1.16.9.bb => dpkg_1.16.10.bb} (71%)
rename meta/recipes-devtools/file/{file_5.13.bb => file_5.14.bb} (86%)
rename meta/recipes-extended/less/{less_457.bb => less_458.bb} (87%)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.45.bb => lsbinitscripts_9.46.bb} (77%)
rename meta/recipes-extended/sysstat/{sysstat_10.1.4.bb => sysstat_10.1.5.bb} (44%)
delete mode 100644 meta/recipes-gnome/libffi/libffi/0001-libffi-update-for-3.0.11.patch
delete mode 100644 meta/recipes-gnome/libffi/libffi/aarch64-adding-build-support.patch
delete mode 100644 meta/recipes-gnome/libffi/libffi/add-aarch64-support.patch
create mode 100644 meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch
rename meta/recipes-gnome/libffi/{libffi_3.0.11.bb => libffi_3.0.13.bb} (76%)
create mode 100644 meta/recipes-graphics/glew/files/fix-glew.pc-install.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0001-xeglgears-Make-EGL_KHR_image-usage-portable.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
rename meta/recipes-graphics/mesa/{mesa-demos_8.0.1.bb => mesa-demos_8.1.0.bb} (69%)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.2.0.bb => libxkbcommon_0.3.0.bb} (67%)
delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb
create mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.5.1.bb
rename meta/recipes-support/nspr/{nspr_4.9.5.bb => nspr_4.9.6.bb} (95%)
rename meta/recipes-support/sqlite/{sqlite3_3071502.bb => sqlite3_3071602.bb} (41%)Signature · 1 line
1.8.0.2
PATCH 1/18 less: Update to 458
---
meta/recipes-extended/less/{less_457.bb => less_458.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-extended/less/{less_457.bb => less_458.bb} (87%)meta/recipes-extended/less/less_458.bb renamed from meta/recipes-extended/less/less_457.bb +2 -3
@@ -23,12 +23,11 @@ LICENSE = "GPLv3+ | BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE;md5=866cc220f330b04ae4661fc3cdfedea7" DEPENDS = "ncurses" -PR = "r0" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "b5a964682f327b0dceb690f34e02632f" -SRC_URI[sha256sum] = "63c9c421df5c64439babc3aa44861512c298af394c932672b3e5aeb53580eed8" +SRC_URI[md5sum] = "935b38aa2e73c888c210dedf8fd94f49" +SRC_URI[sha256sum] = "e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fcac" inherit autotools update-alternatives
Signature · 1 line
1.8.0.2
PATCH 2/18 lsbinitscripts: Update to 9.46
In reply to Saul Wold---
.../lsb/{lsbinitscripts_9.45.bb => lsbinitscripts_9.46.bb} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.45.bb => lsbinitscripts_9.46.bb} (77%)meta/recipes-extended/lsb/lsbinitscripts_9.46.bb renamed from meta/recipes-extended/lsb/lsbinitscripts_9.45.bb +3 -4
@@ -2,17 +2,16 @@ DESCRIPTION = "SysV init scripts which only is used in an LSB image" SECTION = "base" LICENSE = "GPLv2" DEPENDS = "popt glib-2.0" -PR = "r0" LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" S="${WORKDIR}/initscripts-${PV}" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/dd514ee65e4a4610be836bb34c62c0ed/initscripts-${PV}.tar.bz2 \ +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.46.tar.bz2/f0755d9f1e0a8ae470c22798695c3b39/initscripts-9.46.tar.bz2 \ file://functions.patch \ " -SRC_URI[md5sum] = "dd514ee65e4a4610be836bb34c62c0ed" -SRC_URI[sha256sum] = "dd8bfa09f41f56c223f90629f31fc16decc3b9df4c72b1e3ee00cfa3f7d9c48c" +SRC_URI[md5sum] = "f0755d9f1e0a8ae470c22798695c3b39" +SRC_URI[sha256sum] = "f1b9003826d6c524c6b144e554ec38e788531270b8df252218708da11c9e4973" inherit update-alternatives
Signature · 1 line
1.8.0.2
PATCH 3/18 sysstat: Update to 10.1.5
In reply to Saul Wold---
.../recipes-extended/sysstat/{sysstat_10.1.4.bb => sysstat_10.1.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/sysstat/{sysstat_10.1.4.bb => sysstat_10.1.5.bb} (44%)meta/recipes-extended/sysstat/sysstat_10.1.5.bb renamed from meta/recipes-extended/sysstat/sysstat_10.1.4.bb +2 -2
@@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PR = "${INC_PR}.0" -SRC_URI[md5sum] = "0a8e9f69c66fc6737e6645e22eed3275" -SRC_URI[sha256sum] = "7a39a923dbb4c50752a5b8227f4e76fbfea2b2545bd7faf9c168a5dc8e031dc9" +SRC_URI[md5sum] = "cdf66d6acd5c8cab709e07980b77ea6b" +SRC_URI[sha256sum] = "81f1fdcea991f6c4e64a7a65cd9045ec2418be3379d8a80db7dec59bb7b6d3c8"
Signature · 1 line
1.8.0.2
PATCH 4/18 sqlite: Update to 3071602
In reply to Saul Wold---
.../sqlite/{sqlite3_3071502.bb => sqlite3_3071602.bb} | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
rename meta/recipes-support/sqlite/{sqlite3_3071502.bb => sqlite3_3071602.bb} (41%)meta/recipes-support/sqlite/sqlite3_3071602.bb renamed from meta/recipes-support/sqlite/sqlite3_3071502.bb +4 -5
@@ -2,10 +2,9 @@ require sqlite3.inc LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" -PR = "r0" +SRC_URI = "http://www.sqlite.org/2013/sqlite-autoconf-${PV}.tar.gz" -SRC_URI = "http://www.sqlite.org/sqlite-autoconf-${PV}.tar.gz" -S = "${WORKDIR}/sqlite-autoconf-${PV}" +SRC_URI[md5sum] = "ce7d2bc0d9b8dd18995b888c6b0b220f" +SRC_URI[sha256sum] = "1d7e6937c19fc5de1c0cdb392638296e4a6d8b158001dbb421e257dfb6f088db" -SRC_URI[md5sum] = "bcb0ab0b5b30116b2531cfeef3c861b4" -SRC_URI[sha256sum] = "782d16b797f6ca879f6f679ba3fb6ceb54bcb0cab65feef332058bf04b36ba8c" +S = "${WORKDIR}/sqlite-autoconf-${PV}"
Signature · 1 line
1.8.0.2
PATCH 5/18 dhcp: Update to 4.2.5-P1
In reply to Saul Wold---
.../dhcp/{dhcp-4.2.5 => dhcp}/dhcp-3.0.3-dhclient-dbus.patch | 0
.../dhcp/{dhcp-4.2.5 => dhcp}/fix-client-path.patch | 0
.../dhcp/{dhcp-4.2.5 => dhcp}/fix-external-bind.patch | 0
meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fixincludes.patch | 0
meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fixsepbuild.patch | 0
.../dhcp/{dhcp-4.2.5 => dhcp}/link-with-lcrypto.patch | 0
meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/noattrmode.patch | 0
meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/site.h | 0
meta/recipes-connectivity/dhcp/{dhcp_4.2.5.bb => dhcp_4.2.5-P1.bb} | 4 ++--
9 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/dhcp-3.0.3-dhclient-dbus.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fix-client-path.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fix-external-bind.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fixincludes.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/fixsepbuild.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/link-with-lcrypto.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/noattrmode.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.5 => dhcp}/site.h (100%)
rename meta/recipes-connectivity/dhcp/{dhcp_4.2.5.bb => dhcp_4.2.5-P1.bb} (66%)meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.5/dhcp-3.0.3-dhclient-dbus.patch +0 -0
meta/recipes-connectivity/dhcp/dhcp/fix-client-path.patch renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.5/fix-client-path.patch +0 -0
meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.5/fix-external-bind.patch +0 -0
meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.5/fixincludes.patch +0 -0
meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.5/fixsepbuild.patch +0 -0
meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.5/link-with-lcrypto.patch +0 -0
meta/recipes-connectivity/dhcp/dhcp/noattrmode.patch renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.5/noattrmode.patch +0 -0
meta/recipes-connectivity/dhcp/dhcp/site.h renamed from meta/recipes-connectivity/dhcp/dhcp-4.2.5/site.h +0 -0
meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb renamed from meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb +2 -2
@@ -9,5 +9,5 @@ SRC_URI += "file://fixincludes.patch \ file://fixsepbuild.patch \ " -SRC_URI[md5sum] = "6489e919ac093d17249270ee9be1020e" -SRC_URI[sha256sum] = "771a5cffb1fd1392d25926e22e1c58a006e2ad02ecd77d136096e5e366a5b6bc" +SRC_URI[md5sum] = "f68e3c1f00a9af5742bc5e71d567cf93" +SRC_URI[sha256sum] = "59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250"
Signature · 1 line
1.8.0.2
PATCH 6/18 resolvconf: Update to 1.71
In reply to Saul Wold---
.../resolvconf/{resolvconf_1.70.bb => resolvconf_1.71.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-connectivity/resolvconf/{resolvconf_1.70.bb => resolvconf_1.71.bb} (87%)meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb renamed from meta/recipes-connectivity/resolvconf/resolvconf_1.70.bb +2 -3
@@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" RDEPENDS_${PN} = "bash" -PR = "r0" SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" -SRC_URI[md5sum] = "95e19745790fd1c9a102ddde3bfdb15c" -SRC_URI[sha256sum] = "7bb1ccfb68d61a96b91d135c4048f464482b634b0fc4a4b9d9a0f56ced5b4bf6" +SRC_URI[md5sum] = "f073ab06b11584c8af86e7f84a56680e" +SRC_URI[sha256sum] = "f2ec30a0e89330c6cbc3117efd60639da8305782979844ee4a1906e4b0ca230c" inherit allarch
Signature · 1 line
1.8.0.2
PATCH 7/18 dpkg: Update to 1.16.10
In reply to Saul Wold---
meta/recipes-devtools/dpkg/{dpkg_1.16.9.bb => dpkg_1.16.10.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/dpkg/{dpkg_1.16.9.bb => dpkg_1.16.10.bb} (71%)meta/recipes-devtools/dpkg/dpkg_1.16.10.bb renamed from meta/recipes-devtools/dpkg/dpkg_1.16.9.bb +2 -2
@@ -8,7 +8,7 @@ SRC_URI += "file://noman.patch \ file://fix-timestamps.patch \ file://remove-tar-no-timestamp.patch" -SRC_URI[md5sum] = "4df9319b2d17e19cdb6fe94dacee44da" -SRC_URI[sha256sum] = "73cd7fba4e54acddd645346b4bc517030b9c35938e82215d3eeb8b4e7af26b7a" +SRC_URI[md5sum] = "a20a06a5272717274a8b009368f237da" +SRC_URI[sha256sum] = "aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2" PR = "${INC_PR}.0"
Signature · 1 line
1.8.0.2
PATCH 8/18 file: Update to 5.14
In reply to Saul Wold---
meta/recipes-devtools/file/{file_5.13.bb => file_5.14.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/file/{file_5.13.bb => file_5.14.bb} (86%)meta/recipes-devtools/file/file_5.14.bb renamed from meta/recipes-devtools/file/file_5.13.bb +2 -2
@@ -17,8 +17,8 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://dump \ file://filesystems" -SRC_URI[md5sum] = "d60c1364ba956eff7d21f8250808fc6d" -SRC_URI[sha256sum] = "f75b7b23ac576b47ed4ba4915e2fb239d9c0d74ac5b4e6a89704b1ed45ee6e2b" +SRC_URI[md5sum] = "c26625f1d6773ad4bc5a87c0e315632c" +SRC_URI[sha256sum] = "461ba01dd0900a3b7c2dcd901b04903192c07887a9c1928af0be507572c77fe4" inherit autotools
Signature · 1 line
1.8.0.2
PATCH 10/18 nspr: Update to 4.9.6
In reply to Saul Wold---
meta/recipes-support/nspr/{nspr_4.9.5.bb => nspr_4.9.6.bb} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta/recipes-support/nspr/{nspr_4.9.5.bb => nspr_4.9.6.bb} (95%)meta/recipes-support/nspr/nspr_4.9.6.bb renamed from meta/recipes-support/nspr/nspr_4.9.5.bb +3 -4
@@ -11,15 +11,14 @@ SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-$ file://remove-rpath-from-tests.patch \ file://fix-build-on-x86_64.patch \ file://trickly-fix-build-on-x86_64.patch \ - file://fix-build-on-aarch64.patch \ " SRC_URI += "file://nspr.pc.in" -RDEPENDS_${PN}-dev += "perl" +SRC_URI[md5sum] = "62b1e9d376d503d972f90c3c0031d879" +SRC_URI[sha256sum] = "7693fddd3c5cc15d53a50df53ab5dcdaa2eb58f5003302690559471744d6c6f9" -SRC_URI[md5sum] = "b6ccfa8fcbbeb17ebeb19a3edff612bd" -SRC_URI[sha256sum] = "616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604" +RDEPENDS_${PN}-dev += "perl" S = "${WORKDIR}/nspr-${PV}/mozilla/nsprpub"
Signature · 1 line
1.8.0.2
PATCH 11/18 libgcrypt: Update to 1.5.1
In reply to Saul WoldRemove automake patch as it is now supported by upstream
--- .../libgcrypt-1.5.0/obsolete_automake_macros.patch | 15 --------------- meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb | 9 --------- meta/recipes-support/libgcrypt/libgcrypt_1.5.1.bb | 4 ++++ 3 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb create mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.5.1.bb
meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch deleted +0 -15
@@ -1,15 +0,0 @@ -Upstream-Status: Submitted [https://bugs.g10code.com/gnupg/issue1459] - -Signed-off-by: Marko Lindqvist <[email protected]> -diff -Nurd libgcrypt-1.5.0/configure.ac libgcrypt-1.5.0/configure.ac ---- libgcrypt-1.5.0/configure.ac 2011-06-29 11:53:22.000000000 +0300 -+++ libgcrypt-1.5.0/configure.ac 2013-01-03 07:12:26.854793677 +0200 -@@ -59,7 +59,7 @@ - - AC_CONFIG_SRCDIR([src/libgcrypt.vers]) - AM_INIT_AUTOMAKE([]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_LIBOBJ_DIR([compat]) - AC_CANONICAL_HOST
meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb deleted +0 -9
@@ -1,9 +0,0 @@ -require libgcrypt.inc - -PR = "r2" - -SRC_URI += "file://obsolete_automake_macros.patch" - -SRC_URI[md5sum] = "78f8f8bec4580f75b25816f7896d0389" -SRC_URI[sha256sum] = "cc98b1f64c9ae3b0185099cef4ac6c436a849095edf87f34157f0bb10e187990" -
meta/recipes-support/libgcrypt/libgcrypt_1.5.1.bb new file +4 -0
@@ -0,0 +1,4 @@ +require libgcrypt.inc + +SRC_URI[md5sum] = "9963b67d84978727f5795e7ff92385de" +SRC_URI[sha256sum] = "d7f5cb694286b24d91836c728dfcac9e8eead80a02c5e2ac78d8b84983154455"
Signature · 1 line
1.8.0.2
PATCH 12/18 pkgconfig: Move patches in prep for 0.28 update
In reply to Saul Wold--- meta/recipes-devtools/pkgconfig/pkgconfig.inc | 8 +------- meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-)
meta/recipes-devtools/pkgconfig/pkgconfig.inc +1 -7
@@ -12,13 +12,7 @@ DEPENDS = "glib-2.0 popt" DEPENDS_class-native = "" DEPENDS_class-nativesdk = "" -SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ - file://autofoo.patch \ - file://glibconfig-sysdefs.h \ - file://pkg-config-native.in \ - file://disable-legacy.patch \ - file://obsolete_automake_macros.patch \ - " +SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz" S = "${WORKDIR}/pkg-config-${PV}/"
meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb +7 -0
@@ -2,5 +2,12 @@ require pkgconfig.inc PR = "r7" +SRC_URI += "file://autofoo.patch \ + file://glibconfig-sysdefs.h \ + file://pkg-config-native.in \ + file://disable-legacy.patch \ + file://obsolete_automake_macros.patch \ + " + SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"
Signature · 1 line
1.8.0.2
PATCH 13/18 libxkbcommon: Update to 0.3.0
In reply to Saul Wold---
.../xorg-lib/{libxkbcommon_0.2.0.bb => libxkbcommon_0.3.0.bb} | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.2.0.bb => libxkbcommon_0.3.0.bb} (67%)meta/recipes-graphics/xorg-lib/libxkbcommon_0.3.0.bb renamed from meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb +4 -7
@@ -2,18 +2,15 @@ SUMMARY = "Generic XKB keymap library" DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ processes a reduced subset of keymaps as defined by the XKB specification." HOMEPAGE = "http://www.xkbcommon.org" - +LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc" LICENSE = "MIT & MIT-style" DEPENDS = "util-macros flex-native bison-native" -SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "2be3d4a255d02c7d46fc6a9486f21f6a" -SRC_URI[sha256sum] = "74eb0a121ca3998015fd687591426bb15c524645a72cf602831b2e729172fb42" - -LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc" +SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -PR = "r1" +SRC_URI[md5sum] = "22a046100738f99b4cc0297aa210f4e4" +SRC_URI[sha256sum] = "866c0df88f806dff8fc859b6f082cf9f8b6c3b549f0a367541e12b1ca28a5d65" inherit autotools pkgconfig
Signature · 1 line
1.8.0.2
PATCH 14/18 glew: fix generation of glew.pc needed by mesa-demos
In reply to Saul Wold--- .../glew/files/fix-glew.pc-install.patch | 44 ++++++++++++++++++++++ meta/recipes-graphics/glew/glew_1.9.0.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-graphics/glew/files/fix-glew.pc-install.patch
meta/recipes-graphics/glew/files/fix-glew.pc-install.patch new file +44 -0
@@ -0,0 +1,44 @@ + +We maintain the autotools configure.ac and Makefile.am, to correctly +provide the glew.pc, the following patch is needed. + +Upstream-Status: Inappropriate + +Signed-off-by: Saul Wold <[email protected]> + +Index: glew-1.9.0/Makefile.am +=================================================================== +--- glew-1.9.0.orig/Makefile.am ++++ glew-1.9.0/Makefile.am +@@ -3,3 +3,5 @@ ACLOCAL_AMFLAGS = -I m4 --install + + SUBDIRS = include src + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glew.pc +Index: glew-1.9.0/configure.ac +=================================================================== +--- glew-1.9.0.orig/configure.ac ++++ glew-1.9.0/configure.ac +@@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:5:7]) + + AC_CONFIG_FILES([Makefile + include/Makefile +- src/Makefile]) ++ src/Makefile ++ glew.pc]) + AC_OUTPUT +Index: glew-1.9.0/glew.pc.in +=================================================================== +--- glew-1.9.0.orig/glew.pc.in ++++ glew-1.9.0/glew.pc.in +@@ -5,6 +5,6 @@ includedir=@includedir@ + + Name: glew + Description: The OpenGL Extension Wrangler library +-Version: @version@ +-Cflags: -I${includedir} @cflags@ +-Libs: -L${libdir} -l@libname@ ++Version: @VERSION@ ++Cflags: -I${includedir} @CFLAGS@ ++Libs: -L${libdir} -lGLEW
meta/recipes-graphics/glew/glew_1.9.0.bb +1 -0
@@ -12,6 +12,7 @@ PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://autotools.patch \ file://glew_fix_for_automake-1.12.patch \ + file://fix-glew.pc-install.patch \ " SRC_URI[md5sum] = "69ce911decef6249d24742497e6ad06a"
Signature · 1 line
1.8.0.2
PATCH 9/18 libffi: Update to 3.0.13
In reply to Saul WoldNew patch is required to fix the location of the libdir defined i the libffi.la file which caused a bad RPATH (/usr/lib/../lib) due to the gcc -print-multi-os-directory returning ../lib.
Remove Aarch64 patches as it is now supported upsteam. Other patch code is also upstreamed
---
.../libffi/0001-libffi-update-for-3.0.11.patch | 171 --
.../libffi/aarch64-adding-build-support.patch | 63 -
.../libffi/libffi/add-aarch64-support.patch | 2672 --------------------
.../libffi/libffi/fix-libffi.la-location.patch | 18 +
.../libffi/{libffi_3.0.11.bb => libffi_3.0.13.bb} | 11 +-
5 files changed, 21 insertions(+), 2914 deletions(-)
delete mode 100644 meta/recipes-gnome/libffi/libffi/0001-libffi-update-for-3.0.11.patch
delete mode 100644 meta/recipes-gnome/libffi/libffi/aarch64-adding-build-support.patch
delete mode 100644 meta/recipes-gnome/libffi/libffi/add-aarch64-support.patch
create mode 100644 meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch
rename meta/recipes-gnome/libffi/{libffi_3.0.11.bb => libffi_3.0.13.bb} (76%)meta/recipes-gnome/libffi/libffi/0001-libffi-update-for-3.0.11.patch deleted +0 -171
@@ -1,171 +0,0 @@ -From 936ab07cec90243a6a336c5aa6205f4edbeb00d5 Mon Sep 17 00:00:00 2001 -From: Andrei Dinu <[email protected]> -Date: Wed, 12 Sep 2012 17:42:29 +0300 -Subject: [PATCH] libffi update for 3.0.11 - -Upstream-Status : Pending - -Signed-off-by: Andrei Dinu <[email protected]> ---- - m4/ax_append_flag.m4 | 69 +++++++++++++++++++++++++++++++++++++++++ - m4/ax_check_compile_flag.m4 | 72 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 141 insertions(+) - create mode 100644 m4/ax_append_flag.m4 - create mode 100644 m4/ax_check_compile_flag.m4 - -diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4 -new file mode 100644 -index 0000000..1d38b76 ---- /dev/null -+++ b/m4/ax_append_flag.m4 -@@ -0,0 +1,69 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) -+# -+# DESCRIPTION -+# -+# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space -+# added in between. -+# -+# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -+# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains -+# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly -+# FLAG. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim <[email protected]> -+# Copyright (c) 2011 Maarten Bosmans <[email protected]> -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see <http://www.gnu.org/licenses/>. -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 2 -+ -+AC_DEFUN([AX_APPEND_FLAG], -+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl -+AS_VAR_SET_IF(FLAGS, -+ [case " AS_VAR_GET(FLAGS) " in -+ *" $1 "*) -+ AC_RUN_LOG([: FLAGS already contains $1]) -+ ;; -+ *) -+ AC_RUN_LOG([: FLAGS="$FLAGS $1"]) -+ AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"]) -+ ;; -+ esac], -+ [AS_VAR_SET(FLAGS,["$1"])]) -+AS_VAR_POPDEF([FLAGS])dnl -+])dnl AX_APPEND_FLAG -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..c3a8d69 ---- /dev/null -+++ b/m4/ax_check_compile_flag.m4 -@@ -0,0 +1,72 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the current language's compiler -+# or gives an error. (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the current language's default -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -+# force the compiler to issue an error when a bad flag is given. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim <[email protected]> -+# Copyright (c) 2011 Maarten Bosmans <[email protected]> -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see <http://www.gnu.org/licenses/>. -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 2 -+ -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], -+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_COMPILE_FLAGS --- -1.7.9.5 -
meta/recipes-gnome/libffi/libffi/aarch64-adding-build-support.patch deleted +0 -63
63 lines not on this page · raw message
meta/recipes-gnome/libffi/libffi/add-aarch64-support.patch deleted +0 -2672
2,672 lines not on this page · raw message
meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch new file +18 -0
@@ -0,0 +1,18 @@ + +Upstream-Status: Inaproppriate + +Signed-off-by: Saul Wold <[email protected]> + +Index: libffi-3.0.13/Makefile.am +=================================================================== +--- libffi-3.0.13.orig/Makefile.am ++++ libffi-3.0.13/Makefile.am +@@ -98,7 +98,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) + + MAKEOVERRIDES= + +-toolexeclib_LTLIBRARIES = libffi.la ++lib_LTLIBRARIES = libffi.la + noinst_LTLIBRARIES = libffi_convenience.la + + libffi_la_SOURCES = src/prep_cif.c src/types.c \
meta/recipes-gnome/libffi/libffi_3.0.13.bb renamed from meta/recipes-gnome/libffi/libffi_3.0.11.bb +3 -8
@@ -9,16 +9,11 @@ A layer must exist above `libffi' that handles type conversions for values passe LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e54c573c49435ccbbd3f6dc9e49a065e" -PR = "r1" - SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz \ - file://0001-libffi-update-for-3.0.11.patch \ - file://add-aarch64-support.patch \ - file://aarch64-adding-build-support.patch \ -" + file://fix-libffi.la-location.patch" -SRC_URI[md5sum] = "f69b9693227d976835b4857b1ba7d0e3" -SRC_URI[sha256sum] = "70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283" +SRC_URI[md5sum] = "45f3b6dbc9ee7c7dfbbbc5feba571529" +SRC_URI[sha256sum] = "1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c" EXTRA_OECONF += "--disable-builddir"
Signature · 1 line
1.8.0.2
PATCH 15/18 mesa-demos: Update to 8.1.0
In reply to Saul WoldRemoved patches that now appear in the upstream.
---
...glgears-Make-EGL_KHR_image-usage-portable.patch | 95 ----------------------
.../mesa-demos/dso_linking_change_build_fix.patch | 24 ------
.../mesa/mesa-demos/gles2-info.patch | 21 -----
.../{mesa-demos_8.0.1.bb => mesa-demos_8.1.0.bb} | 11 +--
4 files changed, 3 insertions(+), 148 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0001-xeglgears-Make-EGL_KHR_image-usage-portable.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
rename meta/recipes-graphics/mesa/{mesa-demos_8.0.1.bb => mesa-demos_8.1.0.bb} (69%)meta/recipes-graphics/mesa/mesa-demos/0001-xeglgears-Make-EGL_KHR_image-usage-portable.patch deleted +0 -95
@@ -1,95 +0,0 @@ -From 43c2122af1caa750531f29bf734c03d1f50801d1 Mon Sep 17 00:00:00 2001 -Message-Id: <43c2122af1caa750531f29bf734c03d1f50801d1.1365283761.git.tom.zanussi@linux.intel.com> -From: Frank Binns <[email protected]> -Date: Fri, 29 Jun 2012 14:06:27 +0100 -Subject: [PATCH] xeglgears: Make EGL_KHR_image usage portable - -EGL extension functions don't have to be exported which means -xeglgears was failing to link against implementations that -support EGL_KHR_image but were not exporting its related functions. - -This has been fixed by using eglGetProcAddress to get a function -pointer instead of using the functions prototype. This is portable. - -Signed-off-by: Frank Binns <[email protected]> - -Integrated-by: Tom Zanussi <[email protected]> - -Upstream-Status: Backport ---- - src/egl/opengl/xeglgears.c | 37 +++++++++++++++++++++++++++++++------ - 1 file changed, 31 insertions(+), 6 deletions(-) - -diff --git a/src/egl/opengl/xeglgears.c b/src/egl/opengl/xeglgears.c -index 513c587..866b89a 100644 ---- a/src/egl/opengl/xeglgears.c -+++ b/src/egl/opengl/xeglgears.c -@@ -51,6 +51,10 @@ - static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES_func; - #endif - -+#ifdef EGL_KHR_image -+static PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR_func; -+#endif -+ - - #define BENCHMARK - -@@ -405,6 +409,17 @@ egl_manager_new(EGLNativeDisplayType xdpy, const EGLint *attrib_list, - eglGetProcAddress("glEGLImageTargetTexture2DOES"); - #endif - -+#ifdef EGL_KHR_image -+ eglCreateImageKHR_func = (PFNEGLCREATEIMAGEKHRPROC) -+ eglGetProcAddress("eglCreateImageKHR"); -+ if (eglCreateImageKHR_func == NULL) { -+ printf("failed to get eglCreateImageKHR\n"); -+ eglTerminate(eman->dpy); -+ free(eman); -+ return NULL; -+ } -+#endif -+ - return eman; - } - -@@ -850,10 +865,16 @@ main(int argc, char *argv[]) - case GEARS_PIXMAP: - case GEARS_PIXMAP_TEXTURE: - ret = egl_manager_create_pixmap(eman, eman->xwin, EGL_TRUE, NULL); -+ -+#ifdef EGL_KHR_image - if (surface_type == GEARS_PIXMAP_TEXTURE) -- eman->image = eglCreateImageKHR (eman->dpy, eman->ctx, -- EGL_NATIVE_PIXMAP_KHR, -- (EGLClientBuffer) eman->xpix, NULL); -+ eman->image = eglCreateImageKHR_func(eman->dpy, eman->ctx, -+ EGL_NATIVE_PIXMAP_KHR, -+ (EGLClientBuffer) eman->xpix, NULL); -+#else -+ fprintf(stderr, "EGL_KHR_image not found at compile time.\n"); -+#endif -+ - if (ret) - ret = eglMakeCurrent(eman->dpy, eman->pix, eman->pix, eman->ctx); - break; -@@ -892,9 +913,13 @@ main(int argc, char *argv[]) - GL_RENDERBUFFER_EXT, - color_rb); - -- eman->image = eglCreateImageKHR(eman->dpy, eman->ctx, -- EGL_GL_RENDERBUFFER_KHR, -- (EGLClientBuffer) color_rb, NULL); -+#ifdef EGL_KHR_image -+ eman->image = eglCreateImageKHR_func(eman->dpy, eman->ctx, -+ EGL_GL_RENDERBUFFER_KHR, -+ (EGLClientBuffer) color_rb, NULL); -+#else -+ fprintf(stderr, "EGL_KHR_image not found at compile time.\n"); -+#endif - - glGenRenderbuffers(1, &depth_rb); - glBindRenderbuffer(GL_RENDERBUFFER_EXT, depth_rb); --- -1.7.11.4 -
meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch deleted +0 -24
@@ -1,24 +0,0 @@ -after gcc linking has changed, all the libraries must be explicitely specified -This patch avoids these linking errors: - -| CCLD xeglgears -| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.5.1/ld: xeglthreads.o: undefined reference to symbol 'pthread_join@@GLIBC_2.4' -| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.5.1/ld: note: 'pthread_join@@GLIBC_2.4' is defined in DSO /build_disk/poky_build/build0/tmp/sysroots/qemuarm/lib/libpthread.so.0 so try adding it to the linker command line -| /build_disk/poky_build/build0/tmp/sysroots/qemuarm/lib/libpthread.so.0: could not read symbols: Invalid operation -| collect2: ld returned 1 exit status - - -Nitin A Kamble <[email protected]> -Date: 2011/02/03 - -Upstream-Status: Pending - -Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am -=================================================================== ---- mesa-demos-8.0.1.orig/src/egl/opengl/Makefile.am 2010-07-07 10:57:15.000000000 -0700 -+++ mesa-demos-8.0.1/src/egl/opengl/Makefile.am 2011-02-03 14:30:13.928486381 -0800 -@@ -67,3 +67,4 @@ - - eglgears_x11_LDADD = ../eglut/libeglut_x11.la - egltri_x11_LDADD = ../eglut/libeglut_x11.la -+xeglthreads_LDADD = -lpthread
meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch deleted +0 -21
@@ -1,21 +0,0 @@ -Fix to enable gles2 to build. - -Ross Burton <[email protected]> - -Upstream-Status: Pending - -Index: mesa-demos-8.0.1/src/egl/opengles2/es2_info.c -=================================================================== ---- mesa-demos-8.0.1.orig/src/egl/opengles2/es2_info.c 2010-07-07 18:57:15.000000000 +0100 -+++ mesa-demos-8.0.1/src/egl/opengles2/es2_info.c 2012-08-01 13:14:59.000104115 +0100 -@@ -18,8 +18,8 @@ - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/keysym.h> --#include <GLES/gl.h> --#include <GLES/glext.h> -+#include <GLES2/gl2.h> -+#include <GLES2/gl2ext.h> - #include <EGL/egl.h> - -
meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb renamed from meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb +3 -8
@@ -11,18 +11,13 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142 DEPENDS = "virtual/libx11 virtual/libgl glew" -PR = "r4" - SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ - file://dso_linking_change_build_fix.patch \ - file://gles2-info.patch \ file://glut.patch \ file://egl-mesa-screen-surface-build-fix.patch \ - file://egl-mesa-screen-surface-query.patch \ - file://0001-xeglgears-Make-EGL_KHR_image-usage-portable.patch" + file://egl-mesa-screen-surface-query.patch" -SRC_URI[md5sum] = "320c2a4b6edc6faba35d9cb1e2a30bf4" -SRC_URI[sha256sum] = "4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1" +SRC_URI[md5sum] = "9df33ba69a26bbfbc7c8148602e59542" +SRC_URI[sha256sum] = "9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828" inherit autotools pkgconfig
Signature · 1 line
1.8.0.2
PATCH 16/18 glib-2.0: Update to 2.36
In reply to Saul WoldRemove automake patch that is now correctly supported upstream Codegen files have moved to glib-2.0, so correct packaging and removal.
---
.../glib-2.0/glib-2.0/obsolete_automake_macros.patch | 13 -------------
.../glib-2.0/{glib-2.0_2.34.3.bb => glib-2.0_2.36.0.bb} | 12 ++++++------
meta/recipes-core/glib-2.0/glib.inc | 2 +-
3 files changed, 7 insertions(+), 20 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.34.3.bb => glib-2.0_2.36.0.bb} (85%)meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch deleted +0 -13
@@ -1,13 +0,0 @@ -Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691011] - -Signed-off-by: Marko Lindqvist <[email protected]> -diff -Nurd glib-2.34.3/configure.ac glib-2.34.3/configure.ac ---- glib-2.34.3/configure.ac 2012-11-26 19:10:04.000000000 +0200 -+++ glib-2.34.3/configure.ac 2013-01-02 15:49:27.832183712 +0200 -@@ -291,7 +291,6 @@ - AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) - AC_LANG_RESTORE - --AM_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_INSTALL
meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +6 -6
@@ -1,6 +1,5 @@ require glib.inc -PR = "r2" PE = "1" DEPENDS += "libffi python-argparse-native zlib"
@@ -12,15 +11,16 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1] SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://glib-2.0_fix_for_x32.patch \ - file://obsolete_automake_macros.patch \ file://fix-conflicting-rand.patch \ file://Makefile-ptest.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "a4ca31e258273c3761e3de2edd607661" -SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7" SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" + +SRC_URI[md5sum] = "2047dff287473450593edecb18f79c17" +SRC_URI[sha256sum] = "455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227" + BBCLASSEXTEND = "native nativesdk" RDEPENDS_${PN}-ptest += "\
@@ -50,8 +50,8 @@ do_configure_prepend() { do_install_append() { # remove some unpackaged files - rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc - rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo + rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc + rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo # and empty dirs rm -rf ${D}${libdir}/gio
meta/recipes-core/glib-2.0/glib.inc +1 -1
@@ -38,7 +38,7 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/*.la" FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ ${libdir}/gio/modules/.debug" -FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py" +FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ ${datadir}/bash-completion"
Signature · 1 line
1.8.0.2
PATCH 17/18 glib-networking: Update to 2.36
In reply to Saul WoldCOPYING file: Address and Formating changes only
---
.../{glib-networking_2.28.7.bb => glib-networking_2.36.0.bb} | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.28.7.bb => glib-networking_2.36.0.bb} (71%)meta/recipes-core/glib-networking/glib-networking_2.36.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.28.7.bb +4 -6
@@ -3,17 +3,15 @@ HOMEPAGE = "http://git.gnome.org/browse/glib-networking/" BUGTRACKER = "http://bugzilla.gnome.org" LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" SECTION = "libs" DEPENDS = "glib-2.0 gnutls intltool-native" -PR = "r3" +SRC_URI = "${GNOME_MIRROR}/${BPN}/2.36/${BPN}-${PV}.tar.xz" -SRC_URI = "${GNOME_MIRROR}/${BPN}/2.28/${BPN}-${PV}.tar.bz2" - -SRC_URI[md5sum] = "c10e51571d03c10111a37bcd21fbf777" -SRC_URI[sha256sum] = "98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c" +SRC_URI[md5sum] = "062dafdb939510e7b38eea3d3b367be0" +SRC_URI[sha256sum] = "190d66fbaeb023ba4f43c315f23c5372c43be6cbe857596e00990211514650d9" EXTRA_OECONF = "--without-ca-certificates --without-gnome-proxy --without-libproxy"
Signature · 1 line
1.8.0.2
PATCH 18/18 build-appliance: Add version info
In reply to Saul Wold---
.../images/{build-appliance-image.bb => build-appliance-image_8.0.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-core/images/{build-appliance-image.bb => build-appliance-image_8.0.bb} (100%)meta/recipes-core/images/build-appliance-image_8.0.bb renamed from meta/recipes-core/images/build-appliance-image.bb +0 -0
Signature · 1 line
1.8.0.2