* [PATCH 0/4] Package upgrades
@ 2013-03-11 16:27 Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 1/4] inputproto: upgrade to 2.3 Laurentiu Palcu
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Laurentiu Palcu @ 2013-03-11 16:27 UTC (permalink / raw)
To: openembedded-core
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 365eb9b5d22208c967dcd91d8ab52faed20f04b5:
bitbake: bitbake-layers: fix duplicated help info (2013-03-10 04:36:52 +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-vmware: delete references to xserver's mibstore.h
...-intel_2.21.0.bb => xf86-video-intel_2.21.3.bb} | 4 +-
.../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 +-
12 files changed, 128 insertions(+), 70 deletions(-)
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-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%)
--
1.7.9.5
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/4] inputproto: upgrade to 2.3
2013-03-11 16:27 [PATCH 0/4] Package upgrades Laurentiu Palcu
@ 2013-03-11 16:27 ` Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 2/4] xserver-xorg: upgrade to 1.14.0 Laurentiu Palcu
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Laurentiu Palcu @ 2013-03-11 16:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../{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%)
diff --git a/meta/recipes-graphics/xorg-proto/inputproto_2.2.bb b/meta/recipes-graphics/xorg-proto/inputproto_2.3.bb
similarity index 78%
rename from meta/recipes-graphics/xorg-proto/inputproto_2.2.bb
rename to meta/recipes-graphics/xorg-proto/inputproto_2.3.bb
index 3b3ae36..f983ef5 100644
--- a/meta/recipes-graphics/xorg-proto/inputproto_2.2.bb
+++ b/meta/recipes-graphics/xorg-proto/inputproto_2.3.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/4] xserver-xorg: upgrade to 1.14.0
2013-03-11 16:27 [PATCH 0/4] Package upgrades Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 1/4] inputproto: upgrade to 2.3 Laurentiu Palcu
@ 2013-03-11 16:27 ` Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 3/4] xf86-video-intel: upgrade to 2.21.3 Laurentiu Palcu
2013-03-11 16:27 ` [PATCH " Laurentiu Palcu
3 siblings, 0 replies; 8+ messages in thread
From: Laurentiu Palcu @ 2013-03-11 16:27 UTC (permalink / raw)
To: openembedded-core
Aditionally:
* 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;
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../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%)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch
deleted file mode 100644
index 8a4f3e3..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Subject: Add AArch64 support to xserver-xorg
-Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-
-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__)
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch
new file mode 100644
index 0000000..7882ebe
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch
@@ -0,0 +1,35 @@
+Subject: Add AArch64 support to xserver-xorg
+Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
+
+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__)
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
new file mode 100644
index 0000000..f0c165d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
@@ -0,0 +1,21 @@
+Upstream-Status: Pending
+
+fix compilation when not using xinerama
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+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_ */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
similarity index 84%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
index 50b3117..83b8049 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/4] xf86-video-intel: upgrade to 2.21.3
2013-03-11 16:27 [PATCH 0/4] Package upgrades Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 1/4] inputproto: upgrade to 2.3 Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 2/4] xserver-xorg: upgrade to 1.14.0 Laurentiu Palcu
@ 2013-03-11 16:27 ` Laurentiu Palcu
2013-03-12 7:54 ` [PATCH v2 4/4] xf86-video-vmware: delete references to xserver's mibstore.h Laurentiu Palcu
2013-03-11 16:27 ` [PATCH " Laurentiu Palcu
3 siblings, 1 reply; 8+ messages in thread
From: Laurentiu Palcu @ 2013-03-11 16:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...-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%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.3.bb
similarity index 86%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.3.bb
index 157e0f3..6d83ef8 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.3.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] xf86-video-vmware: delete references to xserver's mibstore.h
2013-03-11 16:27 [PATCH 0/4] Package upgrades Laurentiu Palcu
` (2 preceding siblings ...)
2013-03-11 16:27 ` [PATCH 3/4] xf86-video-intel: upgrade to 2.21.3 Laurentiu Palcu
@ 2013-03-11 16:27 ` Laurentiu Palcu
2013-03-12 7:00 ` Saul Wold
3 siblings, 1 reply; 8+ messages in thread
From: Laurentiu Palcu @ 2013-03-11 16:27 UTC (permalink / raw)
To: openembedded-core
mibstore.h has been deleted in the new xserver. Update the driver too.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../xf86-video-vmware/Kill-mibstore.patch | 63 ++++++++++++++++++++
.../xorg-driver/xf86-video-vmware_13.0.0.bb | 2 +
2 files changed, 65 insertions(+)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
new file mode 100644
index 0000000..e85a2ea
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
@@ -0,0 +1,63 @@
+Upstream-Status: Backported
+
+From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
+From: Zack Rusin <zackr@vmware.com>
+Date: Thu, 14 Feb 2013 14:33:01 -0800
+Subject: [PATCH] Kill mibstore
+
+It was a noop for at least 5 years and it has been removed.
+
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+ saa/saa_priv.h | 1 -
+ src/vmware.c | 2 --
+ vmwgfx/vmwgfx_driver.c | 1 -
+ 3 files changed, 4 deletions(-)
+
+diff --git a/saa/saa_priv.h b/saa/saa_priv.h
+index 6652054..5d81453 100644
+--- a/saa/saa_priv.h
++++ b/saa/saa_priv.h
+@@ -48,7 +48,6 @@
+ #include "pixmapstr.h"
+ #include "windowstr.h"
+ #include "servermd.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
+diff --git a/src/vmware.c b/src/vmware.c
+index 41201f1..6b74e14 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -23,7 +23,6 @@ char rcsId_vmware[] =
+ #include "xf86Pci.h" /* pci */
+
+ #include "mipointer.h" /* sw cursor */
+-#include "mibstore.h" /* backing store */
+ #include "micmap.h" /* mi color map */
+ #include "vgaHW.h" /* VGA hardware */
+ #include "fb.h"
+@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
+ * If backing store is to be supported (as is usually the case),
+ * initialise it.
+ */
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 9959ffb..7863ba2 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
+ (ms->only_hw_presents) ? "enabled" : "disabled");
+ }
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+--
+1.7.9.5
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
index 4399bb1..1466b86 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] xf86-video-vmware: delete references to xserver's mibstore.h
2013-03-11 16:27 ` [PATCH " Laurentiu Palcu
@ 2013-03-12 7:00 ` Saul Wold
2013-03-12 7:45 ` Laurentiu Palcu
0 siblings, 1 reply; 8+ messages in thread
From: Saul Wold @ 2013-03-12 7:00 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On 03/11/2013 09:27 AM, Laurentiu Palcu wrote:
> mibstore.h has been deleted in the new xserver. Update the driver too.
>
There seemed to be an issue applying this patch.
Can you please verify this.
Thanks
Sau!
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
> .../xf86-video-vmware/Kill-mibstore.patch | 63 ++++++++++++++++++++
> .../xorg-driver/xf86-video-vmware_13.0.0.bb | 2 +
> 2 files changed, 65 insertions(+)
> create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
>
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
> new file mode 100644
> index 0000000..e85a2ea
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
> @@ -0,0 +1,63 @@
> +Upstream-Status: Backported
> +
> +From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
> +From: Zack Rusin <zackr@vmware.com>
> +Date: Thu, 14 Feb 2013 14:33:01 -0800
> +Subject: [PATCH] Kill mibstore
> +
> +It was a noop for at least 5 years and it has been removed.
> +
> +Signed-off-by: Zack Rusin <zackr@vmware.com>
> +---
> + saa/saa_priv.h | 1 -
> + src/vmware.c | 2 --
> + vmwgfx/vmwgfx_driver.c | 1 -
> + 3 files changed, 4 deletions(-)
> +
> +diff --git a/saa/saa_priv.h b/saa/saa_priv.h
> +index 6652054..5d81453 100644
> +--- a/saa/saa_priv.h
> ++++ b/saa/saa_priv.h
> +@@ -48,7 +48,6 @@
> + #include "pixmapstr.h"
> + #include "windowstr.h"
> + #include "servermd.h"
> +-#include "mibstore.h"
> + #include "colormapst.h"
> + #include "gcstruct.h"
> + #include "input.h"
> +diff --git a/src/vmware.c b/src/vmware.c
> +index 41201f1..6b74e14 100644
> +--- a/src/vmware.c
> ++++ b/src/vmware.c
> +@@ -23,7 +23,6 @@ char rcsId_vmware[] =
> + #include "xf86Pci.h" /* pci */
> +
> + #include "mipointer.h" /* sw cursor */
> +-#include "mibstore.h" /* backing store */
> + #include "micmap.h" /* mi color map */
> + #include "vgaHW.h" /* VGA hardware */
> + #include "fb.h"
> +@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
> + * If backing store is to be supported (as is usually the case),
> + * initialise it.
> + */
> +- miInitializeBackingStore(pScreen);
> + xf86SetBackingStore(pScreen);
> + xf86SetSilkenMouse(pScreen);
> +
> +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
> +index 9959ffb..7863ba2 100644
> +--- a/vmwgfx/vmwgfx_driver.c
> ++++ b/vmwgfx/vmwgfx_driver.c
> +@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
> + (ms->only_hw_presents) ? "enabled" : "disabled");
> + }
> +
> +- miInitializeBackingStore(pScreen);
> + xf86SetBackingStore(pScreen);
> + xf86SetSilkenMouse(pScreen);
> + miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
> +--
> +1.7.9.5
> +
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
> index 4399bb1..1466b86 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
> @@ -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"
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] xf86-video-vmware: delete references to xserver's mibstore.h
2013-03-12 7:00 ` Saul Wold
@ 2013-03-12 7:45 ` Laurentiu Palcu
0 siblings, 0 replies; 8+ messages in thread
From: Laurentiu Palcu @ 2013-03-12 7:45 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On 03/12/2013 09:00 AM, Saul Wold wrote:
> On 03/11/2013 09:27 AM, Laurentiu Palcu wrote:
>> mibstore.h has been deleted in the new xserver. Update the driver too.
>>
> There seemed to be an issue applying this patch.
>
> Can you please verify this.
Yep, my bad... I forgot the '+' in SRC_URI. When I tested, I didn't do a
clean and the source code was already there, so the patch applied.
I'll send a v2 in a few moments.
Laurentiu
>
> Thanks
> Sau!
>
>
>> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
>> ---
>> .../xf86-video-vmware/Kill-mibstore.patch | 63 ++++++++++++++++++++
>> .../xorg-driver/xf86-video-vmware_13.0.0.bb | 2 +
>> 2 files changed, 65 insertions(+)
>> create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
>>
>> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
>> new file mode 100644
>> index 0000000..e85a2ea
>> --- /dev/null
>> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
>> @@ -0,0 +1,63 @@
>> +Upstream-Status: Backported
>> +
>> +From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
>> +From: Zack Rusin <zackr@vmware.com>
>> +Date: Thu, 14 Feb 2013 14:33:01 -0800
>> +Subject: [PATCH] Kill mibstore
>> +
>> +It was a noop for at least 5 years and it has been removed.
>> +
>> +Signed-off-by: Zack Rusin <zackr@vmware.com>
>> +---
>> + saa/saa_priv.h | 1 -
>> + src/vmware.c | 2 --
>> + vmwgfx/vmwgfx_driver.c | 1 -
>> + 3 files changed, 4 deletions(-)
>> +
>> +diff --git a/saa/saa_priv.h b/saa/saa_priv.h
>> +index 6652054..5d81453 100644
>> +--- a/saa/saa_priv.h
>> ++++ b/saa/saa_priv.h
>> +@@ -48,7 +48,6 @@
>> + #include "pixmapstr.h"
>> + #include "windowstr.h"
>> + #include "servermd.h"
>> +-#include "mibstore.h"
>> + #include "colormapst.h"
>> + #include "gcstruct.h"
>> + #include "input.h"
>> +diff --git a/src/vmware.c b/src/vmware.c
>> +index 41201f1..6b74e14 100644
>> +--- a/src/vmware.c
>> ++++ b/src/vmware.c
>> +@@ -23,7 +23,6 @@ char rcsId_vmware[] =
>> + #include "xf86Pci.h" /* pci */
>> +
>> + #include "mipointer.h" /* sw cursor */
>> +-#include "mibstore.h" /* backing store */
>> + #include "micmap.h" /* mi color map */
>> + #include "vgaHW.h" /* VGA hardware */
>> + #include "fb.h"
>> +@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
>> + * If backing store is to be supported (as is usually the case),
>> + * initialise it.
>> + */
>> +- miInitializeBackingStore(pScreen);
>> + xf86SetBackingStore(pScreen);
>> + xf86SetSilkenMouse(pScreen);
>> +
>> +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
>> +index 9959ffb..7863ba2 100644
>> +--- a/vmwgfx/vmwgfx_driver.c
>> ++++ b/vmwgfx/vmwgfx_driver.c
>> +@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
>> + (ms->only_hw_presents) ? "enabled" : "disabled");
>> + }
>> +
>> +- miInitializeBackingStore(pScreen);
>> + xf86SetBackingStore(pScreen);
>> + xf86SetSilkenMouse(pScreen);
>> + miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
>> +--
>> +1.7.9.5
>> +
>> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
>> index 4399bb1..1466b86 100644
>> --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
>> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
>> @@ -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"
>>
>>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 4/4] xf86-video-vmware: delete references to xserver's mibstore.h
2013-03-11 16:27 ` [PATCH 3/4] xf86-video-intel: upgrade to 2.21.3 Laurentiu Palcu
@ 2013-03-12 7:54 ` Laurentiu Palcu
0 siblings, 0 replies; 8+ messages in thread
From: Laurentiu Palcu @ 2013-03-12 7:54 UTC (permalink / raw)
To: openembedded-core
mibstore.h has been deleted in the new xserver. Update the driver too.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
Changes in v2:
* fixed the SRC_URI;
Thanks,
Laurentiu
.../xf86-video-vmware/Kill-mibstore.patch | 63 ++++++++++++++++++++
.../xorg-driver/xf86-video-vmware_13.0.0.bb | 2 +
2 files changed, 65 insertions(+)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
new file mode 100644
index 0000000..e85a2ea
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
@@ -0,0 +1,63 @@
+Upstream-Status: Backported
+
+From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
+From: Zack Rusin <zackr@vmware.com>
+Date: Thu, 14 Feb 2013 14:33:01 -0800
+Subject: [PATCH] Kill mibstore
+
+It was a noop for at least 5 years and it has been removed.
+
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+ saa/saa_priv.h | 1 -
+ src/vmware.c | 2 --
+ vmwgfx/vmwgfx_driver.c | 1 -
+ 3 files changed, 4 deletions(-)
+
+diff --git a/saa/saa_priv.h b/saa/saa_priv.h
+index 6652054..5d81453 100644
+--- a/saa/saa_priv.h
++++ b/saa/saa_priv.h
+@@ -48,7 +48,6 @@
+ #include "pixmapstr.h"
+ #include "windowstr.h"
+ #include "servermd.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
+diff --git a/src/vmware.c b/src/vmware.c
+index 41201f1..6b74e14 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -23,7 +23,6 @@ char rcsId_vmware[] =
+ #include "xf86Pci.h" /* pci */
+
+ #include "mipointer.h" /* sw cursor */
+-#include "mibstore.h" /* backing store */
+ #include "micmap.h" /* mi color map */
+ #include "vgaHW.h" /* VGA hardware */
+ #include "fb.h"
+@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
+ * If backing store is to be supported (as is usually the case),
+ * initialise it.
+ */
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 9959ffb..7863ba2 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
+ (ms->only_hw_presents) ? "enabled" : "disabled");
+ }
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+--
+1.7.9.5
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
index 4399bb1..fef5af4 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-03-12 8:10 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-11 16:27 [PATCH 0/4] Package upgrades Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 1/4] inputproto: upgrade to 2.3 Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 2/4] xserver-xorg: upgrade to 1.14.0 Laurentiu Palcu
2013-03-11 16:27 ` [PATCH 3/4] xf86-video-intel: upgrade to 2.21.3 Laurentiu Palcu
2013-03-12 7:54 ` [PATCH v2 4/4] xf86-video-vmware: delete references to xserver's mibstore.h Laurentiu Palcu
2013-03-11 16:27 ` [PATCH " Laurentiu Palcu
2013-03-12 7:00 ` Saul Wold
2013-03-12 7:45 ` Laurentiu Palcu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox