Package upgrades
v2 cover Package upgrades
Changes in v2:
* removed references to mibstore.h in the following drivers too:
+ xf86-video-fbdev
+ xf86-video-vesa
Tests done:
* built the packages for all architectures (except xf86-video-intel and xf86-video-vmware);
* tested basic functionality in qemu and ideapad s10-3t;
* I changed an xserver-xorg patch related to AArch64 but didn't test it. Even though, at first sight, the change is safe, it would be nice if someone could help testing the xserver upgrade on AArch64;
Thanks,
Laurentiu
The following changes since commit 4da406cd50cf02a63ed76810a670aba1eb561c79:
gst-plugins-gl: allow empty packages (2013-03-12 18:33:30 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib lpalcu/upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/upgrades
Laurentiu Palcu (4):
inputproto: upgrade to 2.3
xserver-xorg: upgrade to 1.14.0
xf86-video-intel: upgrade to 2.21.3
xf86-video-*: delete references to mibstore.h
.../xf86-video-fbdev/Remove-mibstore.h.patch | 35 +++++++++++
.../xorg-driver/xf86-video-fbdev_0.4.3.bb | 2 +
...-intel_2.21.0.bb => xf86-video-intel_2.21.3.bb} | 4 +-
.../xf86-video-vesa/Remove-mibstore.h.patch | 37 +++++++++++
.../xorg-driver/xf86-video-vesa_2.3.2.bb | 2 +
.../xf86-video-vmware/Kill-mibstore.patch | 63 +++++++++++++++++++
.../xorg-driver/xf86-video-vmware_13.0.0.bb | 2 +
.../{inputproto_2.2.bb => inputproto_2.3.bb} | 4 +-
.../xorg-xserver/xserver-xorg-1.13.1/aarch64.patch | 64 --------------------
.../xorg-xserver/xserver-xorg-1.14.0/aarch64.patch | 35 +++++++++++
.../crosscompile.patch | 0
.../fix_compilation_when_not_using_xinerama.patch | 21 +++++++
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 0
.../mips64-compiler.patch | 0
...erver-xorg_1.13.1.bb => xserver-xorg_1.14.0.bb} | 5 +-
16 files changed, 204 insertions(+), 70 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev/Remove-mibstore.h.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.21.0.bb => xf86-video-intel_2.21.3.bb} (86%)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
rename meta/recipes-graphics/xorg-proto/{inputproto_2.2.bb => inputproto_2.3.bb} (78%)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.13.1 => xserver-xorg-1.14.0}/crosscompile.patch (100%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.13.1 => xserver-xorg-1.14.0}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.13.1 => xserver-xorg-1.14.0}/macro_tweak.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.13.1 => xserver-xorg-1.14.0}/mips64-compiler.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.13.1.bb => xserver-xorg_1.14.0.bb} (84%)Signature · 1 line
1.7.9.5
PATCH v2 1/4 inputproto: upgrade to 2.3
---
.../{inputproto_2.2.bb => inputproto_2.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{inputproto_2.2.bb => inputproto_2.3.bb} (78%)meta/recipes-graphics/xorg-proto/inputproto_2.3.bb renamed from meta/recipes-graphics/xorg-proto/inputproto_2.2.bb +2 -2
@@ -17,6 +17,6 @@ inherit gettext BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "13c8aedaf98a92e282b7e456c0a5bed9" -SRC_URI[sha256sum] = "de7516ab25c299740da46c0f1af02f1831c5aa93b7283f512c0f35edaac2bcb0" +SRC_URI[md5sum] = "94db391e60044e140c9854203d080654" +SRC_URI[sha256sum] = "7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f"
Signature · 1 line
1.7.9.5
PATCH v2 2/4 xserver-xorg: upgrade to 1.14.0
In reply to Laurentiu PalcuAditionally:
* adjust the aarch64.patch because the logic changed and the lnx_video.c changes are no longer necessary;
* created patch to fix compilation issue when not using xinerama;
---
.../xorg-xserver/xserver-xorg-1.13.1/aarch64.patch | 64 --------------------
.../xorg-xserver/xserver-xorg-1.14.0/aarch64.patch | 35 +++++++++++
.../crosscompile.patch | 0
.../fix_compilation_when_not_using_xinerama.patch | 21 +++++++
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 0
.../mips64-compiler.patch | 0
...erver-xorg_1.13.1.bb => xserver-xorg_1.14.0.bb} | 5 +-
8 files changed, 59 insertions(+), 66 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.13.1 => xserver-xorg-1.14.0}/crosscompile.patch (100%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.13.1 => xserver-xorg-1.14.0}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.13.1 => xserver-xorg-1.14.0}/macro_tweak.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.13.1 => xserver-xorg-1.14.0}/mips64-compiler.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.13.1.bb => xserver-xorg_1.14.0.bb} (84%)meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch deleted +0 -64
@@ -1,64 +0,0 @@ -Subject: Add AArch64 support to xserver-xorg -Author: Marcin Juszkiewicz <[email protected]> - -lnx_video.c parts are not existing in 1.14 branch. - -Xserver was checked in AArch64 fastmodel (commercial one with graphics support). - -http://patchwork.freedesktop.org/patch/12785/ - -Upstream-status: Pending - ---- - hw/xfree86/os-support/linux/lnx_video.c | 4 ++-- - include/servermd.h | 7 +++++++ - 2 files changed, 9 insertions(+), 2 deletions(-) - ---- xorg-server-1.13.1.orig/hw/xfree86/os-support/linux/lnx_video.c -+++ xorg-server-1.13.1/hw/xfree86/os-support/linux/lnx_video.c -@@ -509,11 +509,11 @@ xf86EnableIO(void) - return FALSE; - } - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); - else - FatalError("xf86EnableIOPorts: failed to set IOPL" -@@ -538,11 +538,11 @@ xf86DisableIO(void) - if (!ExtendedEnabled) - return; - #if defined(__powerpc__) - munmap(ioBase, 0x20000); - ioBase = NULL; --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__) - iopl(0); - ioperm(0, 1024, 0); - #endif - ExtendedEnabled = FALSE; - ---- xorg-server-1.13.1.orig/include/servermd.h -+++ xorg-server-1.13.1/include/servermd.h -@@ -243,10 +243,17 @@ SOFTWARE. - #define BITMAP_BIT_ORDER LSBFirst - #define GLYPHPADBYTES 4 - /* ???? */ - #endif /* AMD64 */ - -+#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64) -+#define IMAGE_BYTE_ORDER MSBFirst -+#define BITMAP_BIT_ORDER MSBFirst -+#define GLYPHPADBYTES 4 -+/* ???? */ -+#endif /* AArch64 */ -+ - #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \ - defined(__alpha__) || defined(__alpha) || \ - defined(__i386__) || \ - defined(__s390x__) || defined(__s390__) -
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch new file +35 -0
@@ -0,0 +1,35 @@ +Subject: Add AArch64 support to xserver-xorg +Author: Marcin Juszkiewicz <[email protected]> + +lnx_video.c parts are not existing in 1.14 branch. + +Xserver was checked in AArch64 fastmodel (commercial one with graphics support). + +http://patchwork.freedesktop.org/patch/12785/ + +Upstream-status: Pending + +--- + include/servermd.h | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +--- xorg-server-1.13.1.orig/include/servermd.h ++++ xorg-server-1.13.1/include/servermd.h +@@ -243,10 +243,17 @@ SOFTWARE. + #define BITMAP_BIT_ORDER LSBFirst + #define GLYPHPADBYTES 4 + /* ???? */ + #endif /* AMD64 */ + ++#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64) ++#define IMAGE_BYTE_ORDER MSBFirst ++#define BITMAP_BIT_ORDER MSBFirst ++#define GLYPHPADBYTES 4 ++/* ???? */ ++#endif /* AArch64 */ ++ + #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \ + defined(__alpha__) || defined(__alpha) || \ + defined(__i386__) || \ + defined(__s390x__) || defined(__s390__) +
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/crosscompile.patch +0 -0
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch new file +21 -0
@@ -0,0 +1,21 @@ +Upstream-Status: Pending + +fix compilation when not using xinerama + +Signed-off-by: Laurentiu Palcu <[email protected]> + +Index: xorg-server-1.14.0/xfixes/xfixesint.h +=================================================================== +--- xorg-server-1.14.0.orig/xfixes/xfixesint.h 2012-07-10 09:06:41.000000000 +0300 ++++ xorg-server-1.14.0/xfixes/xfixesint.h 2013-03-11 15:01:07.019098531 +0200 +@@ -291,8 +291,10 @@ + SProcXFixesDestroyPointerBarrier(ClientPtr client); + + /* Xinerama */ ++#ifdef PANORAMIX + extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr); + void PanoramiXFixesInit(void); + void PanoramiXFixesReset(void); ++#endif + + #endif /* _XFIXESINT_H_ */
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_open_max_preprocessor_error.patch renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch +0 -0
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch +0 -0
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch +0 -0
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb +3 -2
@@ -5,10 +5,11 @@ SRC_URI += "file://crosscompile.patch \ file://fix_open_max_preprocessor_error.patch \ file://mips64-compiler.patch \ file://aarch64.patch \ + file://fix_compilation_when_not_using_xinerama.patch \ " -SRC_URI[md5sum] = "a13d8876e3e804189392119638a07a1f" -SRC_URI[sha256sum] = "c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00" +SRC_URI[md5sum] = "86110278b784e279381b7f6f2295c508" +SRC_URI[sha256sum] = "1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630" PR = "${INC_PR}.0"
Signature · 1 line
1.7.9.5
PATCH v2 3/4 xf86-video-intel: upgrade to 2.21.3
In reply to Laurentiu Palcu---
...-intel_2.21.0.bb => xf86-video-intel_2.21.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.21.0.bb => xf86-video-intel_2.21.3.bb} (86%)meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.3.bb renamed from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.0.bb +2 -2
@@ -23,5 +23,5 @@ EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", " COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -SRC_URI[md5sum] = "f029cc261fca75b32ba85b9c4189db88" -SRC_URI[sha256sum] = "d872adef06cbf1a4434811baad4b8a18feacc6633b59b36557e8d7db7161081c" +SRC_URI[md5sum] = "362a1d70082f5c0d2410aaf87b5125ba" +SRC_URI[sha256sum] = "1ce672a042226dba776649e9067827c24fbb27383c78919a372265bb0d939dbb"
Signature · 1 line
1.7.9.5
PATCH v2 4/4 xf86-video-*: delete references to mibstore.h
In reply to Laurentiu PalcuThis patch removes any references to mibstore.h, which has been removed from xserver-org, from the following drivers:
* xf86-video-vmware
* xf86-video-fbdev
* xf86-video-vesa
--- .../xf86-video-fbdev/Remove-mibstore.h.patch | 35 +++++++++++ .../xorg-driver/xf86-video-fbdev_0.4.3.bb | 2 + .../xf86-video-vesa/Remove-mibstore.h.patch | 37 ++++++++++++ .../xorg-driver/xf86-video-vesa_2.3.2.bb | 2 + .../xf86-video-vmware/Kill-mibstore.patch | 63 ++++++++++++++++++++ .../xorg-driver/xf86-video-vmware_13.0.0.bb | 2 + 6 files changed, 141 insertions(+) create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev/Remove-mibstore.h.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
meta/recipes-graphics/xorg-driver/xf86-video-fbdev/Remove-mibstore.h.patch new file +35 -0
@@ -0,0 +1,35 @@ +Upstream-Status: Backported + +From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001 +From: Adam Jackson <[email protected]> +Date: Tue, 25 Sep 2012 08:54:37 -0400 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson <[email protected]> +--- + src/fbdev.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/fbdev.c b/src/fbdev.c +index cd7ebc5..f5a7378 100644 +--- a/src/fbdev.c ++++ b/src/fbdev.c +@@ -14,7 +14,6 @@ + #include "xf86_OSproc.h" + + #include "mipointer.h" +-#include "mibstore.h" + #include "micmap.h" + #include "colormapst.h" + #include "xf86cmap.h" +@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) + } + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +-- +1.7.9.5 +
meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.3.bb +2 -0
@@ -4,5 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" DESCRIPTION = "X.Org X server -- fbdev display driver" PR = "${INC_PR}.0" +SRC_URI += "file://Remove-mibstore.h.patch" + SRC_URI[md5sum] = "1d99f1dfb3f0fea077b6b61caa3dc85a" SRC_URI[sha256sum] = "ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831"
meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch new file +37 -0
@@ -0,0 +1,37 @@ +Upstream-Status: Backported + +From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001 +From: Adam Jackson <[email protected]> +Date: Tue, 25 Sep 2012 08:55:03 -0400 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson <[email protected]> +--- + src/vesa.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/vesa.c b/src/vesa.c +index 11cd26c..b73d104 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -49,9 +49,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* Colormap handling */ + #include "micmap.h" + #include "xf86cmap.h" +@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL) + VESADGAInit(pScrn, pScreen); + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +-- +1.7.9.5 +
meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb +2 -0
@@ -20,5 +20,7 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" +SRC_URI += "file://Remove-mibstore.h.patch" + SRC_URI[md5sum] = "3eddd393fba79550e012d717499d58ad" SRC_URI[sha256sum] = "144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3"
meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch new file +63 -0
63 lines not on this page · raw message
meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb +2 -0
@@ -6,6 +6,8 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" +SRC_URI += "file://Kill-mibstore.patch" + DEPENDS += "virtual/libx11 libxvmc drm glproto \ virtual/libgl xineramaproto libpciaccess"
Signature · 1 line
1.7.9.5