fixes to 1371 and 1330, and upgrades to some recipes
cover fixes to 1371 and 1330, and upgrades to some recipes
The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4:
distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. (2011-08-15 15:26:04 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/master
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master
Dexuan Cui (10):
bluez-hcidump: upgrade from 2.0 to 2.1
tcf-agent: add openssl into DEPENDS
cronie: upgrade from 1.4.7 to 1.4.8
mdadm: upgrade mdadm from 3.2.1 to 3.2.2
util-macros: upgrade from 1.14.0 to the latest version 0.15.0
freetype: upgrade from 2.4.4 to 2.4.6
xproto: upgrade from 7.0.21 to 7.0.22
glproto: upgrade from 1.4.13 to 1.4.14
dri2proto: upgrade from 2.4 to 2.6 distro_tracking_fields.inc: update the info for the following recipes
.../conf/distro/include/distro_tracking_fields.inc | 56 +++---
.../{bluez-hcidump_2.0.bb => bluez-hcidump_2.1.bb} | 4 +-
meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb | 4 +-
.../cronie/{cronie_1.4.7.bb => cronie_1.4.8.bb} | 6 +-
.../mdadm/fix_for_compilation_with_gcc-4.6.0.patch | 174 --------------------
.../mdadm/{mdadm_3.2.1.bb => mdadm_3.2.2.bb} | 9 +-
.../no-hardcode.patch | 0
.../{freetype_2.4.4.bb => freetype_2.4.6.bb} | 8 +-
.../restore_to_old_xDRI2BufferSwapComplete.patch | 53 ------
.../{dri2proto_2.4.bb => dri2proto_2.6.bb} | 7 +-
.../restore_the_old_xGLXBufferSwapComplete.patch | 53 ------
.../{glproto_1.4.13.bb => glproto_1.4.14.bb} | 7 +-
.../{xproto_7.0.21.bb => xproto_7.0.22.bb} | 4 +-
...util-macros_1.14.0.bb => util-macros_1.15.0.bb} | 4 +-
14 files changed, 53 insertions(+), 336 deletions(-)
rename meta/recipes-connectivity/bluez/{bluez-hcidump_2.0.bb => bluez-hcidump_2.1.bb} (83%)
rename meta/recipes-extended/cronie/{cronie_1.4.7.bb => cronie_1.4.8.bb} (94%)
delete mode 100644 meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch
rename meta/recipes-extended/mdadm/{mdadm_3.2.1.bb => mdadm_3.2.2.bb} (77%)
rename meta/recipes-graphics/freetype/{freetype-2.4.4 => freetype-2.4.6}/no-hardcode.patch (100%)
rename meta/recipes-graphics/freetype/{freetype_2.4.4.bb => freetype_2.4.6.bb} (82%)
delete mode 100644 meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch
rename meta/recipes-graphics/xorg-proto/{dri2proto_2.4.bb => dri2proto_2.6.bb} (66%)
delete mode 100644 meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch
rename meta/recipes-graphics/xorg-proto/{glproto_1.4.13.bb => glproto_1.4.14.bb} (68%)
rename meta/recipes-graphics/xorg-proto/{xproto_7.0.21.bb => xproto_7.0.22.bb} (72%)
rename meta/recipes-graphics/xorg-util/{util-macros_1.14.0.bb => util-macros_1.15.0.bb} (80%)Signature · 1 line
1.7.6
PATCH 1/10 bluez-hcidump: upgrade from 2.0 to 2.1
[YOCTO #1371]
Recently bluez4 was updated from 4.82 to 4.96 and bluez-hcidump can't build:src/hcidump.c:54:24: error: redefinition of 'ntoh64'.
In 2.1 the duplicated definition of ntoh64 was removed.
---
.../{bluez-hcidump_2.0.bb => bluez-hcidump_2.1.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/bluez/{bluez-hcidump_2.0.bb => bluez-hcidump_2.1.bb} (83%)meta/recipes-connectivity/bluez/bluez-hcidump_2.1.bb renamed from meta/recipes-connectivity/bluez/bluez-hcidump_2.0.bb +2 -2
@@ -11,8 +11,8 @@ PR = "r0" SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz" -SRC_URI[md5sum] = "5c2e3ef0a68b2845047867ba51ff8ac9" -SRC_URI[sha256sum] = "b3b64fd0b18301df07d3aaf34c037c1e4808b4aaf702294822d62b5424f617fd" +SRC_URI[md5sum] = "b160f0672276398344eebe9df1b37a2c" +SRC_URI[sha256sum] = "a6cc20b95b6b1a28ff336aad91e124555231628689225c1155e8cd7aac1af86d" S = "${WORKDIR}/bluez-hcidump-${PV}" EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
Signature · 1 line
1.7.6
PATCH 2/10 tcf-agent: add openssl into DEPENDS
In reply to Dexuan Cui[YOCTO #1330]
If tcf-agent's do_compile happens before openssl does populate_root, we'll get such a compilation failure:framework/channel_tcp.c:34:27: fatal error: openssl/ssl.h: No such file or directory
Thanks Kumar Gala for reporting this!
--- meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb +2 -2
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://../epl-v10.html;md5=7aa4215a330a0a4f6a1cbf8da1a0879f SRCREV = "1855" PV = "0.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk;module=agent;proto=http \ http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk/epl-v10.html;name=epl \
@@ -19,7 +19,7 @@ SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk;module=ag SRC_URI[epl.md5sum] = "7aa4215a330a0a4f6a1cbf8da1a0879f" SRC_URI[epl.sha256sum] = "4fd64aeed340d62a64a8da4b371efe0f6d0d745f4d2dbefacba86c646d36bc72" -DEPENDS = "util-linux" +DEPENDS = "util-linux openssl" RDEPENDS_${PN} = "bash" S = "${WORKDIR}/agent"
Signature · 1 line
1.7.6
PATCH 3/10 cronie: upgrade from 1.4.7 to 1.4.8
In reply to Dexuan Cui---
.../cronie/{cronie_1.4.7.bb => cronie_1.4.8.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/cronie/{cronie_1.4.7.bb => cronie_1.4.8.bb} (94%)meta/recipes-extended/cronie/cronie_1.4.8.bb renamed from meta/recipes-extended/cronie/cronie_1.4.7.bb +3 -3
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ SECTION = "utils" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -PR = "r3" +PR = "r0" SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ file://crond.init \
@@ -25,8 +25,8 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ PAM_SRC_URI = "file://crond_pam_config.patch" -SRC_URI[md5sum] = "dfc26c47756d0c40ee27ae3c7ee98e0d" -SRC_URI[sha256sum] = "83bae15ae5504454ba74f4142f5db3aa22be594327fea19d2534f65803137fbd" +SRC_URI[md5sum] = "9b1d2ce6db8d1883e06635f437170657" +SRC_URI[sha256sum] = "a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785f513b3" inherit autotools update-rc.d
Signature · 1 line
1.7.6
PATCH 4/10 mdadm: upgrade mdadm from 3.2.1 to 3.2.2
In reply to Dexuan CuiRemove the patch since 3.2.2 has integrated it.
---
.../mdadm/fix_for_compilation_with_gcc-4.6.0.patch | 174 --------------------
.../mdadm/{mdadm_3.2.1.bb => mdadm_3.2.2.bb} | 9 +-
2 files changed, 4 insertions(+), 179 deletions(-)
delete mode 100644 meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch
rename meta/recipes-extended/mdadm/{mdadm_3.2.1.bb => mdadm_3.2.2.bb} (77%)meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch deleted +0 -174
@@ -1,174 +0,0 @@ -Upstream-Status: Pending - -Nitin A Kamble <[email protected]> 2011/05/06 - -Fix these compilation errors with gcc 4.6.0 - -| super1.c: In function 'calc_sb_1_csum': -| super1.c:114:6: error: variable 'i' set but not used [-Werror=unused-but-set-variable] -| Query.c: In function 'Query': -| Query.c:38:16: error: variable 'superrno' set but not used [-Werror=unused-but-set-variable] -| super1.c: In function 'examine_super1': -| super1.c:390:7: error: variable 'me' set but not used [-Werror=unused-but-set-variable] -| cc1: all warnings being treated as errors -| -| make: *** [Query.o] Error 1 -| make: *** Waiting for unfinished jobs.... -| mdadm.c: In function 'main': -| mdadm.c:106:6: error: variable 'auto_update_home' set but not used [-Werror=unused-but-set-variable] -| mdmon.c: In function 'mdmon': -| mdmon.c:354:6: error: variable 'ignore' set but not used [-Werror=unused-but-set-variable] -| cc1: all warnings being treated as errors -| -| make: *** [mdmon.o] Error 1 -| cc1: all warnings being treated as errors -| -| sysfs.c: In function 'sysfs_uevent': -| sysfs.c:421:6: error: variable 'n' set but not used [-Werror=unused-but-set-variable] -| cc1: all warnings being treated as errors -| -| make: *** [mdadm.o] Error 1 -| make: *** [super1.o] Error 1 -| cc1: all warnings being treated as errors -| -| make: *** [sysfs.o] Error 1 -| Grow.c: In function 'Grow_reshape': -| Grow.c:1315:6: error: variable 'changed' set but not used [-Werror=unused-but-set-variable] -| cc1: all warnings being treated as errors -| -| make: *** [Grow.o] Error 1 -| ERROR: oe_runmake failed - -Index: mdadm-3.2.1/Grow.c -=================================================================== ---- mdadm-3.2.1.orig/Grow.c -+++ mdadm-3.2.1/Grow.c -@@ -1312,7 +1312,6 @@ int Grow_reshape(char *devname, int fd, - char *subarray = NULL; - - int frozen; -- int changed = 0; - char *container = NULL; - char container_buf[20]; - int cfd = -1; -@@ -1479,7 +1478,6 @@ int Grow_reshape(char *devname, int fd, - if (!quiet) - fprintf(stderr, Name ": component size of %s has been set to %lluK\n", - devname, size); -- changed = 1; - } else if (array.level != LEVEL_CONTAINER) { - size = get_component_size(fd)/2; - if (size == 0) -Index: mdadm-3.2.1/Query.c -=================================================================== ---- mdadm-3.2.1.orig/Query.c -+++ mdadm-3.2.1/Query.c -@@ -35,7 +35,7 @@ int Query(char *dev) - int fd = open(dev, O_RDONLY); - int vers; - int ioctlerr; -- int superror, superrno; -+ int superror; - struct mdinfo info; - mdu_array_info_t array; - struct supertype *st = NULL; -@@ -84,7 +84,6 @@ int Query(char *dev) - st = guess_super(fd); - if (st) { - superror = st->ss->load_super(st, fd, dev); -- superrno = errno; - } else - superror = -1; - close(fd); -Index: mdadm-3.2.1/mdadm.c -=================================================================== ---- mdadm-3.2.1.orig/mdadm.c -+++ mdadm-3.2.1/mdadm.c -@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) - char *shortopt = short_options; - int dosyslog = 0; - int rebuild_map = 0; -- int auto_update_home = 0; -+ int __attribute__((__unused__)) auto_update_home = 0; - char *subarray = NULL; - char *remove_path = NULL; - char *udev_filename = NULL; -Index: mdadm-3.2.1/mdmon.c -=================================================================== ---- mdadm-3.2.1.orig/mdmon.c -+++ mdadm-3.2.1/mdmon.c -@@ -351,7 +351,6 @@ static int mdmon(char *devname, int devn - struct sigaction act; - int pfd[2]; - int status; -- int ignore; - pid_t victim = -1; - int victim_sock = -1; - -@@ -459,7 +458,6 @@ static int mdmon(char *devname, int devn - if (victim >= 0) - victim_sock = connect_monitor(container->devname); - -- ignore = chdir("/"); - if (!takeover && victim > 0 && victim_sock >= 0) { - if (fping_monitor(victim_sock) == 0) { - fprintf(stderr, "mdmon: %s already managed\n", -@@ -507,10 +505,8 @@ static int mdmon(char *devname, int devn - close(0); - open("/dev/null", O_RDWR); - close(1); -- ignore = dup(0); - #ifndef DEBUG - close(2); -- ignore = dup(0); - #endif - - do_manager(container); -Index: mdadm-3.2.1/super1.c -=================================================================== ---- mdadm-3.2.1.orig/super1.c -+++ mdadm-3.2.1/super1.c -@@ -111,7 +111,6 @@ static unsigned int calc_sb_1_csum(struc - unsigned long long newcsum; - int size = sizeof(*sb) + __le32_to_cpu(sb->max_dev)*2; - unsigned int *isuper = (unsigned int*)sb; -- int i; - - /* make sure I can count... */ - if (offsetof(struct mdp_superblock_1,data_offset) != 128 || -@@ -123,7 +122,7 @@ static unsigned int calc_sb_1_csum(struc - disk_csum = sb->sb_csum; - sb->sb_csum = 0; - newcsum = 0; -- for (i=0; size>=4; size -= 4 ) { -+ for (; size>=4; size -= 4 ) { - newcsum += __le32_to_cpu(*isuper); - isuper++; - } -@@ -387,13 +386,10 @@ static void examine_super1(struct supert - printf(" Array State : "); - for (d=0; d<__le32_to_cpu(sb->raid_disks) + delta_extra; d++) { - int cnt = 0; -- int me = 0; - unsigned int i; - for (i=0; i< __le32_to_cpu(sb->max_dev); i++) { - unsigned int role = __le16_to_cpu(sb->dev_roles[i]); - if (role == d) { -- if (i == __le32_to_cpu(sb->dev_number)) -- me = 1; - cnt++; - } - } -Index: mdadm-3.2.1/sysfs.c -=================================================================== ---- mdadm-3.2.1.orig/sysfs.c -+++ mdadm-3.2.1/sysfs.c -@@ -418,7 +418,7 @@ int sysfs_set_num(struct mdinfo *sra, st - int sysfs_uevent(struct mdinfo *sra, char *event) - { - char fname[50]; -- int n; -+ int __attribute__((__unused__)) n; - int fd; - - sprintf(fname, "/sys/block/%s/uevent",
meta/recipes-extended/mdadm/mdadm_3.2.2.bb renamed from meta/recipes-extended/mdadm/mdadm_3.2.1.bb +4 -5
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" -PR = "r1" +PR = "r0" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ - file://fix_for_compilation_with_gcc-4.6.0.patch" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "d1e2549202bd79d9e99f1498d1109530" -SRC_URI[sha256sum] = "7f68f149c6c0e8893d0b9220ac255b46af08e6a6b81223cab57ed54d628ae125" +SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651" +SRC_URI[sha256sum] = "0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906" CFLAGS += "-fno-strict-aliasing"
Signature · 1 line
1.7.6
PATCH 5/10 util-macros: upgrade from 1.14.0 to the latest version 0.15.0
In reply to Dexuan Cui---
...util-macros_1.14.0.bb => util-macros_1.15.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-util/{util-macros_1.14.0.bb => util-macros_1.15.0.bb} (80%)meta/recipes-graphics/xorg-util/util-macros_1.15.0.bb renamed from meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb +2 -2
@@ -20,5 +20,5 @@ RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "cbe57cd7cc492a762466f5280a7ffba8" -SRC_URI[sha256sum] = "9bd6949b930aadfce32bc9e101008d4c6ff48329ed0e3a467990bee69f574d66" +SRC_URI[md5sum] = "c7f0c94126443f6744328a92d2b94cff" +SRC_URI[sha256sum] = "db05c59c0e7843c398ed2847ba4b5bf54292499e5fcadbb7c38a445bf4347ab8"
Signature · 1 line
1.7.6
PATCH 6/10 freetype: upgrade from 2.4.4 to 2.4.6
In reply to Dexuan Cuifreetype-2.4.6/docs/LICENSE.TXT changed a little to describe more clearly the compatibility about FreeTypeLicense and GPLv2+, but the actual license remains unchanged: it's still LICENSE = "FreeTypeLicense | GPLv2+".
---
.../no-hardcode.patch | 0
.../{freetype_2.4.4.bb => freetype_2.4.6.bb} | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/freetype/{freetype-2.4.4 => freetype-2.4.6}/no-hardcode.patch (100%)
rename meta/recipes-graphics/freetype/{freetype_2.4.4.bb => freetype_2.4.6.bb} (82%)meta/recipes-graphics/freetype/freetype-2.4.6/no-hardcode.patch renamed from meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch +0 -0
meta/recipes-graphics/freetype/freetype_2.4.6.bb renamed from meta/recipes-graphics/freetype/freetype_2.4.4.bb +4 -4
@@ -7,9 +7,9 @@ HOMEPAGE = "http://www.freetype.org/" BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" LICENSE = "FreeTypeLicense | GPLv2+" -LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=8bc1a580aeb518100d00a2dd29e68edf \ +LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39 \ file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ - file://docs/GPL.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" + file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" SECTION = "libs"
@@ -18,8 +18,8 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://no-hardcode.patch" -SRC_URI[md5sum] = "b3e2b6e2f1c3e0dffa1fd2a0f848b671" -SRC_URI[sha256sum] = "4b8281c7dc4d375c6b65d3c6f4808e488a313fab47d7be82aad2c871c8480fef" +SRC_URI[md5sum] = "5e6510613f612809d2d7862592b92ab7" +SRC_URI[sha256sum] = "24a4a57f3a6859887e91f90f93f754cfc7bf9ab9246a3a696435a0c6a7a1e92a" S = "${WORKDIR}/freetype-${PV}"
Signature · 1 line
1.7.6
PATCH 7/10 xproto: upgrade from 7.0.21 to 7.0.22
In reply to Dexuan Cui---
.../{xproto_7.0.21.bb => xproto_7.0.22.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{xproto_7.0.21.bb => xproto_7.0.22.bb} (72%)meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb renamed from meta/recipes-graphics/xorg-proto/xproto_7.0.21.bb +2 -2
@@ -14,6 +14,6 @@ PE = "1" EXTRA_OECONF_append = " --enable-specs=no" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "c5a93a69b701cf81925fab02b35b0d0e" -SRC_URI[sha256sum] = "38ee2f032c3a9e30504593f8b5e6c1161a6629daba93748a71c6f70c16f65548" +SRC_URI[md5sum] = "da0b0eb2f432b7cc1d665b05422a0457" +SRC_URI[sha256sum] = "ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8"
Signature · 1 line
1.7.6
PATCH 8/10 glproto: upgrade from 1.4.13 to 1.4.14
In reply to Dexuan CuiThe patch has been integrated into 1.4.14 so let's remove it.
---
.../restore_the_old_xGLXBufferSwapComplete.patch | 53 --------------------
.../{glproto_1.4.13.bb => glproto_1.4.14.bb} | 7 +--
2 files changed, 3 insertions(+), 57 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch
rename meta/recipes-graphics/xorg-proto/{glproto_1.4.13.bb => glproto_1.4.14.bb} (68%)meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patch deleted +0 -53
@@ -1,53 +0,0 @@ -Upstream-Status: Inappropriate [backport from upstream] - -In May, people already reported the mesa-dri build issue when upgrading to -glproto-1.4.13 and dri2proto-2.4: -http://lists.freedesktop.org/archives/mesa-dev/2011-May/007331.html - -The story is: Jesse tried to change the definitions of some structs in -glproto, dri2proto and mesa-dri, but the change in mesa-dri side was accepted -and then reverted, see -http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc4a3edcf9d414d5098618d5d3b79d8dd90adcc3 - -so in glproto and dri2proto's sides, we have to revert the change, too: -http://cgit.freedesktop.org/xorg/proto/glproto/commit/?id=7196c9441af941be74180f8e8d4e10a08659b80f - -We could remove this patch when upgrading to newer glproto, dri2proto and -mesa-dri in future. - -Wed Jun 15 14:33:14 CST 2011 -Dexuan Cui <[email protected]> - -------------------------------------------------------- - -commit 7196c9441af941be74180f8e8d4e10a08659b80f -Author: Jesse Barnes <[email protected]> -Date: Thu May 5 09:21:19 2011 -0700 - - Revert "glxproto: make GLX swap event struct match spec" - - This reverts commit f5403828c68af0f12c79c0504df0a4781ca84b2b. - - This broke compatibility with existing code, so revert in favor of a new - struct definition instead. - -diff --git a/glxproto.h b/glxproto.h -index dfa0647..0ff44e3 100644 ---- a/glxproto.h -+++ b/glxproto.h -@@ -1375,13 +1375,13 @@ typedef struct { - BYTE pad; - CARD16 sequenceNumber B16; - CARD16 event_type B16; -- CARD16 pad2; - CARD32 drawable; - CARD32 ust_hi B32; - CARD32 ust_lo B32; - CARD32 msc_hi B32; - CARD32 msc_lo B32; -- CARD32 sbc B32; -+ CARD32 sbc_hi B32; -+ CARD32 sbc_lo B32; - } xGLXBufferSwapComplete; - - /************************************************************************/
meta/recipes-graphics/xorg-proto/glproto_1.4.14.bb renamed from meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb +3 -4
@@ -1,5 +1,4 @@ require xorg-proto-common.inc -SRC_URI += "file://restore_the_old_xGLXBufferSwapComplete.patch" SUMMARY = "OpenGL: X OpenGL extension headers"
@@ -11,10 +10,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" -PR = "r1" +PR = "r0" PE = "1" BBCLASSEXTEND = "nativesdk" -SRC_URI[md5sum] = "9542f2d36751a8ad7eae9d8e176f70d4" -SRC_URI[sha256sum] = "fc0a94d4df003cb6b6953173e6498d9c4c3268ee24bcc46a1172a1e1dbd3d742" +SRC_URI[md5sum] = "f48257daf0017f7a7667e5bf48ca3578" +SRC_URI[sha256sum] = "7aaf555a100a63c67dbffc63153dcaaa3de1a36e605a2e98fce63f64089ff999"
Signature · 1 line
1.7.6
PATCH 9/10 dri2proto: upgrade from 2.4 to 2.6
In reply to Dexuan CuiThe patch has been integrated into 1.4.14 so let's remove it.
---
.../restore_to_old_xDRI2BufferSwapComplete.patch | 53 --------------------
.../{dri2proto_2.4.bb => dri2proto_2.6.bb} | 7 +--
2 files changed, 3 insertions(+), 57 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch
rename meta/recipes-graphics/xorg-proto/{dri2proto_2.4.bb => dri2proto_2.6.bb} (66%)meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patch deleted +0 -53
@@ -1,53 +0,0 @@ -Upstream-Status: Inappropriate [backport from upstream] - -In May, people already reported the mesa-dri build issue when upgrading to -glproto-1.4.13 and dri2proto-2.4: -http://lists.freedesktop.org/archives/mesa-dev/2011-May/007331.html - -The story is: Jesse tried to change the definitions of some structs -in glproto, dri2proto and mesa-dri, but the change in mesa-dri side was accepted -and then reverted, see -http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc4a3edcf9d414d5098618d5d3b79d8dd90adcc3 - -so in glproto and driproto's sides, we have to revert the change, too: -http://cgit.freedesktop.org/xorg/proto/dri2proto/commit/?id=f3c211e1ae183dab5c7529814c9f42af2c29fc6c - -We could remove this patch when upgrading to newer glproto, dri2proto and -mesa-dri in future. - -Wed Jun 15 14:33:14 CST 2011 -Dexuan Cui <[email protected]> - -------------------------------------------------------- - -commit f3c211e1ae183dab5c7529814c9f42af2c29fc6c -Author: Jesse Barnes <[email protected]> -Date: Thu May 5 09:22:39 2011 -0700 - - Revert "dri2proto: make DRI2 swap event match GLX spec" - - This reverts commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a. - - This broke compatibility by renaming existing struct fields. So revert - in favor of a new struct. - -diff --git a/dri2proto.h b/dri2proto.h -index ff76355..9708a4a 100644 ---- a/dri2proto.h -+++ b/dri2proto.h -@@ -290,13 +290,13 @@ typedef struct { - CARD8 pad; - CARD16 sequenceNumber B16; - CARD16 event_type B16; -- CARD16 pad2; - CARD32 drawable B32; - CARD32 ust_hi B32; - CARD32 ust_lo B32; - CARD32 msc_hi B32; - CARD32 msc_lo B32; -- CARD32 sbc B32; -+ CARD32 sbc_hi B32; -+ CARD32 sbc_lo B32; - } xDRI2BufferSwapComplete; - #define sz_xDRI2BufferSwapComplete 32 -
meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb renamed from meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb +3 -4
@@ -1,5 +1,4 @@ require xorg-proto-common.inc -SRC_URI += "file://restore_to_old_xDRI2BufferSwapComplete.patch" SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers"
@@ -11,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \ file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca" -PR = "r1" +PR = "r0" -SRC_URI[md5sum] = "0cdeb1e95901813385dc9576be272bd3" -SRC_URI[sha256sum] = "ff156f178d48ab31beeb4be5eb39d5df7540791ba489a8d94c443bb99a2376f1" +SRC_URI[md5sum] = "2eb74959684f47c862081099059a11ab" +SRC_URI[sha256sum] = "ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909"
Signature · 1 line
1.7.6
PATCH 10/10 distro_tracking_fields.inc: update the info for the following recipes
In reply to Dexuan Cuicronie
mdadm
freetype
xproto
glproto
dri2proto
util-macros
--- .../conf/distro/include/distro_tracking_fields.inc | 56 ++++++++++---------- 1 files changed, 28 insertions(+), 28 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +28 -28
@@ -994,13 +994,13 @@ RECIPE_MAINTAINER_pn-quota = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-mdadm = "green" RECIPE_DEPENDENCY_CHECK_pn-mdadm = "not done" -RECIPE_LATEST_VERSION_pn-mdadm = "3.2.1" +RECIPE_LATEST_VERSION_pn-mdadm = "3.2.2" RECIPE_NO_OF_PATCHES_pn-mdadm = "0" RECIPE_INTEL_SECTION_pn-mdadm = "base utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mdadm = "1+ months" -RECIPE_LATEST_RELEASE_DATE_pn-mdadm = "Mar 28, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mdadm = "2+ months" +RECIPE_LATEST_RELEASE_DATE_pn-mdadm = "Jun 17, 2011" RECIPE_COMMENTS_pn-mdadm = "" -RECIPE_LAST_UPDATE_pn-mdadm = "Apr 20, 2011" +RECIPE_LAST_UPDATE_pn-mdadm = "Aug 16, 2011" RECIPE_MAINTAINER_pn-mdadm = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-screen = "green"
@@ -1986,13 +1986,13 @@ RECIPE_MAINTAINER_pn-cpio = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-cronie = "green" RECIPE_DEPENDENCY_CHECK_pn-cronie = "not done" -RECIPE_LATEST_VERSION_pn-cronie = "1.4.7" -RECIPE_MANUAL_CHECK_DATE_pn-cronie = "Apr 11, 2011" +RECIPE_LATEST_VERSION_pn-cronie = "1.4.8" +RECIPE_MANUAL_CHECK_DATE_pn-cronie = "Aug 16, 2011" RECIPE_INTEL_SECTION_pn-cronie = "base" RECIPE_NO_OF_PATCHES_pn-cronie = "0" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cronie = "5 months" -RECIPE_LATEST_RELEASE_DATE_pn-cronie = "Mar 17, 2011" -RECIPE_LAST_UPDATE_pn-cronie = "Apr 11, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cronie = "3 months" +RECIPE_LATEST_RELEASE_DATE_pn-cronie = "Jun 27, 2011" +RECIPE_LAST_UPDATE_pn-cronie = "Aug 16, 2011" RECIPE_MAINTAINER_pn-cronie = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-grep = "green"
@@ -3839,13 +3839,13 @@ RECIPE_MAINTAINER_pn-fontsproto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-glproto = "green" DISTRO_PN_ALIAS_pn-glproto = "Meego=xorg-x11-proto-glproto" RECIPE_DEPENDENCY_CHECK_pn-glproto = "not done" -RECIPE_LATEST_VERSION_pn-glproto = "1.4.13" +RECIPE_LATEST_VERSION_pn-glproto = "1.4.14" RECIPE_NO_OF_PATCHES_pn-glproto = "0" RECIPE_INTEL_SECTION_pn-glproto = "x11/libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glproto = "9 months" -RECIPE_LATEST_RELEASE_DATE_pn-glproto = "May 4, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glproto = "1+ months" +RECIPE_LATEST_RELEASE_DATE_pn-glproto = "Jun 29, 2011" RECIPE_COMMENTS_pn-glproto = "" -RECIPE_LAST_UPDATE_pn-glproto = "Jun 13, 2011" +RECIPE_LAST_UPDATE_pn-glproto = "Aug 16, 2011" RECIPE_MAINTAINER_pn-glproto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-inputproto = "green"
@@ -4110,13 +4110,13 @@ RECIPE_MAINTAINER_pn-xineramaproto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-dri2proto = "green" DISTRO_PN_ALIAS_pn-dri2proto = "Meego=xorg-x11-proto-dri2proto" RECIPE_DEPENDENCY_CHECK_pn-dri2proto = "not done" -RECIPE_LATEST_VERSION_pn-dri2proto = "2.4" +RECIPE_LATEST_VERSION_pn-dri2proto = "2.6" RECIPE_NO_OF_PATCHES_pn-dri2proto = "0" RECIPE_INTEL_SECTION_pn-dri2proto = "x11/libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dri2proto = "1+ years" -RECIPE_LATEST_RELEASE_DATE_pn-dri2proto = "May 4, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dri2proto = "1+ months" +RECIPE_LATEST_RELEASE_DATE_pn-dri2proto = "Jun 29, 2011" RECIPE_COMMENTS_pn-dri2proto = "" -RECIPE_LAST_UPDATE_pn-dri2proto = "Jun 13, 2011" +RECIPE_LAST_UPDATE_pn-dri2proto = "Aug 16, 2011" RECIPE_MAINTAINER_pn-dri2proto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-xcb-proto = "green"
@@ -4157,13 +4157,13 @@ RECIPE_MAINTAINER_pn-xf86vidmodeproto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-xproto = "green" DISTRO_PN_ALIAS_pn-xproto = "Meego=xorg-x11-proto-xproto Fedora=xorg-x11-proto-devel Ubuntu=x11proto-core-dev Debian=x11proto-core-dev Opensuse=xorg-x11-proto-devel Mandriva=x11-proto-devel" RECIPE_DEPENDENCY_CHECK_pn-xproto = "not done" -RECIPE_LATEST_VERSION_pn-xproto = "7.0.21" +RECIPE_LATEST_VERSION_pn-xproto = "7.0.22" RECIPE_NO_OF_PATCHES_pn-xproto = "0" RECIPE_INTEL_SECTION_pn-xproto = "x11/libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xproto = "3+ months" -RECIPE_LATEST_RELEASE_DATE_pn-xproto = "Mar 22, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xproto = "3 months" +RECIPE_LATEST_RELEASE_DATE_pn-xproto = "Jun 22, 2011" RECIPE_COMMENTS_pn-xproto = "" -RECIPE_LAST_UPDATE_pn-xproto = "Apr 11, 2011" +RECIPE_LAST_UPDATE_pn-xproto = "Aug 16, 2011" RECIPE_MAINTAINER_pn-xproto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-liberation-fonts = "green"
@@ -4494,12 +4494,12 @@ RECIPE_MAINTAINER_pn-xkeyboard-config = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-util-macros = "green" DISTRO_PN_ALIAS_pn-util-macros = "Meego=xorg-x11-util-macros Fedora=xorg-x11-util-macros Mandriva=x11-util-macros" RECIPE_DEPENDENCY_CHECK_pn-util-macros = "not done" -RECIPE_LATEST_VERSION_pn-util-macros = "1.14.0" +RECIPE_LATEST_VERSION_pn-util-macros = "1.15.0" RECIPE_INTEL_SECTION_pn-util-macros = "x11/utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-util-macros = "2+ months" -RECIPE_LATEST_RELEASE_DATE_pn-util-macros = "May 27, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-util-macros = "1 month" +RECIPE_LATEST_RELEASE_DATE_pn-util-macros = "Jun 23, 2011" RECIPE_COMMENTS_pn-util-macros = "" -RECIPE_LAST_UPDATE_pn-util-macros = "Jun 13, 2011" +RECIPE_LAST_UPDATE_pn-util-macros = "Aug 16, 2011" RECIPE_MAINTAINER_pn-util-macros = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-fontconfig = "green"
@@ -4516,14 +4516,14 @@ RECIPE_MAINTAINER_pn-fontconfig = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-freetype = "green" RECIPE_DEPENDENCY_CHECK_pn-freetype = "not done" -RECIPE_LATEST_VERSION_pn-freetype = "2.4.4" +RECIPE_LATEST_VERSION_pn-freetype = "2.4.6" RECIPE_NO_OF_PATCHES_pn-freetype = "1" RECIPE_PATCH_pn-freetype+no-hardcode = "fix freetype-config.in" RECIPE_INTEL_SECTION_pn-freetype = "libs" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-freetype = "1+ months" -RECIPE_LATEST_RELEASE_DATE_pn-freetype = "Nov 28, 2010" +RECIPE_LATEST_RELEASE_DATE_pn-freetype = "Jul 29, 2011" RECIPE_COMMENTS_pn-freetype = "" -RECIPE_LAST_UPDATE_pn-freetype = "Jan 28, 2011" +RECIPE_LAST_UPDATE_pn-freetype = "Aug 16, 2011" RECIPE_MAINTAINER_pn-freetype = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-librsvg = "green"
Signature · 1 line
1.7.6
Saul Wold
AppliedQuoted 35 lines · Dexuan Cui
The following changes since commit
13db5f420ca9bff98561f80d78958278734ad1f4:distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. (2011-08-15 15:26:04 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contribdcui/master
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/masterDexuan Cui (10):
bluez-hcidump: upgrade from 2.0 to 2.1
tcf-agent: add openssl into DEPENDS
cronie: upgrade from 1.4.7 to 1.4.8
mdadm: upgrade mdadm from 3.2.1 to 3.2.2
util-macros: upgrade from 1.14.0 to the latest version 0.15.0
freetype: upgrade from 2.4.4 to 2.4.6
xproto: upgrade from 7.0.21 to 7.0.22
glproto: upgrade from 1.4.13 to 1.4.14
dri2proto: upgrade from 2.4 to 2.6 distro_tracking_fields.inc: update the info for the following recipes.../conf/distro/include/distro_tracking_fields.inc | 56 +++--- .../{bluez-hcidump_2.0.bb => bluez-hcidump_2.1.bb} | 4 +- meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb | 4 +- .../cronie/{cronie_1.4.7.bb => cronie_1.4.8.bb} | 6 +- .../mdadm/fix_for_compilation_with_gcc-4.6.0.patch | 174 -------------------- .../mdadm/{mdadm_3.2.1.bb => mdadm_3.2.2.bb} | 9 +- .../no-hardcode.patch | 0 .../{freetype_2.4.4.bb => freetype_2.4.6.bb} | 8 +- .../restore_to_old_xDRI2BufferSwapComplete.patch | 53 ------ .../{dri2proto_2.4.bb => dri2proto_2.6.bb} | 7 +- .../restore_the_old_xGLXBufferSwapComplete.patch | 53 ------ .../{glproto_1.4.13.bb => glproto_1.4.14.bb} | 7 +- .../{xproto_7.0.21.bb => xproto_7.0.22.bb} | 4 +- ...util-macros_1.14.0.bb => util-macros_1.15.0.bb} | 4 +- 14 files changed, 53 insertions(+), 336 deletions(-)
Quoted 13 lines
rename meta/recipes-connectivity/bluez/{bluez-hcidump_2.0.bb => bluez-hcidump_2.1.bb} (83%) rename meta/recipes-extended/cronie/{cronie_1.4.7.bb => cronie_1.4.8.bb} (94%)
delete mode 100644meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patchrename meta/recipes-extended/mdadm/{mdadm_3.2.1.bb => mdadm_3.2.2.bb} (77%)
rename meta/recipes-graphics/freetype/{freetype-2.4.4 =>freetype-2.4.6}/no-hardcode.patch(100%) rename meta/recipes-graphics/freetype/{freetype_2.4.4.bb => freetype_2.4.6.bb} (82%) delete mode 100644meta/recipes-graphics/xorg-proto/dri2proto/restore_to_old_xDRI2BufferSwapComplete.patchrename meta/recipes-graphics/xorg-proto/{dri2proto_2.4.bb => dri2proto_2.6.bb} (66%) delete mode 100644meta/recipes-graphics/xorg-proto/glproto/restore_the_old_xGLXBufferSwapComplete.patchrename meta/recipes-graphics/xorg-proto/{glproto_1.4.13.bb => glproto_1.4.14.bb} (68%) rename meta/recipes-graphics/xorg-proto/{xproto_7.0.21.bb => xproto_7.0.22.bb} (72%) rename meta/recipes-graphics/xorg-util/{util-macros_1.14.0.bb => util-macros_1.15.0.bb} (80%)
Merged into OE-Core
Thanks
Sau!