Pull request #14
cover Pull request #14
The following changes since commit 658bd7ef32390e5d364fb41ba93363b5ee8eeb3b:
systemd-compat-units: package to fixup the rootfs, shouldn't be needed in the future (2011-05-31 14:50:38 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe
Martin Jansa (3):
xserver-xorg: upgrade from 1.10.1.902 to 1.10.2 and replace part of
randr-support.patch with upstream patch
librsvg: replace .bb with smaller .bbappend gpsd,tangogps,foxtrotgps,navit: move to new recipes-navigation
.../recipes-gnome/librsvg/librsvg_2.32.1.bbappend | 2 +
.../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 ++++++++++++++++++++
...ack-assume-pixman-supports-overlapped-blt.patch | 0
.../hack-fbdev-ignore-return-mode.patch | 0
.../randr-support.patch | 41 ++-----------
.../replace-pkgconfig-sdkdir-poking.patch | 0
...r-xorg_1.10.1.901.bb => xserver-xorg_1.10.2.bb} | 9 ++-
.../foxtrotgps/foxtrotgps_1.0.1.bb | 0
.../gpsd/gpsd-2.95/60-gpsd.rules | 0
.../gpsd/gpsd-2.95/gpsd | 0
.../gpsd/gpsd-2.95/gpsd-default | 0
.../gpsd/gpsd-2.95/libtool.patch | 0
.../gpsd/gpsd_2.95.bb | 0
.../navit/navit-fpu.inc | 0
.../navit/navit-icons/GPL-2 | 0
.../navit/navit-icons/configure.in | 0
.../navit/navit-icons_svn.bb | 0
.../navit/navit.inc | 0
.../navit/navit/maps.xml | 0
.../navit/navit/navit.xml | 0
.../navit/navit/osd.xml | 0
.../navit/navit/plugins.xml | 0
.../navit/navit/speech.xml | 0
.../navit/navit_svn.bb | 0
.../tangogps/tangogps_0.99.4.bb | 0
meta-oe/recipes-support/librsvg/librsvg_2.26.2.bb | 42 -------------
26 files changed, 74 insertions(+), 81 deletions(-)
create mode 100644 meta-oe/recipes-gnome/librsvg/librsvg_2.32.1.bbappend
create mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.1.901 => xserver-xorg-1.10.2}/hack-assume-pixman-supports-overlapped-blt.patch (100%)
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.1.901 => xserver-xorg-1.10.2}/hack-fbdev-ignore-return-mode.patch (100%)
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.1.901 => xserver-xorg-1.10.2}/randr-support.patch (75%)
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.1.901 => xserver-xorg-1.10.2}/replace-pkgconfig-sdkdir-poking.patch (100%)
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg_1.10.1.901.bb => xserver-xorg_1.10.2.bb} (79%)
rename meta-oe/{recipes-support => recipes-navigation}/foxtrotgps/foxtrotgps_1.0.1.bb (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd-2.95/60-gpsd.rules (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd-2.95/gpsd (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd-2.95/gpsd-default (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd-2.95/libtool.patch (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd_2.95.bb (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit-fpu.inc (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit-icons/GPL-2 (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit-icons/configure.in (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit-icons_svn.bb (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit.inc (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/maps.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/navit.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/osd.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/plugins.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/speech.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit_svn.bb (100%)
rename meta-oe/{recipes-support => recipes-navigation}/tangogps/tangogps_0.99.4.bb (100%)
delete mode 100644 meta-oe/recipes-support/librsvg/librsvg_2.26.2.bbSignature · 1 line
1.7.5.3
PATCH 1/3 xserver-xorg: upgrade from 1.10.1.902 to 1.10.2 and replace part of randr-support.patch with upstream patch
---
.../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 ++++++++++++++++++++
...ack-assume-pixman-supports-overlapped-blt.patch | 0
.../hack-fbdev-ignore-return-mode.patch | 0
.../randr-support.patch | 41 ++-----------
.../replace-pkgconfig-sdkdir-poking.patch | 0
...r-xorg_1.10.1.901.bb => xserver-xorg_1.10.2.bb} | 9 ++-
6 files changed, 72 insertions(+), 39 deletions(-)
create mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.1.901 => xserver-xorg-1.10.2}/hack-assume-pixman-supports-overlapped-blt.patch (100%)
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.1.901 => xserver-xorg-1.10.2}/hack-fbdev-ignore-return-mode.patch (100%)
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.1.901 => xserver-xorg-1.10.2}/randr-support.patch (75%)
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.1.901 => xserver-xorg-1.10.2}/replace-pkgconfig-sdkdir-poking.patch (100%)
rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg_1.10.1.901.bb => xserver-xorg_1.10.2.bb} (79%)meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch new file +61 -0
@@ -0,0 +1,61 @@ +From 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd Mon Sep 17 00:00:00 2001 +From: Aaron Plattner <[email protected]> +Date: Tue, 24 May 2011 23:02:42 +0000 +Subject: randr: check rotated virtual size limits correctly + +Commit d1107918d4626268803b54033a07405122278e7f introduced checks to +the RandR path that cause RRSetScreenConfig requests to fail if the +size is too large. Unfortunately, when RandR 1.1 rotation is enabled +it compares the rotated screen dimensions to the unrotated limits, +which causes 90- and 270-degree rotation to fail unless your screen +happens to be square: + + X Error of failed request: BadValue (integer parameter out of range for operation) + Major opcode of failed request: 153 (RANDR) + Minor opcode of failed request: 2 (RRSetScreenConfig) + Value in failed request: 0x780 + Serial number of failed request: 14 + Current serial number in output stream: 14 + +Fix this by moving the check above the code that swaps the dimensions +based on the rotation. + +Signed-off-by: Aaron Plattner <[email protected]> +Reviewed-by: Jeremy Huddleston <[email protected]> +Tested-by: Robert Hooker <[email protected]> +Tested-by: Kent Baxley <[email protected]> +Signed-off-by: Keith Packard <[email protected]> +(cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3) +--- +diff --git a/randr/rrscreen.c b/randr/rrscreen.c +index 1bc1a9e..da6d48d 100644 +--- a/randr/rrscreen.c ++++ b/randr/rrscreen.c +@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client) + */ + width = mode->mode.width; + height = mode->mode.height; +- if (rotation & (RR_Rotate_90|RR_Rotate_270)) +- { +- width = mode->mode.height; +- height = mode->mode.width; +- } +- + if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) { + client->errorValue = width; + free(pData); +@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client) + return BadValue; + } + ++ if (rotation & (RR_Rotate_90|RR_Rotate_270)) ++ { ++ width = mode->mode.height; ++ height = mode->mode.width; ++ } ++ + if (width != pScreen->width || height != pScreen->height) + { + int c; +-- +cgit v0.8.3-6-g21f6
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1.901/hack-assume-pixman-supports-overlapped-blt.patch +0 -0
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1.901/hack-fbdev-ignore-return-mode.patch +0 -0
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1.901/randr-support.patch +6 -35
60 lines not on this page · raw message
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1.901/replace-pkgconfig-sdkdir-poking.patch +0 -0
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.901.bb +5 -4
@@ -7,16 +7,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" DESCRIPTION = "the X.Org X server" DEPENDS += "mesa-dri pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" PE = "2" -PR = "${INC_PR}.2" +PR = "${INC_PR}.0" SRC_URI += " \ + file://50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch \ file://randr-support.patch \ file://hack-fbdev-ignore-return-mode.patch \ file://hack-assume-pixman-supports-overlapped-blt.patch \ file://replace-pkgconfig-sdkdir-poking.patch \ " -SRC_URI[md5sum] = "64585a28abb18726d950cf1005bbcce4" -SRC_URI[sha256sum] = "b7d775891e7e7fc3001763cf5727995b81bf07b72e12d9d41db282fe625298e6" +SRC_URI[md5sum] = "c9ba50bd44ea70da51f13100336a5484" +SRC_URI[sha256sum] = "65264f6640568b9db8d738aec1ddd036c3ae21b7ba05b98d006759d11a72792c" do_install_prepend() { mkdir -p ${D}/${libdir}/X11/fonts
@@ -26,7 +27,7 @@ do_install_prepend() { PACKAGE_ARCH_ion = "${MACHINE_ARCH}" XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" -EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" export LDFLAGS += " -ldl "
Signature · 1 line
1.7.5.3
PATCH 2/3 librsvg: replace .bb with smaller .bbappend
--- .../recipes-gnome/librsvg/librsvg_2.32.1.bbappend | 2 + meta-oe/recipes-support/librsvg/librsvg_2.26.2.bb | 42 -------------------- 2 files changed, 2 insertions(+), 42 deletions(-) create mode 100644 meta-oe/recipes-gnome/librsvg/librsvg_2.32.1.bbappend delete mode 100644 meta-oe/recipes-support/librsvg/librsvg_2.26.2.bb
meta-oe/recipes-gnome/librsvg/librsvg_2.32.1.bbappend new file +2 -0
@@ -0,0 +1,2 @@ +DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native" +BBCLASSEXTEND = "native"
meta-oe/recipes-support/librsvg/librsvg_2.26.2.bb deleted +0 -42
42 lines not on this page · raw message
Signature · 1 line
1.7.5.3
PATCH 3/3 gpsd, tangogps, foxtrotgps, navit: move to new recipes-navigation
In reply to Martin Jansa---
.../foxtrotgps/foxtrotgps_1.0.1.bb | 0
.../gpsd/gpsd-2.95/60-gpsd.rules | 0
.../gpsd/gpsd-2.95/gpsd | 0
.../gpsd/gpsd-2.95/gpsd-default | 0
.../gpsd/gpsd-2.95/libtool.patch | 0
.../gpsd/gpsd_2.95.bb | 0
.../navit/navit-fpu.inc | 0
.../navit/navit-icons/GPL-2 | 0
.../navit/navit-icons/configure.in | 0
.../navit/navit-icons_svn.bb | 0
.../navit/navit.inc | 0
.../navit/navit/maps.xml | 0
.../navit/navit/navit.xml | 0
.../navit/navit/osd.xml | 0
.../navit/navit/plugins.xml | 0
.../navit/navit/speech.xml | 0
.../navit/navit_svn.bb | 0
.../tangogps/tangogps_0.99.4.bb | 0
18 files changed, 0 insertions(+), 0 deletions(-)
rename meta-oe/{recipes-support => recipes-navigation}/foxtrotgps/foxtrotgps_1.0.1.bb (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd-2.95/60-gpsd.rules (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd-2.95/gpsd (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd-2.95/gpsd-default (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd-2.95/libtool.patch (100%)
rename meta-oe/{recipes-support => recipes-navigation}/gpsd/gpsd_2.95.bb (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit-fpu.inc (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit-icons/GPL-2 (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit-icons/configure.in (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit-icons_svn.bb (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit.inc (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/maps.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/navit.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/osd.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/plugins.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit/speech.xml (100%)
rename meta-oe/{recipes-support => recipes-navigation}/navit/navit_svn.bb (100%)
rename meta-oe/{recipes-support => recipes-navigation}/tangogps/tangogps_0.99.4.bb (100%)meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb renamed from meta-oe/recipes-support/foxtrotgps/foxtrotgps_1.0.1.bb +0 -0
meta-oe/recipes-navigation/gpsd/gpsd-2.95/60-gpsd.rules renamed from meta-oe/recipes-support/gpsd/gpsd-2.95/60-gpsd.rules +0 -0
meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd renamed from meta-oe/recipes-support/gpsd/gpsd-2.95/gpsd +0 -0
meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd-default renamed from meta-oe/recipes-support/gpsd/gpsd-2.95/gpsd-default +0 -0
meta-oe/recipes-navigation/gpsd/gpsd-2.95/libtool.patch renamed from meta-oe/recipes-support/gpsd/gpsd-2.95/libtool.patch +0 -0
meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb renamed from meta-oe/recipes-support/gpsd/gpsd_2.95.bb +0 -0
meta-oe/recipes-navigation/navit/navit-fpu.inc renamed from meta-oe/recipes-support/navit/navit-fpu.inc +0 -0
meta-oe/recipes-navigation/navit/navit-icons/GPL-2 renamed from meta-oe/recipes-support/navit/navit-icons/GPL-2 +0 -0
meta-oe/recipes-navigation/navit/navit-icons/configure.in renamed from meta-oe/recipes-support/navit/navit-icons/configure.in +0 -0
meta-oe/recipes-navigation/navit/navit-icons_svn.bb renamed from meta-oe/recipes-support/navit/navit-icons_svn.bb +0 -0
meta-oe/recipes-navigation/navit/navit.inc renamed from meta-oe/recipes-support/navit/navit.inc +0 -0
meta-oe/recipes-navigation/navit/navit/maps.xml renamed from meta-oe/recipes-support/navit/navit/maps.xml +0 -0
meta-oe/recipes-navigation/navit/navit/navit.xml renamed from meta-oe/recipes-support/navit/navit/navit.xml +0 -0
meta-oe/recipes-navigation/navit/navit/osd.xml renamed from meta-oe/recipes-support/navit/navit/osd.xml +0 -0
meta-oe/recipes-navigation/navit/navit/plugins.xml renamed from meta-oe/recipes-support/navit/navit/plugins.xml +0 -0
meta-oe/recipes-navigation/navit/navit/speech.xml renamed from meta-oe/recipes-support/navit/navit/speech.xml +0 -0
meta-oe/recipes-navigation/navit/navit_svn.bb renamed from meta-oe/recipes-support/navit/navit_svn.bb +0 -0
meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb renamed from meta-oe/recipes-support/tangogps/tangogps_0.99.4.bb +0 -0
Signature · 1 line
1.7.5.3
Re: [meta-oe][PATCH 1/3] xserver-xorg: upgrade from 1.10.1.902 to 1.10.2 and replace part of randr-support.patch with upstream patch
In reply to Martin Jansameta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb do_install_prepend() { · line 33
Quoted 8 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>---
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.901.bb +1
-1-EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" export LDFLAGS += " -ldl "
I forgot to update commit message, but I've also enabled kdrive/xephyr per otavio request from oe.dev where it did ICE with gcc-4.5
With gcc-4.6 from meta-oe it builds fine, would be great if someone with gcc-4.5 from meta-oe or gcc-4.6.0/gcc-4.5.0 from oe-core test it before merging it.
If it still fails to build then we can disable it again or fix toolchain if it's worth it..
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-oe][PATCH 1/3] xserver-xorg: upgrade from 1.10.1.902 to 1.10.2 and replace part of randr-support.patch with upstream patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 8 lines · Martin Jansa
Quoted 7 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>---
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.901.bb +1
-1-EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs"
Quoted 8 lines
Quoted 1 line
export LDFLAGS += " -ldl "
I forgot to update commit message, but I've also enabled kdrive/xephyr per otavio request from oe.dev where it did ICE with gcc-4.5
With gcc-4.6 from meta-oe it builds fine, would be great if someone with gcc-4.5 from meta-oe or gcc-4.6.0/gcc-4.5.0 from oe-core test it before merging it.
NOTE: package xserver-xorg-2_1.10.2-r19.0: task do_package_write_ipk:
Succeeded
That's with gcc 4.5 from meta-oe
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFN5RjVMkyGM64RGpERAv1lAJ0WqF3O/dPkqct2pBI6GIfqi9M0VgCfU0VP ka4YCQGKHLC+Yo9OaLRbXeo=
=YcuN
-----END PGP SIGNATURE-----