* [PATCH v3 00/12] xorg upgrades
@ 2012-11-14 13:20 Laurentiu Palcu
2012-11-14 13:20 ` [PATCH v3 01/12] xf86-video-vesa: upgrade to 2.3.2 Laurentiu Palcu
` (11 more replies)
0 siblings, 12 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:20 UTC (permalink / raw)
To: openembedded-core
Changes in v3:
* reintroduced the old xf86-video-omapfb recipe. However, this will not build
because it needs to be ported to work with the compat-api. The new recipe
has this, though. So there will still be work to be done in order to have
this work with the 1.13 xorg server;
* addressed Martin's comments;
Changes in v2:
* changes to yocto BSP related files were separated and will be sent to the
appropriate list;
* added RPROVIDES/RREPLACES/RCONFLICTS where applicable (libdrm, xserver-xorg
and xf86-video-omap recipes). Had a little help from Ross with these, thanks!
Hi,
This patchset contains, mainly, xorg server/drivers upgrades and an unrelated
one: mdadm. The yocto autobuilder nightlies (x86/x86_64/ppc/arm/mips) compiled
successfully. Compilations were done on top of the following commit:
78983e939ab17f02f8911c8b0d0e326b419856b9.
The tests done were basic functionality tests in qemu. xf86-input-synaptics and
xf86-video-omap were not tested due to lack of hardware. If anybody is willing
to give them a try, they're welcome.
Thanks,
Laurentiu
The following changes since commit 41125ddc8651494ffcf888d3b5efce1ae6d953bb:
bitbake: print clear message for "bitbake -e ASSUME_PROVIDED" (2012-11-13 14:21:16 +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 (12):
xf86-video-vesa: upgrade to 2.3.2
xf86-video-intel: upgrade to 2.20.12
xf86-input-mouse: upgrade to 1.8.1
xkeyboard-config: upgrade to 2.7
xcb-proto: upgrade to 1.8
fontconfig: upgrade to 2.10.1
libdrm: upgrade to 2.4.40
xserver-xorg: upgrade to 1.13.0
mdadm: upgrade to 3.2.6
xf86-video-vmware: Add compat API
xf86-input-synaptics: add mtdev dependency
xf86-video-omap: add new recipe to follow the maintained repo
meta/conf/machine/include/ia32-base.inc | 5 +-
.../mdadm/{mdadm_3.2.5.bb => mdadm_3.2.6.bb} | 6 +-
meta/recipes-graphics/drm/libdrm.inc | 16 +-
.../drm/libdrm/disable-cairo.patch | 74 ---
.../drm/{libdrm_2.4.39.bb => libdrm_2.4.40.bb} | 5 +-
meta/recipes-graphics/drm/libdrm_git.bb | 4 +-
.../97_fontconfig | 0
.../fix-pkgconfig.patch | 0
...native_2.9.0.bb => fontconfig-native_2.10.1.bb} | 0
.../{fontconfig_2.9.0.bb => fontconfig_2.10.1.bb} | 7 +-
.../xcb/{xcb-proto_1.7.1.bb => xcb-proto_1.8.bb} | 4 +-
...ut-mouse_1.7.2.bb => xf86-input-mouse_1.8.1.bb} | 7 +-
.../xorg-driver/xf86-input-synaptics_1.6.2.bb | 4 +-
.../xorg-driver/xf86-input-synaptics_git.bb | 4 +-
...intel_2.20.8.bb => xf86-video-intel_2.20.12.bb} | 6 +-
.../xorg-driver/xf86-video-omap_git.bb | 31 +
...ideo-vesa_2.3.1.bb => xf86-video-vesa_2.3.2.bb} | 6 +-
...ware-port-vmware-driver-to-new-compat-API.patch | 655 ++++++++++++++++++++
.../xorg-driver/xf86-video-vmware_12.0.2.bb | 3 +-
...board-config_2.1.bb => xkeyboard-config_2.7.bb} | 10 +-
.../xserver-xorg-1.11.4/pkgconfig-deps.patch | 70 ---
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 0
.../mips64-compiler.patch | 28 +-
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 32 +-
...erver-xorg_1.11.4.bb => xserver-xorg_1.13.0.bb} | 5 +-
27 files changed, 768 insertions(+), 214 deletions(-)
rename meta/recipes-extended/mdadm/{mdadm_3.2.5.bb => mdadm_3.2.6.bb} (86%)
delete mode 100644 meta/recipes-graphics/drm/libdrm/disable-cairo.patch
rename meta/recipes-graphics/drm/{libdrm_2.4.39.bb => libdrm_2.4.40.bb} (44%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.9.0 => fontconfig-2.10.1}/97_fontconfig (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.9.0 => fontconfig-2.10.1}/fix-pkgconfig.patch (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.9.0.bb => fontconfig-native_2.10.1.bb} (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.9.0.bb => fontconfig_2.10.1.bb} (91%)
rename meta/recipes-graphics/xcb/{xcb-proto_1.7.1.bb => xcb-proto_1.8.bb} (61%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.7.2.bb => xf86-input-mouse_1.8.1.bb} (64%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.20.8.bb => xf86-video-intel_2.20.12.bb} (84%)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
rename meta/recipes-graphics/xorg-driver/{xf86-video-vesa_2.3.1.bb => xf86-video-vesa_2.3.2.bb} (80%)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.1.bb => xkeyboard-config_2.7.bb} (75%)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.4 => xserver-xorg-1.13.0}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.4 => xserver-xorg-1.13.0}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.4 => xserver-xorg-1.13.0}/macro_tweak.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.4 => xserver-xorg-1.13.0}/mips64-compiler.patch (42%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.11.4.bb => xserver-xorg_1.13.0.bb} (56%)
--
1.7.9.5
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v3 01/12] xf86-video-vesa: upgrade to 2.3.2
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
@ 2012-11-14 13:20 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 02/12] xf86-video-intel: upgrade to 2.20.12 Laurentiu Palcu
` (10 subsequent siblings)
11 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...ideo-vesa_2.3.1.bb => xf86-video-vesa_2.3.2.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-vesa_2.3.1.bb => xf86-video-vesa_2.3.2.bb} (80%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb
index bc7fb2e..0fc6b71 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb
@@ -11,7 +11,7 @@ can drive most VESA-compatible video cards, but only makes use of the \
basic standard VESA core that is common to these cards. The driver \
supports depths 8, 15 16 and 24."
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto xf86driproto libpciaccess"
@@ -20,5 +20,5 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
-SRC_URI[md5sum] = "02e6eacc2d1e07ac893b62481905d6f0"
-SRC_URI[sha256sum] = "e4a1038d5bc8884de461737f68f963651ef91137976388e1db4efc3991d01573"
+SRC_URI[md5sum] = "3eddd393fba79550e012d717499d58ad"
+SRC_URI[sha256sum] = "144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 02/12] xf86-video-intel: upgrade to 2.20.12
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
2012-11-14 13:20 ` [PATCH v3 01/12] xf86-video-vesa: upgrade to 2.3.2 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 03/12] xf86-input-mouse: upgrade to 1.8.1 Laurentiu Palcu
` (9 subsequent siblings)
11 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...intel_2.20.8.bb => xf86-video-intel_2.20.12.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.20.8.bb => xf86-video-intel_2.20.12.bb} (84%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.20.8.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.20.12.bb
similarity index 84%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.20.8.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.20.12.bb
index 3ac746f..09aa339 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.20.8.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.20.12.bb
@@ -9,7 +9,7 @@ Infrastructure (DRI)."
LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
DEPENDS += "virtual/libx11 drm xf86driproto glproto \
virtual/libgl xineramaproto xf86driproto libpciaccess"
@@ -23,5 +23,5 @@ EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-SRC_URI[md5sum] = "63a002ac596208dc6047289553b75262"
-SRC_URI[sha256sum] = "2a126b2bb93b8d9db5eef68f1496e83713fd51ac435a7fafc7a36ff9c7ca83e7"
+SRC_URI[md5sum] = "6d9565de03c167d8f621315476c20c73"
+SRC_URI[sha256sum] = "39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 03/12] xf86-input-mouse: upgrade to 1.8.1
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
2012-11-14 13:20 ` [PATCH v3 01/12] xf86-video-vesa: upgrade to 2.3.2 Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 02/12] xf86-video-intel: upgrade to 2.20.12 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7 Laurentiu Palcu
` (8 subsequent siblings)
11 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
Licence chacksum changed because Red Hat added a copyright line.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...ut-mouse_1.7.2.bb => xf86-input-mouse_1.8.1.bb} | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.7.2.bb => xf86-input-mouse_1.8.1.bb} (64%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.8.1.bb
similarity index 64%
rename from meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.8.1.bb
index 9ff4563..3b1dce4 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.8.1.bb
@@ -8,9 +8,10 @@ functions as a pointer input device, and may be used as the X server's \
core pointer. Multiple mice are supported by multiple instances of this \
driver."
-LIC_FILES_CHKSUM = "file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19"
+LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510"
PR = "${INC_PR}.0"
-SRC_URI[md5sum] = "871c828b88e9c973f1457724b35576fb"
-SRC_URI[sha256sum] = "332b7357c18e6b9daba51c8ed48ce118e9b51fb5990b6a2a68637be62da7413b"
+SRC_URI[md5sum] = "f314c56e4ac6c8fc0cc2710892d5776e"
+SRC_URI[sha256sum] = "f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8"
+
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (2 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 03/12] xf86-input-mouse: upgrade to 1.8.1 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-15 13:54 ` Richard Purdie
2012-11-15 15:01 ` [PATCH v4 " Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 05/12] xcb-proto: upgrade to 1.8 Laurentiu Palcu
` (7 subsequent siblings)
11 siblings, 2 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
A couple of extra changes:
* changed the SRC_URI to the new, valid, one
* added dependency of gettext (do_qa_configure detected is needed)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...board-config_2.1.bb => xkeyboard-config_2.7.bb} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.1.bb => xkeyboard-config_2.7.bb} (75%)
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.7.bb
similarity index 75%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.7.bb
index 1b28208..96c6188 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.7.bb
@@ -12,14 +12,14 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-confi
LICENSE = "MIT & MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
-SRC_URI = "http://people.freedesktop.org/~svu/xkeyboard-config-${PV}.tar.bz2"
-SRC_URI[md5sum] = "6ce65480445fb2d9c071ad1f002a7675"
-SRC_URI[sha256sum] = "e293aa4b0dd259dbb4f0e7f56fdd95db5047d052c7b3b80922fe5663923a805d"
+SRC_URI="${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "6ad7b43062f123eacf8ff0eb3a4e0678"
+SRC_URI[sha256sum] = "e43478a12fb0fe6757a7bad3a04fd3747ec53e53d5af22a9d9829dfb9aac8321"
SECTION = "x11/libs"
-DEPENDS = "intltool-native xkbcomp-native glib-2.0"
+DEPENDS = "intltool-native xkbcomp-native glib-2.0 virtual/gettext"
-PR = "r2"
+PR = "r0"
EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 05/12] xcb-proto: upgrade to 1.8
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (3 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 06/12] fontconfig: upgrade to 2.10.1 Laurentiu Palcu
` (6 subsequent siblings)
11 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../xcb/{xcb-proto_1.7.1.bb => xcb-proto_1.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xcb/{xcb-proto_1.7.1.bb => xcb-proto_1.8.bb} (61%)
diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.7.1.bb b/meta/recipes-graphics/xcb/xcb-proto_1.8.bb
similarity index 61%
rename from meta/recipes-graphics/xcb/xcb-proto_1.7.1.bb
rename to meta/recipes-graphics/xcb/xcb-proto_1.8.bb
index 27050d2..785156a 100644
--- a/meta/recipes-graphics/xcb/xcb-proto_1.7.1.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_1.8.bb
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
PR = "r0"
-SRC_URI[md5sum] = "948fec39dd42f3694edd5d9689735ec4"
-SRC_URI[sha256sum] = "ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437"
+SRC_URI[md5sum] = "a5de3432cc6e43cc6a27f241dbb991b1"
+SRC_URI[sha256sum] = "233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 06/12] fontconfig: upgrade to 2.10.1
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (4 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 05/12] xcb-proto: upgrade to 1.8 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 07/12] libdrm: upgrade to 2.4.40 Laurentiu Palcu
` (5 subsequent siblings)
11 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
A couple of changes:
* licence snippet in fccache.c moved down the file;
* new files appeared in this version, added them to fontconfig package
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../97_fontconfig | 0
.../fix-pkgconfig.patch | 0
...native_2.9.0.bb => fontconfig-native_2.10.1.bb} | 0
.../{fontconfig_2.9.0.bb => fontconfig_2.10.1.bb} | 7 ++++---
4 files changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.9.0 => fontconfig-2.10.1}/97_fontconfig (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.9.0 => fontconfig-2.10.1}/fix-pkgconfig.patch (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.9.0.bb => fontconfig-native_2.10.1.bb} (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.9.0.bb => fontconfig_2.10.1.bb} (91%)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig b/meta/recipes-graphics/fontconfig/fontconfig-2.10.1/97_fontconfig
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
rename to meta/recipes-graphics/fontconfig/fontconfig-2.10.1/97_fontconfig
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.10.1/fix-pkgconfig.patch
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
rename to meta/recipes-graphics/fontconfig/fontconfig-2.10.1/fix-pkgconfig.patch
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.10.1.bb
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig-native_2.10.1.bb
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.10.1.bb
similarity index 91%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.10.1.bb
index 7f3f111..268a3cb 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.10.1.bb
@@ -14,7 +14,7 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
LICENSE = "MIT-style & MIT & PD"
LIC_FILES_CHKSUM = "file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \
file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
- file://src/fccache.c;beginline=1077;endline=1092;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
+ file://src/fccache.c;beginline=1109;endline=1124;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
SECTION = "libs"
@@ -26,12 +26,13 @@ SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fix-pkgconfig.patch \
file://97_fontconfig"
-SRC_URI[md5sum] = "26c83855ed256b5c032baae032fadc4f"
-SRC_URI[sha256sum] = "ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a"
+SRC_URI[md5sum] = "c94e380eea42f2f23ca9537035ef1899"
+SRC_URI[sha256sum] = "c3912bf909c0057e50a67f58fc1b0ae644f1ebf532a0d97864588d9599280222"
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
FILES_fontconfig-utils = "${bindir}/*"
+FILES_${PN} =+ "${datadir}/xml/*"
# Work around past breakage in debian.bbclass
RPROVIDES_fontconfig-utils = "libfontconfig-utils"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 07/12] libdrm: upgrade to 2.4.40
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (5 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 06/12] fontconfig: upgrade to 2.10.1 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 14:56 ` Burton, Ross
2012-11-15 10:29 ` [PATCH v4 " Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0 Laurentiu Palcu
` (4 subsequent siblings)
11 siblings, 2 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
Other changes:
* removed a backported patch;
* activated libdrm-omap helper layer which is needed by the latest
xf86-video-omap xorg driver;
* split libdrm-drivers package into libdrm-radeon, libdrm-nouveau and
libdrm-omap;
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
meta/recipes-graphics/drm/libdrm.inc | 16 +++--
.../drm/libdrm/disable-cairo.patch | 74 --------------------
.../drm/{libdrm_2.4.39.bb => libdrm_2.4.40.bb} | 5 +-
meta/recipes-graphics/drm/libdrm_git.bb | 4 +-
4 files changed, 15 insertions(+), 84 deletions(-)
delete mode 100644 meta/recipes-graphics/drm/libdrm/disable-cairo.patch
rename meta/recipes-graphics/drm/{libdrm_2.4.39.bb => libdrm_2.4.40.bb} (44%)
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index a64a5df..95d0942 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -11,17 +11,23 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
PROVIDES = "drm"
DEPENDS = "libpthread-stubs udev"
-INC_PR = "r3"
+INC_PR = "r4"
#libpciaccess is required starting from libdrm 2.4.26
DEPENDS += " libpciaccess"
inherit autotools pkgconfig
-EXTRA_OECONF += "--disable-cairo-tests"
+EXTRA_OECONF += "--disable-cairo-tests \
+ --enable-omap-experimental-api \
+ "
+ALLOW_EMPTY_${PN}-drivers = "1"
+PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-kms"
+
+RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap"
-PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
-FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
+FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
+FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
+FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
FILES_${PN}-kms = "${libdir}/libkms*.so.*"
-
diff --git a/meta/recipes-graphics/drm/libdrm/disable-cairo.patch b/meta/recipes-graphics/drm/libdrm/disable-cairo.patch
deleted file mode 100644
index 90e79d4..0000000
--- a/meta/recipes-graphics/drm/libdrm/disable-cairo.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-commit c81d1df4926072d24b4dad1b488e618e57eff1c6
-Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Oct 4 10:26:37 2012 +1000
-
- configure.ac: Allow forcible disabling of Cairo support
-
- We don't want to build libdrm tests with Cairo support under Poky, since
- they're never used and also cause a build loop from libdrm -> cairo ->
- mesa-dri -> libdrm.
-
- To avoid variance in build results, introduce a --disable-cairo-tests
- switch.
-
- Upstream-Status: Backport
-
- Signed-off-by: Daniel Stone <daniel@fooishbar.org>
-
-diff --git a/configure.ac b/configure.ac
-index 290362c..8c28107 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -222,11 +222,23 @@ if test "x$EXYNOS" = xyes; then
- AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
- fi
-
-+AC_ARG_ENABLE([cairo-tests],
-+ [AS_HELP_STRING([--enable-cairo-tests],
-+ [Enable support for Cairo rendering in tests (default: auto)])],
-+ [CAIRO=$enableval], [CAIRO=auto])
- PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
--if test "x$HAVE_CAIRO" = xyes; then
-- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
-+AC_MSG_CHECKING([whether to enable Cairo tests])
-+if test "x$CAIRO" = xauto; then
-+ CAIRO="$HAVE_CAIRO"
- fi
--AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
-+if test "x$CAIRO" = xyes; then
-+ if ! test "x$HAVE_CAIRO" = xyes; then
-+ AC_MSG_ERROR([Cairo support required but not present])
-+ fi
-+ AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support])
-+fi
-+AC_MSG_RESULT([$CAIRO])
-+AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])
-
- # For enumerating devices in test case
- PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
-diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
-index b5ec771..065ae13 100644
---- a/tests/modetest/Makefile.am
-+++ b/tests/modetest/Makefile.am
-@@ -1,8 +1,7 @@
- AM_CFLAGS = \
- -I$(top_srcdir)/include/drm \
- -I$(top_srcdir)/libkms/ \
-- -I$(top_srcdir) \
-- $(CAIRO_CFLAGS)
-+ -I$(top_srcdir)
-
- noinst_PROGRAMS = \
- modetest
-@@ -12,5 +11,9 @@ modetest_SOURCES = \
-
- modetest_LDADD = \
- $(top_builddir)/libdrm.la \
-- $(top_builddir)/libkms/libkms.la \
-- $(CAIRO_LIBS)
-+ $(top_builddir)/libkms/libkms.la
-+
-+if HAVE_CAIRO
-+AM_CFLAGS += $(CAIRO_CFLAGS)
-+modetest_LDADD += $(CAIRO_LIBS)
-+endif
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.39.bb b/meta/recipes-graphics/drm/libdrm_2.4.40.bb
similarity index 44%
rename from meta/recipes-graphics/drm/libdrm_2.4.39.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.40.bb
index f3ce2b1..42f860a 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.39.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.40.bb
@@ -4,8 +4,7 @@ PR = "${INC_PR}.0"
SRC_URI += "file://installtests.patch \
file://GNU_SOURCE_definition.patch \
- file://disable-cairo.patch \
"
-SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d"
-SRC_URI[sha256sum] = "386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d"
+SRC_URI[md5sum] = "626a3dc44a40ef37565b61732b688567"
+SRC_URI[sha256sum] = "48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f"
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
index 5d7f953..e3051c7 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -6,7 +6,7 @@ S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"
-SRCREV = "14db948127e549ea9234e02d8e112de3871f8f9f"
-PV = "2.4.39+git${SRCPV}"
+SRCREV = "e01d68f9f3acfc35fe164283904b5d058c2ab378"
+PV = "2.4.40+git${SRCPV}"
PR = "${INC_PR}.0"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (6 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 07/12] libdrm: upgrade to 2.4.40 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 15:03 ` Burton, Ross
2012-11-15 11:07 ` [PATCH v4 " Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 09/12] mdadm: upgrade to 3.2.6 Laurentiu Palcu
` (3 subsequent siblings)
11 siblings, 2 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
The patch contains several aditional changes:
* removed one backported patch (included in the new release);
* changed mips64-compiler.patch to apply properly;
* licence checksum for COPYING file changed: some copyright years have
been changed
The following external modules are now built-in:
* DBE
* DRI2
* DRI
* RECORD
The extmod module was completely removed.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
meta/conf/machine/include/ia32-base.inc | 5 +-
.../xserver-xorg-1.11.4/pkgconfig-deps.patch | 70 --------------------
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 0
.../mips64-compiler.patch | 28 ++++----
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 32 +++++----
...erver-xorg_1.11.4.bb => xserver-xorg_1.13.0.bb} | 5 +-
8 files changed, 37 insertions(+), 103 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.4 => xserver-xorg-1.13.0}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.4 => xserver-xorg-1.13.0}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.4 => xserver-xorg-1.13.0}/macro_tweak.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.4 => xserver-xorg-1.13.0}/mips64-compiler.patch (42%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.11.4.bb => xserver-xorg_1.13.0.bb} (56%)
diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc
index 4b10183..c2d267a 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/ia32-base.inc
@@ -33,11 +33,8 @@ XSERVER_IA32_BASE = "xserver-xorg \
xf86-input-synaptics \
"
-XSERVER_IA32_EXT = "xserver-xorg-extension-dri \
- xserver-xorg-extension-dri2 \
+XSERVER_IA32_EXT = "
xserver-xorg-extension-glx \
- xserver-xorg-extension-extmod \
- xserver-xorg-extension-dbe \
xserver-xorg-module-libint10 \
"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
deleted file mode 100644
index fee8d76..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-commit 41d903918a5721e53ed694880eab44170f9717cc
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed Sep 14 13:45:18 2011 -0500
-
- xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires
-
- Every module building against xorg-server does not *Require* pixman nor
- libpciaccess. If such modules need pixman or pciaccess, they should be
- depending on them directly rather than inheriting a dependency from
- xorg-server. To do this, they should use PKG_CHECK_MODULES in configure.ac
- to check for pixman-1 or pciaccess and include the apporpriate _LIBS variable
- to the appropriate _LDFLAGS variable in Makefile.am
-
- This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to
- to satisfy include dependencies but avoid linking needlessly.
-
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-
-diff --git a/configure.ac b/configure.ac
-index 50beb01..4bfa82c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -780,11 +780,6 @@ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
- WINDOWSWMPROTO="windowswmproto"
- APPLEWMPROTO="applewmproto >= 1.4"
-
--dnl Core modules for most extensions, et al.
--SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
--# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
--AC_SUBST(SDK_REQUIRED_MODULES)
--
- dnl List of libraries that require a specific version
- LIBAPPLEWM="applewm >= 1.4"
- LIBDMX="dmx >= 1.0.99.1"
-@@ -806,6 +801,11 @@ dnl specific modules against it
- PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
- REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
-
-+dnl Core modules for most extensions, et al.
-+SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.99.99.902] [kbproto >= 1.0.3] fontsproto $LIBPIXMAN"
-+# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
-+AC_SUBST(SDK_REQUIRED_MODULES)
-+
- REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
-
- if test "x$CONFIG_UDEV" = xyes &&
-@@ -1583,6 +1583,7 @@ if test "x$XORG" = xyes; then
- if test "x$PCI" = xyes; then
-
- PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
-+ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
- SAVE_LIBS=$LIBS
- SAVE_CFLAGS=$CFLAGS
- CFLAGS=$PCIACCESS_CFLAGS
-diff --git a/xorg-server.pc.in b/xorg-server.pc.in
-index fb238b5..a98eca8 100644
---- a/xorg-server.pc.in
-+++ b/xorg-server.pc.in
-@@ -15,7 +15,6 @@ abi_extension=@abi_extension@
- Name: xorg-server
- Description: Modular X.Org X Server
- Version: @PACKAGE_VERSION@
--Requires: pixman-1 pciaccess
- Requires.private: @SDK_REQUIRED_MODULES@
- Cflags: -I${sdkdir} @symbol_visibility@
- Libs: -L${libdir}
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
similarity index 42%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
index e6bc95b..168368e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
@@ -6,24 +6,24 @@ This patch choses the right values for mips64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
-Index: xorg-server-1.11.2/hw/xfree86/common/compiler.h
+Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h
===================================================================
---- xorg-server-1.11.2.orig/hw/xfree86/common/compiler.h 2012-05-10 12:19:59.485599046 -0700
-+++ xorg-server-1.11.2/hw/xfree86/common/compiler.h 2012-05-10 12:20:53.109602488 -0700
-@@ -104,6 +104,7 @@
-
- # if !defined(__arm__)
- # if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
+--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300
++++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200
+@@ -101,6 +101,7 @@
+ #if defined(NO_INLINE) || defined(DO_PROTOTYPES)
+ #if !defined(__arm__)
+ #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
+ && !defined(__mips64) \
&& !(defined(__alpha__) && defined(linux)) \
&& !(defined(__ia64__) && defined(linux)) \
-@@ -708,7 +709,7 @@
+@@ -721,7 +722,7 @@
}
- # elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
--# ifdef __arm32__
-+# if defined (__arm32__) || defined (__mips64)
- # define PORT_SIZE long
- # else
- # define PORT_SIZE short
+ #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
+-#ifdef __arm32__
++#if defined (__arm32__) || defined (__mips64)
+ #define PORT_SIZE long
+ #else
+ #define PORT_SIZE short
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 33564eb..4135a8b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "The X.Org X server"
HOMEPAGE = "http://www.x.org"
SECTION = "x11/base"
LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
@@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
PROVIDES += "virtual/xserver"
PE = "2"
-INC_PR = "r3"
+INC_PR = "r5"
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
@@ -48,12 +48,7 @@ PACKAGES =+ "${PN}-security-policy \
${PN}-utils \
${PN}-xephyr \
${PN}-multimedia-modules \
- ${PN}-extension-dri \
- ${PN}-extension-dri2 \
${PN}-extension-glx \
- ${PN}-extension-record \
- ${PN}-extension-extmod \
- ${PN}-extension-dbe \
${PN}-module-libint10 \
${PN}-module-libafb \
${PN}-module-libwfb \
@@ -67,6 +62,24 @@ PACKAGES =+ "${PN}-security-policy \
RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
RDEPENDS_${PN}-xvfb += "xkeyboard-config"
RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
+RREPLACES_${PN} = "${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ "
+RPROVIDES_${PN} = "${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ "
+RCONFLICTS_${PN} = "${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ "
FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
@@ -82,12 +95,7 @@ FILES_${PN}-xvfb = "${bindir}/Xvfb"
FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
FILES_${PN}-xephyr = "${bindir}/Xephyr"
FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
-FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
-FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
-FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
-FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
-FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
similarity index 56%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
index 4739ee2..8ad87b8 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
@@ -4,10 +4,9 @@ require xserver-xorg.inc
SRC_URI += "file://crosscompile.patch \
file://fix_open_max_preprocessor_error.patch \
file://mips64-compiler.patch \
- file://pkgconfig-deps.patch \
"
-SRC_URI[md5sum] = "256325e9b17dff479d92bed97f6b0adb"
-SRC_URI[sha256sum] = "3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc"
+SRC_URI[md5sum] = "bde3d178b756597d2ec2a19ef60d2e1f"
+SRC_URI[sha256sum] = "548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a"
PR = "${INC_PR}.0"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 09/12] mdadm: upgrade to 3.2.6
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (7 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 10/12] xf86-video-vmware: Add compat API Laurentiu Palcu
` (2 subsequent siblings)
11 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../mdadm/{mdadm_3.2.5.bb => mdadm_3.2.6.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/mdadm/{mdadm_3.2.5.bb => mdadm_3.2.6.bb} (86%)
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.5.bb b/meta/recipes-extended/mdadm/mdadm_3.2.6.bb
similarity index 86%
rename from meta/recipes-extended/mdadm/mdadm_3.2.5.bb
rename to meta/recipes-extended/mdadm/mdadm_3.2.6.bb
index 61846f4..7b6a6c7 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.5.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.6.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
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://mdadm-3.2.2_fix_for_x32.patch \
"
-SRC_URI[md5sum] = "83ba4a6249ae24677e915e44c9cfcc58"
-SRC_URI[sha256sum] = "5ae2bfd241c88601c1ef9072806248491e025fa09a388c40230d72d65eabbd3c"
+SRC_URI[md5sum] = "3e255dc71e5144bbcb872788ca647267"
+SRC_URI[sha256sum] = "c44ed3b31238b41cffe67caffaf45067d01e095de94988889ea8a94e22dc6c38"
CFLAGS += "-fno-strict-aliasing"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 10/12] xf86-video-vmware: Add compat API
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (8 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 09/12] mdadm: upgrade to 3.2.6 Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 11/12] xf86-input-synaptics: add mtdev dependency Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo Laurentiu Palcu
11 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
Needed after upgrading xserver to 1.13.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
...ware-port-vmware-driver-to-new-compat-API.patch | 655 ++++++++++++++++++++
.../xorg-driver/xf86-video-vmware_12.0.2.bb | 3 +-
2 files changed, 657 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch
new file mode 100644
index 0000000..610a133
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch
@@ -0,0 +1,655 @@
+Upstream-Status: Backport
+
+From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Wed, 6 Jun 2012 09:58:01 +0100
+Subject: [PATCH] vmware: port vmware driver to new compat API
+
+This is a port of the vmware driver to the new compat API.
+
+Tested-by: Jakob Bornecrantz <jakob@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ saa/saa.c | 4 +-
+ saa/saa.h | 4 +-
+ src/Makefile.am | 1 +
+ src/compat-api.h | 99 +++++++++++++++++++++++++++++++++++++++++++++
+ src/vmware.c | 40 +++++++++---------
+ src/vmware.h | 2 +-
+ src/vmware_common.h | 2 +
+ vmwgfx/vmwgfx_dri2.c | 4 +-
+ vmwgfx/vmwgfx_driver.c | 73 +++++++++++++++++----------------
+ vmwgfx/vmwgfx_driver.h | 7 ++--
+ vmwgfx/vmwgfx_saa.c | 4 +-
+ vmwgfx/vmwgfx_tex_video.c | 6 +--
+ 12 files changed, 174 insertions(+), 72 deletions(-)
+ create mode 100644 src/compat-api.h
+
+diff --git a/saa/saa.c b/saa/saa.c
+index 173c090..f2d68e9 100644
+--- a/saa/saa.c
++++ b/saa/saa.c
+@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable)
+ * screen private, before calling down to the next CloseScreen.
+ */
+ Bool
+-saa_close_screen(int i, ScreenPtr pScreen)
++saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
+ {
+ struct saa_screen_priv *sscreen = saa_screen(pScreen);
+ struct saa_driver *driver = sscreen->driver;
+@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen)
+
+ free(sscreen);
+
+- return (*pScreen->CloseScreen) (i, pScreen);
++ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
+ }
+
+ struct saa_driver *
+diff --git a/saa/saa.h b/saa/saa.h
+index c7aa3b6..4e5ced5 100644
+--- a/saa/saa.h
++++ b/saa/saa.h
+@@ -44,6 +44,8 @@
+ #include <damage.h>
+ #include <picturestr.h>
+
++#include "../src/compat-api.h"
++
+ #define SAA_VERSION_MAJOR 0
+ #define SAA_VERSION_MINOR 1
+
+@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr
+ saa_bitmap_to_region(PixmapPtr pPix);
+
+ extern _X_EXPORT Bool
+-saa_close_screen(int i, ScreenPtr pScreen);
++saa_close_screen(CLOSE_SCREEN_ARGS_DECL);
+
+ extern _X_EXPORT Bool
+ saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 04c9e0d..b0dd147 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,6 +37,7 @@ endif
+ vmware_drv_la_SOURCES = \
+ bits2pixels.c \
+ bits2pixels.h \
++ compat-api.h \
+ guest_os.h \
+ includeCheck.h \
+ svga_escape.h \
+diff --git a/src/compat-api.h b/src/compat-api.h
+new file mode 100644
+index 0000000..6bc946f
+--- /dev/null
++++ b/src/compat-api.h
+@@ -0,0 +1,99 @@
++/*
++ * Copyright 2012 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ *
++ * Author: Dave Airlie <airlied@redhat.com>
++ */
++
++/* this file provides API compat between server post 1.13 and pre it,
++ it should be reused inside as many drivers as possible */
++#ifndef COMPAT_API_H
++#define COMPAT_API_H
++
++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
++#endif
++
++#ifndef XF86_HAS_SCRN_CONV
++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
++#endif
++
++#ifndef XF86_SCRN_INTERFACE
++
++#define SCRN_ARG_TYPE int
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
++
++#define SCREEN_ARG_TYPE int
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
++
++#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
++
++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
++
++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
++
++#define FREE_SCREEN_ARGS_DECL int arg, int flags
++
++#define VT_FUNC_ARGS_DECL int arg, int flags
++#define VT_FUNC_ARGS pScrn->scrnIndex, 0
++
++#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
++#else
++#define SCRN_ARG_TYPE ScrnInfoPtr
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
++
++#define SCREEN_ARG_TYPE ScreenPtr
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
++
++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS pScreen
++
++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
++
++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
++#define SWITCH_MODE_ARGS(arg, m) arg, m
++
++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
++
++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
++#define VT_FUNC_ARGS pScrn
++
++#define XF86_SCRN_ARG(x) (x)
++
++#endif
++
++#endif
+diff --git a/src/vmware.c b/src/vmware.c
+index e3892f1..41201f1 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap)
+ pScrn->pScreen->rootDepth),
+ (pointer)(pVMWARE->FbBase + pScrn->fbOffset));
+
+- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE);
+- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE);
++ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE);
++ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE);
+ }
+
+ vgaHWProtect(pScrn, FALSE);
+@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE)
+ }
+
+ static void
+-VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags)
++VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL)
+ {
+ /* FIXME */
+ }
+@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn)
+ }
+
+ static Bool
+-VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
++VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
+ ScreenPtr save = &pVMWARE->ScrnFuncs;
+
+@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
+ pScrn->DriverFunc = NULL;
+ #endif
+
+- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
++ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
+ }
+
+ static Bool
+@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1,
+ }
+
+ static Bool
+-VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn;
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ vgaHWPtr hwp;
+ VMWAREPtr pVMWARE;
+ OptionInfoPtr options;
+ Bool useXinerama = TRUE;
+
+- /* Get the ScrnInfoRec */
+- pScrn = xf86Screens[pScreen->myNum];
+ pVMWARE = VMWAREPTR(pScrn);
+
+
+@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ VMWAREModeInit(pScrn, pScrn->currentMode, FALSE);
+
+ /* Set the viewport if supported */
+- VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++ VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
+
+ /*
+ * Setup the screen's visuals, and initialise the framebuffer
+@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ }
+
+ static Bool
+-VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+-
++VMWARESwitchMode(SWITCH_MODE_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ ScreenPtr pScreen = pScrn->pScreen;
+
+ pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM +
+@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+ }
+
+ static Bool
+-VMWAREEnterVT(int scrnIndex, int flags)
++VMWAREEnterVT(VT_FUNC_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
+
+ /*
+@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags)
+ }
+
+ static void
+-VMWARELeaveVT(int scrnIndex, int flags)
++VMWARELeaveVT(VT_FUNC_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
+
+ /*
+@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags)
+ }
+
+ static void
+-VMWAREFreeScreen(int scrnIndex, int flags)
++VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL)
+ {
++ SCRN_INFO_PTR(arg);
+ /*
+ * If the vgahw module is used vgaHWFreeHWRec() would be called
+ * here.
+ */
+- VMWAREFreeRec(xf86Screens[scrnIndex]);
++ VMWAREFreeRec(pScrn);
+ }
+
+ static ModeStatus
+-VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
++VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
+ {
+ return MODE_OK;
+ }
+diff --git a/src/vmware.h b/src/vmware.h
+index 458390a..4818e16 100644
+--- a/src/vmware.h
++++ b/src/vmware.h
+@@ -177,7 +177,7 @@ typedef struct {
+ #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
+
+ static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
+- return xf86Screens[s->myNum];
++ return xf86ScreenToScrn(s);
+ }
+
+ #define MIN(a,b) ((a)<(b)?(a):(b))
+diff --git a/src/vmware_common.h b/src/vmware_common.h
+index 9cd7194..5629c10 100644
+--- a/src/vmware_common.h
++++ b/src/vmware_common.h
+@@ -32,6 +32,8 @@
+ #include <X11/extensions/panoramiXproto.h>
+ #include <xf86.h>
+
++#include "compat-api.h"
++
+ xXineramaScreenInfo *
+ VMWAREParseTopologyString(ScrnInfoPtr pScrn,
+ const char *topology,
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 1b82ac4..7de0772 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -83,7 +83,7 @@ static Bool
+ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format)
+ {
+ ScreenPtr pScreen = pDraw->pScreen;
+- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ modesettingPtr ms = modesettingPTR(pScrn);
+ BufferPrivatePtr private = buffer->driverPrivate;
+ PixmapPtr pPixmap;
+@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
+ Bool
+ xorg_dri2_init(ScreenPtr pScreen)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ modesettingPtr ms = modesettingPTR(pScrn);
+ DRI2InfoRec dri2info;
+ int major, minor;
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index ed1eb8c..9959ffb 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -107,14 +107,13 @@ typedef uint8_t uint8;
+ */
+
+ static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags);
+-static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc,
+- char **argv);
+-static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags);
+-static void drv_adjust_frame(int scrnIndex, int x, int y, int flags);
+-static Bool drv_enter_vt(int scrnIndex, int flags);
+-static void drv_leave_vt(int scrnIndex, int flags);
+-static void drv_free_screen(int scrnIndex, int flags);
+-static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose,
++static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL);
++static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL);
++static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL);
++static Bool drv_enter_vt(VT_FUNC_ARGS_DECL);
++static void drv_leave_vt(VT_FUNC_ARGS_DECL);
++static void drv_free_screen(FREE_SCREEN_ARGS_DECL);
++static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose,
+ int flags);
+
+ extern void xorg_tracker_set_functions(ScrnInfoPtr scrn);
+@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn)
+ * Internal function definitions
+ */
+
+-static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen);
++static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL);
+
+ /*
+ * Internal functions
+@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
+
+ void xorg_flush(ScreenPtr pScreen)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ modesettingPtr ms = modesettingPTR(pScrn);
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ PixmapPtr pixmap = NULL;
+@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen)
+ free(pixmaps);
+ }
+
+-static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
+- pointer pReadmask)
++static void drv_block_handler(BLOCKHANDLER_ARGS_DECL)
+ {
+- ScreenPtr pScreen = screenInfo.screens[i];
+- modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]);
++ SCREEN_PTR(arg);
++ modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
+
+ vmwgfx_swap(ms, pScreen, BlockHandler);
+- pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
++ pScreen->BlockHandler(BLOCKHANDLER_ARGS);
+ vmwgfx_swap(ms, pScreen, BlockHandler);
+
+ vmwgfx_flush_dri2(pScreen);
+@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
+ static Bool
+ drv_create_screen_resources(ScreenPtr pScreen)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ modesettingPtr ms = modesettingPTR(pScrn);
+ Bool ret;
+
+@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen)
+ if (!ret)
+ return ret;
+
+- drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++ drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
+
+- return drv_enter_vt(pScreen->myNum, 1);
++ return drv_enter_vt(VT_FUNC_ARGS);
+ }
+
+ static Bool
+@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn)
+ static Bool
+ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+ modesettingPtr ms = modesettingPTR(pScrn);
+@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
+ static Bool
+ vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+ modesettingPtr ms = modesettingPTR(pScrn);
+@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors,
+
+
+ static Bool
+-drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++drv_screen_init(SCREEN_INIT_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ modesettingPtr ms = modesettingPTR(pScrn);
+ VisualPtr visual;
+
+@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ }
+
+ static void
+-drv_adjust_frame(int scrnIndex, int x, int y, int flags)
++drv_adjust_frame(ADJUST_FRAME_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86OutputPtr output = config->output[config->compat_output];
+ xf86CrtcPtr crtc = output->crtc;
+@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags)
+ }
+
+ static void
+-drv_free_screen(int scrnIndex, int flags)
++drv_free_screen(FREE_SCREEN_ARGS_DECL)
+ {
+- drv_free_rec(xf86Screens[scrnIndex]);
++ SCRN_INFO_PTR(arg);
++ drv_free_rec(pScrn);
+ }
+
+ static void
+-drv_leave_vt(int scrnIndex, int flags)
++drv_leave_vt(VT_FUNC_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ modesettingPtr ms = modesettingPTR(pScrn);
+
+ vmwgfx_cursor_bypass(ms->fd, 0, 0);
+@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags)
+ * This gets called when gaining control of the VT, and from ScreenInit().
+ */
+ static Bool
+-drv_enter_vt(int scrnIndex, int flags)
++drv_enter_vt(VT_FUNC_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+
+ if (!drv_set_master(pScrn))
+ return FALSE;
+@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags)
+ }
+
+ static Bool
+-drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags)
++drv_switch_mode(SWITCH_MODE_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+
+ return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
+ }
+
+ static Bool
+-drv_close_screen(int scrnIndex, ScreenPtr pScreen)
++drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ modesettingPtr ms = modesettingPTR(pScrn);
+
+ if (ms->cursor) {
+@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
+ xorg_dri2_close(pScreen);
+
+ if (pScrn->vtSema)
+- pScrn->LeaveVT(scrnIndex, 0);
++ pScrn->LeaveVT(VT_FUNC_ARGS);
+
+ pScrn->vtSema = FALSE;
+
+@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
+ if (ms->xat)
+ xa_tracker_destroy(ms->xat);
+
+- return (*pScreen->CloseScreen) (scrnIndex, pScreen);
++ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
+ }
+
+ static ModeStatus
+-drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
++drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
+ {
+ return MODE_OK;
+ }
+diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
+index 4fcfed6..f78a85f 100644
+--- a/vmwgfx/vmwgfx_driver.h
++++ b/vmwgfx/vmwgfx_driver.h
+@@ -46,6 +46,7 @@
+ #include <xa_tracker.h>
+ #include <xf86Module.h>
+
++#include "../src/compat-api.h"
+ #ifdef DRI2
+ #include <dri2.h>
+ #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3))
+@@ -118,9 +119,9 @@ typedef struct _modesettingRec
+ ScreenBlockHandlerProcPtr saved_BlockHandler;
+ CreateScreenResourcesProcPtr saved_CreateScreenResources;
+ CloseScreenProcPtr saved_CloseScreen;
+- Bool (*saved_EnterVT)(int, int);
+- void (*saved_LeaveVT)(int, int);
+- void (*saved_AdjustFrame)(int, int, int, int);
++ Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL);
++ void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL);
++ void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL);
+ Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr);
+ Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr);
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 469598a..63df3a1 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen)
+ struct vmwgfx_saa *vsaa =
+ to_vmwgfx_saa(saa_get_driver(pScreen));
+ struct _WsbmListHead *list, *next;
+- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+
+ if (!pScrn->vtSema)
+ return;
+@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver,
+ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
+ struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap);
+ struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix);
+- ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen);
+
+ /*
+ * Make dri2 drawables up to date, or add them to the flush list
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index af53379..449266b 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn,
+ DrawablePtr pDraw)
+ {
+ struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data;
+- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
++ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
+ PixmapPtr pPixmap;
+ INT32 x1, x2, y1, y2;
+ BoxRec dstBox;
+@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports)
+ static XF86VideoAdaptorPtr
+ xorg_setup_textured_adapter(ScreenPtr pScreen)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ modesettingPtr ms = modesettingPTR(pScrn);
+ XF86VideoAdaptorPtr adapt;
+ XF86AttributePtr attrs;
+@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen)
+ void
+ xorg_xv_init(ScreenPtr pScreen)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ modesettingPtr ms = modesettingPTR(pScrn);
+ XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL;
+ XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL;
+--
+1.7.9.5
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
index 4468fae..707d3b8 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
@@ -9,8 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
DEPENDS += "virtual/libx11 libxvmc drm glproto \
virtual/libgl xineramaproto libpciaccess"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+SRC_URI += "file://vmware-port-vmware-driver-to-new-compat-API.patch"
SRC_URI[md5sum] = "0743ec7c479603fba60d118858fd5783"
SRC_URI[sha256sum] = "c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 11/12] xf86-input-synaptics: add mtdev dependency
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (9 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 10/12] xf86-video-vmware: Add compat API Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo Laurentiu Palcu
11 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
After upgrading xserver to 1.13, multitouch support is automatically
enabled in xf86-input-synaptics. Hence, the need for mtdev dependency.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../xorg-driver/xf86-input-synaptics_1.6.2.bb | 4 ++--
.../xorg-driver/xf86-input-synaptics_git.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.6.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.6.2.bb
index 193bd08..8a94bfd 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.6.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.6.2.bb
@@ -12,11 +12,11 @@ advanced features of the touchpad to become available."
LIC_FILES_CHKSUM = "file://COPYING;md5=e395e21f3c21d4fc3a243783e85e9ab5"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI[md5sum] = "9914022a173e3f0ccfe7137ab84f6133"
SRC_URI[sha256sum] = "c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920"
-DEPENDS += "libxi"
+DEPENDS += "libxi mtdev"
FILES_${PN} += "${datadir}/X11/xorg.conf.d"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
index 3b3db59..73b8089 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
@@ -10,9 +10,9 @@ advanced features of the touchpad to become available."
SRCREV = "934bc0012f948c52aadc8eda912f7728fb7394a2"
PV = "0.15.2+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
S = "${WORKDIR}/git"
-DEPENDS += "libxi"
+DEPENDS += "libxi mtdev"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
` (10 preceding siblings ...)
2012-11-14 13:21 ` [PATCH v3 11/12] xf86-input-synaptics: add mtdev dependency Laurentiu Palcu
@ 2012-11-14 13:21 ` Laurentiu Palcu
2012-11-21 16:20 ` Martin Jansa
11 siblings, 1 reply; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-14 13:21 UTC (permalink / raw)
To: openembedded-core
This new recipe is needed because the old driver is unmaintained. This
new recipe will follow the new repo.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../xorg-driver/xf86-video-omap_git.bb | 31 ++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
new file mode 100644
index 0000000..b3177eb
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
@@ -0,0 +1,31 @@
+require xorg-driver-video.inc
+
+SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
+
+DESCRIPTION = "omap driver supports the basic Texas Instruments OMAP \
+framebuffer."
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
+DEPENDS += "virtual/libx11 libdrm"
+
+RPROVIDES = "xf86-video-omapfb"
+RCONFLICTS = "xf86-video-omapfb"
+RREPLACES = "xf86-video-omapfb"
+
+SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
+PR = "${INC_PR}.0"
+PV = "0.4.2+gitr${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \
+"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF_armv7a = " --enable-neon "
+CFLAGS += " -I${STAGING_INCDIR}/xorg "
+
+# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
+do_compile_prepend_armv7a () {
+ sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c
+}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH v3 07/12] libdrm: upgrade to 2.4.40
2012-11-14 13:21 ` [PATCH v3 07/12] libdrm: upgrade to 2.4.40 Laurentiu Palcu
@ 2012-11-14 14:56 ` Burton, Ross
2012-11-14 16:04 ` Burton, Ross
2012-11-15 10:29 ` [PATCH v4 " Laurentiu Palcu
1 sibling, 1 reply; 38+ messages in thread
From: Burton, Ross @ 2012-11-14 14:56 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On 14 November 2012 13:21, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> Other changes:
> * removed a backported patch;
> * activated libdrm-omap helper layer which is needed by the latest
> xf86-video-omap xorg driver;
> * split libdrm-drivers package into libdrm-radeon, libdrm-nouveau and
> libdrm-omap;
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Acked-By: Ross Burton <ross.burton@intel.com>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0
2012-11-14 13:21 ` [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0 Laurentiu Palcu
@ 2012-11-14 15:03 ` Burton, Ross
2012-11-14 16:18 ` Burton, Ross
2012-11-15 11:07 ` [PATCH v4 " Laurentiu Palcu
1 sibling, 1 reply; 38+ messages in thread
From: Burton, Ross @ 2012-11-14 15:03 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On 14 November 2012 13:21, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> The patch contains several aditional changes:
> * removed one backported patch (included in the new release);
> * changed mips64-compiler.patch to apply properly;
> * licence checksum for COPYING file changed: some copyright years have
> been changed
>
> The following external modules are now built-in:
> * DBE
> * DRI2
> * DRI
> * RECORD
>
> The extmod module was completely removed.
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
I'd like to see the upgrade path verified just to make sure we don't
have a repeat of the EXA farce...
Ross
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 07/12] libdrm: upgrade to 2.4.40
2012-11-14 14:56 ` Burton, Ross
@ 2012-11-14 16:04 ` Burton, Ross
0 siblings, 0 replies; 38+ messages in thread
From: Burton, Ross @ 2012-11-14 16:04 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On 14 November 2012 14:56, Burton, Ross <ross.burton@intel.com> wrote:
> Acked-By: Ross Burton <ross.burton@intel.com>
Retracted. There isn't a libdrm-intel package for the Intel driver,
so it goes into libdrm. This then messes up the renaming and upgrades
become impossible.
Ross
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0
2012-11-14 15:03 ` Burton, Ross
@ 2012-11-14 16:18 ` Burton, Ross
2012-11-15 10:43 ` Burton, Ross
0 siblings, 1 reply; 38+ messages in thread
From: Burton, Ross @ 2012-11-14 16:18 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On 14 November 2012 15:03, Burton, Ross <ross.burton@intel.com> wrote:
> I'd like to see the upgrade path verified just to make sure we don't
> have a repeat of the EXA farce...
Just did an upgrade. There is the drm breakage I talked about in the
other mail, and then some very odd breakage I wasn't expecting with
Xorg ABI versions.
The xorg server/drivers upgraded fine, but then on startup we got the
ABI errors. This shouldn't have happened - the ABI version in the
code should have matched the ABI in the dependencies, but they are
different.
I'm digging into this now.
Ross
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v4 07/12] libdrm: upgrade to 2.4.40
2012-11-14 13:21 ` [PATCH v3 07/12] libdrm: upgrade to 2.4.40 Laurentiu Palcu
2012-11-14 14:56 ` Burton, Ross
@ 2012-11-15 10:29 ` Laurentiu Palcu
2012-11-15 10:37 ` Laurentiu Palcu
1 sibling, 1 reply; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-15 10:29 UTC (permalink / raw)
To: openembedded-core
Other changes:
* removed a backported patch;
* activated libdrm-omap helper layer which is needed by the latest
xf86-video-omap xorg driver;
* split libdrm-drivers package into libdrm-radeon, libdrm-nouveau and
libdrm-omap, libdrm-intel and libdrm-exynos;
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
meta/recipes-graphics/drm/libdrm.inc | 20 ++++--
.../drm/libdrm/disable-cairo.patch | 74 --------------------
meta/recipes-graphics/drm/libdrm_2.4.39.bb | 11 ---
meta/recipes-graphics/drm/libdrm_2.4.40.bb | 10 +++
meta/recipes-graphics/drm/libdrm_git.bb | 4 +-
5 files changed, 27 insertions(+), 92 deletions(-)
delete mode 100644 meta/recipes-graphics/drm/libdrm/disable-cairo.patch
delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.39.bb
create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.40.bb
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index a64a5df..9c1124e 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -11,17 +11,27 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
PROVIDES = "drm"
DEPENDS = "libpthread-stubs udev"
-INC_PR = "r3"
+INC_PR = "r4"
#libpciaccess is required starting from libdrm 2.4.26
DEPENDS += " libpciaccess"
inherit autotools pkgconfig
-EXTRA_OECONF += "--disable-cairo-tests"
+EXTRA_OECONF += "--disable-cairo-tests \
+ --enable-omap-experimental-api \
+ "
+ALLOW_EMPTY_${PN}-drivers = "1"
+PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
+ ${PN}-intel ${PN}-exynos ${PN}-kms"
+
+RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
+ ${PN}-exynos"
-PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
-FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
+FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
+FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
+FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
+FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
+FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
FILES_${PN}-kms = "${libdir}/libkms*.so.*"
-
diff --git a/meta/recipes-graphics/drm/libdrm/disable-cairo.patch b/meta/recipes-graphics/drm/libdrm/disable-cairo.patch
deleted file mode 100644
index 90e79d4..0000000
--- a/meta/recipes-graphics/drm/libdrm/disable-cairo.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-commit c81d1df4926072d24b4dad1b488e618e57eff1c6
-Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Oct 4 10:26:37 2012 +1000
-
- configure.ac: Allow forcible disabling of Cairo support
-
- We don't want to build libdrm tests with Cairo support under Poky, since
- they're never used and also cause a build loop from libdrm -> cairo ->
- mesa-dri -> libdrm.
-
- To avoid variance in build results, introduce a --disable-cairo-tests
- switch.
-
- Upstream-Status: Backport
-
- Signed-off-by: Daniel Stone <daniel@fooishbar.org>
-
-diff --git a/configure.ac b/configure.ac
-index 290362c..8c28107 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -222,11 +222,23 @@ if test "x$EXYNOS" = xyes; then
- AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
- fi
-
-+AC_ARG_ENABLE([cairo-tests],
-+ [AS_HELP_STRING([--enable-cairo-tests],
-+ [Enable support for Cairo rendering in tests (default: auto)])],
-+ [CAIRO=$enableval], [CAIRO=auto])
- PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
--if test "x$HAVE_CAIRO" = xyes; then
-- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
-+AC_MSG_CHECKING([whether to enable Cairo tests])
-+if test "x$CAIRO" = xauto; then
-+ CAIRO="$HAVE_CAIRO"
- fi
--AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
-+if test "x$CAIRO" = xyes; then
-+ if ! test "x$HAVE_CAIRO" = xyes; then
-+ AC_MSG_ERROR([Cairo support required but not present])
-+ fi
-+ AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support])
-+fi
-+AC_MSG_RESULT([$CAIRO])
-+AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])
-
- # For enumerating devices in test case
- PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
-diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
-index b5ec771..065ae13 100644
---- a/tests/modetest/Makefile.am
-+++ b/tests/modetest/Makefile.am
-@@ -1,8 +1,7 @@
- AM_CFLAGS = \
- -I$(top_srcdir)/include/drm \
- -I$(top_srcdir)/libkms/ \
-- -I$(top_srcdir) \
-- $(CAIRO_CFLAGS)
-+ -I$(top_srcdir)
-
- noinst_PROGRAMS = \
- modetest
-@@ -12,5 +11,9 @@ modetest_SOURCES = \
-
- modetest_LDADD = \
- $(top_builddir)/libdrm.la \
-- $(top_builddir)/libkms/libkms.la \
-- $(CAIRO_LIBS)
-+ $(top_builddir)/libkms/libkms.la
-+
-+if HAVE_CAIRO
-+AM_CFLAGS += $(CAIRO_CFLAGS)
-+modetest_LDADD += $(CAIRO_LIBS)
-+endif
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.39.bb b/meta/recipes-graphics/drm/libdrm_2.4.39.bb
deleted file mode 100644
index f3ce2b1..0000000
--- a/meta/recipes-graphics/drm/libdrm_2.4.39.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libdrm.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://installtests.patch \
- file://GNU_SOURCE_definition.patch \
- file://disable-cairo.patch \
- "
-
-SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d"
-SRC_URI[sha256sum] = "386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d"
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.40.bb b/meta/recipes-graphics/drm/libdrm_2.4.40.bb
new file mode 100644
index 0000000..42f860a
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm_2.4.40.bb
@@ -0,0 +1,10 @@
+require libdrm.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://installtests.patch \
+ file://GNU_SOURCE_definition.patch \
+ "
+
+SRC_URI[md5sum] = "626a3dc44a40ef37565b61732b688567"
+SRC_URI[sha256sum] = "48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f"
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
index 5d7f953..e3051c7 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -6,7 +6,7 @@ S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"
-SRCREV = "14db948127e549ea9234e02d8e112de3871f8f9f"
-PV = "2.4.39+git${SRCPV}"
+SRCREV = "e01d68f9f3acfc35fe164283904b5d058c2ab378"
+PV = "2.4.40+git${SRCPV}"
PR = "${INC_PR}.0"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH v4 07/12] libdrm: upgrade to 2.4.40
2012-11-15 10:29 ` [PATCH v4 " Laurentiu Palcu
@ 2012-11-15 10:37 ` Laurentiu Palcu
0 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-15 10:37 UTC (permalink / raw)
To: openembedded-core
v4:
* added the missing library packages (libdrm-intel, libdrm-exynos)
On 11/15/2012 12:29 PM, Laurentiu Palcu wrote:
> Other changes:
> * removed a backported patch;
> * activated libdrm-omap helper layer which is needed by the latest
> xf86-video-omap xorg driver;
> * split libdrm-drivers package into libdrm-radeon, libdrm-nouveau and
> libdrm-omap, libdrm-intel and libdrm-exynos;
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
> meta/recipes-graphics/drm/libdrm.inc | 20 ++++--
> .../drm/libdrm/disable-cairo.patch | 74 --------------------
> meta/recipes-graphics/drm/libdrm_2.4.39.bb | 11 ---
> meta/recipes-graphics/drm/libdrm_2.4.40.bb | 10 +++
> meta/recipes-graphics/drm/libdrm_git.bb | 4 +-
> 5 files changed, 27 insertions(+), 92 deletions(-)
> delete mode 100644 meta/recipes-graphics/drm/libdrm/disable-cairo.patch
> delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.39.bb
> create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.40.bb
>
> diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
> index a64a5df..9c1124e 100644
> --- a/meta/recipes-graphics/drm/libdrm.inc
> +++ b/meta/recipes-graphics/drm/libdrm.inc
> @@ -11,17 +11,27 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
> PROVIDES = "drm"
> DEPENDS = "libpthread-stubs udev"
>
> -INC_PR = "r3"
> +INC_PR = "r4"
>
> #libpciaccess is required starting from libdrm 2.4.26
> DEPENDS += " libpciaccess"
>
> inherit autotools pkgconfig
>
> -EXTRA_OECONF += "--disable-cairo-tests"
> +EXTRA_OECONF += "--disable-cairo-tests \
> + --enable-omap-experimental-api \
> + "
> +ALLOW_EMPTY_${PN}-drivers = "1"
> +PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
> + ${PN}-intel ${PN}-exynos ${PN}-kms"
> +
> +RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
> + ${PN}-exynos"
>
> -PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
> FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
> -FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
> +FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
> +FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
> +FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
> +FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
> +FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
> FILES_${PN}-kms = "${libdir}/libkms*.so.*"
> -
> diff --git a/meta/recipes-graphics/drm/libdrm/disable-cairo.patch b/meta/recipes-graphics/drm/libdrm/disable-cairo.patch
> deleted file mode 100644
> index 90e79d4..0000000
> --- a/meta/recipes-graphics/drm/libdrm/disable-cairo.patch
> +++ /dev/null
> @@ -1,74 +0,0 @@
> -commit c81d1df4926072d24b4dad1b488e618e57eff1c6
> -Author: Daniel Stone <daniel@fooishbar.org>
> -Date: Thu Oct 4 10:26:37 2012 +1000
> -
> - configure.ac: Allow forcible disabling of Cairo support
> -
> - We don't want to build libdrm tests with Cairo support under Poky, since
> - they're never used and also cause a build loop from libdrm -> cairo ->
> - mesa-dri -> libdrm.
> -
> - To avoid variance in build results, introduce a --disable-cairo-tests
> - switch.
> -
> - Upstream-Status: Backport
> -
> - Signed-off-by: Daniel Stone <daniel@fooishbar.org>
> -
> -diff --git a/configure.ac b/configure.ac
> -index 290362c..8c28107 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -222,11 +222,23 @@ if test "x$EXYNOS" = xyes; then
> - AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
> - fi
> -
> -+AC_ARG_ENABLE([cairo-tests],
> -+ [AS_HELP_STRING([--enable-cairo-tests],
> -+ [Enable support for Cairo rendering in tests (default: auto)])],
> -+ [CAIRO=$enableval], [CAIRO=auto])
> - PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
> --if test "x$HAVE_CAIRO" = xyes; then
> -- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
> -+AC_MSG_CHECKING([whether to enable Cairo tests])
> -+if test "x$CAIRO" = xauto; then
> -+ CAIRO="$HAVE_CAIRO"
> - fi
> --AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
> -+if test "x$CAIRO" = xyes; then
> -+ if ! test "x$HAVE_CAIRO" = xyes; then
> -+ AC_MSG_ERROR([Cairo support required but not present])
> -+ fi
> -+ AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support])
> -+fi
> -+AC_MSG_RESULT([$CAIRO])
> -+AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])
> -
> - # For enumerating devices in test case
> - PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
> -diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
> -index b5ec771..065ae13 100644
> ---- a/tests/modetest/Makefile.am
> -+++ b/tests/modetest/Makefile.am
> -@@ -1,8 +1,7 @@
> - AM_CFLAGS = \
> - -I$(top_srcdir)/include/drm \
> - -I$(top_srcdir)/libkms/ \
> -- -I$(top_srcdir) \
> -- $(CAIRO_CFLAGS)
> -+ -I$(top_srcdir)
> -
> - noinst_PROGRAMS = \
> - modetest
> -@@ -12,5 +11,9 @@ modetest_SOURCES = \
> -
> - modetest_LDADD = \
> - $(top_builddir)/libdrm.la \
> -- $(top_builddir)/libkms/libkms.la \
> -- $(CAIRO_LIBS)
> -+ $(top_builddir)/libkms/libkms.la
> -+
> -+if HAVE_CAIRO
> -+AM_CFLAGS += $(CAIRO_CFLAGS)
> -+modetest_LDADD += $(CAIRO_LIBS)
> -+endif
> diff --git a/meta/recipes-graphics/drm/libdrm_2.4.39.bb b/meta/recipes-graphics/drm/libdrm_2.4.39.bb
> deleted file mode 100644
> index f3ce2b1..0000000
> --- a/meta/recipes-graphics/drm/libdrm_2.4.39.bb
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -require libdrm.inc
> -
> -PR = "${INC_PR}.0"
> -
> -SRC_URI += "file://installtests.patch \
> - file://GNU_SOURCE_definition.patch \
> - file://disable-cairo.patch \
> - "
> -
> -SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d"
> -SRC_URI[sha256sum] = "386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d"
> diff --git a/meta/recipes-graphics/drm/libdrm_2.4.40.bb b/meta/recipes-graphics/drm/libdrm_2.4.40.bb
> new file mode 100644
> index 0000000..42f860a
> --- /dev/null
> +++ b/meta/recipes-graphics/drm/libdrm_2.4.40.bb
> @@ -0,0 +1,10 @@
> +require libdrm.inc
> +
> +PR = "${INC_PR}.0"
> +
> +SRC_URI += "file://installtests.patch \
> + file://GNU_SOURCE_definition.patch \
> + "
> +
> +SRC_URI[md5sum] = "626a3dc44a40ef37565b61732b688567"
> +SRC_URI[sha256sum] = "48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f"
> diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
> index 5d7f953..e3051c7 100644
> --- a/meta/recipes-graphics/drm/libdrm_git.bb
> +++ b/meta/recipes-graphics/drm/libdrm_git.bb
> @@ -6,7 +6,7 @@ S = "${WORKDIR}/git"
>
> DEFAULT_PREFERENCE = "-1"
>
> -SRCREV = "14db948127e549ea9234e02d8e112de3871f8f9f"
> -PV = "2.4.39+git${SRCPV}"
> +SRCREV = "e01d68f9f3acfc35fe164283904b5d058c2ab378"
> +PV = "2.4.40+git${SRCPV}"
> PR = "${INC_PR}.0"
>
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0
2012-11-14 16:18 ` Burton, Ross
@ 2012-11-15 10:43 ` Burton, Ross
0 siblings, 0 replies; 38+ messages in thread
From: Burton, Ross @ 2012-11-15 10:43 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On 14 November 2012 16:18, Burton, Ross <ross.burton@intel.com> wrote:
> The xorg server/drivers upgraded fine, but then on startup we got the
> ABI errors. This shouldn't have happened - the ABI version in the
> code should have matched the ABI in the dependencies, but they are
> different.
>
> I'm digging into this now.
For a start, bump the PR in the video and input driver includes, so
that all drivers get rebuilt - both the video and input ABIs changed.
Ross
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v4 08/12] xserver-xorg: upgrade to 1.13.0
2012-11-14 13:21 ` [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0 Laurentiu Palcu
2012-11-14 15:03 ` Burton, Ross
@ 2012-11-15 11:07 ` Laurentiu Palcu
2012-11-15 11:13 ` Laurentiu Palcu
1 sibling, 1 reply; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-15 11:07 UTC (permalink / raw)
To: openembedded-core
The patch contains several aditional changes:
* removed one backported patch (included in the new release);
* changed mips64-compiler.patch to apply properly;
* licence checksum for COPYING file changed: some copyright years have
been changed;
* bump PR in xorg-driver-common.inc so that all input/video drivers
get rebuilt. That's becaue the ABI changed;
The following external modules are now built-in:
* DBE
* DRI2
* DRI
* RECORD
The extmod module was completely removed.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
meta/conf/machine/include/ia32-base.inc | 5 +-
.../xorg-driver/xorg-driver-common.inc | 2 +-
.../xserver-xorg-1.11.4/crosscompile.patch | 22 ------
.../fix_open_max_preprocessor_error.patch | 15 -----
.../xserver-xorg-1.11.4/macro_tweak.patch | 25 -------
.../xserver-xorg-1.11.4/mips64-compiler.patch | 29 --------
.../xserver-xorg-1.11.4/pkgconfig-deps.patch | 70 --------------------
.../xserver-xorg-1.13.0/crosscompile.patch | 22 ++++++
.../fix_open_max_preprocessor_error.patch | 15 +++++
.../xserver-xorg-1.13.0/macro_tweak.patch | 25 +++++++
.../xserver-xorg-1.13.0/mips64-compiler.patch | 29 ++++++++
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 32 +++++----
.../xorg-xserver/xserver-xorg_1.11.4.bb | 13 ----
.../xorg-xserver/xserver-xorg_1.13.0.bb | 12 ++++
14 files changed, 125 insertions(+), 191 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc
index 4b10183..c2d267a 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/ia32-base.inc
@@ -33,11 +33,8 @@ XSERVER_IA32_BASE = "xserver-xorg \
xf86-input-synaptics \
"
-XSERVER_IA32_EXT = "xserver-xorg-extension-dri \
- xserver-xorg-extension-dri2 \
+XSERVER_IA32_EXT = "
xserver-xorg-extension-glx \
- xserver-xorg-extension-extmod \
- xserver-xorg-extension-dbe \
xserver-xorg-module-libint10 \
"
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index f9f25ff..4c9b47d 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -5,7 +5,7 @@ SECTION = "x11/drivers"
LICENSE = "MIT-X"
PE = "2"
-INC_PR = "r18"
+INC_PR = "r19"
DEPENDS = "virtual/xserver xproto randrproto util-macros"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
deleted file mode 100644
index 2f98bb8..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff --git a/configure.ac b/configure.ac
-index b3b752c..600500b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
- dnl compiling, assume default font path uses standard FONTROOTDIR directories.
- DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
--if test "$cross_compiling" != yes; then
-- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
-- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
-- [case $host_os in
-+ case $host_os in
- darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
-- esac])
--fi
-+ esac
- AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
- [ FONTPATH="$withval" ],
- [ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
deleted file mode 100644
index 2f62972..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/os/osdep.h
-===================================================================
---- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
-+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100
-@@ -92,7 +92,7 @@
- * like sysconf(_SC_OPEN_MAX) is not supported.
- */
-
--#if OPEN_MAX <= 256
-+#if 0
- #define MAXSOCKS (OPEN_MAX - 1)
- #else
- #define MAXSOCKS 256
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
deleted file mode 100644
index ec0eea6..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904 and newer.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-diff --git a/xorg-server.m4 b/xorg-server.m4
-index bdecf62..040fdb8 100644
---- a/xorg-server.m4
-+++ b/xorg-server.m4
-@@ -28,10 +28,12 @@ dnl
- # Checks for the $1 define in xorg-server.h (from the sdk). If it
- # is defined, then add $1 to $REQUIRED_MODULES.
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
deleted file mode 100644
index e6bc95b..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
-so we end up with incompatible conversion errors
-
-This patch choses the right values for mips64
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-Index: xorg-server-1.11.2/hw/xfree86/common/compiler.h
-===================================================================
---- xorg-server-1.11.2.orig/hw/xfree86/common/compiler.h 2012-05-10 12:19:59.485599046 -0700
-+++ xorg-server-1.11.2/hw/xfree86/common/compiler.h 2012-05-10 12:20:53.109602488 -0700
-@@ -104,6 +104,7 @@
-
- # if !defined(__arm__)
- # if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
-+ && !defined(__mips64) \
- && !(defined(__alpha__) && defined(linux)) \
- && !(defined(__ia64__) && defined(linux)) \
-
-@@ -708,7 +709,7 @@
- }
-
- # elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
--# ifdef __arm32__
-+# if defined (__arm32__) || defined (__mips64)
- # define PORT_SIZE long
- # else
- # define PORT_SIZE short
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
deleted file mode 100644
index fee8d76..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-commit 41d903918a5721e53ed694880eab44170f9717cc
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed Sep 14 13:45:18 2011 -0500
-
- xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires
-
- Every module building against xorg-server does not *Require* pixman nor
- libpciaccess. If such modules need pixman or pciaccess, they should be
- depending on them directly rather than inheriting a dependency from
- xorg-server. To do this, they should use PKG_CHECK_MODULES in configure.ac
- to check for pixman-1 or pciaccess and include the apporpriate _LIBS variable
- to the appropriate _LDFLAGS variable in Makefile.am
-
- This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to
- to satisfy include dependencies but avoid linking needlessly.
-
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-
-diff --git a/configure.ac b/configure.ac
-index 50beb01..4bfa82c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -780,11 +780,6 @@ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
- WINDOWSWMPROTO="windowswmproto"
- APPLEWMPROTO="applewmproto >= 1.4"
-
--dnl Core modules for most extensions, et al.
--SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
--# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
--AC_SUBST(SDK_REQUIRED_MODULES)
--
- dnl List of libraries that require a specific version
- LIBAPPLEWM="applewm >= 1.4"
- LIBDMX="dmx >= 1.0.99.1"
-@@ -806,6 +801,11 @@ dnl specific modules against it
- PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
- REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
-
-+dnl Core modules for most extensions, et al.
-+SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.99.99.902] [kbproto >= 1.0.3] fontsproto $LIBPIXMAN"
-+# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
-+AC_SUBST(SDK_REQUIRED_MODULES)
-+
- REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
-
- if test "x$CONFIG_UDEV" = xyes &&
-@@ -1583,6 +1583,7 @@ if test "x$XORG" = xyes; then
- if test "x$PCI" = xyes; then
-
- PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
-+ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
- SAVE_LIBS=$LIBS
- SAVE_CFLAGS=$CFLAGS
- CFLAGS=$PCIACCESS_CFLAGS
-diff --git a/xorg-server.pc.in b/xorg-server.pc.in
-index fb238b5..a98eca8 100644
---- a/xorg-server.pc.in
-+++ b/xorg-server.pc.in
-@@ -15,7 +15,6 @@ abi_extension=@abi_extension@
- Name: xorg-server
- Description: Modular X.Org X Server
- Version: @PACKAGE_VERSION@
--Requires: pixman-1 pciaccess
- Requires.private: @SDK_REQUIRED_MODULES@
- Cflags: -I${sdkdir} @symbol_visibility@
- Libs: -L${libdir}
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
new file mode 100644
index 0000000..2f98bb8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
@@ -0,0 +1,22 @@
+Upstream-Status: Inappropriate [configuration]
+
+diff --git a/configure.ac b/configure.ac
+index b3b752c..600500b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+ dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
+ dnl compiling, assume default font path uses standard FONTROOTDIR directories.
+ DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+-if test "$cross_compiling" != yes; then
+- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+- [case $host_os in
++ case $host_os in
+ darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+- esac])
+-fi
++ esac
+ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+ [ FONTPATH="$withval" ],
+ [ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
new file mode 100644
index 0000000..2f62972
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Pending
+
+Index: git/os/osdep.h
+===================================================================
+--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
++++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100
+@@ -92,7 +92,7 @@
+ * like sysconf(_SC_OPEN_MAX) is not supported.
+ */
+
+-#if OPEN_MAX <= 256
++#if 0
+ #define MAXSOCKS (OPEN_MAX - 1)
+ #else
+ #define MAXSOCKS 256
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
new file mode 100644
index 0000000..ec0eea6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
@@ -0,0 +1,25 @@
+This is the revised version of files/macro_tweak.patch for
+xorg-server 1.8.99.904 and newer.
+
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <ke.yu@intel.com>
+
+diff --git a/xorg-server.m4 b/xorg-server.m4
+index bdecf62..040fdb8 100644
+--- a/xorg-server.m4
++++ b/xorg-server.m4
+@@ -28,10 +28,12 @@ dnl
+ # Checks for the $1 define in xorg-server.h (from the sdk). If it
+ # is defined, then add $1 to $REQUIRED_MODULES.
+
++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
++
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
++ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
new file mode 100644
index 0000000..168368e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
@@ -0,0 +1,29 @@
+on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
+so we end up with incompatible conversion errors
+
+This patch choses the right values for mips64
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h
+===================================================================
+--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300
++++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200
+@@ -101,6 +101,7 @@
+ #if defined(NO_INLINE) || defined(DO_PROTOTYPES)
+ #if !defined(__arm__)
+ #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
++ && !defined(__mips64) \
+ && !(defined(__alpha__) && defined(linux)) \
+ && !(defined(__ia64__) && defined(linux)) \
+
+@@ -721,7 +722,7 @@
+ }
+
+ #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
+-#ifdef __arm32__
++#if defined (__arm32__) || defined (__mips64)
+ #define PORT_SIZE long
+ #else
+ #define PORT_SIZE short
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 33564eb..4135a8b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "The X.Org X server"
HOMEPAGE = "http://www.x.org"
SECTION = "x11/base"
LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
@@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
PROVIDES += "virtual/xserver"
PE = "2"
-INC_PR = "r3"
+INC_PR = "r5"
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
@@ -48,12 +48,7 @@ PACKAGES =+ "${PN}-security-policy \
${PN}-utils \
${PN}-xephyr \
${PN}-multimedia-modules \
- ${PN}-extension-dri \
- ${PN}-extension-dri2 \
${PN}-extension-glx \
- ${PN}-extension-record \
- ${PN}-extension-extmod \
- ${PN}-extension-dbe \
${PN}-module-libint10 \
${PN}-module-libafb \
${PN}-module-libwfb \
@@ -67,6 +62,24 @@ PACKAGES =+ "${PN}-security-policy \
RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
RDEPENDS_${PN}-xvfb += "xkeyboard-config"
RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
+RREPLACES_${PN} = "${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ "
+RPROVIDES_${PN} = "${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ "
+RCONFLICTS_${PN} = "${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ "
FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
@@ -82,12 +95,7 @@ FILES_${PN}-xvfb = "${bindir}/Xvfb"
FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
FILES_${PN}-xephyr = "${bindir}/Xephyr"
FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
-FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
-FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
-FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
-FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
-FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
deleted file mode 100644
index 4739ee2..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xserver-xorg.inc
-
-# Misc build failure for master HEAD
-SRC_URI += "file://crosscompile.patch \
- file://fix_open_max_preprocessor_error.patch \
- file://mips64-compiler.patch \
- file://pkgconfig-deps.patch \
- "
-
-SRC_URI[md5sum] = "256325e9b17dff479d92bed97f6b0adb"
-SRC_URI[sha256sum] = "3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc"
-
-PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
new file mode 100644
index 0000000..8ad87b8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
@@ -0,0 +1,12 @@
+require xserver-xorg.inc
+
+# Misc build failure for master HEAD
+SRC_URI += "file://crosscompile.patch \
+ file://fix_open_max_preprocessor_error.patch \
+ file://mips64-compiler.patch \
+ "
+
+SRC_URI[md5sum] = "bde3d178b756597d2ec2a19ef60d2e1f"
+SRC_URI[sha256sum] = "548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a"
+
+PR = "${INC_PR}.0"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH v4 08/12] xserver-xorg: upgrade to 1.13.0
2012-11-15 11:07 ` [PATCH v4 " Laurentiu Palcu
@ 2012-11-15 11:13 ` Laurentiu Palcu
0 siblings, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-15 11:13 UTC (permalink / raw)
To: openembedded-core
v4:
* bumped PR xorg-driver-common.inc to get the the input/video drivers
rebuilt.
On 11/15/2012 01:07 PM, Laurentiu Palcu wrote:
> The patch contains several aditional changes:
> * removed one backported patch (included in the new release);
> * changed mips64-compiler.patch to apply properly;
> * licence checksum for COPYING file changed: some copyright years have
> been changed;
> * bump PR in xorg-driver-common.inc so that all input/video drivers
> get rebuilt. That's becaue the ABI changed;
>
> The following external modules are now built-in:
> * DBE
> * DRI2
> * DRI
> * RECORD
>
> The extmod module was completely removed.
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
> meta/conf/machine/include/ia32-base.inc | 5 +-
> .../xorg-driver/xorg-driver-common.inc | 2 +-
> .../xserver-xorg-1.11.4/crosscompile.patch | 22 ------
> .../fix_open_max_preprocessor_error.patch | 15 -----
> .../xserver-xorg-1.11.4/macro_tweak.patch | 25 -------
> .../xserver-xorg-1.11.4/mips64-compiler.patch | 29 --------
> .../xserver-xorg-1.11.4/pkgconfig-deps.patch | 70 --------------------
> .../xserver-xorg-1.13.0/crosscompile.patch | 22 ++++++
> .../fix_open_max_preprocessor_error.patch | 15 +++++
> .../xserver-xorg-1.13.0/macro_tweak.patch | 25 +++++++
> .../xserver-xorg-1.13.0/mips64-compiler.patch | 29 ++++++++
> .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 32 +++++----
> .../xorg-xserver/xserver-xorg_1.11.4.bb | 13 ----
> .../xorg-xserver/xserver-xorg_1.13.0.bb | 12 ++++
> 14 files changed, 125 insertions(+), 191 deletions(-)
> delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
> delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
> delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
> delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
> delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
> create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
> create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
> create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
> create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
> delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
> create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
>
> diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc
> index 4b10183..c2d267a 100644
> --- a/meta/conf/machine/include/ia32-base.inc
> +++ b/meta/conf/machine/include/ia32-base.inc
> @@ -33,11 +33,8 @@ XSERVER_IA32_BASE = "xserver-xorg \
> xf86-input-synaptics \
> "
>
> -XSERVER_IA32_EXT = "xserver-xorg-extension-dri \
> - xserver-xorg-extension-dri2 \
> +XSERVER_IA32_EXT = "
> xserver-xorg-extension-glx \
> - xserver-xorg-extension-extmod \
> - xserver-xorg-extension-dbe \
> xserver-xorg-module-libint10 \
> "
>
> diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
> index f9f25ff..4c9b47d 100644
> --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
> +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
> @@ -5,7 +5,7 @@ SECTION = "x11/drivers"
> LICENSE = "MIT-X"
>
> PE = "2"
> -INC_PR = "r18"
> +INC_PR = "r19"
>
> DEPENDS = "virtual/xserver xproto randrproto util-macros"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
> deleted file mode 100644
> index 2f98bb8..0000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -Upstream-Status: Inappropriate [configuration]
> -
> -diff --git a/configure.ac b/configure.ac
> -index b3b752c..600500b 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
> - dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
> - dnl compiling, assume default font path uses standard FONTROOTDIR directories.
> - DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
> --if test "$cross_compiling" != yes; then
> -- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
> -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
> -- [case $host_os in
> -+ case $host_os in
> - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
> -- esac])
> --fi
> -+ esac
> - AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
> - [ FONTPATH="$withval" ],
> - [ FONTPATH="${DEFAULT_FONT_PATH}" ])
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
> deleted file mode 100644
> index 2f62972..0000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Index: git/os/osdep.h
> -===================================================================
> ---- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
> -+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100
> -@@ -92,7 +92,7 @@
> - * like sysconf(_SC_OPEN_MAX) is not supported.
> - */
> -
> --#if OPEN_MAX <= 256
> -+#if 0
> - #define MAXSOCKS (OPEN_MAX - 1)
> - #else
> - #define MAXSOCKS 256
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
> deleted file mode 100644
> index ec0eea6..0000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -This is the revised version of files/macro_tweak.patch for
> -xorg-server 1.8.99.904 and newer.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Yu Ke <ke.yu@intel.com>
> -
> -diff --git a/xorg-server.m4 b/xorg-server.m4
> -index bdecf62..040fdb8 100644
> ---- a/xorg-server.m4
> -+++ b/xorg-server.m4
> -@@ -28,10 +28,12 @@ dnl
> - # Checks for the $1 define in xorg-server.h (from the sdk). If it
> - # is defined, then add $1 to $REQUIRED_MODULES.
> -
> -+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
> -+
> - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
> - AC_REQUIRE([PKG_PROG_PKG_CONFIG])
> - SAVE_CFLAGS="$CFLAGS"
> -- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
> -+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
> - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
> - #include "xorg-server.h"
> - #if !defined $1
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
> deleted file mode 100644
> index e6bc95b..0000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
> -so we end up with incompatible conversion errors
> -
> -This patch choses the right values for mips64
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Upstream-Status: Pending
> -Index: xorg-server-1.11.2/hw/xfree86/common/compiler.h
> -===================================================================
> ---- xorg-server-1.11.2.orig/hw/xfree86/common/compiler.h 2012-05-10 12:19:59.485599046 -0700
> -+++ xorg-server-1.11.2/hw/xfree86/common/compiler.h 2012-05-10 12:20:53.109602488 -0700
> -@@ -104,6 +104,7 @@
> -
> - # if !defined(__arm__)
> - # if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
> -+ && !defined(__mips64) \
> - && !(defined(__alpha__) && defined(linux)) \
> - && !(defined(__ia64__) && defined(linux)) \
> -
> -@@ -708,7 +709,7 @@
> - }
> -
> - # elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
> --# ifdef __arm32__
> -+# if defined (__arm32__) || defined (__mips64)
> - # define PORT_SIZE long
> - # else
> - # define PORT_SIZE short
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
> deleted file mode 100644
> index fee8d76..0000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -Upstream-Status: Backport
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -commit 41d903918a5721e53ed694880eab44170f9717cc
> -Author: Jeremy Huddleston <jeremyhu@apple.com>
> -Date: Wed Sep 14 13:45:18 2011 -0500
> -
> - xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires
> -
> - Every module building against xorg-server does not *Require* pixman nor
> - libpciaccess. If such modules need pixman or pciaccess, they should be
> - depending on them directly rather than inheriting a dependency from
> - xorg-server. To do this, they should use PKG_CHECK_MODULES in configure.ac
> - to check for pixman-1 or pciaccess and include the apporpriate _LIBS variable
> - to the appropriate _LDFLAGS variable in Makefile.am
> -
> - This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to
> - to satisfy include dependencies but avoid linking needlessly.
> -
> - Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
> - Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
> -
> -diff --git a/configure.ac b/configure.ac
> -index 50beb01..4bfa82c 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -780,11 +780,6 @@ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
> - WINDOWSWMPROTO="windowswmproto"
> - APPLEWMPROTO="applewmproto >= 1.4"
> -
> --dnl Core modules for most extensions, et al.
> --SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
> --# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
> --AC_SUBST(SDK_REQUIRED_MODULES)
> --
> - dnl List of libraries that require a specific version
> - LIBAPPLEWM="applewm >= 1.4"
> - LIBDMX="dmx >= 1.0.99.1"
> -@@ -806,6 +801,11 @@ dnl specific modules against it
> - PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
> - REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
> -
> -+dnl Core modules for most extensions, et al.
> -+SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.99.99.902] [kbproto >= 1.0.3] fontsproto $LIBPIXMAN"
> -+# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
> -+AC_SUBST(SDK_REQUIRED_MODULES)
> -+
> - REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
> -
> - if test "x$CONFIG_UDEV" = xyes &&
> -@@ -1583,6 +1583,7 @@ if test "x$XORG" = xyes; then
> - if test "x$PCI" = xyes; then
> -
> - PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
> -+ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
> - SAVE_LIBS=$LIBS
> - SAVE_CFLAGS=$CFLAGS
> - CFLAGS=$PCIACCESS_CFLAGS
> -diff --git a/xorg-server.pc.in b/xorg-server.pc.in
> -index fb238b5..a98eca8 100644
> ---- a/xorg-server.pc.in
> -+++ b/xorg-server.pc.in
> -@@ -15,7 +15,6 @@ abi_extension=@abi_extension@
> - Name: xorg-server
> - Description: Modular X.Org X Server
> - Version: @PACKAGE_VERSION@
> --Requires: pixman-1 pciaccess
> - Requires.private: @SDK_REQUIRED_MODULES@
> - Cflags: -I${sdkdir} @symbol_visibility@
> - Libs: -L${libdir}
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
> new file mode 100644
> index 0000000..2f98bb8
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
> @@ -0,0 +1,22 @@
> +Upstream-Status: Inappropriate [configuration]
> +
> +diff --git a/configure.ac b/configure.ac
> +index b3b752c..600500b 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
> + dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
> + dnl compiling, assume default font path uses standard FONTROOTDIR directories.
> + DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
> +-if test "$cross_compiling" != yes; then
> +- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
> +- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
> +- [case $host_os in
> ++ case $host_os in
> + darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
> +- esac])
> +-fi
> ++ esac
> + AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
> + [ FONTPATH="$withval" ],
> + [ FONTPATH="${DEFAULT_FONT_PATH}" ])
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
> new file mode 100644
> index 0000000..2f62972
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
> @@ -0,0 +1,15 @@
> +Upstream-Status: Pending
> +
> +Index: git/os/osdep.h
> +===================================================================
> +--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
> ++++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100
> +@@ -92,7 +92,7 @@
> + * like sysconf(_SC_OPEN_MAX) is not supported.
> + */
> +
> +-#if OPEN_MAX <= 256
> ++#if 0
> + #define MAXSOCKS (OPEN_MAX - 1)
> + #else
> + #define MAXSOCKS 256
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
> new file mode 100644
> index 0000000..ec0eea6
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
> @@ -0,0 +1,25 @@
> +This is the revised version of files/macro_tweak.patch for
> +xorg-server 1.8.99.904 and newer.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Yu Ke <ke.yu@intel.com>
> +
> +diff --git a/xorg-server.m4 b/xorg-server.m4
> +index bdecf62..040fdb8 100644
> +--- a/xorg-server.m4
> ++++ b/xorg-server.m4
> +@@ -28,10 +28,12 @@ dnl
> + # Checks for the $1 define in xorg-server.h (from the sdk). If it
> + # is defined, then add $1 to $REQUIRED_MODULES.
> +
> ++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
> ++
> + AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
> + AC_REQUIRE([PKG_PROG_PKG_CONFIG])
> + SAVE_CFLAGS="$CFLAGS"
> +- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
> ++ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
> + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
> + #include "xorg-server.h"
> + #if !defined $1
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
> new file mode 100644
> index 0000000..168368e
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
> @@ -0,0 +1,29 @@
> +on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
> +so we end up with incompatible conversion errors
> +
> +This patch choses the right values for mips64
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
> +Upstream-Status: Pending
> +Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h
> +===================================================================
> +--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300
> ++++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200
> +@@ -101,6 +101,7 @@
> + #if defined(NO_INLINE) || defined(DO_PROTOTYPES)
> + #if !defined(__arm__)
> + #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
> ++ && !defined(__mips64) \
> + && !(defined(__alpha__) && defined(linux)) \
> + && !(defined(__ia64__) && defined(linux)) \
> +
> +@@ -721,7 +722,7 @@
> + }
> +
> + #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
> +-#ifdef __arm32__
> ++#if defined (__arm32__) || defined (__mips64)
> + #define PORT_SIZE long
> + #else
> + #define PORT_SIZE short
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 33564eb..4135a8b 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "The X.Org X server"
> HOMEPAGE = "http://www.x.org"
> SECTION = "x11/base"
> LICENSE = "MIT-X"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13"
>
> # xf86-*-* packages depend on an X server built with the xfree86 DDX
> # so we have a virtual to represent that:
> @@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
> PROVIDES += "virtual/xserver"
>
> PE = "2"
> -INC_PR = "r3"
> +INC_PR = "r5"
>
> XORG_PN = "xorg-server"
> SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
> @@ -48,12 +48,7 @@ PACKAGES =+ "${PN}-security-policy \
> ${PN}-utils \
> ${PN}-xephyr \
> ${PN}-multimedia-modules \
> - ${PN}-extension-dri \
> - ${PN}-extension-dri2 \
> ${PN}-extension-glx \
> - ${PN}-extension-record \
> - ${PN}-extension-extmod \
> - ${PN}-extension-dbe \
> ${PN}-module-libint10 \
> ${PN}-module-libafb \
> ${PN}-module-libwfb \
> @@ -67,6 +62,24 @@ PACKAGES =+ "${PN}-security-policy \
> RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
> RDEPENDS_${PN}-xvfb += "xkeyboard-config"
> RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
> +RREPLACES_${PN} = "${PN}-extension-dri \
> + ${PN}-extension-dri2 \
> + ${PN}-extension-record \
> + ${PN}-extension-extmod \
> + ${PN}-extension-dbe \
> + "
> +RPROVIDES_${PN} = "${PN}-extension-dri \
> + ${PN}-extension-dri2 \
> + ${PN}-extension-record \
> + ${PN}-extension-extmod \
> + ${PN}-extension-dbe \
> + "
> +RCONFLICTS_${PN} = "${PN}-extension-dri \
> + ${PN}-extension-dri2 \
> + ${PN}-extension-record \
> + ${PN}-extension-extmod \
> + ${PN}-extension-dbe \
> + "
>
> FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
> FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
> @@ -82,12 +95,7 @@ FILES_${PN}-xvfb = "${bindir}/Xvfb"
> FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
> FILES_${PN}-xephyr = "${bindir}/Xephyr"
> FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
> -FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
> -FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
> FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
> -FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
> -FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
> -FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
> FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
> FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
> FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
> deleted file mode 100644
> index 4739ee2..0000000
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -require xserver-xorg.inc
> -
> -# Misc build failure for master HEAD
> -SRC_URI += "file://crosscompile.patch \
> - file://fix_open_max_preprocessor_error.patch \
> - file://mips64-compiler.patch \
> - file://pkgconfig-deps.patch \
> - "
> -
> -SRC_URI[md5sum] = "256325e9b17dff479d92bed97f6b0adb"
> -SRC_URI[sha256sum] = "3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc"
> -
> -PR = "${INC_PR}.0"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
> new file mode 100644
> index 0000000..8ad87b8
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
> @@ -0,0 +1,12 @@
> +require xserver-xorg.inc
> +
> +# Misc build failure for master HEAD
> +SRC_URI += "file://crosscompile.patch \
> + file://fix_open_max_preprocessor_error.patch \
> + file://mips64-compiler.patch \
> + "
> +
> +SRC_URI[md5sum] = "bde3d178b756597d2ec2a19ef60d2e1f"
> +SRC_URI[sha256sum] = "548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a"
> +
> +PR = "${INC_PR}.0"
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7
2012-11-14 13:21 ` [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7 Laurentiu Palcu
@ 2012-11-15 13:54 ` Richard Purdie
2012-11-15 14:20 ` Palcu, Laurentiu
2012-11-15 15:01 ` [PATCH v4 " Laurentiu Palcu
1 sibling, 1 reply; 38+ messages in thread
From: Richard Purdie @ 2012-11-15 13:54 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
On Wed, 2012-11-14 at 15:21 +0200, Laurentiu Palcu wrote:
> A couple of extra changes:
> * changed the SRC_URI to the new, valid, one
> * added dependency of gettext (do_qa_configure detected is needed)
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
> ...board-config_2.1.bb => xkeyboard-config_2.7.bb} | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
> rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.1.bb => xkeyboard-config_2.7.bb} (75%)
checking whether to enable maintainer-specific portions of Makefiles... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... i586-poky-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for xsltproc... /media/build1/poky/build1/tmp/sysroots/x86_64-linux/usr/bin/xsltproc
checking for a sed that does not truncate output... (cached) /bin/sed
checking for i586-poky-linux-pkg-config... no
checking for pkg-config... /media/build1/poky/build1/tmp/sysroots/x86_64-linux/usr/bin/pkg-config
configure: WARNING: using cross tools not prefixed with host triplet
checking pkg-config is at least version 0.9.0... yes
checking for DEPS... no
configure: WARNING:
Required dependencies not found. These dependencies are
run-time dependencies only and not required for building.
Skip this check with --disable-runtime-deps.
Installing this version of xkeyboard-config on a host
without the required dependencies may result in unusable
keyboard layouts.
configure: error: No package 'x11' found
Configure failed. The contents of all config.log files follows to aid debugging
/media/build1/poky/build1/tmp/work/i586-poky-linux/xkeyboard-config/2.7-r0/xkeyboard-config-2.7/config.log
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
Cheers,
Richard
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7
2012-11-15 13:54 ` Richard Purdie
@ 2012-11-15 14:20 ` Palcu, Laurentiu
2012-11-15 14:37 ` Burton, Ross
0 siblings, 1 reply; 38+ messages in thread
From: Palcu, Laurentiu @ 2012-11-15 14:20 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
Hi Richard,
That's weird... I tested the compilation using the Yocto autobuilder nightly targets for
all architectures with/without shared state. All were successful. However, I applied the
patches on top of the commit I specified in the cover letter. A didn't retest with the
latest changes in master...
What image were you trying to compile? I can give it a test on top of the latest changes
in master...
Thanks,
Laurentiu
-----Original Message-----
From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
Sent: Thursday, November 15, 2012 3:55 PM
To: Palcu, Laurentiu
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7
On Wed, 2012-11-14 at 15:21 +0200, Laurentiu Palcu wrote:
> A couple of extra changes:
> * changed the SRC_URI to the new, valid, one
> * added dependency of gettext (do_qa_configure detected is needed)
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
> ...board-config_2.1.bb => xkeyboard-config_2.7.bb} | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-) rename
> meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.1.bb =>
> xkeyboard-config_2.7.bb} (75%)
checking whether to enable maintainer-specific portions of Makefiles... no checking build system type... x86_64-pc-linux-gnu checking host system type... i586-poky-linux-gnu checking for a sed that does not truncate output... /bin/sed checking for xsltproc... /media/build1/poky/build1/tmp/sysroots/x86_64-linux/usr/bin/xsltproc
checking for a sed that does not truncate output... (cached) /bin/sed checking for i586-poky-linux-pkg-config... no checking for pkg-config... /media/build1/poky/build1/tmp/sysroots/x86_64-linux/usr/bin/pkg-config
configure: WARNING: using cross tools not prefixed with host triplet checking pkg-config is at least version 0.9.0... yes checking for DEPS... no
configure: WARNING:
Required dependencies not found. These dependencies are
run-time dependencies only and not required for building.
Skip this check with --disable-runtime-deps.
Installing this version of xkeyboard-config on a host
without the required dependencies may result in unusable
keyboard layouts.
configure: error: No package 'x11' found Configure failed. The contents of all config.log files follows to aid debugging /media/build1/poky/build1/tmp/work/i586-poky-linux/xkeyboard-config/2.7-r0/xkeyboard-config-2.7/config.log
This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake.
Cheers,
Richard
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7
2012-11-15 14:20 ` Palcu, Laurentiu
@ 2012-11-15 14:37 ` Burton, Ross
0 siblings, 0 replies; 38+ messages in thread
From: Burton, Ross @ 2012-11-15 14:37 UTC (permalink / raw)
To: Palcu, Laurentiu; +Cc: openembedded-core
On 15 November 2012 14:20, Palcu, Laurentiu <laurentiu.palcu@intel.com> wrote:
> That's weird... I tested the compilation using the Yocto autobuilder nightly targets for
> all architectures with/without shared state. All were successful. However, I applied the
> patches on top of the commit I specified in the cover letter. A didn't retest with the
> latest changes in master...
Ordering issue - it doesn't depend on x11 but checks at configure. We
need to add --disable-runtime-deps to the configure invocation - I
thought I'd already done this but obviously not.
Laurentiu - can you add this to your branch?
Ross
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v4 04/12] xkeyboard-config: upgrade to 2.7
2012-11-14 13:21 ` [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7 Laurentiu Palcu
2012-11-15 13:54 ` Richard Purdie
@ 2012-11-15 15:01 ` Laurentiu Palcu
1 sibling, 0 replies; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-15 15:01 UTC (permalink / raw)
To: openembedded-core
A few extra changes:
* changed the SRC_URI to the new, valid, one
* added dependency of gettext (do_qa_configure detected is needed)
* disable runtime dependency checks at configure time
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../xorg-lib/xkeyboard-config_2.1.bb | 34 --------------------
.../xorg-lib/xkeyboard-config_2.7.bb | 34 ++++++++++++++++++++
2 files changed, 34 insertions(+), 34 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
create mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config_2.7.bb
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
deleted file mode 100644
index 1b28208..0000000
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "Keyboard configuration database for X Window"
-
-DESCRIPTION = "The non-arch keyboard configuration database for X \
-Window. The goal is to provide the consistent, well-structured, \
-frequently released open source of X keyboard configuration data for X \
-Window System implementations. The project is targeted to XKB-based \
-systems."
-
-HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig"
-BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config"
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
-
-SRC_URI = "http://people.freedesktop.org/~svu/xkeyboard-config-${PV}.tar.bz2"
-SRC_URI[md5sum] = "6ce65480445fb2d9c071ad1f002a7675"
-SRC_URI[sha256sum] = "e293aa4b0dd259dbb4f0e7f56fdd95db5047d052c7b3b80922fe5663923a805d"
-
-SECTION = "x11/libs"
-DEPENDS = "intltool-native xkbcomp-native glib-2.0"
-
-PR = "r2"
-
-EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
-
-RDEPENDS_${PN} += "xkbcomp"
-FILES_${PN} += "${datadir}/X11/xkb"
-
-inherit autotools pkgconfig
-
-do_install_append () {
- install -d ${D}${datadir}/X11/xkb/compiled
- cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
-}
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.7.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.7.bb
new file mode 100644
index 0000000..08d03a5
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.7.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Keyboard configuration database for X Window"
+
+DESCRIPTION = "The non-arch keyboard configuration database for X \
+Window. The goal is to provide the consistent, well-structured, \
+frequently released open source of X keyboard configuration data for X \
+Window System implementations. The project is targeted to XKB-based \
+systems."
+
+HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig"
+BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config"
+
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
+
+SRC_URI="${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "6ad7b43062f123eacf8ff0eb3a4e0678"
+SRC_URI[sha256sum] = "e43478a12fb0fe6757a7bad3a04fd3747ec53e53d5af22a9d9829dfb9aac8321"
+
+SECTION = "x11/libs"
+DEPENDS = "intltool-native xkbcomp-native glib-2.0 virtual/gettext"
+
+PR = "r0"
+
+EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps"
+
+RDEPENDS_${PN} += "xkbcomp"
+FILES_${PN} += "${datadir}/X11/xkb"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+ install -d ${D}${datadir}/X11/xkb/compiled
+ cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
+}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-14 13:21 ` [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo Laurentiu Palcu
@ 2012-11-21 16:20 ` Martin Jansa
2012-11-21 17:12 ` Richard Purdie
2012-11-22 8:31 ` Laurentiu Palcu
0 siblings, 2 replies; 38+ messages in thread
From: Martin Jansa @ 2012-11-21 16:20 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2534 bytes --]
On Wed, Nov 14, 2012 at 03:21:10PM +0200, Laurentiu Palcu wrote:
> This new recipe is needed because the old driver is unmaintained. This
> new recipe will follow the new repo.
On which MACHINE did you test this? Here it fails in do_configure with:
| configure:18796: result: yes
| configure:18808: checking whether to include DRI support
| configure:18812: checking for /usr/include/xorg/dri.h
| configure:18818: error: cannot check for file existence when cross compiling
So I'm wondering if it was tested at all.
With xf86-video-omapfb not ported to xserver-1.13 video API it makes new
default xserver from oe-core unusable on many armv7a machines..
Cheers,
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
> ---
> .../xorg-driver/xf86-video-omap_git.bb | 31 ++++++++++++++++++++
> 1 file changed, 31 insertions(+)
> create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
>
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
> new file mode 100644
> index 0000000..b3177eb
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
> @@ -0,0 +1,31 @@
> +require xorg-driver-video.inc
> +
> +SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
> +
> +DESCRIPTION = "omap driver supports the basic Texas Instruments OMAP \
> +framebuffer."
> +
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
> +DEPENDS += "virtual/libx11 libdrm"
> +
> +RPROVIDES = "xf86-video-omapfb"
> +RCONFLICTS = "xf86-video-omapfb"
> +RREPLACES = "xf86-video-omapfb"
> +
> +SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
> +PR = "${INC_PR}.0"
> +PV = "0.4.2+gitr${SRCPV}"
> +
> +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \
> +"
> +
> +S = "${WORKDIR}/git"
> +
> +EXTRA_OECONF_armv7a = " --enable-neon "
> +CFLAGS += " -I${STAGING_INCDIR}/xorg "
> +
> +# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
> +do_compile_prepend_armv7a () {
> + sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c
> +}
> --
> 1.7.9.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-21 16:20 ` Martin Jansa
@ 2012-11-21 17:12 ` Richard Purdie
2012-11-21 17:21 ` Martin Jansa
2012-11-22 8:31 ` Laurentiu Palcu
1 sibling, 1 reply; 38+ messages in thread
From: Richard Purdie @ 2012-11-21 17:12 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On Wed, 2012-11-21 at 17:20 +0100, Martin Jansa wrote:
> On Wed, Nov 14, 2012 at 03:21:10PM +0200, Laurentiu Palcu wrote:
> > This new recipe is needed because the old driver is unmaintained. This
> > new recipe will follow the new repo.
>
> On which MACHINE did you test this? Here it fails in do_configure with:
> | configure:18796: result: yes
> | configure:18808: checking whether to include DRI support
> | configure:18812: checking for /usr/include/xorg/dri.h
> | configure:18818: error: cannot check for file existence when cross compiling
>
> So I'm wondering if it was tested at all.
>
> With xf86-video-omapfb not ported to xserver-1.13 video API it makes new
> default xserver from oe-core unusable on many armv7a machines..
/usr/include/xorg/dri.h probably existed on the machine it was tested
on. I appreciate this needs to get fixed but I know it was tested.
Cheers,
Richard
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-21 17:12 ` Richard Purdie
@ 2012-11-21 17:21 ` Martin Jansa
2012-11-21 20:04 ` Burton, Ross
0 siblings, 1 reply; 38+ messages in thread
From: Martin Jansa @ 2012-11-21 17:21 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]
On Wed, Nov 21, 2012 at 05:12:31PM +0000, Richard Purdie wrote:
> On Wed, 2012-11-21 at 17:20 +0100, Martin Jansa wrote:
> > On Wed, Nov 14, 2012 at 03:21:10PM +0200, Laurentiu Palcu wrote:
> > > This new recipe is needed because the old driver is unmaintained. This
> > > new recipe will follow the new repo.
> >
> > On which MACHINE did you test this? Here it fails in do_configure with:
> > | configure:18796: result: yes
> > | configure:18808: checking whether to include DRI support
> > | configure:18812: checking for /usr/include/xorg/dri.h
> > | configure:18818: error: cannot check for file existence when cross compiling
> >
> > So I'm wondering if it was tested at all.
> >
> > With xf86-video-omapfb not ported to xserver-1.13 video API it makes new
> > default xserver from oe-core unusable on many armv7a machines..
>
> /usr/include/xorg/dri.h probably existed on the machine it was tested
> on. I appreciate this needs to get fixed but I know it was tested.
Doesn't AC_CHECK_FILE macro fail the same when it does exist?
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-21 17:21 ` Martin Jansa
@ 2012-11-21 20:04 ` Burton, Ross
0 siblings, 0 replies; 38+ messages in thread
From: Burton, Ross @ 2012-11-21 20:04 UTC (permalink / raw)
To: openembedded-core
On 21 November 2012 17:21, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > So I'm wondering if it was tested at all.
>> >
>> > With xf86-video-omapfb not ported to xserver-1.13 video API it makes new
>> > default xserver from oe-core unusable on many armv7a machines..
>>
>> /usr/include/xorg/dri.h probably existed on the machine it was tested
>> on. I appreciate this needs to get fixed but I know it was tested.
>
> Doesn't AC_CHECK_FILE macro fail the same when it does exist?
AC_CHECK_FILE always fails when cross-compiling. Any instances of it
should be replaced with something more useful - especially header
checks that should be using pkgconfig. I recommend patching the build
to use pkgconfig and sending the patch upstream.
Ross
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-21 16:20 ` Martin Jansa
2012-11-21 17:12 ` Richard Purdie
@ 2012-11-22 8:31 ` Laurentiu Palcu
2012-11-22 8:37 ` Martin Jansa
1 sibling, 1 reply; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-22 8:31 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 11/21/2012 06:20 PM, Martin Jansa wrote:
> On Wed, Nov 14, 2012 at 03:21:10PM +0200, Laurentiu Palcu wrote:
>> > This new recipe is needed because the old driver is unmaintained. This
>> > new recipe will follow the new repo.
> On which MACHINE did you test this? Here it fails in do_configure with:
> | configure:18796: result: yes
> | configure:18808: checking whether to include DRI support
> | configure:18812: checking for /usr/include/xorg/dri.h
> | configure:18818: error: cannot check for file existence when cross compiling
>
> So I'm wondering if it was tested at all.
>
Martin,
I remember that I clearly mentioned, in the cover letter, the commit
upon which I applied the patches before compiling the nightlies for all
architectures. Here it is:
"The yocto autobuilder nightlies (x86/x86_64/ppc/arm/mips) compiled
successfully. Compilations were done on top of the following commit:
78983e939ab17f02f8911c8b0d0e326b419856b9."
At the moment I was working on the xorg upgrades this was the last
commit... Did you try the patches on top of this commit? Does the
compilation fail?
Thanks,
Laurentiu
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-22 8:31 ` Laurentiu Palcu
@ 2012-11-22 8:37 ` Martin Jansa
2012-11-22 8:59 ` Laurentiu Palcu
0 siblings, 1 reply; 38+ messages in thread
From: Martin Jansa @ 2012-11-22 8:37 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
On Thu, Nov 22, 2012 at 10:31:51AM +0200, Laurentiu Palcu wrote:
>
>
> On 11/21/2012 06:20 PM, Martin Jansa wrote:
> > On Wed, Nov 14, 2012 at 03:21:10PM +0200, Laurentiu Palcu wrote:
> >> > This new recipe is needed because the old driver is unmaintained. This
> >> > new recipe will follow the new repo.
> > On which MACHINE did you test this? Here it fails in do_configure with:
> > | configure:18796: result: yes
> > | configure:18808: checking whether to include DRI support
> > | configure:18812: checking for /usr/include/xorg/dri.h
> > | configure:18818: error: cannot check for file existence when cross compiling
> >
> > So I'm wondering if it was tested at all.
> >
> Martin,
>
> I remember that I clearly mentioned, in the cover letter, the commit
> upon which I applied the patches before compiling the nightlies for all
> architectures. Here it is:
>
> "The yocto autobuilder nightlies (x86/x86_64/ppc/arm/mips) compiled
> successfully. Compilations were done on top of the following commit:
> 78983e939ab17f02f8911c8b0d0e326b419856b9."
Does qemuarm include this driver? I guess not. I don't know what exactly
is "autobuilder nightlies" but did it include xf86-video-omap explicitly
or just some generic image?
Also I cannot find this commit in oe-core as well as poky (I'm using
oe-core).
> At the moment I was working on the xorg upgrades this was the last
> commit... Did you try the patches on top of this commit? Does the
> compilation fail?
No I try to use master.
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-22 8:37 ` Martin Jansa
@ 2012-11-22 8:59 ` Laurentiu Palcu
2012-11-22 12:34 ` Nicolas Dechesne
0 siblings, 1 reply; 38+ messages in thread
From: Laurentiu Palcu @ 2012-11-22 8:59 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
>
> Does qemuarm include this driver? I guess not. I don't know what exactly
> is "autobuilder nightlies" but did it include xf86-video-omap explicitly
> or just some generic image?
The autobuilder nightly for arm (for example) does, among other things,
the following:
* Builds core-image-sato, core-image-sato-dev, core-image-sato-sdk,
core-image-minimal, core-image-minimal-dev for qemuarm
* Builds core-image-sato, core-image-sato-sdk, core-image-minimal for
beagleboard
* Builds the meta-toolchain-gmae
Here's a link to one of the latest arm nightly builds. You can see that,
for beagleboard, it includes xf86-video-omap driver:
http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/727
This is the production autobuilder. The autobuilder server I used to
test the patches is internal and cannot be accessed from outside.
>
> Also I cannot find this commit in oe-core as well as poky (I'm using
> oe-core).
Here's the link:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=78983e939ab17f02f8911c8b0d0e326b419856b9
Thanks,
Laurentiu
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-22 8:59 ` Laurentiu Palcu
@ 2012-11-22 12:34 ` Nicolas Dechesne
2012-11-22 12:43 ` Martin Jansa
0 siblings, 1 reply; 38+ messages in thread
From: Nicolas Dechesne @ 2012-11-22 12:34 UTC (permalink / raw)
To: Laurentiu Palcu; +Cc: Martin Jansa, openembedded-core
On Thu, Nov 22, 2012 at 9:59 AM, Laurentiu Palcu
<laurentiu.palcu@intel.com> wrote:
>
> The autobuilder nightly for arm (for example) does, among other things,
> the following:
> * Builds core-image-sato, core-image-sato-dev, core-image-sato-sdk,
> core-image-minimal, core-image-minimal-dev for qemuarm
> * Builds core-image-sato, core-image-sato-sdk, core-image-minimal for
> beagleboard
> * Builds the meta-toolchain-gmae
>
> Here's a link to one of the latest arm nightly builds. You can see that,
> for beagleboard, it includes xf86-video-omap driver:
>
> http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/727
>
> This is the production autobuilder. The autobuilder server I used to
> test the patches is internal and cannot be accessed from outside.
and we can see that the build failed with
| checking for ANSI C header files... (cached) yes
| checking whether to include DRI support... checking for
/usr/include/xorg/dri.h... configure: error: cannot check for file
existence when cross compiling
| Configure failed. The contents of all config.log files follows to
aid debugging
| /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-arm/build/build/tmp/work/armv7a-vfp-neon-poky-linux-gnueabi/xf86-video-omap/2_0.4.2+gitr1+ae0394e687f1a77e966cf72f895da91840dffb8f-r20.0/git/config.log
| This file contains any messages produced by compilers while
| running configure, to aid debugging if configure makes a mistake.
|
| It was created by xf86-video-omap configure 0.4.2, which was
| generated by GNU Autoconf 2.69. Invocation command line was
from http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/727/steps/shell_55/logs/stdio
I am looking at Ross patch, as our configure.ac file is clearly wrong
here in xf86-video-omap (in fact most of the testing for this X11
driver was done in ubuntu, so using native compilation...). will make
sure to get that fixed upstream asap.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-22 12:34 ` Nicolas Dechesne
@ 2012-11-22 12:43 ` Martin Jansa
2012-11-22 14:05 ` Burton, Ross
0 siblings, 1 reply; 38+ messages in thread
From: Martin Jansa @ 2012-11-22 12:43 UTC (permalink / raw)
To: Nicolas Dechesne; +Cc: openembedded-core
On Thu, Nov 22, 2012 at 1:34 PM, Nicolas Dechesne <ndec13@gmail.com> wrote:
> On Thu, Nov 22, 2012 at 9:59 AM, Laurentiu Palcu
> <laurentiu.palcu@intel.com> wrote:
>>
>> The autobuilder nightly for arm (for example) does, among other things,
>> the following:
>> * Builds core-image-sato, core-image-sato-dev, core-image-sato-sdk,
>> core-image-minimal, core-image-minimal-dev for qemuarm
>> * Builds core-image-sato, core-image-sato-sdk, core-image-minimal for
>> beagleboard
>> * Builds the meta-toolchain-gmae
>>
>> Here's a link to one of the latest arm nightly builds. You can see that,
>> for beagleboard, it includes xf86-video-omap driver:
>>
>> http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/727
>>
>> This is the production autobuilder. The autobuilder server I used to
>> test the patches is internal and cannot be accessed from outside.
>
>
> and we can see that the build failed with
>
> | checking for ANSI C header files... (cached) yes
> | checking whether to include DRI support... checking for
> /usr/include/xorg/dri.h... configure: error: cannot check for file
> existence when cross compiling
> | Configure failed. The contents of all config.log files follows to
> aid debugging
> | /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-arm/build/build/tmp/work/armv7a-vfp-neon-poky-linux-gnueabi/xf86-video-omap/2_0.4.2+gitr1+ae0394e687f1a77e966cf72f895da91840dffb8f-r20.0/git/config.log
> | This file contains any messages produced by compilers while
> | running configure, to aid debugging if configure makes a mistake.
> |
> | It was created by xf86-video-omap configure 0.4.2, which was
> | generated by GNU Autoconf 2.69. Invocation command line was
>
> from http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/727/steps/shell_55/logs/stdio
>
> I am looking at Ross patch, as our configure.ac file is clearly wrong
> here in xf86-video-omap (in fact most of the testing for this X11
> driver was done in ubuntu, so using native compilation...). will make
> sure to get that fixed upstream asap.
Ross's patch fixes the build issue, but then xf86-video-omap does not
work in runtime (at least on nokia900)
[ 275.922] (II) Module omap: vendor="X.Org Foundation"
[ 275.922] compiled for 1.13.0, module version = 0.83.0
[ 275.922] Module class: X.Org Video Driver
[ 275.922] ABI class: X.Org Video Driver, version 13.0
[ 275.924] (II) OMAP: Driver for TI OMAP: OMAP3430 with PowerVR SGX530,
OMAP3630 with PowerVR SGX530, OMAP4430 with PowerVR SGX540,
OMAP4460 with PowerVR SGX540, OMAP5430 with PowerVR SGX544 MP,
OMAP5432 with PowerVR SGX544 MP
[ 275.925] (--) using VT number 2
[ 275.944] (WW) Falling back to old probe method for omap
[ 276.469] (EE) No devices detected.
Well that's probably the same issue GNUtoo reported on xf86-video-omap
patch, before it was merged and xf86-video-omapfb removed..
Pity that bits of red in autobuilder logs are the most important
quality indicator for some people...
Cheers,
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-22 12:43 ` Martin Jansa
@ 2012-11-22 14:05 ` Burton, Ross
2012-11-22 14:09 ` Martin Jansa
0 siblings, 1 reply; 38+ messages in thread
From: Burton, Ross @ 2012-11-22 14:05 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 22 November 2012 12:43, Martin Jansa <martin.jansa@gmail.com> wrote:
> Well that's probably the same issue GNUtoo reported on xf86-video-omap
> patch, before it was merged and xf86-video-omapfb removed..
>
> Pity that bits of red in autobuilder logs are the most important
> quality indicator for some people...
Bits of red that nobody is willing to fix? If you've the hardware to
test it on, and the need for it to work, the backporting the
compat-api changes (which have been made to every other video driver)
isn't *that* difficult.
Ross
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-22 14:05 ` Burton, Ross
@ 2012-11-22 14:09 ` Martin Jansa
2012-11-22 14:26 ` Nicolas Dechesne
0 siblings, 1 reply; 38+ messages in thread
From: Martin Jansa @ 2012-11-22 14:09 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]
On Thu, Nov 22, 2012 at 02:05:21PM +0000, Burton, Ross wrote:
> On 22 November 2012 12:43, Martin Jansa <martin.jansa@gmail.com> wrote:
> > Well that's probably the same issue GNUtoo reported on xf86-video-omap
> > patch, before it was merged and xf86-video-omapfb removed..
> >
> > Pity that bits of red in autobuilder logs are the most important
> > quality indicator for some people...
>
> Bits of red that nobody is willing to fix? If you've the hardware to
> test it on, and the need for it to work, the backporting the
> compat-api changes (which have been made to every other video driver)
> isn't *that* difficult.
As said in other thread I did that already for xf86-video-glamo in
meta-oe, so I agree that it's not *that* difficult.
But I'm not sending xf86-video-glamo change before it's tested not only
to build, but also to work in runtime.
And I cannot work on xf86-video-omapfb now, because builder is still
rebuilding armv7a after last layout changes.
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo
2012-11-22 14:09 ` Martin Jansa
@ 2012-11-22 14:26 ` Nicolas Dechesne
0 siblings, 0 replies; 38+ messages in thread
From: Nicolas Dechesne @ 2012-11-22 14:26 UTC (permalink / raw)
To: Martin Jansa, robclark; +Cc: openembedded-core
On Thu, Nov 22, 2012 at 3:09 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> As said in other thread I did that already for xf86-video-glamo in
> meta-oe, so I agree that it's not *that* difficult.
>
> But I'm not sending xf86-video-glamo change before it's tested not only
> to build, but also to work in runtime.
>
> And I cannot work on xf86-video-omapfb now, because builder is still
> rebuilding armv7a after last layout changes.
xf86-video-omap was largely developped and tested on OMAP4 and OMAP5
(Panda). it was tested at some point on OMAP3 (beagle), but not
intensively.
when i introduced it in our meta-ti layer, we took care of using it
for Panda only, see:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=410dc026f2ee24a2346e7563a83f0181c79809cf
http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=95e12712ddffcc7ec0789a8700137afe2e449445
what I would suggest given the current situation is to fallback to
fbdev until either someone properly tests this new driver on OMAP3, or
someone ports omapfb on new X11. I would not recommend to remove
xf86-video-omap as we are using it for Panda.
Also note that as mentioned here, video-omap needs omapdrm driver
(from staging) as well as CMA support. these bits need to make it in
the kernel before video-omap can be safely used on OMAP3.
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2012-11-22 14:41 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-14 13:20 [PATCH v3 00/12] xorg upgrades Laurentiu Palcu
2012-11-14 13:20 ` [PATCH v3 01/12] xf86-video-vesa: upgrade to 2.3.2 Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 02/12] xf86-video-intel: upgrade to 2.20.12 Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 03/12] xf86-input-mouse: upgrade to 1.8.1 Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 04/12] xkeyboard-config: upgrade to 2.7 Laurentiu Palcu
2012-11-15 13:54 ` Richard Purdie
2012-11-15 14:20 ` Palcu, Laurentiu
2012-11-15 14:37 ` Burton, Ross
2012-11-15 15:01 ` [PATCH v4 " Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 05/12] xcb-proto: upgrade to 1.8 Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 06/12] fontconfig: upgrade to 2.10.1 Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 07/12] libdrm: upgrade to 2.4.40 Laurentiu Palcu
2012-11-14 14:56 ` Burton, Ross
2012-11-14 16:04 ` Burton, Ross
2012-11-15 10:29 ` [PATCH v4 " Laurentiu Palcu
2012-11-15 10:37 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 08/12] xserver-xorg: upgrade to 1.13.0 Laurentiu Palcu
2012-11-14 15:03 ` Burton, Ross
2012-11-14 16:18 ` Burton, Ross
2012-11-15 10:43 ` Burton, Ross
2012-11-15 11:07 ` [PATCH v4 " Laurentiu Palcu
2012-11-15 11:13 ` Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 09/12] mdadm: upgrade to 3.2.6 Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 10/12] xf86-video-vmware: Add compat API Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 11/12] xf86-input-synaptics: add mtdev dependency Laurentiu Palcu
2012-11-14 13:21 ` [PATCH v3 12/12] xf86-video-omap: add new recipe to follow the maintained repo Laurentiu Palcu
2012-11-21 16:20 ` Martin Jansa
2012-11-21 17:12 ` Richard Purdie
2012-11-21 17:21 ` Martin Jansa
2012-11-21 20:04 ` Burton, Ross
2012-11-22 8:31 ` Laurentiu Palcu
2012-11-22 8:37 ` Martin Jansa
2012-11-22 8:59 ` Laurentiu Palcu
2012-11-22 12:34 ` Nicolas Dechesne
2012-11-22 12:43 ` Martin Jansa
2012-11-22 14:05 ` Burton, Ross
2012-11-22 14:09 ` Martin Jansa
2012-11-22 14:26 ` Nicolas Dechesne
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.