* [PATCHv2 01/30] libxft, libxrender, renderproto: add native BBCLASSEXTEND
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 02/30] xorg-app-common: merge some changes from meta-oe Martin Jansa
` (29 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | 2 ++
meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb | 2 +-
.../xorg-proto/renderproto_0.11.1.bb | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
index ac7dfb1..0fb10e6 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
@@ -23,6 +23,8 @@ PE = "1"
XORG_PN = "libXft"
+BBCLASSEXTEND = "native nativesdk"
+
python () {
if bb.data.getVar('DEBIAN_NAMES', d, 1):
bb.data.setVar('PKG_${PN}', '${MLPREFIX}libxft2', d)
diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb b/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
index a5c5ead..893ea14 100644
--- a/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
@@ -18,7 +18,7 @@ PE = "1"
XORG_PN = "libXrender"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
SRC_URI[md5sum] = "3b3b7d076c2384b6c600c0b5f4ba971f"
SRC_URI[sha256sum] = "7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668"
diff --git a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
index a352b1e..5eb06cb 100644
--- a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
+++ b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
@@ -14,7 +14,7 @@ CONFLICTS = "renderext"
PR = "r0"
PE = "1"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
SRC_URI[md5sum] = "a914ccc1de66ddeb4b611c6b0686e274"
SRC_URI[sha256sum] = "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 02/30] xorg-app-common: merge some changes from meta-oe
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
2011-10-03 13:28 ` [PATCHv2 01/30] libxft, libxrender, renderproto: add native BBCLASSEXTEND Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 03/30] xorg-driver: rename .inc files and " Martin Jansa
` (28 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* use BPN directly instead of XORG_PN
* fix depends
* fix packaging
* add INC_PR (used by recipes in meta-oe now, but should be used here
too)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-app/xorg-app-common.inc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
index 4add357..86e5c23 100644
--- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc
+++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
@@ -3,14 +3,14 @@ HOMEPAGE = "http://www.x.org/"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11/apps"
LICENSE = "MIT-X"
-DEPENDS = "util-macros virtual/libx11"
+DEPENDS = "util-macros-native virtual/libx11"
-XORG_PN = "${BPN}"
+INC_PR = "r5"
-SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
inherit autotools pkgconfig
-FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
+FILES_${PN} += " /usr/lib/X11/${BPN} /usr/share/X11/app-defaults/"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 03/30] xorg-driver: rename .inc files and merge some changes from meta-oe
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
2011-10-03 13:28 ` [PATCHv2 01/30] libxft, libxrender, renderproto: add native BBCLASSEXTEND Martin Jansa
2011-10-03 13:28 ` [PATCHv2 02/30] xorg-app-common: merge some changes from meta-oe Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 04/30] xf86-video-omapfb: bump SRCREV and add patch " Martin Jansa
` (27 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* use INC_PR
* use BPN directly instead of XORG_PN
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xf86-input-evdev_2.6.0.bb | 4 ++--
.../xorg-driver/xf86-input-keyboard_1.6.0.bb | 4 ++--
.../xorg-driver/xf86-input-keyboard_git.bb | 3 ++-
.../xorg-driver/xf86-input-mouse_1.7.0.bb | 4 +++-
.../xorg-driver/xf86-input-mouse_git.bb | 4 ++--
.../xorg-driver/xf86-input-synaptics_1.4.0.bb | 4 +++-
.../xorg-driver/xf86-input-synaptics_git.bb | 3 ++-
.../xorg-driver/xf86-input-vmmouse_12.7.0.bb | 4 ++--
.../xorg-driver/xf86-video-intel_2.15.0.bb | 4 ++--
.../xorg-driver/xf86-video-intel_git.bb | 4 ++--
.../xorg-driver/xf86-video-omapfb_git.bb | 4 ++--
.../xorg-driver/xf86-video-vesa_2.3.0.bb | 4 +++-
.../xorg-driver/xf86-video-vmware_11.0.3.bb | 4 ++--
...86-driver-common.inc => xorg-driver-common.inc} | 14 +++++++-------
...xf86-input-common.inc => xorg-driver-input.inc} | 3 +--
...xf86-video-common.inc => xorg-driver-video.inc} | 2 +-
16 files changed, 38 insertions(+), 31 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-driver-common.inc => xorg-driver-common.inc} (66%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-common.inc => xorg-driver-input.inc} (81%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-common.inc => xorg-driver-video.inc} (65%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
index a37be17..db6a3b3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- event devices (evdev) input driver"
@@ -14,7 +14,7 @@ xorg.conf for each input device that will use this driver. "
LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
-PR = "r0"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "f33fe9413bde68936d8909206a13e8a1"
SRC_URI[sha256sum] = "b0e7f3991a8183a4743196c3e16d7184d439b80bf43653aa2f45b0756a6753ac"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
index 9b1441d..e374fbd 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- keyboard input driver"
@@ -9,7 +9,7 @@ core keyboard."
LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10"
-PR = "r0"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "e2abe9f13e526a73cb68a7d257546eba"
SRC_URI[sha256sum] = "c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
index fe8cee9..5bc0558 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- keyboard input driver"
@@ -9,6 +9,7 @@ core keyboard."
SRCREV = "3e28d68b50d291938734e9684b8296ca864f3892"
PV = "1.3.2+git${SRCPV}"
+PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard;protocol=git"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
index fbc2c66..b4918ef 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- mouse input driver"
@@ -10,5 +10,7 @@ driver."
LIC_FILES_CHKSUM = "file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19"
+PR = "${INC_PR}.0"
+
SRC_URI[md5sum] = "7f31472689c15b6de62eff04d0fb57d7"
SRC_URI[sha256sum] = "4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
index b4dd1ed..392892e 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- mouse input driver"
@@ -10,7 +10,7 @@ driver."
SRCREV = "ea5cfe804e112f320f14ad896c7802d53551d3e6"
PV = "1.3.0+git${SRCPV}"
-PR = "r2"
+PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git \
file://unbreak.patch"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb
index 39cd35f..a75d051 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- synaptics touchpad input driver"
@@ -10,6 +10,8 @@ advanced features of the touchpad to become available."
LIC_FILES_CHKSUM = "file://COPYING;md5=e395e21f3c21d4fc3a243783e85e9ab5"
+PR = "${INC_PR}.0"
+
DEPENDS += "libxi"
#
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 dbfcef5..3b3db59 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- synaptics touchpad input driver"
@@ -10,6 +10,7 @@ advanced features of the touchpad to become available."
SRCREV = "934bc0012f948c52aadc8eda912f7728fb7394a2"
PV = "0.15.2+git${SRCPV}"
+PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
index 9535a8f..42e2b14 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
@@ -1,7 +1,7 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
DESCRIPTION = "X.Org X server -- VMWare mouse input driver"
-PR = "r0"
+PR = "${INC_PR}.0"
RDEPENDS_${PN} += "xf86-input-mouse"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
index 6c9db59..caa8a40 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
@@ -1,4 +1,4 @@
-require xf86-video-common.inc
+require xorg-driver-video.inc
SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
@@ -9,7 +9,7 @@ Infrastructure (DRI)."
LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
-PR = "r0"
+PR = "${INC_PR}.0"
EXTRA_OECONF += "--disable-xvmc"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 34fe533..ed1f269 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -1,4 +1,4 @@
-require xf86-video-common.inc
+require xorg-driver-video.inc
SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
@@ -12,7 +12,7 @@ DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
SRCREV = "87ea531c5dc5b39809395b277c330854aaaaf019"
PV = "2.10.0+git${SRCPV}"
-PR = "r0"
+PR = "${INC_PR}.0"
EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 66aa5c4..cf58302 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -1,4 +1,4 @@
-require xf86-driver-common.inc
+require xorg-driver-driver.inc
SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
@@ -11,7 +11,7 @@ DEPENDS += "virtual/libx11"
SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
PV = "0.1.1+git${SRCPV}"
SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
index 474c779..30e3dee 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
@@ -1,4 +1,4 @@
-require xf86-video-common.inc
+require xorg-driver-video.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=e5418e7a75e21268637984e70265e146"
@@ -11,6 +11,8 @@ 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}.0"
+
DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto xf86driproto libpciaccess"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb
index a0f6041..e77c918 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb
@@ -1,4 +1,4 @@
-require xf86-video-common.inc
+require xorg-driver-video.inc
SUMMARY = "X.Org X server -- VMware SVGA display driver"
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
DEPENDS += "virtual/libx11 libxvmc drm glproto \
virtual/libgl xineramaproto libpciaccess"
-PR = "r0"
+PR = "${INC_PR}.0"
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
diff --git a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
similarity index 66%
rename from meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
rename to meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 34d03b2..801d8d3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -5,14 +5,13 @@ SECTION = "x11/drivers"
LICENSE = "MIT-X"
PE = "1"
-PR = "r1"
+INC_PR = "r15"
DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
-XORG_PN = "${BPN}"
-SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
@@ -27,7 +26,8 @@ do_configure_prepend () {
mv configure.ac.new configure.ac
}
-do_install_append () {
- # driver's la files are not packaged
- rm -f ${D}${libdir}/xorg/modules/drivers/*.la
+# FIXME: We don't want to include the libtool archives (*.la) from modules
+# directory, as they serve no useful purpose. Upstream should fix Makefile.am
+do_install_append() {
+ find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
}
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
similarity index 81%
rename from meta/recipes-graphics/xorg-driver/xf86-input-common.inc
rename to meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index 6fc88cf..bf4ca6c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
@@ -1,7 +1,6 @@
-include xf86-driver-common.inc
+include xorg-driver-common.inc
DEPENDS += "inputproto kbproto "
FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
similarity index 65%
rename from meta/recipes-graphics/xorg-driver/xf86-video-common.inc
rename to meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
index f2e2817..57c80d1 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
@@ -1,4 +1,4 @@
-include xf86-driver-common.inc
+include xorg-driver-common.inc
DEPENDS =+ "renderproto videoproto xextproto fontsproto"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 04/30] xf86-video-omapfb: bump SRCREV and add patch from meta-oe
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (2 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 03/30] xorg-driver: rename .inc files and " Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 16:00 ` Phil Blundell
2011-10-03 13:28 ` [PATCHv2 05/30] libdrm: improve packaging Martin Jansa
` (26 subsequent siblings)
30 siblings, 1 reply; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../0004-Attempt-to-fix-VRFB.patch | 325 ++++++++++++++++++++
.../xorg-driver/xf86-video-omapfb_git.bb | 20 +-
2 files changed, 335 insertions(+), 10 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
new file mode 100644
index 0000000..6b59b9f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
@@ -0,0 +1,325 @@
+From 9f034f7a83751e4d1bbff6dd742d54bd96d38230 Mon Sep 17 00:00:00 2001
+From: Eino-Ville Talvala <talvala@stanford.edu>
+Date: Tue, 23 Aug 2011 18:37:01 +0200
+Subject: [PATCH] Attempt to fix VRFB
+
+Upstream-Status: Pending
+
+http://dominion.thruhere.net/git/cgit.cgi/xf86-video-omapfb/commit/?h=koen/fixups&id=6833fc9f795265e4943d248103fbaf3463b515d6
+
+Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net>
+
+---
+ src/image-format-conversions.c | 4 +-
+ src/image-format-conversions.h | 2 +-
+ src/omapfb-driver.c | 28 +++++++++++++--
+ src/omapfb-xv-blizzard.c | 1 +
+ src/omapfb-xv-generic.c | 72 +++++++++++++++++++++++++++++++--------
+ src/omapfb-xv.c | 3 ++
+ 6 files changed, 88 insertions(+), 22 deletions(-)
+
+diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c
+index dcefa9b..d43427d 100644
+--- a/src/image-format-conversions.c
++++ b/src/image-format-conversions.c
+@@ -38,13 +38,13 @@
+ #include "image-format-conversions.h"
+
+ /* Basic line-based copy for packed formats */
+-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest)
++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest)
+ {
+ int i;
+ int len = w * 2;
+ for (i = 0; i < h; i++)
+ {
+- memcpy(dest + i * len, src + i * stride, len);
++ memcpy(dest + i * dst_stride, src + i * src_stride, len);
+ }
+ }
+
+diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h
+index 584896a..ba7caf2 100644
+--- a/src/image-format-conversions.h
++++ b/src/image-format-conversions.h
+@@ -27,7 +27,7 @@
+ #include <stdint.h>
+
+ /* Basic line-based copy for packed formats */
+-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest);
++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest);
+
+ /* Basic C implementation of YV12/I420 to UYVY conversion */
+ void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
+diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
+index 48aa09c..07989f5 100644
+--- a/src/omapfb-driver.c
++++ b/src/omapfb-driver.c
+@@ -66,6 +66,7 @@
+ #define OMAPFB_VERSION 1000
+ #define OMAPFB_DRIVER_NAME "OMAPFB"
+ #define OMAPFB_NAME "omapfb"
++#define ENFORCE_MODES
+
+ static Bool OMAPFBProbe(DriverPtr drv, int flags);
+ static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags);
+@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = {
+ typedef enum {
+ OPTION_ACCELMETHOD,
+ OPTION_FB,
++ OPTION_ROTATE,
+ } FBDevOpts;
+
+ static const OptionInfoRec OMAPFBOptions[] = {
+ { OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE },
+ { OPTION_FB, "fb", OPTV_STRING, {0}, FALSE },
++ { OPTION_ROTATE, "rotation", OPTV_STRING, {0}, FALSE },
+ { -1, NULL, OPTV_NONE, {0}, FALSE }
+ };
+
+@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
+ {
+ OMAPFBPtr ofb;
+ EntityInfoPtr pEnt;
++ char *rotate;
+ rgb zeros = { 0, 0, 0 };
+ struct stat st;
+
+@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
+ pScrn->progClock = TRUE;
+ pScrn->chipset = "omapfb";
+
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n");
++
+ /* Start with configured virtual size */
+ pScrn->virtualX = pScrn->display->virtualX;
+ pScrn->virtualY = pScrn->display->virtualY;
+@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ ofb->CloseScreen = pScreen->CloseScreen;
+ pScreen->CloseScreen = OMAPFBCloseScreen;
+
++ /* Enforce the default mode (this is silly I guess) */
++#ifdef ENFORCE_MODES
++ //xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n");
++ //set_mode(ofb, &ofb->default_mode);
++ //pScrn->displayWidth = ofb->fixed_info.line_length /
++ // (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres;
++#endif
++
+ /* Map our framebuffer memory */
++ ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres;
+ ofb->fb = mmap (NULL, ofb->mem_info.size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ ofb->fd, 0);
+- if (ofb->fb == NULL) {
+- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n");
++ if (ofb->fb == MAP_FAILED) {
++ xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size);
+ return FALSE;
+ }
+
+@@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ } else if (!ofb->dss) {
+
+ ofb->plane_info.enabled = 1;
+- ofb->plane_info.out_width = ofb->state_info.xres;
+- ofb->plane_info.out_height = ofb->state_info.yres;
++ if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) {
++ ofb->plane_info.out_width = ofb->state_info.xres;
++ ofb->plane_info.out_height = ofb->state_info.yres;
++ } else {
++ ofb->plane_info.out_width = ofb->state_info.yres;
++ ofb->plane_info.out_height = ofb->state_info.xres;
++ }
+
+ if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) {
+ xf86DrvMsg(scrnIndex, X_ERROR,
+diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c
+index 406ffc6..b71d2aa 100644
+--- a/src/omapfb-xv-blizzard.c
++++ b/src/omapfb-xv-blizzard.c
+@@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn,
+ packed_line_copy(src_w & ~3,
+ src_h & ~3,
+ ((src_w + 1) & ~1) * 2,
++ ofb->port->fixed_info.line_length,
+ (uint8_t*)buf,
+ (uint8_t*)ofb->port->fb);
+ break;
+diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c
+index e6f89fe..b33f344 100644
+--- a/src/omapfb-xv-generic.c
++++ b/src/omapfb-xv-generic.c
+@@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
+ {
+ OMAPFBPtr ofb = OMAPFB(pScrn);
+
+- /* The memory size is already set in OMAPFBXVQueryImageAttributes */
++ /* The memory size is already set before we get here */
+ if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to allocate video plane memory\n");
+@@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
+ ofb->port->fb = mmap (NULL, ofb->port->mem_info.size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ ofb->port->fd, 0);
+- if (ofb->port->fb == NULL) {
++ if (ofb->port->fb == MAP_FAILED) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Mapping video memory failed\n");
+ return XvBadAlloc;
+ }
+
+ /* Update the state info */
++ /* Let's not - it's bad
+ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
+ {
+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
+ return XvBadAlloc;
+ }
+-
++ */
+ return Success;
+ }
+
+@@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
+ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
+ {
+ OMAPFBPtr ofb = OMAPFB(pScrn);
++ int ret;
+
+ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
+ {
+@@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
+ return XvBadAlloc;
+ }
++ /* Changing rotation/nonstd flags can change the fixed info! */
++ if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info))
++ {
++ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
++ return XvBadAlloc;
++ }
++ /* Correct fixed info requires recalculation of needed memory */
++ ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres;
++
++ /* Allocate buffer memory */
++ ret = OMAPXVAllocPlane(pScrn);
++ if (ret != Success)
++ return ret;
++
++ /* Workaround for reset of mode after memory allo */
++ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
++ {
++ xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__);
++ return XvBadAlloc;
++ }
++ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
++ {
++ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
++ return XvBadAlloc;
++ }
+
+ if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE,
+ &ofb->port->plane_info) != 0) {
+@@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ DrawablePtr pDraw)
+ {
+ OMAPFBPtr ofb = OMAPFB(pScrn);
++ short drw_temp;
++ short rot_xres, rot_yres;
+
+ if (!ofb->port->plane_info.enabled
+ || ofb->port->update_window.x != src_x
+@@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ return Success;
+ }
+
+- /* If we don't have the plane running, enable it */
+- if (!ofb->port->plane_info.enabled) {
+- ret = OMAPXVAllocPlane(pScrn);
+- if (ret != Success)
+- return ret;
+- }
+-
+ /* Set up the state info, xres and yres will be used for
+ * scaling to the values in the plane info struct
+ */
+@@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ ofb->port->state_info.yres_virtual = 0;
+ ofb->port->state_info.xoffset = 0;
+ ofb->port->state_info.yoffset = 0;
+- ofb->port->state_info.rotate = 0;
++ //ofb->port->state_info.rotate = 0;
+ ofb->port->state_info.grayscale = 0;
+ ofb->port->state_info.activate = FB_ACTIVATE_NOW;
+ ofb->port->state_info.bits_per_pixel = 0;
+ ofb->port->state_info.nonstd = xv_to_omapfb_format(image);
+
++ /* Plane info does not rotate with state_info */
++ if (ofb->port->state_info.rotate == 1 ||
++ ofb->port->state_info.rotate == 3) {
++ drw_temp = drw_x;
++ drw_x = drw_y;
++ drw_y = drw_temp;
++
++ drw_temp = drw_w;
++ drw_w = drw_h;
++ drw_h = drw_temp;
++
++ rot_xres = ofb->port->state_info.yres;
++ rot_yres = ofb->port->state_info.xres;
++ } else {
++ rot_xres = ofb->port->state_info.xres;
++ rot_yres = ofb->port->state_info.yres;
++ }
++
++
+ /* Set up the video plane info */
+ ofb->port->plane_info.enabled = 1;
+ ofb->port->plane_info.pos_x = drw_x;
+@@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ ofb->port->plane_info.out_height = drw_h & ~15;
+
+ /* Cap output to screen size */
+- if (ofb->port->plane_info.out_width > ofb->state_info.xres) {
++ if (ofb->port->plane_info.out_width > rot_xres) {
+ ofb->port->plane_info.pos_x = 0;
+- ofb->port->plane_info.out_width = ofb->state_info.xres;
++ ofb->port->plane_info.out_width = rot_xres;
+ }
+- if (ofb->port->plane_info.out_height > ofb->state_info.yres) {
++ if (ofb->port->plane_info.out_height > rot_yres) {
+ ofb->port->plane_info.pos_y = 0;
+- ofb->port->plane_info.out_height = ofb->state_info.yres;
++ ofb->port->plane_info.out_height = rot_yres;
+ }
+
+ ret = OMAPXVSetupVideoPlane(pScrn);
+@@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ packed_line_copy(src_w & ~15,
+ src_h & ~15,
+ ((src_w + 1) & ~1) * 2,
++ ofb->port->fixed_info.line_length,
+ (uint8_t*)buf,
+ (uint8_t*)ofb->port->fb);
+ break;
+diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c
+index 1df651e..0fee2c6 100644
+--- a/src/omapfb-xv.c
++++ b/src/omapfb-xv.c
+@@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn,
+ h = *height;
+
+ w = (w + 1) & ~1;
++
++ /* Can't calculate these here - don't know line length
+ ofb->port->mem_info.size = w << 1;
+ ofb->port->mem_info.size *= h;
++ */
+
+ return size;
+ }
+--
+1.7.5.4
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index cf58302..565ad7e 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -1,25 +1,25 @@
-require xorg-driver-driver.inc
+require xorg-driver-video.inc
SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \
framebuffer."
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
+LICENSE = "MIT-X & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
DEPENDS += "virtual/libx11"
-SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
-PE = "1"
-PR = "${INC_PR}.0"
-PV = "0.1.1+git${SRCPV}"
+SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
+PR = "${INC_PR}.5"
+PV = "0.1.1+gitr${SRCPV}"
-SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
+SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
file://omap-revert-set-CRTC-limit.patch \
file://omap-revert-set-virtual-size.patch \
file://omap-force-plain-mode.patch \
file://omap-blacklist-tv-out.patch \
- "
+ file://0004-Attempt-to-fix-VRFB.patch \
+"
S = "${WORKDIR}/git"
@@ -28,5 +28,5 @@ 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/omapfb-xv.c
+ sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
}
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* Re: [PATCHv2 04/30] xf86-video-omapfb: bump SRCREV and add patch from meta-oe
2011-10-03 13:28 ` [PATCHv2 04/30] xf86-video-omapfb: bump SRCREV and add patch " Martin Jansa
@ 2011-10-03 16:00 ` Phil Blundell
2011-10-04 7:28 ` Martin Jansa
0 siblings, 1 reply; 75+ messages in thread
From: Phil Blundell @ 2011-10-03 16:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-10-03 at 15:28 +0200, Martin Jansa wrote:
> From: Martin Jansa <martin.jansa@gmail.com>
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
This is a bit of a lame checkin message. "Add patch from meta-oe"
doesn't really say anything useful about what you're changing, and there
is no long comment at all. Also ...
>@@ -1,25 +1,25 @@
>-require xorg-driver-driver.inc
>+require xorg-driver-video.inc
>
> SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
>
> DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \
> framebuffer."
>
>-LICENSE = "MIT-X"
>-LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
>+LICENSE = "MIT-X & GPLv2+"
>+LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
> DEPENDS += "virtual/libx11"
... these changes don't seem to be covered by the description above.
And, finally, if this is an OMAP-specific driver, why is it in oe-core
in the first place? I would have thought it would be better placed in
meta-ti or some such layer.
p.
^ permalink raw reply [flat|nested] 75+ messages in thread
* Re: [PATCHv2 04/30] xf86-video-omapfb: bump SRCREV and add patch from meta-oe
2011-10-03 16:00 ` Phil Blundell
@ 2011-10-04 7:28 ` Martin Jansa
2011-10-04 9:43 ` Phil Blundell
0 siblings, 1 reply; 75+ messages in thread
From: Martin Jansa @ 2011-10-04 7:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2570 bytes --]
On Mon, Oct 03, 2011 at 05:00:35PM +0100, Phil Blundell wrote:
> On Mon, 2011-10-03 at 15:28 +0200, Martin Jansa wrote:
> > From: Martin Jansa <martin.jansa@gmail.com>
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
Sorry about 3 SOB lines... it's because I had it from
oe-core/master-next, but I belive RP will merge master-next first where
it's only with his and mine SOB.
> This is a bit of a lame checkin message. "Add patch from meta-oe"
> doesn't really say anything useful about what you're changing, and there
> is no long comment at all. Also ...
Rotation didn't work when using VFRB, this patch is fixing that and is from
koen upstream repo as patch header says and I cannot probably describe it
better then original author.
> >@@ -1,25 +1,25 @@
> >-require xorg-driver-driver.inc
> >+require xorg-driver-video.inc
> >
> > SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
> >
> > DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \
> > framebuffer."
> >
> >-LICENSE = "MIT-X"
> >-LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
> >+LICENSE = "MIT-X & GPLv2+"
> >+LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
> > DEPENDS += "virtual/libx11"
>
> ... these changes don't seem to be covered by the description above.
because COPYING file wasn't available in SRCREV used in old oe-core
version.. so this change is just simplification and improving license
metadata, because original MIT-X src/omapfb-driver.c doesn't cover what
was explained in COPYING file:
The src/omapfb.h header is under the GPL license.
> And, finally, if this is an OMAP-specific driver, why is it in oe-core
> in the first place? I would have thought it would be better placed in
> meta-ti or some such layer.
We've discussed it on oe-devel ML already
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/034781.html
now we have very similar recipes in oe-core and meta-oe which is imho
worst case.. I'm fine with dropping it from oe-core and keeping it in
meta-oe, but I would prefer to keep it in meta-oe ie because
nokia900.conf is maintained in meta-smartphone layer and I don't want to
add meta-ti as dependency just because this one recipe.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 75+ messages in thread
* [PATCHv2 05/30] libdrm: improve packaging
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (3 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 04/30] xf86-video-omapfb: bump SRCREV and add patch " Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 06/30] xserver/mesa: Bump PR after libdrm packaging changes Martin Jansa
` (25 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/drm/libdrm.inc | 7 ++++---
meta/recipes-graphics/drm/libdrm_2.4.26.bb | 2 +-
meta/recipes-graphics/drm/libdrm_git.bb | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index 1ad9dc3..20d7f1f 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -15,7 +15,8 @@ DEPENDS += " libpciaccess"
inherit autotools pkgconfig
-PACKAGES =+ "libdrm-tests"
-FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*"
+PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
+FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
+FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
+FILES_${PN}-kms = "${libdir}/libkms*.so.*"
-LEAD_SONAME = "libdrm.so"
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.26.bb b/meta/recipes-graphics/drm/libdrm_2.4.26.bb
index e5aa6a4..f7a7307 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.26.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.26.bb
@@ -7,4 +7,4 @@ SRC_URI += "file://installtests.patch"
SRC_URI[md5sum] = "062569426773f69b11a47a7712bba770"
SRC_URI[sha256sum] = "b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc"
-PR = "r0"
+PR = "r1"
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
index 7d4e1b3..85bd4fb 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -6,4 +6,4 @@ S = ${WORKDIR}/git
SRCREV = "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
PV = "2.4.15+git${SRCPV}"
-PR = "r0"
+PR = "r1"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 06/30] xserver/mesa: Bump PR after libdrm packaging changes
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (4 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 05/30] libdrm: improve packaging Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 07/30] rgb: import from meta-oe layer Martin Jansa
` (24 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 2 +-
meta/recipes-graphics/mesa/mesa-dri_git.bb | 2 +-
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 2 +-
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 2 +-
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
index aac7a1c..68f89a2 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
@@ -8,7 +8,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://crossfix.patch \
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index c4132d7..9e32d0a 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -13,7 +13,7 @@ DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
PV = "7.7+git${SRCPV}"
-PR = "r1"
+PR = "r2"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
index ea57140..035e39c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
@@ -7,7 +7,7 @@ PROTO_DEPS += "xf86driproto dri2proto"
DEPENDS += "font-util"
PE = "1"
-PR = "r0"
+PR = "r1"
SRC_URI += "file://crosscompile.patch"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index adefcdb..066ff13 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
PE = "1"
-PR = "r0"
+PR = "r1"
PV = "1.10+git${SRCPV}"
PROTO_DEPS += "xf86driproto dri2proto"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
index f9b3a64..5575c0f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
@@ -2,7 +2,7 @@ require xserver-xf86-lite.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-PR = "r0"
+PR = "r1"
DEPENDS += "font-util"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 07/30] rgb: import from meta-oe layer
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (5 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 06/30] xserver/mesa: Bump PR after libdrm packaging changes Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 08/30] xserver-xf86-dri-lite: remove old git recipe Martin Jansa
` (23 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-app/rgb_1.0.4.bb | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb b/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
new file mode 100644
index 0000000..59dca2a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DEPENDS += " xproto util-macros"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951"
+SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1"
+
+FILES_${PN} += "${datadir}/X11"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 08/30] xserver-xf86-dri-lite: remove old git recipe
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (6 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 07/30] rgb: import from meta-oe layer Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 09/30] xserver-xf86: improve packaging and move shared definitions to .inc files Martin Jansa
` (22 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 25 --------------------
1 files changed, 0 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
deleted file mode 100644
index 066ff13..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require xserver-xf86-dri-lite.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
-PE = "1"
-PR = "r1"
-PV = "1.10+git${SRCPV}"
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-RDEPENDS_${PN} += "xkeyboard-config"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
- file://crosscompile.patch; \
- file://fix_macros1.patch;"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;"
-
-EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
-
-S = "${WORKDIR}/git"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 09/30] xserver-xf86: improve packaging and move shared definitions to .inc files
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (7 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 08/30] xserver-xf86-dri-lite: remove old git recipe Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 10/30] xserver-xf86: add new version 1.11.1 Martin Jansa
` (21 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* introduce DISTRO_XORG_CONFIG_MANAGER for distribution to select
hal/udev/files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xf86-common.inc | 114 +++++++++++++++++---
.../xorg-xserver/xserver-xf86-dri-lite.inc | 35 ++-----
.../xorg-xserver/xserver-xf86-lite.inc | 32 +-----
3 files changed, 110 insertions(+), 71 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
index 000aea3..81abfc9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
@@ -2,8 +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=3dd2bbe3563837f80ed8926b06c1c353"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
@@ -12,26 +11,115 @@ PROVIDES = "virtual/xserver-xf86"
# Other packages tend to just care that there is *an* X server:
PROVIDES += "virtual/xserver"
+# Config manager for xserver, options are: hal, udev, empty (for configuration in xorg.conf)
+DISTRO_XORG_CONFIG_MANAGER ?= "udev"
+
+# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting
+CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
+CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
+
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI += "file://macro_tweak.patch"
S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
-PACKAGES =+ "${PN}-utils"
+PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
-RDEPENDS_${PN} += "xserver-xf86-config xkeyboard-config"
+LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
-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} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
-FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
+DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
- ${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
- "
+EXTRA_OECONF += "--with-fop=no \
+ --disable-static \
+ --disable-acfb \
+ --disable-ccfb \
+ --disable-mcfb \
+ --disable-dga \
+ --disable-xinerama \
+ --disable-xf86misc \
+ --disable-xorgcfg \
+ --disable-record \
+ --disable-dmx \
+ --disable-xnest \
+ --disable-xvfb \
+ --enable-composite \
+ --sysconfdir=/etc/X11 \
+ --localstatedir=/var \
+ --with-fontdir=${datadir}/fonts/X11 \
+ --with-xkb-output=/var/lib/xkb \
+ ${CONFIG_MANAGER_OPTION} \
+ ac_cv_file__usr_share_sgml_X11_defs_ent=no \
+"
-SRC_URI += "file://macro_tweak.patch"
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+# 32.0k libdri.so
+# 336.0k libglx.so
+# 1360k libint10.so
+# 180.0k libwfb.so
+# 320.0k libxaa.so
+# 124.0k libxf1bpp.so
+# 84.0k libxf4bpp.so
+# librecord.so
+# libextmod.so
+# libdbe.so
+
+PACKAGES =+ "${PN}-security-policy \
+ ${PN}-sdl \
+ ${PN}-fbdev \
+ ${PN}-xprint \
+ ${PN}-xvfb \
+ ${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 \
+ ${PN}-module-libmfb \
+ ${PN}-module-libcfb \
+ ${PN}-module-xaa \
+ ${PN}-module-libxf1bpp \
+ ${PN}-module-libxf4bpp"
+
+RDEPENDS_${PN} += "xorg-minimal-fonts"
+RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
+RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-EXTRA_OECONF = "--with-fop=no"
+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"
+FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
+FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
+ ${libdir}/xorg/modules/*/.debug \
+ ${libdir}/xorg/modules/*/*/.debug \
+ "
+FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
+FILES_${PN}-sdl = "${bindir}/Xsdl"
+FILES_${PN}-fbdev = "${bindir}/Xfbdev"
+FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
+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"
+FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
+FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
+FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
+FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
+FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
index 3aca760..740c59d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -1,37 +1,16 @@
require xserver-xf86-common.inc
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
+PROTO_DEPS += "xf86driproto dri2proto"
+LIB_DEPS += "virtual/libgl"
-LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
+inherit glx-use-tls
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-
-RDEPENDS_${PN} += "hal xorg-minimal-fonts"
-
-FILES_${PN} += "${bindir}/Xorg "
-
-EXTRA_OECONF += "--disable-static \
- --disable-acfb \
- --disable-ccfb \
- --disable-mcfb \
- --disable-dga \
- --disable-xinerama \
- --disable-xf86misc \
- --disable-xorgcfg \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --disable-xvfb \
- --enable-composite \
- --enable-glx-tls \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
+EXTRA_OECONF += "\
+ --enable-dri \
+ --enable-dri2 \
--with-pic \
--with-int10=x86emu \
- --with-fontdir=${datadir}/fonts/X11 \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+"
# Due to mesa-dri
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
index 5447058..a785e64 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
@@ -1,34 +1,6 @@
require xserver-xf86-common.inc
-PROVIDES += "xserver-xf86-lite"
-
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
-
-LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-
-RDEPENDS_${PN} += "hal xorg-minimal-fonts"
-
-FILES_${PN} += "${bindir}/Xorg "
-
-EXTRA_OECONF += "--disable-static \
- --disable-acfb \
- --disable-ccfb \
- --disable-mcfb \
- --disable-dga \
- --disable-xinerama \
- --disable-xf86misc \
- --disable-xorgcfg \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --disable-xvfb \
- --enable-composite \
+EXTRA_OECONF += "\
--disable-dri \
--disable-glx \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
- --with-fontdir=${datadir}/fonts/X11 \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 10/30] xserver-xf86: add new version 1.11.1
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (8 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 09/30] xserver-xf86: improve packaging and move shared definitions to .inc files Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 11/30] xserver-xf86: remove old 1.10.1 version Martin Jansa
` (20 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* move shared definitions to .inc file
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xf86-1.11.1.inc | 7 +++++++
.../xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb | 4 ++++
.../xorg-xserver/xserver-xf86-lite_1.11.1.bb | 2 ++
3 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc
new file mode 100644
index 0000000..690de3f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc
@@ -0,0 +1,7 @@
+SRC_URI += "file://crosscompile.patch"
+
+# Misc build failure for master HEAD
+SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+
+SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d"
+SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
new file mode 100644
index 0000000..54ff37a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
@@ -0,0 +1,4 @@
+require xserver-xf86-dri-lite.inc
+require xserver-xf86-${PV}.inc
+
+PE = "1"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
new file mode 100644
index 0000000..0c1b0fd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
@@ -0,0 +1,2 @@
+require xserver-xf86-lite.inc
+require xserver-xf86-${PV}.inc
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 11/30] xserver-xf86: remove old 1.10.1 version
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (9 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 10/30] xserver-xf86: add new version 1.11.1 Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 12/30] xserver-xf86-dri-lite: remove COMPATIBLE_HOST Martin Jansa
` (19 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 20 --------------------
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 12 ------------
2 files changed, 0 insertions(+), 32 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
deleted file mode 100644
index 035e39c..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require xserver-xf86-dri-lite.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-PE = "1"
-PR = "r1"
-
-SRC_URI += "file://crosscompile.patch"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch"
-
-SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de"
-SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d"
-
-EXTRA_OECONF += "--enable-dri --enable-dri2"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
deleted file mode 100644
index 5575c0f..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xserver-xf86-lite.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-PR = "r1"
-
-DEPENDS += "font-util"
-
-SRC_URI += "file://crosscompile.patch"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 12/30] xserver-xf86-dri-lite: remove COMPATIBLE_HOST
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (10 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 11/30] xserver-xf86: remove old 1.10.1 version Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 13/30] xserver-xf86: drop unused files Martin Jansa
` (18 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* ie om-gta02 has mesa-dri module too
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xf86-dri-lite.inc | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
index 740c59d..0d956b5 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -11,6 +11,3 @@ EXTRA_OECONF += "\
--with-pic \
--with-int10=x86emu \
"
-
-# Due to mesa-dri
-COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 13/30] xserver-xf86: drop unused files
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (11 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 12/30] xserver-xf86-dri-lite: remove COMPATIBLE_HOST Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 14/30] xserver-xf86: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe Martin Jansa
` (17 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/files/macro_tweak.patch | 20 --
.../cache-xkbcomp-output-for-fast-start-up.patch | 360 --------------------
.../xserver-xf86-dri-lite/fix_macros1.patch | 24 --
3 files changed, 0 insertions(+), 404 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
diff --git a/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
deleted file mode 100644
index c4af228..0000000
--- a/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Pending
-
-Index: xorg-server-1.5.0/xorg-server.m4
-===================================================================
---- xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.000000000 +0100
-+++ xorg-server-1.5.0/xorg-server.m4 2008-11-04 23:56:55.000000000 +0000
-@@ -28,9 +28,12 @@
- # 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],[
-+ 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-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
deleted file mode 100644
index 6b1b40f..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-From 0f70ba9d3412b17ac4e08e33e1be3c226c06ea54 Mon Sep 17 00:00:00 2001
-From: Yan Li <yan.i.li@intel.com>
-Date: Tue, 12 May 2009 17:49:07 +0800
-Subject: [PATCH] XKB: cache xkbcomp output for fast start-up v5 for 1.6.1
-Organization: Intel
-
-xkbcomp outputs will be cached in files with hashed keymap as
-names. This saves boot time for around 1s on commodity netbooks.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yan Li <yan.i.li@intel.com>
----
- configure.ac | 6 +-
- xkb/README.compiled | 8 +-
- xkb/ddxLoad.c | 192 +++++++++++++++++++++++++++++++++++++++++---------
- 3 files changed, 164 insertions(+), 42 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4c4c797..7a5020a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -476,9 +476,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [
- AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
- [ XKBPATH="$withval" ],
- [ XKBPATH="${datadir}/X11/xkb" ])
--AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
-+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]),
- [ XKBOUTPUT="$withval" ],
-- [ XKBOUTPUT="compiled" ])
-+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ])
- AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
- [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),
- [ SERVERCONFIG="$withval" ],
-@@ -1757,7 +1757,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir])
- XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
-
- if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then
-- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
-+ AC_MSG_ERROR([xkb-output must be an absolute path.])
- fi
-
- # XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-diff --git a/xkb/README.compiled b/xkb/README.compiled
-index 71caa2f..a4a2ae0 100644
---- a/xkb/README.compiled
-+++ b/xkb/README.compiled
-@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients. The X server
- or some other tool might destroy or replace the files in this directory,
- so it is not a safe place to store compiled keymaps for long periods of
- time. The default keymap for any server is usually stored in:
-- X<num>-default.xkm
--where <num> is the display number of the server in question, which makes
--it possible for several servers *on the same host* to share the same
--directory.
-+ server-<SHA1>.xkm
-+
-+where <SHA1> is the SHA1 hash of keymap source, so that compiled
-+keymap of different keymap sources are stored in different files.
-
- Unless the X server is modified, sharing this directory between servers on
- different hosts could cause problems.
-diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
-index 4d5dfb6..60a68af 100644
---- a/xkb/ddxLoad.c
-+++ b/xkb/ddxLoad.c
-@@ -32,6 +32,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <xkb-config.h>
- #endif
-
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+# include <sha1.h>
-+#else /* Use OpenSSL's libcrypto */
-+# include <stddef.h> /* buggy openssl/sha.h wants size_t */
-+# include <openssl/sha.h>
-+#endif
- #include <stdio.h>
- #include <ctype.h>
- #define NEED_EVENTS 1
-@@ -46,24 +52,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #define XKBSRV_NEED_FILE_FUNCS
- #include <xkbsrv.h>
- #include <X11/extensions/XI.h>
-+#include <errno.h>
- #include "xkb.h"
-
- #if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
- #include <paths.h>
- #endif
-
-- /*
-- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
-- * relative to the top-level XKB configuration directory.
-- * Making the server write to a subdirectory of that directory
-- * requires some work in the general case (install procedure
-- * has to create links to /var or somesuch on many machines),
-- * so we just compile into /usr/tmp for now.
-- */
--#ifndef XKM_OUTPUT_DIR
--#define XKM_OUTPUT_DIR "compiled/"
--#endif
--
- #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
- #define ERROR_PREFIX "\"> \""
- #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
-@@ -179,6 +174,45 @@ OutputDirectory(
- }
-
- static Bool
-+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input)
-+{
-+ int i;
-+ unsigned char sha1[SHA_DIGEST_LENGTH];
-+
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+ SHA1_CTX ctx;
-+
-+ SHA1Init (&ctx);
-+ SHA1Update (&ctx, input, strlen(input));
-+ SHA1Final (sha1, &ctx);
-+#else /* Use OpenSSL's libcrypto */
-+ SHA_CTX ctx;
-+ int success;
-+
-+ success = SHA1_Init (&ctx);
-+ if (! success)
-+ return BadAlloc;
-+
-+ success = SHA1_Update (&ctx, input, strlen(input));
-+ if (! success)
-+ return BadAlloc;
-+
-+ success = SHA1_Final (sha1, &ctx);
-+ if (! success)
-+ return BadAlloc;
-+#endif
-+
-+ /* convert sha1 to sha1_asc */
-+ for(i=0; i<SHA_DIGEST_LENGTH; ++i) {
-+ sprintf(sha1Asc+i*2, "%02X", sha1[i]);
-+ }
-+
-+ return Success;
-+}
-+
-+/* call xkbcomp and compile XKB keymap, return xkm file name in
-+ nameRtrn */
-+static Bool
- XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- XkbComponentNamesPtr names,
- unsigned want,
-@@ -187,7 +221,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- int nameRtrnLen)
- {
- FILE * out;
-- char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
-+ char * buf = NULL, xkmfile[PATH_MAX], xkm_output_dir[PATH_MAX];
-+ char * tmpXkmFile = NULL;
-+ char * canonicalXkmFileName = NULL;
-+ char sha1Asc[SHA_DIGEST_LENGTH*2+1], xkbKeyMapBuf[100*1024];
-+ int ret, result;
-
- const char *emptystring = "";
- const char *xkbbasedirflag = emptystring;
-@@ -198,16 +236,70 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- /* WIN32 has no popen. The input must be stored in a file which is
- used as input for xkbcomp. xkbcomp does not read from stdin. */
- char tmpname[PATH_MAX];
-- const char *xkmfile = tmpname;
-+ const char *xkbfile = tmpname;
- #else
-- const char *xkmfile = "-";
-+ const char *xkbfile = "-";
- #endif
-
-- snprintf(keymap, sizeof(keymap), "server-%s", display);
-+ /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
-+ of which SHA1 is generated and used as result xkm file name */
-+ memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
-+ out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w");
-+ if (NULL == out) {
-+ ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n");
-+ return False;
-+ }
-+ ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
-+ if (fclose(out) !=0)
-+ {
-+ ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n");
-+ return False;
-+ }
-+#ifdef DEBUG
-+ if (xkbDebugFlags) {
-+ ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
-+ fputs(xkbKeyMapBuf, stderr);
-+ }
-+#endif
-+ if (!ret) {
-+ ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
-+ return False;
-+ }
-+
-+ DebugF("[xkb] computing SHA1 of keymap\n");
-+ if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
-+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
-+ }
-+ else {
-+ ErrorF("[xkb] Computing SHA1 of keymap failed, "
-+ "using display name instead as xkm file name\n");
-+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", display);
-+ }
-
-- XkbEnsureSafeMapName(keymap);
-+ XkbEnsureSafeMapName(xkmfile);
- OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
-
-+ /* set nameRtrn, fail if it's too small */
-+ if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) {
-+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n");
-+ return False;
-+ }
-+ strncpy(nameRtrn, xkmfile, nameRtrnLen);
-+
-+ /* if the xkm file already exists, reuse it */
-+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile);
-+ if (access(canonicalXkmFileName, R_OK) == 0) {
-+ /* yes, we can reuse the old xkm file */
-+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName);
-+ result = True;
-+ goto _ret;
-+ }
-+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName);
-+
-+ /* continue to call xkbcomp to compile the keymap. to avoid race
-+ condition, we compile it to a tmpfile then rename it to
-+ xkmfile */
-+
- #ifdef WIN32
- strcpy(tmpname, Win32TempDir());
- strcat(tmpname, "\\xkb_XXXXXX");
-@@ -230,19 +322,30 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- }
- }
-
-+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) {
-+ ErrorF("[xkb] Can't generate temp xkm file name");
-+ result = False;
-+ goto _ret;
-+ }
-+
- buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
-- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
-+ "-em1 %s -emp %s -eml %s \"%s\"",
- xkbbindir, xkbbindirsep,
- ( (xkbDebugFlags < 2) ? 1 :
- ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ),
-- xkbbasedirflag, xkmfile,
-+ xkbbasedirflag, xkbfile,
- PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
-- xkm_output_dir, keymap);
-+ tmpXkmFile);
-
- if (xkbbasedirflag != emptystring) {
- xfree(xkbbasedirflag);
- }
-
-+ /* there's a potential race condition between calling tempnam()
-+ and invoking xkbcomp to write the result file (potential temp
-+ file name conflicts), but since xkbcomp is a standalone
-+ program, we have to live with this */
-+
- #ifndef WIN32
- out= Popen(buf,"w");
- #else
-@@ -250,31 +353,43 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- #endif
-
- if (out!=NULL) {
--#ifdef DEBUG
-- if (xkbDebugFlags) {
-- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
-- XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
-+ /* write XKBKeyMapBuf to xkbcomp */
-+ if (EOF==fputs(xkbKeyMapBuf, out))
-+ {
-+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n");
-+ result = False;
-+ goto _ret;
- }
--#endif
-- XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
- #ifndef WIN32
- if (Pclose(out)==0)
- #else
- if (fclose(out)==0 && System(buf) >= 0)
- #endif
- {
-+ /* xkbcomp success */
- if (xkbDebugFlags)
- DebugF("[xkb] xkb executes: %s\n",buf);
-- if (nameRtrn) {
-- strncpy(nameRtrn,keymap,nameRtrnLen);
-- nameRtrn[nameRtrnLen-1]= '\0';
-+
-+ /* if canonicalXkmFileName already exists now, we simply
-+ overwrite it, this is OK */
-+ ret = rename(tmpXkmFile, canonicalXkmFileName);
-+ if (0 != ret) {
-+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n",
-+ tmpXkmFile, canonicalXkmFileName,
-+ strerror(errno));
-+
-+ /* in case of error, don't unlink tmpXkmFile, leave it
-+ for debugging */
-+
-+ result = False;
-+ goto _ret;
- }
-- if (buf != NULL)
-- xfree (buf);
-- return True;
-+
-+ result = True;
-+ goto _ret;
- }
- else
-- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
-+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile);
- #ifdef WIN32
- /* remove the temporary file */
- unlink(tmpname);
-@@ -289,9 +404,17 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- }
- if (nameRtrn)
- nameRtrn[0]= '\0';
-+ result = False;
-+
-+_ret:
-+ if (tmpXkmFile)
-+ free(tmpXkmFile);
-+ if (canonicalXkmFileName)
-+ xfree(canonicalXkmFileName);
- if (buf != NULL)
- xfree (buf);
-- return False;
-+
-+ return result;
- }
-
- static FILE *
-@@ -375,7 +498,6 @@ unsigned missing;
- DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
- }
- fclose(file);
-- (void) unlink (fileName);
- return (need|want)&(~missing);
- }
-
---
-1.5.6.5
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
deleted file mode 100644
index b2c8d58..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-We need to insert the sysroot path into compiler commandlines for this
-kind of variable use, otherwise we're looking into /usr/include/.
-
-RP - 26/11/09
-
-Upstream-Status: Pending
-
-Index: git/xorg-server.m4
-===================================================================
---- git.orig/xorg-server.m4 2010-02-05 10:00:55.000000000 +0000
-+++ git/xorg-server.m4 2010-02-05 10:02:12.000000000 +0000
-@@ -28,10 +28,11 @@
- # 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
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 14/30] xserver-xf86: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (12 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 13/30] xserver-xf86: drop unused files Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 15/30] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Martin Jansa
` (16 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* FILESEXTRAPATHS needs to be in xserver-xf86-lite_1.11.1
because in .inc we don't have ${PV} expanded yet
* crosscompile.patch macro_tweak.patch were identical
* fix_open_max_preprocessor_error.patch has only different header
# $ diff xserver-xorg/fix_open_max_preprocessor_error.patch xserver-xorg-dri/fix_open_max_preprocessor_error.patch
1c1
< Upstream-Status: Pending
---
> Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 7 +----
.../fix_open_max_preprocessor_error.patch | 15 ----------
.../xserver-xf86-dri-lite/macro_tweak.patch | 30 --------------------
.../xserver-xf86-lite/crosscompile.patch | 22 --------------
.../xorg-xserver/xserver-xf86-lite_1.11.1.bb | 2 +
7 files changed, 3 insertions(+), 73 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xf86-dri-lite-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xf86-dri-lite-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xf86-dri-lite-1.11.1}/macro_tweak.patch (74%)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/macro_tweak.patch
similarity index 74%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/macro_tweak.patch
index 2b75427..ec0eea6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/macro_tweak.patch
@@ -1,10 +1,5 @@
This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904.
-
-the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
-are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
-can be safely replace by this patch.
+xorg-server 1.8.99.904 and newer.
Upstream-Status: Pending
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
deleted file mode 100644
index 9c33072..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-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-xf86-dri-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
deleted file mode 100644
index 2b75427..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904.
-
-the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
-are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
-can be safely replace by this patch.
-
-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-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
deleted file mode 100644
index 2f98bb8..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/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-xf86-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
index 0c1b0fd..e214dec 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
@@ -1,2 +1,4 @@
require xserver-xf86-lite.inc
require xserver-xf86-${PV}.inc
+
+FILESEXTRAPATHS_append := "${THISDIR}/xserver-xf86-dri-lite:${THISDIR}/xserver-xf86-dri-lite-${PV}:"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 15/30] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (13 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 14/30] xserver-xf86: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 16/30] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory Martin Jansa
` (15 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* xserver-xorg is closer to upstream naming and
that's how it's named in OE-classic and meta-oe? It would make meta-oe
transition easier and better to do it now then convert meta-oe to
xserver-xf86 and then rename it back later.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/distro/include/default-providers.inc | 4 ++--
.../conf/distro/include/distro_tracking_fields.inc | 20 ++++++++++----------
meta/conf/machine/qemux86-64.conf | 6 +++---
meta/conf/machine/qemux86.conf | 6 +++---
meta/conf/multilib.conf | 2 +-
.../xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb | 4 ----
.../xorg-xserver/xserver-xf86-lite_1.11.1.bb | 4 ----
...ver-xf86-1.11.1.inc => xserver-xorg-1.11.1.inc} | 0
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 0
...ver-xf86-common.inc => xserver-xorg-common.inc} | 1 +
...xserver-xf86-lite.inc => xserver-xorg-lite.inc} | 2 +-
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb | 4 ++++
...{xserver-xf86-dri-lite.inc => xserver-xorg.inc} | 2 +-
.../xorg-xserver/xserver-xorg_1.11.1.bb | 4 ++++
16 files changed, 30 insertions(+), 29 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-1.11.1.inc => xserver-xorg-1.11.1.inc} (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite-1.11.1 => xserver-xorg-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite-1.11.1 => xserver-xorg-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite-1.11.1 => xserver-xorg-1.11.1}/macro_tweak.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc => xserver-xorg-common.inc} (99%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc => xserver-xorg-lite.inc} (73%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc => xserver-xorg.inc} (87%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index d51ac64..a5cdb5b 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -3,8 +3,8 @@
#
PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 47fa7bf..eaaafaa 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3680,14 +3680,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic core"
RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010"
RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke <ke.yu@intel.com>"
-RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed
-RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904"
-RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2 monthes"
-RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01"
-RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core"
-RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011"
-RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke <ke.yu@intel.com>"
+RECIPE_STATUS_pn-xserver-xorg="green" # no update needed
+RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904"
+RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2 monthes"
+RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01"
+RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core"
+RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011"
+RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke <ke.yu@intel.com>"
RECIPE_STATUS_pn-xf86-input-synaptics = "red"
DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
@@ -5895,8 +5895,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
-DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
-DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 18a7513..f28cf08 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -4,8 +4,8 @@
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
require conf/machine/include/tune-x86_64.inc
require conf/machine/include/qemu.inc
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xf86-dri-lite \
+XSERVER ?= "xserver-xorg \
mesa-dri-driver-swrast \
xf86-input-vmmouse \
xf86-input-keyboard \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 5d0d03e..75c9042 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -4,8 +4,8 @@
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
require conf/machine/include/tune-i586.inc
require conf/machine/include/qemu.inc
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xf86-dri-lite \
+XSERVER ?= "xserver-xorg \
mesa-dri-driver-swrast \
xf86-input-vmmouse \
xf86-input-keyboard \
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index b9da33a..5e4b435 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
deleted file mode 100644
index 54ff37a..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xserver-xf86-dri-lite.inc
-require xserver-xf86-${PV}.inc
-
-PE = "1"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
deleted file mode 100644
index e214dec..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xserver-xf86-lite.inc
-require xserver-xf86-${PV}.inc
-
-FILESEXTRAPATHS_append := "${THISDIR}/xserver-xf86-dri-lite:${THISDIR}/xserver-xf86-dri-lite-${PV}:"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
similarity index 99%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 81abfc9..16f2a23 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
+# deprecated, we should use virtual/xserver instead
PROVIDES = "virtual/xserver-xf86"
# Other packages tend to just care that there is *an* X server:
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
similarity index 73%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index a785e64..be84e9e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,4 +1,4 @@
-require xserver-xf86-common.inc
+require xserver-xorg-common.inc
EXTRA_OECONF += "\
--disable-dri \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
new file mode 100644
index 0000000..ec29b21
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
@@ -0,0 +1,4 @@
+require xserver-xorg-lite.inc
+require xserver-xorg-${PV}.inc
+
+FILESEXTRAPATHS_append := "${THISDIR}/xserver-xorg:${THISDIR}/xserver-xorg-${PV}:"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
similarity index 87%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 0d956b5..9a057f1 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,4 +1,4 @@
-require xserver-xf86-common.inc
+require xserver-xorg-common.inc
PROTO_DEPS += "xf86driproto dri2proto"
LIB_DEPS += "virtual/libgl"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
new file mode 100644
index 0000000..8e97888
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
@@ -0,0 +1,4 @@
+require xserver-xorg.inc
+require xserver-xorg-${PV}.inc
+
+PE = "1"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 16/30] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (14 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 15/30] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 17/30] xorg-driver-common: bump INC_PR to rebuild drivers agains new xserver-xorg ABI Martin Jansa
` (14 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-kdrive/disable-apm.patch | 24 ------
.../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 43 ----------
| 87 --------------------
.../xserver-kdrive/fbdev_xrandr_ioctl.patch | 63 --------------
.../xserver-kdrive/no-serial-probing.patch | 17 ----
5 files changed, 0 insertions(+), 234 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
deleted file mode 100644
index c22b1c0..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
---- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
-+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
-@@ -342,7 +342,7 @@
- /*
- * Open the APM driver
- */
-- LinuxApmFd = open ("/dev/apm_bios", 2);
-+ /*LinuxApmFd = open ("/dev/apm_bios", 2);
- if (LinuxApmFd < 0 && errno == ENOENT)
- LinuxApmFd = open ("/dev/misc/apm_bios", 2);
- if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
- RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
- AddEnabledDevice (LinuxApmFd);
- }
--
-+ */
- /*
- * now get the VT
- */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
deleted file mode 100644
index 631c111..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-Index: xorg-server-1.3.0.0/configure.ac
-===================================================================
---- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200
-+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200
-@@ -520,7 +520,11 @@
- XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
-
- dnl Core modules for most extensions, et al.
-+if test "$KDRIVE" = yes; then
-+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
-+else
- REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
-+fi
- REQUIRED_LIBS="xfont xau fontenc"
-
- AM_CONDITIONAL(XV, [test "x$XV" = xyes])
-@@ -1603,7 +1607,9 @@
- AC_SUBST(XKB_COMPILED_DIR)
-
- dnl and the rest of these are generic, so they're in config.h
-+if test ! x"$KDRIVE" = xyes; then
- AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
-+fi
- AC_DEFINE(XResExtension, 1, [Build XRes extension])
-
- AC_TRY_COMPILE([
-@@ -1616,10 +1622,12 @@
-
- AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
-
-+if test ! "x$KDRIVE" = xyes ; then
- dnl xorgconfig CLI configuration utility
- PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
- AC_SUBST(XORGCONFIG_DEP_CFLAGS)
- AC_SUBST(XORGCONFIG_DEP_LIBS)
-+fi
-
- dnl xorgcfg GUI configuration utility
- AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
deleted file mode 100644
index 896c033..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Add some extra video modes and change the default to VGA.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
----
- hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 39 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.000000000 +0000
-@@ -32,6 +32,31 @@ const KdMonitorTiming kdMonitorTimings[
- /* H V Hz KHz */
- /* FP BP BLANK POLARITY */
-
-+ /* Treo 650 */
-+
-+ { 320, 320, 64, 16256,
-+ 17, 12, 32, KdSyncNegative,
-+ 1, 11, 14, KdSyncNegative,
-+ },
-+
-+ { 320, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
-+ /* LifeDrive/T3/TX modes */
-+
-+ { 320, 480, 64, 16256,
-+ 17, 12, 32, KdSyncNegative,
-+ 1, 11, 14, KdSyncNegative,
-+ },
-+
-+ { 480, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
-+
- /* IPAQ modeline:
- *
- * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
-@@ -41,6 +66,11 @@ const KdMonitorTiming kdMonitorTimings[
- 1, 11, 14, KdSyncNegative,
- },
-
-+ { 240, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
- /* Other VESA modes */
- { 640, 350, 85, 31500, /* VESA */
- 32, 96, 192, KdSyncPositive, /* 26.413 */
-@@ -76,10 +106,19 @@ const KdMonitorTiming kdMonitorTimings[
- 16, 120, 176, KdSyncNegative, /* 37.861 */
- 1, 20, 24, KdSyncNegative, /* 72.809 */
- },
-+ /* DEFAULT */
-+#define MONITOR_TIMING_DEFAULT 13
- { 640, 480, 60, 25175, /* VESA */
- 16, 48, 160, KdSyncNegative, /* 31.469 */
- 10, 33, 45, KdSyncNegative, /* 59.940 */
- },
-+
-+
-+ { 480, 640, 60, 0, /* VESA */
-+ 0, 0, 0, KdSyncNegative, /* 31.469 */
-+ 0, 0, 0, KdSyncNegative, /* 59.940 */
-+ },
-+
-
- /* 800x600 modes */
- { 800, 600, 85, 56250, /* VESA */
-@@ -90,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
- 16, 160, 256, KdSyncPositive, /* 46.875 */
- 1, 21, 25, KdSyncPositive, /* 75.000 */
- },
-- /* DEFAULT */
--#define MONITOR_TIMING_DEFAULT 9
- { 800, 600, 72, 50000, /* VESA */
- 56, 64, 240, KdSyncPositive, /* 48.077 */
- 37, 23, 66, KdSyncPositive, /* 72.188 */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
deleted file mode 100644
index 07348dc..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Upstream-Status: Pending
-
-Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:46.000000000 +0100
-@@ -498,6 +498,7 @@
- KdScreenInfo *screen = pScreenPriv->screen;
- FbdevScrPriv *scrpriv = screen->driver;
- Bool wasEnabled = pScreenPriv->enabled;
-+ FbdevPriv *priv = screen->card->driver;
- FbdevScrPriv oldscr;
- int oldwidth;
- int oldheight;
-@@ -525,11 +526,46 @@
- oldheight = screen->height;
- oldmmwidth = pScreen->mmWidth;
- oldmmheight = pScreen->mmHeight;
--
-+
- /*
- * Set new configuration
- */
--
-+
-+ if (newwidth != oldwidth || newheight != oldheight)
-+ {
-+ struct fb_var_screeninfo var;
-+ int k;
-+
-+ k = ioctl (priv->fd, FBIOGET_VSCREENINFO, &var);
-+
-+ if (k < 0)
-+ {
-+ ErrorF("Error with framebuffer ioctl FBIOGET_VSCREENINFO: %s", strerror (errno));
-+ return FALSE;
-+ }
-+
-+ var.xres = newwidth;
-+ var.yres = newheight;
-+ var.activate = FB_ACTIVATE_NOW;
-+
-+ k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
-+
-+ if (k >= 0)
-+ {
-+ if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0)
-+ {
-+ perror("Error with framebuffer ioctl FIOGET_FSCREENINFO");
-+ close (priv->fd);
-+ return FALSE;
-+ }
-+ if ((k=ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var)) < 0) {
-+ perror("Error framebuffer ioctl FIOGET_VSCREENINFO");
-+ close (priv->fd);
-+ return FALSE;
-+ }
-+ }
-+ }
-+
- scrpriv->randr = KdAddRotation (screen->randr, randr);
-
- KdOffscreenSwapOut (screen->pScreen);
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
deleted file mode 100644
index 6acb834..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
---- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700
-+++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700
-@@ -927,8 +927,10 @@ char *kdefaultMouse[] = {
- "/dev/psaux",
- "/dev/input/mice",
- "/dev/adbmouse",
-+#ifdef BREAK_MY_SERIAL_CONSOLE
- "/dev/ttyS0",
- "/dev/ttyS1",
-+#endif
- };
-
- #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 17/30] xorg-driver-common: bump INC_PR to rebuild drivers agains new xserver-xorg ABI
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (15 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 16/30] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 18/30] libx11: package xcb, merge few changes from meta-oe Martin Jansa
` (13 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xorg-driver-common.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 801d8d3..edcbbbc 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 = "1"
-INC_PR = "r15"
+INC_PR = "r17"
DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 18/30] libx11: package xcb, merge few changes from meta-oe
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (16 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 17/30] xorg-driver-common: bump INC_PR to rebuild drivers agains new xserver-xorg ABI Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 19/30] libx11: add new version 1.4.4 Martin Jansa
` (12 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* move --with-keysymdef/--with-keysymdefdir setting to recipes (newer
versions are using keysymdefdir instead keysymdef
* fix MIN_REHASH in makekeys by sed call
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 2 +-
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11.inc | 25 ++++++++++++-------
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11_git.bb | 2 +
7 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index 487e796..018a141 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -19,5 +19,5 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
index dea7faf..4cda779 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
@@ -13,5 +13,5 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index 1469bc1..18cd10a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -14,4 +14,4 @@ SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
file://../libx11-${PV}/nodolt.patch \
file://../libx11-${PV}/makekeys_crosscompile.patch"
-EXTRA_OECONF += "--disable-xcms --with-xcb"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
index 730efe1..d1bf67b 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
@@ -8,6 +8,6 @@ SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
-EXTRA_OECONF += "--disable-xcms --with-xcb"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 455753f..748a48c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,32 +11,39 @@ inherit siteinfo
PROVIDES = "virtual/libx11"
XORG_PN = "libX11"
-LEAD_SONAME = "libX11.so"
+LICENSE = "MIT & MIT-style & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-specs"
+EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
+
+PACKAGES =+ "${PN}-xcb"
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-do_compile() {
+do_compile_prepend() {
cd ${S}/src/util
mv makekeys.c.orig makekeys.c || true
touch makekeys-makekeys.o
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ # MIN_REHASH 10 is only in 1.0.1
+ sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c
+ sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c
+ touch makekeys-makekeys.o;
if [ "${SITEINFO_BITS}" == "64" ]; then
- ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
- else
- ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys
- fi
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+ else
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys
+ fi
)
if [ "$?" != "0" ]; then
exit 1
fi
# mv to stop it getting rebuilt
mv makekeys.c makekeys.c.orig
- cd ${S}
- oe_runmake
+ cd ../../
}
# Multiple libx11 derivatives from from this file and are selected by virtual/libx11
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
index f98bbe8..ffec7d1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
@@ -30,6 +30,6 @@ DEPENDS_virtclass-nativesdk += "bigreqsproto xproto xextproto \
XCB = "--with-xcb"
XCB_virtclass-native = "--without-xcb"
XCB_virtclass-nativesdk = "--without-xcb"
-EXTRA_OECONF += "${XCB}"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h ${XCB}"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.bb b/meta/recipes-graphics/xorg-lib/libx11_git.bb
index 4da80bd..afa1560 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_git.bb
@@ -11,4 +11,6 @@ DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
DEFAULT_PREFERENCE = "-1"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
BBCLASSEXTEND = "nativesdk"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 19/30] libx11: add new version 1.4.4
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (17 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 18/30] libx11: package xcb, merge few changes from meta-oe Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 20/30] libx11: remove older 1.3.4 Martin Jansa
` (11 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-lib/libx11-1.4.4/keysymdef_include.patch | 23 +++++++++++++++
.../libx11-1.4.4/x11_disable_makekeys.patch | 29 ++++++++++++++++++++
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 18 ++++++++++++
3 files changed, 70 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
new file mode 100644
index 0000000..d1bdab9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
+--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
+@@ -355,7 +355,14 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysym definitions])
+-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++AC_ARG_WITH(keysymdefdir,
++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
++
++if test x$KEYSYMDEFDIR = x; then
++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++fi
++
+ FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+ for i in $FILES; do
+ if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000..9763313
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.3.4/src/util/Makefile.am
+===================================================================
+--- libX11-1.3.4.orig/src/util/Makefile.am
++++ libX11-1.3.4/src/util/Makefile.am
+@@ -1,24 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+-
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
new file mode 100644
index 0000000..823b3dc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
@@ -0,0 +1,18 @@
+require libx11.inc
+inherit gettext
+
+BBCLASSEXTEND = "native nativesdk"
+
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
+
+DEPENDS += "util-macros xtrans libxdmcp libxau \
+ bigreqsproto xproto xextproto xcmiscproto \
+ xf86bigfontproto kbproto inputproto libxcb \
+ xproto-native"
+
+SRC_URI += " file://keysymdef_include.patch \
+ file://x11_disable_makekeys.patch \
+ "
+
+SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
+SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 20/30] libx11: remove older 1.3.4
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (18 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 19/30] libx11: add new version 1.4.4 Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 21/30] libx11: drop old 1.2.2 git version Martin Jansa
` (10 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* libx11-1.3.4 directory is kept for libx11-trim_1.3.4.bb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 35 ------------------------
1 files changed, 0 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
deleted file mode 100644
index ffec7d1..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require libx11.inc
-inherit gettext
-
-LICENSE = "MIT & MIT-style & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
-
-PE = "1"
-PR = "r4"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
- file://nodolt.patch \
- file://include_fix.patch \
- file://makekeys_crosscompile.patch"
-
-SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
-SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
-
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
- libxdmcp xf86bigfontproto kbproto inputproto xproto-native libxcb"
-
-DEPENDS_virtclass-native += "bigreqsproto-native xextproto-native \
- xtrans-native libxau-native xcmiscproto-native \
- libxdmcp-native xf86bigfontproto-native kbproto-native \
- inputproto-native xproto-native"
-
-DEPENDS_virtclass-nativesdk += "bigreqsproto xproto xextproto \
- xtrans libxau xcmiscproto libxdmcp xf86bigfontproto kbproto \
- inputproto xproto-native"
-
-XCB = "--with-xcb"
-XCB_virtclass-native = "--without-xcb"
-XCB_virtclass-nativesdk = "--without-xcb"
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h ${XCB}"
-
-BBCLASSEXTEND = "native nativesdk"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 21/30] libx11: drop old 1.2.2 git version
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (19 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 20/30] libx11: remove older 1.3.4 Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 22/30] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4 Martin Jansa
` (9 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 21993 bytes --]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 17 -
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 570 --------------------
.../xorg-lib/libx11-git/fix-disable-xlocale.diff | 16 -
.../libx11-git/fix-utf8-wrong-define.patch | 17 -
.../xorg-lib/libx11-git/include_fix.patch | 25 -
.../xorg-lib/libx11-git/nodolt.patch | 14 -
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 30 -
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 13 -
meta/recipes-graphics/xorg-lib/libx11_git.bb | 16 -
meta/recipes-graphics/xorg-lib/libx11_git.inc | 11 -
10 files changed, 0 insertions(+), 729 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.inc
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
deleted file mode 100644
index 4cda779..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require libx11.inc
-require libx11_git.inc
-
-DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
-this version."
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch"
-
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
- libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-
-SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
-
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
deleted file mode 100644
index b49fc22..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
+++ /dev/null
@@ -1,570 +0,0 @@
-Upstream-Status: Pending
-
----
- configure.ac | 9 -
- src/Makefile.am | 5
- src/X18NCMSstubs.c | 428 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/imConv.c | 4
- src/locking.c | 4
- 5 files changed, 448 insertions(+), 2 deletions(-)
-
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -263,11 +263,18 @@ if test -f "$KEYSYMDEF"; then
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
- AC_SUBST(KEYSYMDEF)
-
--AM_CONDITIONAL(UDC, test xfalse = xtrue)
-+AC_ARG_ENABLE(udc,
-+ AC_HELP_STRING([--disable-udc],
-+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
-+ [UDC=$enableval],[UDC=yes])
-+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
-+if test x"$UDC" = "xyes"; then
-+ AC_DEFINE(UDC,1,[Include support for UDC])
-+fi
-
- AC_ARG_ENABLE(xcms,
- AC_HELP_STRING([--disable-xcms],
- [Disable Xlib support for CMS *EXPERIMENTAL*]),
- [XCMS=$enableval],[XCMS=yes])
---- git.orig/src/Makefile.am
-+++ git/src/Makefile.am
-@@ -329,18 +329,21 @@ endif
-
- if THRSTUBS
- libX11_la_SOURCES+=UIThrStubs.c
- endif
-
-+libX11_la_SOURCES+=X18NCMSstubs.c
-+
- x11datadir = @X11_DATADIR@
- x11data_DATA = XKeysymDB XErrorDB
-
- EXTRA_DIST = \
- $(x11data_DATA) \
- os2Stubs.c \
- udcInf.c \
-- UIThrStubs.c
-+ UIThrStubs.c \
-+ X18NCMSstubs.c
-
- if XCB
- libX11_la_SOURCES += \
- xcb_lock.c \
- xcb_disp.c \
---- /dev/null
-+++ git/src/X18NCMSstubs.c
-@@ -0,0 +1,428 @@
-+/*
-+ * X18NCMSstubs.c
-+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
-+ *
-+ * Copyright © 2003 Matthew Allum
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Matthew Allum not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Keith Packard and Compaq makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <stdlib.h>
-+#include "Xlibint.h"
-+#include "Xlcint.h"
-+#include <X11/Xlocale.h>
-+#include <X11/Xos.h>
-+#ifdef WIN32
-+#undef close
-+#endif
-+#include <X11/Xutil.h>
-+#include "XlcPubI.h"
-+
-+#include "Xcmsint.h" /* for XcmsCCC type */
-+#include "XlcPubI.h" /* for XLCd type */
-+#include "config.h"
-+
-+#if ! XLOCALE
-+
-+Bool
-+XSupportsLocale()
-+{
-+ return False;
-+}
-+
-+char *
-+XSetLocaleModifiers(
-+ const char *modifiers)
-+{
-+ return NULL;
-+}
-+
-+XLCd
-+_XOpenLC(
-+ char *name)
-+{
-+ return NULL;
-+}
-+
-+XLCd
-+_XlcCurrentLC()
-+{
-+ return NULL;
-+}
-+
-+void
-+_XlcVaToArgList(
-+ va_list var,
-+ int count,
-+ XlcArgList *args_ret)
-+{
-+ return;
-+}
-+
-+void
-+_XlcCountVaList(
-+ va_list var,
-+ int *count_ret)
-+{
-+ return;
-+}
-+
-+void
-+_XCloseLC(
-+ XLCd lcd)
-+{
-+ return;
-+}
-+
-+int
-+_XlcConvert(
-+ XlcConv conv,
-+ XPointer *from,
-+ int *from_left,
-+ XPointer *to,
-+ int *to_left,
-+ XPointer *args,
-+ int num_args)
-+{
-+ return 0;
-+}
-+
-+/* XIM Stubs */
-+
-+XPointer
-+_XimGetLocaleCode ( _Xconst char* encoding_name )
-+{
-+ return NULL;
-+}
-+
-+int
-+_XimGetCharCode (
-+ XPointer ucs_conv,
-+ KeySym keysym,
-+ unsigned char* buf,
-+ int nbytes)
-+{
-+ return 0;
-+}
-+
-+/* Xrm Stubs */
-+
-+XrmMethods
-+_XrmInitParseInfo(
-+ XPointer *state)
-+{
-+ return (XrmMethods) NULL;
-+}
-+
-+/* Xwc Stubs */
-+
-+int
-+XwcTextExtents(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len,
-+ XRectangle *overall_ink_extents,
-+ XRectangle *overall_logical_extents)
-+{
-+ return 0;
-+}
-+
-+void
-+XwcDrawString(Display *display,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x, int y,
-+ _Xconst wchar_t *string,
-+ int num_wchars)
-+{
-+ ;
-+}
-+
-+void
-+XwcDrawText(
-+ Display *dpy,
-+ Drawable d,
-+ GC gc,
-+ int x,
-+ int y,
-+ XwcTextItem *text_items,
-+ int nitems)
-+{
-+ ;
-+}
-+
-+void
-+XwcDrawImageString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst wchar_t *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+int
-+XwcTextEscapement(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len)
-+{
-+ return 0;
-+}
-+
-+Status
-+XwcTextPerCharExtents(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len,
-+ XRectangle *ink_extents_buffer,
-+ XRectangle *logical_extents_buffer,
-+ int buffer_size,
-+ int *num_chars,
-+ XRectangle *max_ink_extents,
-+ XRectangle *max_logical_extents)
-+{
-+ ;
-+}
-+
-+int
-+XwcTextPropertyToTextList(
-+ Display *dpy,
-+ const XTextProperty *text_prop,
-+ wchar_t ***list_ret,
-+ int *count_ret)
-+{
-+ return 0;
-+}
-+
-+int
-+XwcTextListToTextProperty(
-+ Display *dpy,
-+ wchar_t **list,
-+ int count,
-+ XICCEncodingStyle style,
-+ XTextProperty *text_prop)
-+{
-+ return 0;
-+}
-+
-+void
-+XwcFreeStringList(wchar_t **list)
-+{
-+ return;
-+}
-+
-+
-+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
-+ Display *dpy,
-+ Window w,
-+ _Xconst char *windowName,
-+ _Xconst char *iconName,
-+ char **argv,
-+ int argc,
-+ XSizeHints *sizeHints,
-+ XWMHints *wmHints,
-+ XClassHint *classHints)
-+{
-+ return;
-+}
-+
-+int
-+XmbTextPropertyToTextList(
-+ Display *dpy,
-+ const XTextProperty *text_prop,
-+ char ***list_ret,
-+ int *count_ret)
-+{
-+ return XLocaleNotSupported;
-+}
-+
-+int
-+XmbTextListToTextProperty(
-+ Display *dpy,
-+ char **list,
-+ int count,
-+ XICCEncodingStyle style,
-+ XTextProperty *text_prop)
-+{
-+ return XLocaleNotSupported;
-+}
-+
-+int
-+XmbTextExtents(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len,
-+ XRectangle *overall_ink_extents,
-+ XRectangle *overall_logical_extents)
-+{
-+ return 0;
-+}
-+
-+void
-+XmbDrawText(
-+ Display *dpy,
-+ Drawable d,
-+ GC gc,
-+ int x,
-+ int y,
-+ XmbTextItem *text_items,
-+ int nitems)
-+{
-+ ;
-+}
-+
-+void
-+XmbDrawString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+void
-+XmbDrawImageString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+int
-+XmbTextEscapement(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ return 0;
-+}
-+
-+Status
-+XmbTextPerCharExtents(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len,
-+ XRectangle *ink_extents_buffer,
-+ XRectangle *logical_extents_buffer,
-+ int buffer_size,
-+ int *num_chars,
-+ XRectangle *max_ink_extents,
-+ XRectangle *max_logical_extents)
-+{
-+ return 0;
-+}
-+
-+unsigned int
-+KeySymToUcs4(KeySym keysym)
-+{
-+ return 0;
-+}
-+
-+#endif
-+
-+#if ! XCMS
-+
-+XcmsCCC
-+XcmsCCCOfColormap(dpy, cmap)
-+ Display *dpy;
-+ Colormap cmap;
-+{
-+ return NULL;
-+}
-+
-+Status
-+_XcmsResolveColorString (
-+ XcmsCCC ccc,
-+ const char **color_string,
-+ XcmsColor *pColor_exact_return,
-+ XcmsColorFormat result_format)
-+{
-+ return(XcmsFailure);
-+}
-+
-+void
-+_XcmsUnresolveColor(
-+ XcmsCCC ccc,
-+ XcmsColor *pColor)
-+{
-+ return;
-+}
-+
-+void
-+_XUnresolveColor(
-+ XcmsCCC ccc,
-+ XColor *pXColor)
-+{
-+ return;
-+}
-+
-+XcmsCmapRec *
-+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
-+ Display *dpy;
-+ Colormap cmap;
-+ Window windowID;
-+ Visual *visual;
-+{
-+ return NULL;
-+}
-+
-+void
-+_XcmsRGB_to_XColor(
-+ XcmsColor *pColors,
-+ XColor *pXColors,
-+ unsigned int nColors)
-+{
-+ return;
-+}
-+
-+XcmsCmapRec *
-+_XcmsCopyCmapRecAndFree(
-+ Display *dpy,
-+ Colormap src_cmap,
-+ Colormap copy_cmap)
-+{
-+ return NULL;
-+}
-+
-+void
-+_XcmsDeleteCmapRec(
-+ Display *dpy,
-+ Colormap cmap)
-+{
-+ return;
-+}
-+
-+#endif
---- git.orig/src/imConv.c
-+++ git/src/imConv.c
-@@ -81,10 +81,11 @@ static const struct SubstRec SubstTable[
- /*
- * Given the name of a charset, returns the pointer to convertors
- * from UCS char to specified charset char.
- * This converter is needed for _XimGetCharCode subroutine.
- */
-+#ifdef XLOCALE
- XPointer
- _XimGetLocaleCode (
- _Xconst char* encoding_name)
- {
- XPointer cvt = _Utf8GetConvByName(encoding_name);
-@@ -94,10 +95,11 @@ _XimGetLocaleCode (
- if (!strcmp(encoding_name, SubstTable[i].encoding_name))
- return _Utf8GetConvByName(SubstTable[i].charset_name);
- }
- return cvt;
- }
-+#endif
-
- /*
- * Returns the locale dependent representation of a keysym.
- * The locale's encoding is passed in form of pointer to UCS convertor.
- * The resulting multi-byte sequence is placed starting at buf (a buffer
-@@ -105,10 +107,11 @@ _XimGetLocaleCode (
- * Returns the length of the resulting multi-byte sequence, excluding the
- * terminating NUL byte. Return 0 if the keysym is not representable in the
- * locale
- */
- /*ARGSUSED*/
-+#ifdef XLOCALE
- int
- _XimGetCharCode (
- XPointer ucs_conv,
- KeySym keysym,
- unsigned char* buf,
-@@ -133,10 +136,11 @@ _XimGetCharCode (
- return nbytes;
- if (count<nbytes)
- buf[count]= '\0';
- return count;
- }
-+#endif
-
- #ifdef XKB
- static int lookup_string(
- XKeyEvent* event,
- char* buffer,
---- git.orig/src/locking.c
-+++ git/src/locking.c
-@@ -53,11 +53,13 @@ in this Software without prior written a
- #endif
-
- #define NUM_FREE_CVLS 4
-
- /* in lcWrap.c */
-+#ifdef XLOCALE
- extern LockInfoPtr _Xi18n_lock;
-+#endif
-
- #ifdef WIN32
- static DWORD _X_TlsIndex = (DWORD)-1;
-
- void _Xthread_init()
-@@ -623,13 +625,15 @@ Status XInitThreads()
- return 0;
- }
- _Xglobal_lock = &global_lock;
- xmutex_init(_Xglobal_lock->lock);
- xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
-+#ifdef XLOCALE
- _Xi18n_lock = &i18n_lock;
- xmutex_init(_Xi18n_lock->lock);
- xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
-+#endif
- _XLockMutex_fn = _XLockMutex;
- _XUnlockMutex_fn = _XUnlockMutex;
- _XCreateMutex_fn = _XCreateMutex;
- _XFreeMutex_fn = _XFreeMutex;
- _XInitDisplayLock_fn = _XInitDisplayLock;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
deleted file mode 100644
index 7dcdd6a..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
---- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
-@@ -701,7 +701,11 @@
- }
- if (l - 2 - (p - charset) < 0)
- return 0;
-+#ifdef XLOCALE
- if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
-+#else
-+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
-+#endif
- return 0;
- if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
- return 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
deleted file mode 100644
index 26d3349..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
-+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
-@@ -103,7 +103,7 @@
-
- /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
- November 2000. Its presence is indicated through the following macro. */
--#define X_HAVE_UTF8_STRING 1
-+#undef X_HAVE_UTF8_STRING
-
- typedef char *XPointer;
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
deleted file mode 100644
index b3bcbab..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- libX11-1.1.5.orig/configure.ac
-+++ libX11-1.1.5/configure.ac
-@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
- AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
-
- #
- # Find keysymdef.h
- #
--AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
- if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
deleted file mode 100644
index cc05fdc..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libX11-1.2.1/configure.ac
-===================================================================
---- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
-+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
-@@ -20,7 +20,6 @@
-
- # Checks for programs.
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_CC
- XORG_CWARNFLAGS
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
deleted file mode 100644
index 5dc6f06..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- src/util/Makefile.am | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-Index: git/src/util/Makefile.am
-===================================================================
---- git.orig/src/util/Makefile.am 2010-01-28 22:24:29.000000000 +0000
-+++ git/src/util/Makefile.am 2010-01-28 22:29:26.000000000 +0000
-@@ -1,19 +1,2 @@
-
--noinst_PROGRAMS=makekeys
-
--makekeys_CFLAGS=$(X11_CFLAGS)
--
--CC = @CC_FOR_BUILD@
--
--EXTRA_DIST = mkks.sh
--
--if LINT
--# Check source code with tools like lint & sparse
--
--ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
--
--lint:
-- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
--
--endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
deleted file mode 100644
index d1bf67b..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require libx11.inc
-require libx11_git.inc
-
-DESCRIPTION += " Support for XCB, and XCMS is disabled in this version."
-
-PR = "r2"
-SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
-
-DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
-
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
-CFLAGS += "-D_GNU_SOURCE"
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.bb b/meta/recipes-graphics/xorg-lib/libx11_git.bb
deleted file mode 100644
index afa1560..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require libx11.inc
-require libx11_git.inc
-
-inherit gettext
-
-SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
-PR = "r2"
-
-DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
- bigreqsproto xtrans libxau libxcb libxdmcp util-macros"
-
-DEFAULT_PREFERENCE = "-1"
-
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.inc b/meta/recipes-graphics/xorg-lib/libx11_git.inc
deleted file mode 100644
index 4de424d..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_git.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PV = "1.2.1+git${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
-S = "${WORKDIR}/git"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
- file://include_fix.patch \
- file://nodolt.patch"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
-FILESPATH = "${FILE_DIRNAME}/libx11-git"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 22/30] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (20 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 21/30] libx11: drop old 1.2.2 git version Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 23/30] libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory Martin Jansa
` (8 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* because there isn't libx11-1.3.4 recipe anymore
* remove older versions from libx11-trim directory
* notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has
--with-xcb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff | 0
.../fix-disable-xlocale.diff | 0
.../fix-utf8-wrong-define.patch | 0
.../include_fix.patch | 0
.../makekeys_crosscompile.patch | 0
.../nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
.../xorg-lib/libx11-trim/include_fix.patch | 25 ----------------
.../xorg-lib/libx11-trim/nodolt.patch | 14 ---------
.../libx11-trim/x11_disable_makekeys.patch | 31 --------------------
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 8 ++--
11 files changed, 4 insertions(+), 74 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/fix-disable-xlocale.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/fix-utf8-wrong-define.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/makekeys_crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
deleted file mode 100644
index b3bcbab..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- libX11-1.1.5.orig/configure.ac
-+++ libX11-1.1.5/configure.ac
-@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
- AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
-
- #
- # Find keysymdef.h
- #
--AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
- if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
deleted file mode 100644
index cc05fdc..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libX11-1.2.1/configure.ac
-===================================================================
---- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
-+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
-@@ -20,7 +20,6 @@
-
- # Checks for programs.
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_CC
- XORG_CWARNFLAGS
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
deleted file mode 100644
index 0445835..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- src/util/Makefile.am | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-Index: libX11-1.2.1/src/util/Makefile.am
-===================================================================
---- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100
-+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100
-@@ -1,20 +1,3 @@
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
-
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS=$(X11_CFLAGS)
--
--CC = @CC_FOR_BUILD@
--
- EXTRA_DIST = mkks.sh
--
--if LINT
--# Check source code with tools like lint & sparse
--
--ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
--
--lint:
-- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
--
--endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index 18cd10a..c505b24 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -9,9 +9,9 @@ PR = "r1"
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
-SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
- file://../libx11-${PV}/include_fix.patch \
- file://../libx11-${PV}/nodolt.patch \
- file://../libx11-${PV}/makekeys_crosscompile.patch"
+SRC_URI += "file://x11_disable_makekeys.patch \
+ file://include_fix.patch \
+ file://nodolt.patch \
+ file://makekeys_crosscompile.patch"
EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 23/30] libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (21 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 22/30] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4 Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 24/30] libx11-diet: add SRC_URI checksums Martin Jansa
` (7 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../{libx11 => libx11-diet-1.3}/include_fix.patch | 0
.../{libx11 => libx11-diet-1.3}/nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 1 -
4 files changed, 0 insertions(+), 1 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/x11_disable_makekeys.patch (100%)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index 018a141..44e8765 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -17,7 +17,6 @@ SRC_URI += "file://x11_disable_makekeys.patch \
DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
CFLAGS += "-D_GNU_SOURCE"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 24/30] libx11-diet: add SRC_URI checksums
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (22 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 23/30] libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 25/30] xserver-nodm-init: merge some changes from meta-oe Martin Jansa
` (6 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index 44e8765..a2fca63 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -14,6 +14,9 @@ SRC_URI += "file://x11_disable_makekeys.patch \
file://fix-utf8-wrong-define.patch \
file://nodolt.patch"
+SRC_URI[md5sum] = "0545089013213e90aac19b8f8045d32e"
+SRC_URI[sha256sum] = "34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac"
+
DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 25/30] xserver-nodm-init: merge some changes from meta-oe
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (23 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 24/30] libx11-diet: add SRC_URI checksums Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 26/30] glx-use-tls: add from meta-oe layer Martin Jansa
` (5 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* /etc/X11/Xusername handling should be moved to x11-common so the same
username and logic is used from initscript and when user starts it
from terminal
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../x11-common/xserver-nodm-init/xserver-nodm | 30 ++++++--------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index c707a4b..9cd7904 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
@@ -8,10 +8,7 @@
# Default-Stop: 0 1 6
### END INIT INFO
-killproc() { # kill the named process(es)
- pid=`/bin/pidof $1`
- [ "$pid" != "" ] && kill $pid
-}
+. /etc/init.d/functions
read CMDLINE < /proc/cmdline
for x in $CMDLINE; do
@@ -25,25 +22,16 @@ done
case "$1" in
start)
+ # We don't want this script to block the rest of the boot process
+ if [ "$2" != "background" ]; then
+ $0 $1 background &
+ else
. /etc/profile
- username=root
+
echo "Starting Xserver"
- if [ -f /etc/X11/Xusername ]; then
- username=`cat /etc/X11/Xusername`
- # setting for rootless X
- chmod o+w /var/log
- chmod g+r /dev/tty[0-3]
- chmod o+rw /dev/input/*
- # hidraw device is probably needed
- if [ -e /dev/hidraw0 ]; then
- chmod o+rw /dev/hidraw*
- fi
- fi
- # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
- su -l -c '/etc/X11/Xserver&' $username
- # Wait for the desktop to say its finished loading
- # before loading the rest of the system
- # dbus-wait org.matchbox_project.desktop Loaded
+ . /etc/X11/xserver-common
+ xinit /etc/X11/Xsession -- `which $XSERVER` $ARGS >/var/log/Xsession.log 2>&1
+ fi
;;
stop)
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 26/30] glx-use-tls: add from meta-oe layer
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (24 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 25/30] xserver-nodm-init: merge some changes from meta-oe Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 15:02 ` Phil Blundell
2011-10-03 13:28 ` [PATCHv2 27/30] mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move uclibc.patch Martin Jansa
` (4 subsequent siblings)
30 siblings, 1 reply; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* it's in .bbclass instead of .inc because it's used by mesa and
xserver-xf86 recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/glx-use-tls.bbclass | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/glx-use-tls.bbclass
diff --git a/meta/classes/glx-use-tls.bbclass b/meta/classes/glx-use-tls.bbclass
new file mode 100644
index 0000000..7530872
--- /dev/null
+++ b/meta/classes/glx-use-tls.bbclass
@@ -0,0 +1,7 @@
+def get_tls_setting(bb, d):
+ # until we have no prober TLS support in uclibc disable it
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
+ return ""
+ return "--enable-glx-tls"
+
+EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* Re: [PATCHv2 26/30] glx-use-tls: add from meta-oe layer
2011-10-03 13:28 ` [PATCHv2 26/30] glx-use-tls: add from meta-oe layer Martin Jansa
@ 2011-10-03 15:02 ` Phil Blundell
2011-10-03 15:09 ` Martin Jansa
0 siblings, 1 reply; 75+ messages in thread
From: Phil Blundell @ 2011-10-03 15:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Can you add some commentary explaining why this is necessary -- i.e.
what exactly is lacking in uClibc to mean it doesn't have "prober TLS
support"?
p.
On Mon, 2011-10-03 at 15:28 +0200, Martin Jansa wrote:
> * it's in .bbclass instead of .inc because it's used by mesa and
> xserver-xf86 recipes
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/classes/glx-use-tls.bbclass | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
> create mode 100644 meta/classes/glx-use-tls.bbclass
>
> diff --git a/meta/classes/glx-use-tls.bbclass b/meta/classes/glx-use-tls.bbclass
> new file mode 100644
> index 0000000..7530872
> --- /dev/null
> +++ b/meta/classes/glx-use-tls.bbclass
> @@ -0,0 +1,7 @@
> +def get_tls_setting(bb, d):
> + # until we have no prober TLS support in uclibc disable it
> + if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
> + return ""
> + return "--enable-glx-tls"
> +
> +EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
^ permalink raw reply [flat|nested] 75+ messages in thread* Re: [PATCHv2 26/30] glx-use-tls: add from meta-oe layer
2011-10-03 15:02 ` Phil Blundell
@ 2011-10-03 15:09 ` Martin Jansa
2011-10-04 12:00 ` Richard Purdie
2011-10-13 19:46 ` Phil Blundell
0 siblings, 2 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 15:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1727 bytes --]
On Mon, Oct 03, 2011 at 04:02:10PM +0100, Phil Blundell wrote:
> Can you add some commentary explaining why this is necessary -- i.e.
> what exactly is lacking in uClibc to mean it doesn't have "prober TLS
> support"?
I'm not using uClibc myself and tracking original bbclass in OE-classic
leads to this commit
http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
So I'm CCing woglinde and he will probably explain it.
Regards,
>
> p.
>
> On Mon, 2011-10-03 at 15:28 +0200, Martin Jansa wrote:
> > * it's in .bbclass instead of .inc because it's used by mesa and
> > xserver-xf86 recipes
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/classes/glx-use-tls.bbclass | 7 +++++++
> > 1 files changed, 7 insertions(+), 0 deletions(-)
> > create mode 100644 meta/classes/glx-use-tls.bbclass
> >
> > diff --git a/meta/classes/glx-use-tls.bbclass b/meta/classes/glx-use-tls.bbclass
> > new file mode 100644
> > index 0000000..7530872
> > --- /dev/null
> > +++ b/meta/classes/glx-use-tls.bbclass
> > @@ -0,0 +1,7 @@
> > +def get_tls_setting(bb, d):
> > + # until we have no prober TLS support in uclibc disable it
> > + if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
> > + return ""
> > + return "--enable-glx-tls"
> > +
> > +EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
>
>
>
> _______________________________________________
> 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] 75+ messages in thread* Re: [PATCHv2 26/30] glx-use-tls: add from meta-oe layer
2011-10-03 15:09 ` Martin Jansa
@ 2011-10-04 12:00 ` Richard Purdie
2011-10-13 19:46 ` Phil Blundell
1 sibling, 0 replies; 75+ messages in thread
From: Richard Purdie @ 2011-10-04 12:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-10-03 at 17:09 +0200, Martin Jansa wrote:
> On Mon, Oct 03, 2011 at 04:02:10PM +0100, Phil Blundell wrote:
> > Can you add some commentary explaining why this is necessary -- i.e.
> > what exactly is lacking in uClibc to mean it doesn't have "prober TLS
> > support"?
>
> I'm not using uClibc myself and tracking original bbclass in OE-classic
> leads to this commit
> http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
>
> So I'm CCing woglinde and he will probably explain it.
At the very least this should become an include file in the mesa
directory. Its not sufficiently generally used at this point to become a
bbclass file...
Cheers,
Richard
^ permalink raw reply [flat|nested] 75+ messages in thread
* Re: [PATCHv2 26/30] glx-use-tls: add from meta-oe layer
2011-10-03 15:09 ` Martin Jansa
2011-10-04 12:00 ` Richard Purdie
@ 2011-10-13 19:46 ` Phil Blundell
2011-10-14 0:09 ` Khem Raj
1 sibling, 1 reply; 75+ messages in thread
From: Phil Blundell @ 2011-10-13 19:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-10-03 at 17:09 +0200, Martin Jansa wrote:
> On Mon, Oct 03, 2011 at 04:02:10PM +0100, Phil Blundell wrote:
> > Can you add some commentary explaining why this is necessary -- i.e.
> > what exactly is lacking in uClibc to mean it doesn't have "prober TLS
> > support"?
>
> I'm not using uClibc myself and tracking original bbclass in OE-classic
> leads to this commit
> http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
>
> So I'm CCing woglinde and he will probably explain it.
I see this patch has been applied in the meantime so I guess it's a
slightly academic question now, but I still think it would benefit from
some further explanation.
p.
^ permalink raw reply [flat|nested] 75+ messages in thread
* Re: [PATCHv2 26/30] glx-use-tls: add from meta-oe layer
2011-10-13 19:46 ` Phil Blundell
@ 2011-10-14 0:09 ` Khem Raj
2011-10-14 8:40 ` Martin Jansa
0 siblings, 1 reply; 75+ messages in thread
From: Khem Raj @ 2011-10-14 0:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Oct 13, 2011 at 12:46 PM, Phil Blundell <philb@gnu.org> wrote:
> On Mon, 2011-10-03 at 17:09 +0200, Martin Jansa wrote:
>> On Mon, Oct 03, 2011 at 04:02:10PM +0100, Phil Blundell wrote:
>> > Can you add some commentary explaining why this is necessary -- i.e.
>> > what exactly is lacking in uClibc to mean it doesn't have "prober TLS
>> > support"?
>>
>> I'm not using uClibc myself and tracking original bbclass in OE-classic
>> leads to this commit
>> http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
>>
>> So I'm CCing woglinde and he will probably explain it.
>
> I see this patch has been applied in the meantime so I guess it's a
> slightly academic question now, but I still think it would benefit from
> some further explanation.
This patch is no longer needed. Since uclibc now supports TLS/NPTL and
we do not support
Linuxthreads in OE (starting with oe-core) if we did configure with LT
then uclibc does
not have TLS implementation that goes with LT but thats a moot point in oe-core
>
> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 75+ messages in thread
* Re: [PATCHv2 26/30] glx-use-tls: add from meta-oe layer
2011-10-14 0:09 ` Khem Raj
@ 2011-10-14 8:40 ` Martin Jansa
2011-10-14 20:44 ` Khem Raj
0 siblings, 1 reply; 75+ messages in thread
From: Martin Jansa @ 2011-10-14 8:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1919 bytes --]
On Thu, Oct 13, 2011 at 05:09:08PM -0700, Khem Raj wrote:
> On Thu, Oct 13, 2011 at 12:46 PM, Phil Blundell <philb@gnu.org> wrote:
> > On Mon, 2011-10-03 at 17:09 +0200, Martin Jansa wrote:
> >> On Mon, Oct 03, 2011 at 04:02:10PM +0100, Phil Blundell wrote:
> >> > Can you add some commentary explaining why this is necessary -- i.e.
> >> > what exactly is lacking in uClibc to mean it doesn't have "prober TLS
> >> > support"?
> >>
> >> I'm not using uClibc myself and tracking original bbclass in OE-classic
> >> leads to this commit
> >> http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
> >>
> >> So I'm CCing woglinde and he will probably explain it.
> >
> > I see this patch has been applied in the meantime so I guess it's a
> > slightly academic question now, but I still think it would benefit from
> > some further explanation.
>
> This patch is no longer needed. Since uclibc now supports TLS/NPTL and
> we do not support
> Linuxthreads in OE (starting with oe-core) if we did configure with LT
> then uclibc does
> not have TLS implementation that goes with LT but thats a moot point in oe-core
I'm not using uclibc at all, but if you're 100% sure, then I'll send
patch removing glx-use-tls.inc after the rest of Xorg patchset is
applied and mesa removed from meta-oe..
Regards,
>
> >
> > p.
> >
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
>
> _______________________________________________
> 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] 75+ messages in thread
* [PATCHv2 27/30] mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move uclibc.patch
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (25 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 26/30] glx-use-tls: add from meta-oe layer Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:28 ` [PATCHv2 28/30] mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2 was removed Martin Jansa
` (3 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* uclibc patch does apply to all mesa versions and adding mesa-dri to
FILESPATH in all recipes is worse then adding mesa
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 36 +++++++++++++++++---
meta/recipes-graphics/mesa/mesa-dri.inc | 22 ++++++++++++
meta/recipes-graphics/mesa/mesa-xlib.inc | 1 +
.../mesa/{mesa-dri => mesa}/uclibc.patch | 0
4 files changed, 54 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-dri.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib.inc
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/uclibc.patch (100%)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index d8e800e..595597f 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -10,25 +10,51 @@ HOMEPAGE = "http://mesa3d.org"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11"
LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
- ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos "
+INC_PR = "r12"
+PE = "2"
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "makedepend-native ${PROTO_DEPS} ${LIB_DEPS}"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
S = "${WORKDIR}/Mesa-${PV}"
PROVIDES = "virtual/libgl"
+# for mesa-dri and mesa-xlib
+FILESEXTRAPATHS_append := "${THISDIR}/mesa:${THISDIR}/mesa-${PV}:"
+
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-glu \
--disable-glw \
--disable-glut \
- --enable-glx-tls"
+ "
+
+inherit glx-use-tls
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
+ install -d ${D}/${includedir}/GL
+ cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
new file mode 100644
index 0000000..ce98228
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -0,0 +1,22 @@
+DEPENDS += "dri2proto expat libdrm"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
+MACHINE_DRI_MODULES ?= ""
+PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
+
+EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium -with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+
+python populate_packages_prepend() {
+ import os.path
+
+ dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+
+ do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+
diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
new file mode 100644
index 0000000..44e5dc6
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
@@ -0,0 +1 @@
+EXTRA_OECONF += " --with-driver=xlib"
diff --git a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch b/meta/recipes-graphics/mesa/mesa/uclibc.patch
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
rename to meta/recipes-graphics/mesa/mesa/uclibc.patch
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 28/30] mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2 was removed
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (26 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 27/30] mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move uclibc.patch Martin Jansa
@ 2011-10-03 13:28 ` Martin Jansa
2011-10-03 13:29 ` [PATCHv2 29/30] mesa: add new version 7.11 Martin Jansa
` (2 subsequent siblings)
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
* it will be added again with 7.11 but with different content (builtin_compiler, instead of glsl)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../mesa/mesa-dri-glsl-native_7.8.2.bb | 27 --------------------
1 files changed, 0 insertions(+), 27 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
deleted file mode 100644
index d6f2c33..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "gl shader language specific build from mesa-dri"
-HOMEPAGE = "http://mesa3d.org"
-BUGTRACKER = "https://bugs.freedesktop.org"
-SECTION = "x11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://apps/compile.c;endline=26;md5=27c2833286ce9566b162bcbe21d5b267"
-PR = "r0"
-
-DEPENDS = "makedepend-native"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
-SRC_URI[md5sum] = "6be2d343a0089bfd395ce02aaf8adb57"
-SRC_URI[sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d"
-
-S = "${WORKDIR}/Mesa-7.8.2/src/glsl/"
-
-inherit native
-
-# use default config for native build
-do_configure_prepend() {
- ln -s ${S}/../../configs/default ${S}/../../configs/current
-}
-
-do_install() {
- install -d ${D}/${bindir}
- install -m 755 ${S}/apps/compile ${D}/${bindir}/glsl-compile
-}
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* [PATCHv2 29/30] mesa: add new version 7.11
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (27 preceding siblings ...)
2011-10-03 13:28 ` [PATCHv2 28/30] mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2 was removed Martin Jansa
@ 2011-10-03 13:29 ` Martin Jansa
2011-10-12 22:03 ` Richard Purdie
2011-10-03 13:29 ` [PATCHv2 30/30] mesa: drop older 7.10.2 and 7.7+git recipes Martin Jansa
2011-10-04 10:23 ` [PATCHv2 00/30] Xorg related changes Richard Purdie
30 siblings, 1 reply; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:29 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 ++++++++++
.../mesa/mesa-dri-glsl-native_7.11.bb | 28 ++++++++++++++++++++
meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 4 +++
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 4 +++
4 files changed, 51 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc b/meta/recipes-graphics/mesa/mesa-7.11.inc
new file mode 100644
index 0000000..98b888f
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-7.11.inc
@@ -0,0 +1,15 @@
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+ file://uclibc.patch \
+ "
+
+DEPENDS += "mesa-dri-glsl-native"
+
+SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
+SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
+
+do_configure_prepend() {
+ #check for python not python2, because python-native does not stage python2 binary/link
+ sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
+ # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
+ sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
new file mode 100644
index 0000000..f1987fd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "gl shader language specific build from mesa-dri"
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
+
+DEPENDS = "makedepend-native"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
+SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
+
+S = "${WORKDIR}/Mesa-${PV}/src/glsl/"
+
+inherit native
+
+# use default config for native build
+do_configure_prepend() {
+ ln -s ${S}/../../configs/default ${S}/../../configs/current
+}
+
+do_install() {
+ install -d ${D}/${bindir}/glsl
+ install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler
+ install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
new file mode 100644
index 0000000..26b56e4
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-dri.inc
+PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
new file mode 100644
index 0000000..93bb8cd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-xlib.inc
+PR = "${INC_PR}.0"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* Re: [PATCHv2 29/30] mesa: add new version 7.11
2011-10-03 13:29 ` [PATCHv2 29/30] mesa: add new version 7.11 Martin Jansa
@ 2011-10-12 22:03 ` Richard Purdie
0 siblings, 0 replies; 75+ messages in thread
From: Richard Purdie @ 2011-10-12 22:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-10-03 at 15:29 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/recipes-graphics/mesa/mesa-7.11.inc | 15 ++++++++++
> .../mesa/mesa-dri-glsl-native_7.11.bb | 28 ++++++++++++++++++++
> meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 4 +++
> meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 4 +++
> 4 files changed, 51 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
I've been seeing a ton of different issues after the xserver upgrade
with mesa/driver mismatches. In order to try and get some stability back
to master, I've merged just enough of the mesa upgrade to 7.11 to get
things building again.
Looking at the rest of the patch, I have worried about "machine
specific" elements in something which is not machine specific. The rest
of the pieces are likley going to need more thought (per arch default
config?).
We should be able to sort through the remaining changes in this patch
series as I like moving things to the common include, it just needs to
be split from the version upgrade and the machine issue resolved.
I've also bumped the video-intel driver version and merged a fix to get
things to build.
Cheers,
Richard
^ permalink raw reply [flat|nested] 75+ messages in thread
* [PATCHv2 30/30] mesa: drop older 7.10.2 and 7.7+git recipes
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (28 preceding siblings ...)
2011-10-03 13:29 ` [PATCHv2 29/30] mesa: add new version 7.11 Martin Jansa
@ 2011-10-03 13:29 ` Martin Jansa
2011-10-04 10:23 ` [PATCHv2 00/30] Xorg related changes Richard Purdie
30 siblings, 0 replies; 75+ messages in thread
From: Martin Jansa @ 2011-10-03 13:29 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 46 ------
meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 18 ---
meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h | 162 --------------------
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 40 -----
meta/recipes-graphics/mesa/mesa-dri_git.bb | 57 -------
meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 22 ---
6 files changed, 0 insertions(+), 345 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/cross2.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_git.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch b/meta/recipes-graphics/mesa/mesa-dri/cross2.patch
deleted file mode 100644
index 264c153..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100
-+++ git/configure.ac 2009-09-01 16:38:47.000000000 +0100
-@@ -269,15 +269,6 @@
- GLAPI_ASM_SOURCES=""
- AC_MSG_CHECKING([whether to enable assembly])
- test "x$enable_asm" = xno && AC_MSG_RESULT([no])
--# disable if cross compiling on x86/x86_64 since we must run gen_matypes
--if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
-- case "$host_cpu" in
-- i?86 | x86_64)
-- enable_asm=no
-- AC_MSG_RESULT([no, cross compiling])
-- ;;
-- esac
--fi
- # check for supported arches
- if test "x$enable_asm" = xyes; then
- case "$host_cpu" in
-Index: git/src/mesa/x86/Makefile
-===================================================================
---- git.orig/src/mesa/x86/Makefile 2009-09-01 16:40:02.000000000 +0100
-+++ git/src/mesa/x86/Makefile 2009-09-01 16:40:13.000000000 +0100
-@@ -14,19 +14,6 @@
- -I../tnl
-
-
--default: gen_matypes matypes.h
--
--clean:
-- -rm -f matypes.h gen_matypes
--
--
--gen_matypes: gen_matypes.c
-- $(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes
--
--# need some special rules here, unfortunately
--matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
-- ./gen_matypes > matypes.h
--
- common_x86_asm.o: matypes.h
- 3dnow_normal.o: matypes.h
- 3dnow_xform1.o: matypes.h
diff --git a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch b/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
deleted file mode 100644
index d300e2f..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
-Index: Mesa-7.5/bin/mklib
-===================================================================
---- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100
-+++ Mesa-7.5/bin/mklib 2009-08-12 13:04:19.000000000 +0100
-@@ -234,9 +234,9 @@
- if [ "x$LINK" = "x" ] ; then
- # -linker was not specified so set default link command now
- if [ $CPLUSPLUS = 1 ] ; then
-- LINK=g++
-+ LINK=$CXX
- else
-- LINK=gcc
-+ LINK=$CC
- fi
- fi
-
diff --git a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h b/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
deleted file mode 100644
index 98d2188..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * This file is automatically generated from the Mesa internal type
- * definitions. Do not edit directly.
- */
-
-#ifndef __ASM_TYPES_H__
-#define __ASM_TYPES_H__
-
-
-
-/* =============================================================
- * Offsets for GLcontext
- */
-
-#define CTX_DRIVER_CTX 996
-
-#define CTX_LIGHT_ENABLED 39404
-#define CTX_LIGHT_SHADE_MODEL 39408
-#define CTX_LIGHT_COLOR_MAT_FACE 39412
-#define CTX_LIGHT_COLOR_MAT_MODE 39416
-#define CTX_LIGHT_COLOR_MAT_MASK 39420
-#define CTX_LIGHT_COLOR_MAT_ENABLED 39424
-#define CTX_LIGHT_ENABLED_LIST 39432
-#define CTX_LIGHT_NEED_VERTS 43793
-#define CTX_LIGHT_FLAGS 43796
-#define CTX_LIGHT_BASE_COLOR 43800
-
-
-/* =============================================================
- * Offsets for struct vertex_buffer
- */
-
-#define VB_SIZE 0
-#define VB_COUNT 4
-
-#define VB_ELTS 8
-#define VB_OBJ_PTR 12
-#define VB_EYE_PTR 16
-#define VB_CLIP_PTR 20
-#define VB_PROJ_CLIP_PTR 24
-#define VB_CLIP_OR_MASK 28
-#define VB_CLIP_MASK 32
-#define VB_NORMAL_PTR 36
-#define VB_EDGE_FLAG 44
-#define VB_TEX0_COORD_PTR 48
-#define VB_TEX1_COORD_PTR 52
-#define VB_TEX2_COORD_PTR 56
-#define VB_TEX3_COORD_PTR 60
-#define VB_INDEX_PTR 80
-#define VB_COLOR_PTR 88
-#define VB_SECONDARY_COLOR_PTR 96
-#define VB_FOG_COORD_PTR 104
-#define VB_PRIMITIVE 108
-
-
-/*
- * Flags for struct vertex_buffer
- */
-
-#define VERT_BIT_OBJ 0x1
-#define VERT_BIT_NORM 0x4
-#define VERT_BIT_RGBA 0x8
-#define VERT_BIT_SPEC_RGB 0x10
-#define VERT_BIT_FOG_COORD 0x20
-#define VERT_BIT_TEX0 0x100
-#define VERT_BIT_TEX1 0x200
-#define VERT_BIT_TEX2 0x400
-#define VERT_BIT_TEX3 0x800
-
-
-/* =============================================================
- * Offsets for GLvector4f
- */
-
-#define V4F_DATA 0
-#define V4F_START 4
-#define V4F_COUNT 8
-#define V4F_STRIDE 12
-#define V4F_SIZE 16
-#define V4F_FLAGS 20
-
-/*
- * Flags for GLvector4f
- */
-
-#define VEC_MALLOC 0x10
-#define VEC_NOT_WRITEABLE 0x40
-#define VEC_BAD_STRIDE 0x100
-
-#define VEC_SIZE_1 0x1
-#define VEC_SIZE_2 0x3
-#define VEC_SIZE_3 0x7
-#define VEC_SIZE_4 0xf
-
-
-/* =============================================================
- * Offsets for GLmatrix
- */
-
-#define MATRIX_DATA 0
-#define MATRIX_INV 4
-#define MATRIX_FLAGS 8
-#define MATRIX_TYPE 12
-
-
-/* =============================================================
- * Offsets for struct gl_light
- */
-
-#define LIGHT_NEXT 0
-#define LIGHT_PREV 4
-
-#define LIGHT_AMBIENT 8
-#define LIGHT_DIFFUSE 24
-#define LIGHT_SPECULAR 40
-#define LIGHT_EYE_POSITION 56
-#define LIGHT_SPOT_DIRECTION 72
-#define LIGHT_SPOT_EXPONENT 88
-#define LIGHT_SPOT_CUTOFF 92
-#define LIGHT_COS_CUTOFF 100
-#define LIGHT_CONST_ATTEN 104
-#define LIGHT_LINEAR_ATTEN 108
-#define LIGHT_QUADRATIC_ATTEN 112
-#define LIGHT_ENABLED 116
-
-#define LIGHT_FLAGS 120
-
-#define LIGHT_POSITION 124
-#define LIGHT_VP_INF_NORM 140
-#define LIGHT_H_INF_NORM 152
-#define LIGHT_NORM_DIRECTION 164
-#define LIGHT_VP_INF_SPOT_ATTEN 180
-
-#define LIGHT_SPOT_EXP_TABLE 184
-#define LIGHT_MAT_AMBIENT 4280
-#define LIGHT_MAT_DIFFUSE 4304
-#define LIGHT_MAT_SPECULAR 4328
-
-#define SIZEOF_GL_LIGHT 4360
-
-/*
- * Flags for struct gl_light
- */
-
-#define LIGHT_SPOT 0x1
-#define LIGHT_LOCAL_VIEWER 0x2
-#define LIGHT_POSITIONAL 0x4
-
-#define LIGHT_NEED_VERTICES 0x6
-
-
-/* =============================================================
- * Offsets for struct gl_lightmodel
- */
-
-#define LIGHT_MODEL_AMBIENT 0
-#define LIGHT_MODEL_LOCAL_VIEWER 16
-#define LIGHT_MODEL_TWO_SIDE 17
-#define LIGHT_MODEL_COLOR_CONTROL 20
-
-
-#endif /* __ASM_TYPES_H__ */
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
deleted file mode 100644
index 68f89a2..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-include mesa-common.inc
-
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-
-PROTO_DEPS = "xf86driproto glproto dri2proto"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \
- libxml2-native"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native"
-
-PR = "r2"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
- file://crossfix.patch \
- file://uclibc.patch \
- "
-
-SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771"
-SRC_URI[sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-LEAD_SONAME = "libGL.so.1"
-
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
-
-python populate_packages_prepend() {
- import os.path
-
- dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
-
- do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
-
-COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
deleted file mode 100644
index 9e32d0a..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-include mesa-common.inc
-
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
- file://cross2.patch \
- file://matypes.h"
-# file://mesa-DRI2Swapbuffer.patch "
-S = "${WORKDIR}/git"
-
-PROTO_DEPS = "xf86driproto glproto dri2proto"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-
-SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
-PV = "7.7+git${SRCPV}"
-PR = "r2"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-PACKAGES =+ "${PN}-xprogs"
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
-
-LEAD_SONAME = "libGL.so.1"
-
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
-
-do_configure_prepend () {
- cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86
- touch ${S}/src/mesa/x86/matypes.h
-}
-
-do_compile () {
- oe_runmake clean
- oe_runmake -C src/glsl CC='${BUILD_CC}' CFLAGS=""
- mv ${S}/src/glsl/apps/compile ${S}/host_compile
- oe_runmake clean
- oe_runmake GLSL_CL="${S}/host_compile"
-}
-
-do_install_append () {
- install -d ${D}/usr/bin
- install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}
-
-python populate_packages_prepend() {
- import os.path
-
- dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
-
- do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
-
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
deleted file mode 100644
index 511103d..0000000
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-include mesa-common.inc
-
-FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
- file://uclibc.patch \
- "
-
-SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771"
-SRC_URI[sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1"
-
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native"
-
-PE = "1"
-PR = "r1"
-
-EXTRA_OECONF += "--with-driver=xlib"
--
1.7.7
^ permalink raw reply related [flat|nested] 75+ messages in thread* Re: [PATCHv2 00/30] Xorg related changes
2011-10-03 13:28 ` [PATCHv2 00/30] " Martin Jansa
` (29 preceding siblings ...)
2011-10-03 13:29 ` [PATCHv2 30/30] mesa: drop older 7.10.2 and 7.7+git recipes Martin Jansa
@ 2011-10-04 10:23 ` Richard Purdie
2011-10-04 10:52 ` Martin Jansa
30 siblings, 1 reply; 75+ messages in thread
From: Richard Purdie @ 2011-10-04 10:23 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On Mon, 2011-10-03 at 15:28 +0200, Martin Jansa wrote:
> this patchset brings meta-oe and oe-core xorg stuff together and most of
> xorg recipes will be removed from meta-oe (sending another pull request now).
Did anything in the first seven patches of this series change compared
to what I have queued?
Cheers,
Richard
^ permalink raw reply [flat|nested] 75+ messages in thread