* [meta-oe][PATCH 00/10] Pull request #22
@ 2011-09-16 13:56 Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 01/10] connman: drop initscript file used by SHR Martin Jansa
` (9 more replies)
0 siblings, 10 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
First few "safe" changes from jansa/x11.. more stuff will come
when oe-core-contrib/jansa/x11 is applied in oe-core..
The following changes since commit 9c4ff53d2fa688581d257eb7e045f9e6a20470d3:
vlc: update to 1.1.11 and fix xml2 build (2011-09-15 15:59:26 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe
Martin Jansa (10):
connman: drop initscript file used by SHR
vlc: drop depends not yet in meta-oe
xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc
to RDEPENDS on xserver-xf86-config from oe-core and bsp layers
pointercal-xinput: move machine specific files to their bsp layers,
remove SECTION
xserver-xorg: drop 1.9.4 and git version
xcb: drop from meta-oe, now it's in oe-core
xorg-app: use xorg-app-common.inc from oe-core
xorg-driver: use .inc files from oe-core
task-x11: define better default XSERVER/XSERVER_COMMON values and
make whole recipe MACHINE_ARCH
libdrm-2.4.25: drop from meta-oe, now there is 2.4.26 in oe-core
.../connman/connman/shr/connman | 42 -
meta-oe/recipes-core/tasks/task-x11.bb | 10 +-
.../recipes-graphics/drm/libdrm-2.4.25/glamo.patch | 1095 --------------------
.../drm/libdrm-2.4.25/installtests.patch | 49 -
meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb | 37 -
.../recipes-graphics/xcb/libpthread-stubs_0.3.bb | 25 -
meta-oe/recipes-graphics/xcb/libxcb_1.7.bbappend | 2 -
.../recipes-graphics/xcb/xcb-proto_1.6.bbappend | 2 -
.../pointercal-xinput/iphone3g/pointercal.xinput | 1 -
.../pointercal-xinput/nokia900/pointercal.xinput | 2 -
.../pointercal-xinput/om-gta01/pointercal.xinput | 2 -
.../pointercal-xinput/om-gta02/pointercal.xinput | 2 -
.../xinput-calibrator/pointercal-xinput_0.0.bb | 4 +-
meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb | 4 +-
meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb | 4 +-
meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb | 4 +-
.../recipes-graphics/xorg-app/setxkbmap_1.2.0.bb | 4 +-
meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb | 4 +-
.../recipes-graphics/xorg-app/xorg-app-common.inc | 15 -
meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb | 4 +-
meta-oe/recipes-graphics/xorg-app/xterm_266.bb | 4 +-
.../xorg-driver/xf86-input-tslib_0.0.6.bb | 4 +-
.../xorg-driver/xf86-input-void_1.4.0.bb | 4 +-
.../xorg-driver/xf86-video-fbdev_0.4.2.bb | 5 +-
.../xorg-driver/xf86-video-geode_2.11.12.bb | 4 +-
.../xorg-driver/xf86-video-glamo_git.bb | 4 +-
.../xorg-driver/xf86-video-omapfb_git.bb | 5 +-
.../xorg-driver/xorg-driver-common.inc | 40 -
.../xorg-driver/xorg-driver-input.inc | 4 -
.../xorg-driver/xorg-driver-video.inc | 4 -
.../xorg-xserver/xorg-xserver-common.inc | 2 +-
.../xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch | 22 -
...ack-assume-pixman-supports-overlapped-blt.patch | 14 -
.../hack-fbdev-ignore-return-mode.patch | 39 -
.../xserver-xorg-1.9.4/randr-support.patch | 102 --
.../xserver-xorg-conf/am3517-evm/xorg.conf | 29 -
.../xserver-xorg-conf/am37x-evm/xorg.conf | 29 -
.../xserver-xorg-conf/archos5/xorg.conf | 29 -
.../xserver-xorg-conf/archos5it/xorg.conf | 29 -
.../xserver-xorg-conf/at91sam9263ek/xorg.conf | 11 -
.../xserver-xorg-conf/at91sam9g45ek/xorg.conf | 23 -
.../xserver-xorg-conf/babbage/xorg.conf | 56 -
.../xserver-xorg-conf/beagleboard/xorg.conf | 29 -
.../xorg-xserver/xserver-xorg-conf/bug/xorg.conf | 75 --
.../xorg-xserver/xserver-xorg-conf/bug20/xorg.conf | 37 -
.../xserver-xorg-conf/cm-t35/xorg.conf | 29 -
.../xserver-xorg-conf/dm37x-evm/xorg.conf | 29 -
.../xserver-xorg-conf/eee701/xorg.conf | 97 --
.../xserver-xorg-conf/htcdream/xorg.conf | 69 --
.../xserver-xorg-conf/htcleo/xorg.conf | 73 --
.../xserver-xorg-conf/igep0020/xorg.conf | 29 -
.../xorg-xserver/xserver-xorg-conf/ion/xorg.conf | 51 -
.../xserver-xorg-conf/iphone3g/xorg.conf | 29 -
.../xorg-xserver/xserver-xorg-conf/mh355/xorg.conf | 47 -
.../xserver-xorg-conf/nokia800/xorg.conf | 29 -
.../xserver-xorg-conf/nokia900/xorg.conf | 62 --
.../xserver-xorg-conf/om-gta01/xorg.conf | 49 -
.../xserver-xorg-conf/om-gta02/xorg.conf | 55 -
.../xserver-xorg-conf/omap3-pandora/xorg.conf | 24 -
.../xserver-xorg-conf/omap3-touchbook/xorg.conf | 25 -
.../xorg-xserver/xserver-xorg-conf/omap3/xorg.conf | 29 -
.../xserver-xorg-conf/omap3evm/xorg.conf | 29 -
.../xserver-xorg-conf/omapzoom/xorg.conf | 29 -
.../xserver-xorg-conf/omapzoom2/xorg.conf | 29 -
.../xserver-xorg-conf/omapzoom36x/xorg.conf | 29 -
.../xorg-xserver/xserver-xorg-conf/overo/xorg.conf | 29 -
.../xserver-xorg-conf/palmpre/xorg.conf | 58 -
.../xserver-xorg-conf/ronetix-pm9263/xorg.conf | 47 -
.../xorg-xserver/xserver-xorg-conf/spitz/xorg.conf | 49 -
.../xserver-xorg-conf/vortex86sx/xorg.conf | 13 -
.../xserver-xorg-conf/xilinx-ml507/xorg.conf | 39 -
.../xserver-xorg-conf/xilinx-virtex5/xorg.conf | 38 -
.../xorg-xserver/xserver-xorg-conf_0.1.bb | 17 -
.../xorg-xserver/xserver-xorg_1.10.2.bb | 2 +-
.../xorg-xserver/xserver-xorg_1.9.4.bb | 31 -
.../xorg-xserver/xserver-xorg_git.bb | 38 -
meta-oe/recipes-multimedia/vlc/vlc.inc | 3 +-
77 files changed, 34 insertions(+), 3088 deletions(-)
delete mode 100755 meta-oe/recipes-connectivity/connman/connman/shr/connman
delete mode 100644 meta-oe/recipes-graphics/drm/libdrm-2.4.25/glamo.patch
delete mode 100644 meta-oe/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
delete mode 100644 meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb
delete mode 100644 meta-oe/recipes-graphics/xcb/libpthread-stubs_0.3.bb
delete mode 100644 meta-oe/recipes-graphics/xcb/libxcb_1.7.bbappend
delete mode 100644 meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bbappend
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
delete mode 100644 meta-oe/recipes-graphics/xorg-app/xorg-app-common.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xorg-driver-common.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xorg-driver-input.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xorg-driver-video.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5it/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9263ek/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9g45ek/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/babbage/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/eee701/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ion/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/mh355/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia800/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom36x/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/overo/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/spitz/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/vortex86sx/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-virtex5/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.9.4.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
--
1.7.6.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 01/10] connman: drop initscript file used by SHR
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 02/10] vlc: drop depends not yet in meta-oe Martin Jansa
` (8 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
* moved to meta-shr
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../connman/connman/shr/connman | 42 --------------------
1 files changed, 0 insertions(+), 42 deletions(-)
delete mode 100755 meta-oe/recipes-connectivity/connman/connman/shr/connman
diff --git a/meta-oe/recipes-connectivity/connman/connman/shr/connman b/meta-oe/recipes-connectivity/connman/connman/shr/connman
deleted file mode 100755
index 708b1b4..0000000
--- a/meta-oe/recipes-connectivity/connman/connman/shr/connman
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-DAEMON="/usr/sbin/connmand -I usb0"
-PIDFILE=/var/run/connmand.pid
-DESC="Connection Manager"
-
-if [ -f /etc/default/connman ] ; then
- . /etc/default/connman
-fi
-
-set -e
-
-do_start() {
- $DAEMON
-}
-
-do_stop() {
- start-stop-daemon --stop --name connmand --quiet
-}
-
-case "$1" in
- start)
- echo "Starting $DESC"
- do_start
- ;;
- stop)
- echo "Stopping $DESC"
- do_stop
- ;;
- restart|force-reload)
- echo "Restarting $DESC"
- do_stop
- sleep 1
- do_start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 02/10] vlc: drop depends not yet in meta-oe
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 01/10] connman: drop initscript file used by SHR Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 14:06 ` Gary Thomas
2011-09-16 13:56 ` [meta-oe][PATCH 03/10] xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to RDEPENDS on xserver-xf86-config from oe-core and bsp layers Martin Jansa
` (7 subsequent siblings)
9 siblings, 1 reply; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-multimedia/vlc/vlc.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
index ce608dc..aecfb3a 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
@@ -4,7 +4,8 @@ LICENSE = "GPLv2"
SECTION = "multimedia"
DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
- ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
+"
+# ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 03/10] xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to RDEPENDS on xserver-xf86-config from oe-core and bsp layers
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 01/10] connman: drop initscript file used by SHR Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 02/10] vlc: drop depends not yet in meta-oe Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 14:16 ` Koen Kooi
2011-09-16 13:56 ` [meta-oe][PATCH 04/10] pointercal-xinput: move machine specific files to their bsp layers, remove SECTION Martin Jansa
` (6 subsequent siblings)
9 siblings, 1 reply; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xorg-xserver-common.inc | 2 +-
.../xserver-xorg-conf/am3517-evm/xorg.conf | 29 ------
.../xserver-xorg-conf/am37x-evm/xorg.conf | 29 ------
.../xserver-xorg-conf/archos5/xorg.conf | 29 ------
.../xserver-xorg-conf/archos5it/xorg.conf | 29 ------
.../xserver-xorg-conf/at91sam9263ek/xorg.conf | 11 --
.../xserver-xorg-conf/at91sam9g45ek/xorg.conf | 23 -----
.../xserver-xorg-conf/babbage/xorg.conf | 56 -----------
.../xserver-xorg-conf/beagleboard/xorg.conf | 29 ------
.../xorg-xserver/xserver-xorg-conf/bug/xorg.conf | 75 ---------------
.../xorg-xserver/xserver-xorg-conf/bug20/xorg.conf | 37 --------
.../xserver-xorg-conf/cm-t35/xorg.conf | 29 ------
.../xserver-xorg-conf/dm37x-evm/xorg.conf | 29 ------
.../xserver-xorg-conf/eee701/xorg.conf | 97 --------------------
.../xserver-xorg-conf/htcdream/xorg.conf | 69 --------------
.../xserver-xorg-conf/htcleo/xorg.conf | 73 ---------------
.../xserver-xorg-conf/igep0020/xorg.conf | 29 ------
.../xorg-xserver/xserver-xorg-conf/ion/xorg.conf | 51 ----------
.../xserver-xorg-conf/iphone3g/xorg.conf | 29 ------
.../xorg-xserver/xserver-xorg-conf/mh355/xorg.conf | 47 ----------
.../xserver-xorg-conf/nokia800/xorg.conf | 29 ------
.../xserver-xorg-conf/nokia900/xorg.conf | 62 -------------
.../xserver-xorg-conf/om-gta01/xorg.conf | 49 ----------
.../xserver-xorg-conf/om-gta02/xorg.conf | 55 -----------
.../xserver-xorg-conf/omap3-pandora/xorg.conf | 24 -----
.../xserver-xorg-conf/omap3-touchbook/xorg.conf | 25 -----
.../xorg-xserver/xserver-xorg-conf/omap3/xorg.conf | 29 ------
.../xserver-xorg-conf/omap3evm/xorg.conf | 29 ------
.../xserver-xorg-conf/omapzoom/xorg.conf | 29 ------
.../xserver-xorg-conf/omapzoom2/xorg.conf | 29 ------
.../xserver-xorg-conf/omapzoom36x/xorg.conf | 29 ------
.../xorg-xserver/xserver-xorg-conf/overo/xorg.conf | 29 ------
.../xserver-xorg-conf/palmpre/xorg.conf | 58 ------------
.../xserver-xorg-conf/ronetix-pm9263/xorg.conf | 47 ----------
.../xorg-xserver/xserver-xorg-conf/spitz/xorg.conf | 49 ----------
.../xserver-xorg-conf/vortex86sx/xorg.conf | 13 ---
.../xserver-xorg-conf/xilinx-ml507/xorg.conf | 39 --------
.../xserver-xorg-conf/xilinx-virtex5/xorg.conf | 38 --------
.../xorg-xserver/xserver-xorg-conf_0.1.bb | 17 ----
.../xorg-xserver/xserver-xorg_1.10.2.bb | 2 +-
40 files changed, 2 insertions(+), 1481 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5it/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9263ek/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9g45ek/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/babbage/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/eee701/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ion/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/mh355/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia800/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom36x/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/overo/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/spitz/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/vortex86sx/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-virtex5/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xorg.conf
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
index 06763bb..0b4a854 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
+++ b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
@@ -53,7 +53,7 @@ EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
PACKAGES =+ "xserver-security-policy"
FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
-RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config rgb xserver-xorg-conf"
+RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config rgb xserver-xf86-config"
PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5it/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5it/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5it/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9263ek/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9263ek/xorg.conf
deleted file mode 100644
index 7f3eb77..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9263ek/xorg.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Section "ServerLayout"
- Identifier "default"
- InputDevice "atmel-ts" "CorePointer"
-EndSection
-
-Section "InputDevice"
- Identifier "atmel-ts"
- Driver "evdev"
- Option "SwapAxes" "1"
- Option "Device" "/dev/input/touchscreen0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9g45ek/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9g45ek/xorg.conf
deleted file mode 100644
index 0502f87..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9g45ek/xorg.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-Section "ServerLayout"
- Identifier "default"
- InputDevice "atmel-tsadcc" "CorePointer"
-EndSection
-
-Section "InputDevice"
- Identifier "atmel-tsadcc"
- Driver "evdev"
- Option "Device" "/dev/input/touchscreen0"
-EndSection
-
-Section "InputDevice"
- Driver "mouse"
- Identifier "Mouse[1]"
- Option "Buttons" "10"
- Option "Device" "/dev/input/mice"
-EndSection
-
-Section "InputDevice"
- Driver "kbd"
- Identifier "Keyboard[0]"
- Option "Protocol" "Standard"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/babbage/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/babbage/xorg.conf
deleted file mode 100644
index d4d41db..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/babbage/xorg.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# X11 configuration for i.MX51 Babbage EVK
-# Based on pm9263 by Koan sas
-#
-
-Section "Monitor"
- Identifier "Display"
-EndSection
-
-Section "Device"
- Identifier "fbdevice"
- Driver "fbdev"
- Option "fbdev" "/dev/fb0"
- Option "shadowfb" "true"
-EndSection
-
-Section "Screen"
- Identifier "fbscreen"
- Device "fbdevice"
- Monitor "Display"
-EndSection
-
-Section "InputDevice"
- Identifier "mxc_ts"
- Driver "evdev"
- Option "SwapAxes" "0"
- Option "Device" "/dev/input/touchscreen0"
-EndSection
-
-Section "InputDevice"
- Identifier "Generic Mouse"
- Driver "mouse"
- Option "CorePointer"
-EndSection
-
-Section "InputDevice"
- Identifier "Keypad"
- Driver "evdev"
- Option "Device" "/dev/input/event0"
-# Option "XkbModel" "nokiarx51"
-# Option "XkbLayout" "us"
-EndSection
-
-Section "ServerLayout"
- Identifier "Layout"
- Screen "fbscreen"
- InputDevice "mxc_ts" "CorePointer"
- InputDevice "Keypad"
-# Enable mouse only if necessary, it may interfere with touchscreen behaviour
-# InputDevice "Generic Mouse"
-EndSection
-
-#Section "ServerFlags"
-# Option "AutoAddDevices" "false"
-#EndSection
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug/xorg.conf
deleted file mode 100644
index cf684ec..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug/xorg.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Initial version of X11 configuration for BugLabs BUG device.
-#
-# Up to 2 LCD modules are supported (as DISPLAY=0.0/0.1).
-# Touchscreen on both screen works properly (req tslib 0.0.6 driver).
-#
-# Mouse is not supported yet because the evdev driver need a precise
-# dev node and evdev dev nodes are somewhat random
-#
-
-Section "Monitor"
- Identifier "Monitor 1"
-EndSection
-
-Section "Monitor"
- Identifier "Monitor 2"
-EndSection
-
-Section "Device"
- Identifier "fbdev Device 2"
- Driver "fbdev"
- Option "fbdev" "/dev/fb2"
- Option "shadowfb" "true"
-EndSection
-
-Section "Device"
- Identifier "fbdev Device 1"
- Driver "fbdev"
- Option "fbdev" "/dev/fb1"
- Option "shadowfb" "true"
-EndSection
-
-Section "Screen"
- Identifier "fbdev Screen 2"
- Device "fbdev Device 2"
- Monitor "Monitor 2"
-EndSection
-
-Section "Screen"
- Identifier "fbdev Screen 1"
- Device "fbdev Device 1"
- Monitor "Monitor 1"
-EndSection
-
-Section "ServerLayout"
- Identifier "Layout"
- Screen "fbdev Screen 1"
- Screen "fbdev Screen 2" Below "fbdev Screen 1"
- InputDevice "ts4"
- InputDevice "ts5"
- InputDevice "Keyboard"
-EndSection
-
-Section "InputDevice"
- Identifier "ts5"
- Driver "tslib"
- Option "Device" "/dev/input/bmi_lcd_ts5"
- Option "ScreenNumber" "1"
-EndSection
-
-Section "InputDevice"
- Identifier "ts4"
- Driver "tslib"
- Option "Device" "/dev/input/bmi_lcd_ts4"
- Option "ScreenNumber" "0"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard"
- Driver "kbd"
-EndSection
-
-Section "ServerFlags"
- Option "AutoAddDevices" "false"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf
deleted file mode 100644
index 6301d06..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
-# Load "type1"
-# Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
- InputDevice "bmi-lcd-ts" "CorePointer"
-EndSection
-
-Section "InputDevice"
- Identifier "bmi-lcd-ts"
- Driver "tslib"
- Option "SwapAxes" "1"
- Option "Device" "/dev/input/touchscreen0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf
deleted file mode 100644
index 07d849d..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/eee701/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/eee701/xorg.conf
deleted file mode 100644
index 4ee293b..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/eee701/xorg.conf
+++ /dev/null
@@ -1,97 +0,0 @@
-Section "ServerLayout"
- Identifier "X.org Configured"
- Screen 0 "Screen0" 0 0
- InputDevice "Touchpad"
- InputDevice "Keyboard"
- InputDevice "Mouse"
- Option "AllowEmptyInput" "false"
-EndSection
-
-Section "Files"
- ModulePath "/usr/lib/xorg/modules"
- FontPath "/usr/share/fonts/X11/misc"
-EndSection
-
-Section "Module"
- Load "dbe"
- Load "extmod"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard"
- Driver "kbd"
- Option "CoreKeyboard"
-EndSection
-
-Section "InputDevice"
- Identifier "Touchpad"
- Driver "synaptics"
- Option "TapButton1" "1"
- Option "CorePointer"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse"
- Driver "mouse"
- Option "Protocol" "Auto"
-EndSection
-
-
-Section "Monitor"
- Identifier "Monitor0"
- VendorName "Monitor Vendor"
- ModelName "Monitor Model"
-EndSection
-
-Section "Device"
- ### Available Driver options are:-
- ### Values: <i>: integer, <f>: float, <bool>: "True"/"False",
- ### <string>: "String", <freq>: "<f> Hz/kHz/MHz"
- ### [arg]: arg optional
- #Option "NoAccel" # [<bool>]
- #Option "SWcursor" # [<bool>]
- #Option "ColorKey" # <i>
- #Option "CacheLines" # <i>
- #Option "Dac6Bit" # [<bool>]
- #Option "DRI" # [<bool>]
- #Option "NoDDC" # [<bool>]
- #Option "ShowCache" # [<bool>]
- #Option "XvMCSurfaces" # <i>
- #Option "PageFlip" # [<bool>]
- Identifier "Card0"
- Driver "intel"
- VendorName "Unknown Vendor"
- BoardName "Unknown Board"
- BusID "PCI:0:2:0"
-EndSection
-
-Section "Screen"
- Identifier "Screen0"
- Device "Card0"
- Monitor "Monitor0"
- SubSection "Display"
- Viewport 0 0
- Depth 1
- EndSubSection
- SubSection "Display"
- Viewport 0 0
- Depth 4
- EndSubSection
- SubSection "Display"
- Viewport 0 0
- Depth 8
- EndSubSection
- SubSection "Display"
- Viewport 0 0
- Depth 15
- EndSubSection
- SubSection "Display"
- Viewport 0 0
- Depth 16
- EndSubSection
- SubSection "Display"
- Viewport 0 0
- Depth 24
- EndSubSection
-EndSection
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
deleted file mode 100644
index be3c6ec..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-Section "Monitor"
- Identifier "Monitor0"
- Mode "320x480"
- DotClock 0
- HTimings 320 320 320 320
- VTimings 480 480 480 480
- Flags "-HSync" "-VSync"
- EndMode
-EndSection
-
-Section "Device"
- Identifier "fbdev"
- Driver "fbdev"
- Option "ShadowFB" "on"
- Option "Rotate" "CW" # comment for disabling rotation
-EndSection
-
-Section "Screen"
- Identifier "Framebuffer"
- Device "fbdev"
- Monitor "Monitor0"
- DefaultFbBpp 16
- SubSection "Display"
- Depth 16
- Modes "320x480"
- EndSubSection
-EndSection
-
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Framebuffer"
- InputDevice "Trackball"
- InputDevice "Touchscreen"
- InputDevice "Keyboard"
-EndSection
-
-Section "InputDevice"
- Identifier "Trackball"
- Driver "evdev"
- Option "Device" "/dev/input/event2"
- Option "ScreenNumber" "0"
- Option "ReportingMode" "Raw"
- Option "SwapAxes" "True" # comment for disabling rotation
- Option "InvertY" "True" # comment for disabling rotation
-EndSection
-
-
-Section "InputDevice"
- Identifier "Touchscreen"
- Driver "evdev"
- Option "Device" "/dev/input/event1"
- Option "SwapAxes" "True" # comment for disabling rotation
- Option "InvertY" "True" # comment for disabling rotation
- Option "ReportingMode" "Raw"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard"
- Driver "kbd"
- Option "XkbLayout" "us"
- Option "XkbModel" "htcdream"
-EndSection
-
-
-Section "ServerFlags"
- Option "AutoAddDevices" "false"
-EndSection
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf
deleted file mode 100644
index 4153a26..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-Section "Monitor"
- Identifier "Monitor0"
- Mode "480x800"
- DotClock 0
- HTimings 480 480 480 480
- VTimings 800 800 800 800
- Flags "-HSync" "-VSync"
- EndMode
-EndSection
-
-
-
-Section "Device"
- Identifier "fbdev"
- Driver "fbdev"
- Option "ShadowFB" "on"
- #Option "Rotate" "CW"
-EndSection
-
-
-Section "Screen"
- Identifier "Framebuffer"
- Device "fbdev"
- Monitor "Monitor"
- DefaultFbBpp 16
- SubSection "Display"
- Depth 16
- Modes "480x800"
- EndSubSection
-EndSection
-
-Section "Screen"
- Identifier "480x800x16"
- Device "fbdev"
- Monitor "Monitor"
- DefaultFbBpp 16
- SubSection "Display"
- Depth 16
- Modes "480x800"
- EndSubSection
-EndSection
-
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Framebuffer"
- InputDevice "Touchscreen" "CorePointer"
- InputDevice "Keyboard" "CoreKeyboard"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse0"
- Driver "mouse"
- Option "Protocol" "auto"
- Option "Device" "/dev/input/mice"
- Option "Emulate3Buttons" "no"
- Option "ZAxisMapping" "4 5"
-EndSection
-
-
-Section "InputDevice"
- Identifier "Touchscreen"
- Driver "tslib"
- Option "Protocol" "auto"
- Option "Device" "/dev/input/event0"
- Option "CorePointer" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard"
- Driver "kbd"
- Option "XkbLayout" "en_US"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf
deleted file mode 100644
index 07d849d..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ion/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ion/xorg.conf
deleted file mode 100644
index 95a1523..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ion/xorg.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# xorg.conf (X.Org X Window System server configuration file)
-#
-# This file was generated by dexconf, the Debian X Configuration tool, using
-# values from the debconf database.
-#
-# Edit this file with caution, and see the xorg.conf manual page.
-# (Type "man xorg.conf" at the shell prompt.)
-#
-# This file is automatically updated on xserver-xorg package upgrades *only*
-# if it has not been modified since the last upgrade of the xserver-xorg
-# package.
-#
-# Note that some configuration settings that could be done previously
-# in this file, now are automatically configured by the server and settings
-# here are ignored.
-#
-# If you have edited this file but would like it to be automatically updated
-# again, run the following command:
-# sudo dpkg-reconfigure -phigh xserver-xorg
-
-Section "Device"
- Identifier "NVidia"
- Driver "nvidia"
-# Option "NoLogo" "True"
-EndSection
-
-Section "Monitor"
- Identifier "DELL 2007WFP"
-# Option "DPMS"
- HorizSync 30.0-83.0
- VertRefresh 56.0-76.0
- ModeLine "1680x1050" 119.0 1680 1728 1760 1840 1050 1053 1059 1080 -HSync +VSync
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "NVidia"
- Monitor "DELL 2007WFP"
- DefaultDepth 24
- SubSection "Display"
- Depth 24
- Modes "1680x1050"
- ViewPort 0 0
- EndSubSection
-EndSection
-
-Section "Module"
- Load "glx"
-EndSection
-
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf
deleted file mode 100644
index 83ac9c1..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "fbdev"
- Option "ShadowFB" "on"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
-EndSection
-
-
-Section "InputDevice"
- Identifier "touchscreen"
- Driver "evdev"
- Option "Device" "/dev/input/event2"
- Option "ReportingMode" "Raw"
- Option "SendCoreEvents" "On"
- Option "GrabDevices" "True"
- Option "InvertY" "0"
- Option "SwapAxes" "0"
-EndSection
-
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
- InputDevice "touchscreen" "CorePointer" "AlwaysCore"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/mh355/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/mh355/xorg.conf
deleted file mode 100644
index 4c275c9..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/mh355/xorg.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# X11 configuration for Microhard MH355 device
-# (C)2010 Koan sas - www.KoanSoftware.com
-#
-
-Section "Monitor"
- Identifier "Display"
-EndSection
-
-Section "Device"
- Identifier "fbdevice"
- Driver "fbdev"
- Option "fbdev" "/dev/fb0"
- Option "shadowfb" "true"
-EndSection
-
-Section "Screen"
- Identifier "fbscreen"
- Device "fbdevice"
- Monitor "Display"
-EndSection
-
-Section "InputDevice"
- Identifier "mh355-ts"
- Driver "evdev"
- Option "SwapAxes" "1"
- Option "Device" "/dev/input/touchscreen0"
-EndSection
-
-Section "InputDevice"
- Identifier "Generic Mouse"
- Driver "mouse"
- Option "CorePointer"
-EndSection
-
-Section "ServerLayout"
- Identifier "Layout"
- Screen "fbscreen"
- InputDevice "mh355-ts" "CorePointer"
-# Enable mouse only if necessary, it may interfere with touchscreen behaviour
-# InputDevice "Generic Mouse"
-EndSection
-
-Section "ServerFlags"
- Option "AutoAddDevices" "false"
-EndSection
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia800/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia800/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia800/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
deleted file mode 100644
index d9d742f..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Default omapfb Device"
- Driver "omapfb"
- Option "fb" "/dev/fb0"
-
-EndSection
-
-Section "InputDevice"
- Identifier "gpio-keys"
- Driver "evdev"
- Option "Device" "/dev/input/event0"
-EndSection
-
-Section "InputDevice"
- Identifier "twl4030_pwrbutton"
- Driver "evdev"
- Option "Device" "/dev/input/event3"
-EndSection
-
-
-Section "InputDevice"
- Identifier "Keyboard"
- Driver "evdev"
- Option "Device" "/dev/input/event1"
- Option "XkbModel" "nokiarx51"
- Option "XkbLayout" "us"
- Option "CoreKeyboard"
-EndSection
-
-Section "InputDevice"
- Identifier "Touchscreen"
- Driver "evdev"
- Option "Device" "/dev/input/event2"
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Default omapfb Device"
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- InputDevice "Touchscreen"
- InputDevice "Keyboard"
- InputDevice "gpio-keys"
- InputDevice "twl4030_pwrbutton"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
deleted file mode 100644
index edb5e0e..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-Section "Monitor"
- Identifier "LCD Panel"
-EndSection
-
-
-Section "Device"
- Identifier "Fbdev"
- Driver "fbdev"
-EndSection
-
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Fbdev"
- Monitor "LCD Panel"
-EndSection
-
-
-Section "InputDevice"
- Identifier "Power Button"
- Driver "evdev"
- Option "Device" "/dev/input/event2"
-EndSection
-
-
-Section "InputDevice"
- Identifier "AUX Button"
- Driver "evdev"
- Option "Device" "/dev/input/event0"
-EndSection
-
-
-Section "InputDevice"
- Identifier "Touchscreen"
- Driver "evdev"
- Option "Device" "/dev/input/event1"
-EndSection
-
-Section "ServerFlags"
- Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- InputDevice "Power Button"
- InputDevice "AUX Button"
- InputDevice "Touchscreen"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
deleted file mode 100644
index de6ed1c..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-Section "Module"
- Load "glx"
- Load "dri2"
-EndSection
-
-
-Section "Monitor"
- Identifier "LCD Panel"
-EndSection
-
-
-Section "Device"
- Identifier "Glamo Graphics Chip"
- Driver "glamo"
-EndSection
-
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Glamo Graphics Chip"
- Monitor "LCD Panel"
-EndSection
-
-
-Section "InputDevice"
- Identifier "Power Button"
- Driver "evdev"
- Option "Device" "/dev/input/event0"
-EndSection
-
-
-Section "InputDevice"
- Identifier "AUX Button"
- Driver "evdev"
- Option "Device" "/dev/input/event2"
-EndSection
-
-
-Section "InputDevice"
- Identifier "Touchscreen"
- Driver "evdev"
- Option "Device" "/dev/input/event1"
-EndSection
-
-Section "ServerFlags"
- Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- InputDevice "Power Button"
- InputDevice "AUX Button"
- InputDevice "Touchscreen"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf
deleted file mode 100644
index 446ac97..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf
deleted file mode 100644
index 56425ab..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "fbdev"
- Option "ShadowFB" "false"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom36x/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom36x/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom36x/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/overo/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/overo/xorg.conf
deleted file mode 100644
index 983bb08..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/overo/xorg.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "glx"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf
deleted file mode 100644
index 6915b87..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-Section "Module"
- Load "extmod"
- Load "dbe"
- Load "freetype"
- Load "type1"
- Load "record"
- Load "dri"
-EndSection
-
-Section "Monitor"
- Identifier "Builtin Default Monitor"
-EndSection
-
-Section "Device"
- Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
- Option "fb" "/dev/fb0"
-EndSection
-
-Section "Screen"
- Identifier "Builtin Default fbdev Screen 0"
- Device "Builtin Default fbdev Device 0"
- Monitor "Builtin Default Monitor"
-EndSection
-
-Section "ServerLayout"
- Identifier "Builtin Default Layout"
- Screen "Builtin Default fbdev Screen 0"
- InputDevice "Touchscreen" "CorePointer"
-EndSection
-
-Section "InputDevice"
- Identifier "Touchscreen"
- Driver "evdev"
- Option "Device" "/dev/input/event6"
- Option "SendCoreEvents" "true"
- Option "Protocol" "Auto"
- Option "Width" "320"
- Option "Height" "528"
- Option "EmulateRightButton" "1"
- Option "CorePointer" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard"
- Driver "palm-pre"
- Option "Device" "/dev/input/event2"
- Option "SendCoreEvents" "true"
- #Option "XkbModel" "palm-pre"
- Option "XkbLayout" "palm-pre"
-# Option "XKbOptions" ""
-EndSection
-
-#Section "InputDevice"
-# Identifier "Keyboard"
-# Driver "evdev"
-# Option "Device" "/dev/input/event2"
-#EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf
deleted file mode 100644
index d4651ad..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# X11 configuration for Ronetix PM9263 device.
-# (C)2009-2010 Koan sas - www.KoanSoftware.com
-#
-
-Section "Monitor"
- Identifier "Display"
-EndSection
-
-Section "Device"
- Identifier "fbdevice"
- Driver "fbdev"
- Option "fbdev" "/dev/fb0"
- Option "shadowfb" "true"
-EndSection
-
-Section "Screen"
- Identifier "fbscreen"
- Device "fbdevice"
- Monitor "Display"
-EndSection
-
-Section "InputDevice"
- Identifier "atmel-ts"
- Driver "evdev"
- Option "SwapAxes" "1"
- Option "Device" "/dev/input/touchscreen0"
-EndSection
-
-Section "InputDevice"
- Identifier "Generic Mouse"
- Driver "mouse"
- Option "CorePointer"
-EndSection
-
-Section "ServerLayout"
- Identifier "Layout"
- Screen "fbscreen"
- InputDevice "atmel-ts" "CorePointer"
-# Enable mouse only if necessary, it may interfere with touchscreen behaviour
-# InputDevice "Generic Mouse"
-EndSection
-
-Section "ServerFlags"
- Option "AutoAddDevices" "false"
-EndSection
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/spitz/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/spitz/xorg.conf
deleted file mode 100644
index 224df5c..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/spitz/xorg.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-Section "Device"
- Identifier "Generic Video Card"
- Driver "fbdev"
- Option "UseFBDev" "true"
- Option "Rotate" "CW"
-EndSection
-
-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
- HorizSync 28-32
- VertRefresh 43-60
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Generic Video Card"
- Monitor "Generic Monitor"
- DefaultDepth 16
- SubSection "Display"
- Depth 1
- Modes "640x480"
- EndSubSection
- SubSection "Display"
- Depth 4
- Modes "640x480"
- EndSubSection
- SubSection "Display"
- Depth 8
- Modes "640x480"
- EndSubSection
- SubSection "Display"
- Depth 15
- Modes "640x480"
- EndSubSection
- SubSection "Display"
- Depth 16
- Modes "640x480"
- EndSubSection
- SubSection "Display"
- Depth 24
- Modes "640x480"
- EndSubSection
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/vortex86sx/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/vortex86sx/xorg.conf
deleted file mode 100644
index 0f03faf..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/vortex86sx/xorg.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-Section "Device"
- Identifier "Card0"
- Driver "vesa"
-EndSection
-
-# SIS driver is proper one for this device but fails with misc errors.
-#Section "Device"
-# Identifier "Card0"
-# Driver "sis"
-#
-# Disable MMX/SSE tests
-# Option "BenchmarkMemCpy" "off"
-#EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf
deleted file mode 100644
index 2950193..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-Section "Monitor"
- Identifier "LCD Panel"
-EndSection
-
-Section "Device"
- Identifier "Xilinx frame buffer"
- Driver "fbdev"
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Xilinx frame buffer"
- Monitor "LCD Panel"
- SubSection "Display"
- Depth 24
- Modes "640x480"
- EndSubSection
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard"
- Driver "kbd"
-# Option "XkbLayout" "es"
-# Option "XkbModel" "pc105"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse"
- Driver "mouse"
- Option "protocol" "auto"
- Option "device" "/dev/input/mice"
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- InputDevice "Keyboard"
- InputDevice "Mouse"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-virtex5/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-virtex5/xorg.conf
deleted file mode 100644
index 61f0f9f..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-virtex5/xorg.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Xorg conf file for Xilinx platforms
-Section "Monitor"
- Identifier "LCD Panel"
-EndSection
-
-Section "Device"
- Identifier "Xilinx frame buffer"
- Driver "fbdev"
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Xilinx frame buffer"
- Monitor "LCD Panel"
- SubSection "Display"
- Depth 24
- Modes "640x480"
- EndSubSection
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard"
- Driver "kbd"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse"
- Driver "mouse"
- Option "protocol" "auto"
- Option "device" "/dev/input/mice"
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen 0 "Default Screen" 0 0
- InputDevice "Keyboard"
- InputDevice "Mouse"
-EndSection
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xorg.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb
deleted file mode 100644
index 66505bd..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r43"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = "file://xorg.conf"
-
-do_install() {
- install -d ${D}/${sysconfdir}/X11
- install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
-}
-
-# Set some dependencies to make the confs actually work
-RDEPENDS_omap3 = "xf86-video-omapfb"
-
-CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
index 5810d37..1d88364 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
+++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
DESCRIPTION = "the X.Org X server"
DEPENDS += "mesa-dri pixman libpciaccess openssl dri2proto glproto font-util-native"
PE = "2"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI += " \
file://50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch \
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 04/10] pointercal-xinput: move machine specific files to their bsp layers, remove SECTION
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
` (2 preceding siblings ...)
2011-09-16 13:56 ` [meta-oe][PATCH 03/10] xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to RDEPENDS on xserver-xf86-config from oe-core and bsp layers Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 05/10] xserver-xorg: drop 1.9.4 and git version Martin Jansa
` (5 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../pointercal-xinput/iphone3g/pointercal.xinput | 1 -
.../pointercal-xinput/nokia900/pointercal.xinput | 2 --
.../pointercal-xinput/om-gta01/pointercal.xinput | 2 --
.../pointercal-xinput/om-gta02/pointercal.xinput | 2 --
.../xinput-calibrator/pointercal-xinput_0.0.bb | 4 +---
5 files changed, 1 insertions(+), 10 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
deleted file mode 100644
index d6ce56b..0000000
--- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/iphone3g/pointercal.xinput
+++ /dev/null
@@ -1 +0,0 @@
-xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 -102 4739 6 7321;
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput
deleted file mode 100644
index 66bb32c..0000000
--- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/nokia900/pointercal.xinput
+++ /dev/null
@@ -1,2 +0,0 @@
-xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 204 3897 3763 178;
-
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
deleted file mode 100644
index be25da3..0000000
--- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
+++ /dev/null
@@ -1,2 +0,0 @@
-xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
-xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
deleted file mode 100644
index be25da3..0000000
--- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
+++ /dev/null
@@ -1,2 +0,0 @@
-xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
-xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
index 993a75d..9b68d54 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
@@ -2,9 +2,7 @@ DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-SECTION = "base"
-
-PR = "r3"
+PR = "r4"
SRC_URI = "file://pointercal.xinput"
S = "${WORKDIR}"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 05/10] xserver-xorg: drop 1.9.4 and git version
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
` (3 preceding siblings ...)
2011-09-16 13:56 ` [meta-oe][PATCH 04/10] pointercal-xinput: move machine specific files to their bsp layers, remove SECTION Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 06/10] xcb: drop from meta-oe, now it's in oe-core Martin Jansa
` (4 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch | 22 ----
...ack-assume-pixman-supports-overlapped-blt.patch | 14 ---
.../hack-fbdev-ignore-return-mode.patch | 39 --------
.../xserver-xorg-1.9.4/randr-support.patch | 102 --------------------
.../xorg-xserver/xserver-xorg_1.9.4.bb | 31 ------
.../xorg-xserver/xserver-xorg_git.bb | 38 -------
6 files changed, 0 insertions(+), 246 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.9.4.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch
deleted file mode 100644
index e332ce0..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xorg-server/m4/dolt.m4
-===================================================================
---- xorg-server.orig/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400
-+++ xorg-server/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400
-@@ -147,7 +147,7 @@
- cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
- #!$DOLT_BASH
- __DOLTLIBTOOL__EOF__
-- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
-+ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
- top_builddir_slash="${0%%doltlibtool}"
- : ${top_builddir_slash:=./}
- args=()
-@@ -163,7 +163,7 @@
- if $modeok && $tagok ; then
- . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
- else
-- exec ${top_builddir_slash}libtool "$[]@"
-+ exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
- fi
- __DOLTLIBTOOL__EOF__
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch
deleted file mode 100644
index a947582..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/fb/fbcopy.c b/fb/fbcopy.c
-index 07eb663..ba394b7 100644
---- a/fb/fbcopy.c
-+++ b/fb/fbcopy.c
-@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
- while (nbox--)
- {
- #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
-- if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
-- !upsidedown)
-+ if (pm == FB_ALLONES && alu == GXcopy)
- {
- if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
- (pbox->x1 + dx + srcXoff),
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch
deleted file mode 100644
index d3661cb..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
-(and probably other) while returning from chvt or resume on some
-hardware (e. g. zaurus).
-
-Correct fix would require debugging of fbdev mode during LeaveVT and
-EnterVT.
-
-This patch may cause staying in incorrect or corrupted display mode
-after EnterVT, but on man affected devices it does not cause any visible
-problems.
-
-Hacked code is never called on properly written drivers.
-
-Devices affected and testers involved for future patch removal:
-Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
-
-See also:
-https://bugzilla.redhat.com/show_bug.cgi?id=238451
-
-The bug (first line indicates that your device is affected):
-
-(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
-
-Fatal server error:
-EnterVT failed for screen 0
-
-Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-===================================================================
---- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
-+++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
- #if DEBUG
- print_fbdev_mode("returned", &set_var);
- #endif
-- return FALSE;
-+ /* return FALSE; UGLY HACK to allow return from chvt */
- }
-
- if (!check)
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch
deleted file mode 100644
index abc7db4..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -uNr xorg-server-1.9.0.orig//hw/xfree86/common/xf86Xinput.c xorg-server-1.9.0/hw/xfree86/common/xf86Xinput.c
---- xorg-server-1.9.0.orig//hw/xfree86/common/xf86Xinput.c 2010-08-13 07:53:48.000000000 +0200
-+++ xorg-server-1.9.0/hw/xfree86/common/xf86Xinput.c 2010-08-28 21:31:10.000000000 +0200
-@@ -106,6 +106,8 @@
-
- #include "os.h"
-
-+#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
-+
- EventListPtr xf86Events = NULL;
-
- /**
-@@ -1359,4 +1361,73 @@
- EnableDevice(dev, TRUE);
- }
-
-+/* Taken from evdev-properties.h. */
-+#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap"
-+#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion"
-+
-+/* This is a hack until we get device -> CRTC association. */
-+void
-+xf86InputRotationNotify(Rotation rotation)
-+{
-+ DeviceIntPtr dev;
-+ LocalDevicePtr local;
-+ int ret;
-+ int swap_axes = 0;
-+ CARD8 invert[2] = { 0, 0 };
-+ static Atom prop_swap = 0, prop_invert = 0;
-+ static int atom_generation = -1;
-+
-+ if (atom_generation != serverGeneration) {
-+ prop_swap = 0;
-+ prop_invert = 0;
-+ }
-+
-+ switch (rotation & RR_Rotate_All) {
-+ case RR_Rotate_0:
-+ swap_axes = 1;
-+ invert[0] = 0;
-+ invert[1] = 0;
-+ break;
-+ case RR_Rotate_90:
-+ swap_axes = 0;
-+ invert[0] = 0;
-+ invert[1] = 1;
-+ break;
-+ case RR_Rotate_180:
-+ swap_axes = 1;
-+ invert[0] = 0;
-+ invert[1] = 0;
-+ break;
-+ case RR_Rotate_270:
-+ swap_axes = 0;
-+ invert[0] = 0;
-+ invert[1] = 1;
-+ break;
-+ }
-+
-+ if (!prop_swap)
-+ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES,
-+ strlen(EVDEV_PROP_SWAP_AXES), TRUE);
-+ if (!prop_invert)
-+ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES,
-+ strlen(EVDEV_PROP_INVERT_AXES), TRUE);
-+
-+ for (dev = inputInfo.devices; dev; dev = dev->next) {
-+ local = dev->public.devicePrivate;
-+ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8,
-+ PropModeReplace, 1, &swap_axes, FALSE);
-+ if (ret != Success) {
-+ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n");
-+ continue;
-+ }
-+ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8,
-+ PropModeReplace, 2, invert, FALSE);
-+ if (ret != Success) {
-+ xf86Msg(X_ERROR, "Changing invert property failed!\n");
-+ continue;
-+ }
-+ }
-+}
-+
-+
- /* end of xf86Xinput.c */
-diff -uNr xorg-server-1.9.0.orig//hw/xfree86/modes/xf86Crtc.c xorg-server-1.9.0/hw/xfree86/modes/xf86Crtc.c
---- xorg-server-1.9.0.orig//hw/xfree86/modes/xf86Crtc.c 2010-07-20 05:24:12.000000000 +0200
-+++ xorg-server-1.9.0/hw/xfree86/modes/xf86Crtc.c 2010-08-28 21:28:48.000000000 +0200
-@@ -387,6 +387,12 @@
- if (didLock)
- crtc->funcs->unlock (crtc);
-
-+ /*
-+ * Rotate Touchscreen
-+ */
-+ xf86InputRotationNotify(crtc->rotation);
-+
-+
- return ret;
- }
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.9.4.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.9.4.bb
deleted file mode 100644
index 16f21c6..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.9.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
-DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
-
-require xorg-xserver-common.inc
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto font-util-native"
-PE = "2"
-PR = "${INC_PR}.0"
-
-SRC_URI += " \
- file://dolt-fix.patch \
- file://randr-support.patch \
- file://hack-fbdev-ignore-return-mode.patch \
- file://hack-assume-pixman-supports-overlapped-blt.patch \
- "
-SRC_URI[md5sum] = "040f091dfdfb4e335116eb0032cc690b"
-SRC_URI[sha256sum] = "ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458"
-
-do_install_prepend() {
- mkdir -p ${D}/${libdir}/X11/fonts
-}
-
-# The NVidia driver requires Xinerama support in the X server. Ion uses it.
-PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
-XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
-
-EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
-EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs"
-
-export LDFLAGS += " -ldl "
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
deleted file mode 100644
index ee91ae0..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
-DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
-
-require xorg-xserver-common.inc
-
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto font-util-native"
-PV = "1.10.1"
-PR = "${INC_PR}.0"
-PR_append = "+gitr${SRCPV}"
-PE = "2"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRCREV = "a73311f8304193f9245fb077f173bf1e1d52e040"
-SRC_URI = " \
- git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=server-1.10-branch \
- file://hack-fbdev-ignore-return-mode.patch \
- file://hack-assume-pixman-supports-overlapped-blt.patch \
-"
-
-S = "${WORKDIR}/git"
-
-do_install_prepend() {
- mkdir -p ${D}/${libdir}/X11/fonts
-}
-
-# The NVidia driver requires Xinerama support in the X server. Ion uses it.
-PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
-XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
-
-EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
-EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs"
-
-export LDFLAGS += " -ldl "
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 06/10] xcb: drop from meta-oe, now it's in oe-core
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
` (4 preceding siblings ...)
2011-09-16 13:56 ` [meta-oe][PATCH 05/10] xserver-xorg: drop 1.9.4 and git version Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 07/10] xorg-app: use xorg-app-common.inc from oe-core Martin Jansa
` (3 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-graphics/xcb/libpthread-stubs_0.3.bb | 25 --------------------
meta-oe/recipes-graphics/xcb/libxcb_1.7.bbappend | 2 -
.../recipes-graphics/xcb/xcb-proto_1.6.bbappend | 2 -
3 files changed, 0 insertions(+), 29 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xcb/libpthread-stubs_0.3.bb
delete mode 100644 meta-oe/recipes-graphics/xcb/libxcb_1.7.bbappend
delete mode 100644 meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bbappend
diff --git a/meta-oe/recipes-graphics/xcb/libpthread-stubs_0.3.bb b/meta-oe/recipes-graphics/xcb/libpthread-stubs_0.3.bb
deleted file mode 100644
index 4c6a43b..0000000
--- a/meta-oe/recipes-graphics/xcb/libpthread-stubs_0.3.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Library that provides weak aliases for pthread functions"
-DESCRIPTION = "This library provides weak aliases for pthread functions \
-not provided in libc or otherwise available by default."
-HOMEPAGE = "http://xcb.freedesktop.org"
-BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=XCB"
-SECTION = "x11/libs"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad"
-PR = "r0"
-
-BBCLASSEXTEND = "native nativesdk"
-
-PARALLEL_MAKE = ""
-#DEPENDS = "xcb-proto xproto libxau libxslt-native"
-# DEPENDS += "xsltproc-native gperf-native"
-
-SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "e8fa31b42e13f87e8f5a7a2b731db7ee"
-SRC_URI[sha256sum] = "35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299"
-
-inherit autotools pkgconfig
-
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
diff --git a/meta-oe/recipes-graphics/xcb/libxcb_1.7.bbappend b/meta-oe/recipes-graphics/xcb/libxcb_1.7.bbappend
deleted file mode 100644
index 3bc71e0..0000000
--- a/meta-oe/recipes-graphics/xcb/libxcb_1.7.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
-
diff --git a/meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bbappend b/meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bbappend
deleted file mode 100644
index efc347a..0000000
--- a/meta-oe/recipes-graphics/xcb/xcb-proto_1.6.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-BBCLASSEXTEND += "nativesdk"
-
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 07/10] xorg-app: use xorg-app-common.inc from oe-core
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
` (5 preceding siblings ...)
2011-09-16 13:56 ` [meta-oe][PATCH 06/10] xcb: drop from meta-oe, now it's in oe-core Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 08/10] xorg-driver: use .inc files " Martin Jansa
` (2 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb | 4 ++--
meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb | 4 ++--
meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb | 4 ++--
.../recipes-graphics/xorg-app/setxkbmap_1.2.0.bb | 4 ++--
meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb | 4 ++--
.../recipes-graphics/xorg-app/xorg-app-common.inc | 15 ---------------
meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb | 4 ++--
meta-oe/recipes-graphics/xorg-app/xterm_266.bb | 4 ++--
8 files changed, 14 insertions(+), 29 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-app/xorg-app-common.inc
diff --git a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb
index bf3ecba..d3fbd13 100644
--- a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb
+++ b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb
@@ -1,8 +1,8 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
DESCRIPTION = "Tool for manipulating ICE protocol authorization records"
LIC_FILES_CHKSUM = "file://COPYING;md5=13f70acf3c27f5f834bbc954df775f8e"
DEPENDS += "libice"
-PR = "${INC_PR}.0"
+PR = "r6"
SRC_URI[md5sum] = "bb2e4d2611047f7c5a1a82ec956a9de4"
SRC_URI[sha256sum] = "0ee6fd4554f0131b1ed526ee00b9cf643e7dc97eb70fb51448848ef2f349938d"
diff --git a/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
index 59dca2a..d51e1e8 100644
--- a/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
+++ b/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
@@ -1,8 +1,8 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
DEPENDS += " xproto util-macros"
LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
PE = "1"
-PR = "${INC_PR}.0"
+PR = "r6"
SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951"
SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1"
diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb
index c919462..05d701d 100644
--- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb
@@ -1,10 +1,10 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
DESCRIPTION = "a simple program for managing utmp/wtmp entries"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=07e6423e8815e6b372cd45da76faacd0"
-PR = "${INC_PR}.0"
+PR = "r6"
SRC_URI[archive.md5sum] = "8c8fcda19f4cffe573d43ec9b8255f8e"
SRC_URI[archive.sha256sum] = "73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190"
diff --git a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb
index 592a95d..22df1f1 100644
--- a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb
+++ b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb
@@ -1,8 +1,8 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=5feafdbe6dfe9e2bd32325be0cfc86f8"
DEPENDS += " libxkbfile"
PE = "1"
-PR = "${INC_PR}.0"
+PR = "r6"
SRC_URI[archive.md5sum] = "2f6df89201eb9a2cbfb905d6b82a191e"
SRC_URI[archive.sha256sum] = "999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39"
diff --git a/meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb b/meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb
index c1acc98..3480185 100644
--- a/meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb
@@ -1,8 +1,8 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"
DESCRIPTION = "a utility to configure and test XInput devices"
DEPENDS += " libxi"
-PR = "${INC_PR}.0"
+PR = "r6"
SRC_URI[md5sum] = "1e2f0ad4f3fa833b65c568907f171d28"
SRC_URI[sha256sum] = "6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76"
diff --git a/meta-oe/recipes-graphics/xorg-app/xorg-app-common.inc b/meta-oe/recipes-graphics/xorg-app/xorg-app-common.inc
deleted file mode 100644
index 8358af4..0000000
--- a/meta-oe/recipes-graphics/xorg-app/xorg-app-common.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "X application"
-HOMEPAGE = "http://www.x.org/"
-SECTION = "x11/apps"
-LICENSE = "MIT-X"
-DEPENDS = "util-macros-native virtual/libx11"
-
-INC_PR = "r5"
-
-SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += " /usr/lib/X11/${BPN} /usr/share/X11/app-defaults/"
diff --git a/meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb b/meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb
index 96d15c8..82b530e 100644
--- a/meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb
@@ -1,10 +1,10 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
DESCRIPTION = "X server resource database utility"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69"
DEPENDS += "libxmu"
-PR = "${INC_PR}.0"
+PR = "r6"
SRC_URI[archive.md5sum] = "ed2e48cf33584455d74615ad4bbe4246"
SRC_URI[archive.sha256sum] = "642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7"
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_266.bb b/meta-oe/recipes-graphics/xorg-app/xterm_266.bb
index d826c27..35f5403 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_266.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_266.bb
@@ -1,7 +1,7 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
DEPENDS = "libxaw xproto xextproto libxext libxau libxpm ncurses"
-PR = "${INC_PR}.0"
+PR = "r6"
LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=33;md5=4791b08be94de2e6315ddd158659997d"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 08/10] xorg-driver: use .inc files from oe-core
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
` (6 preceding siblings ...)
2011-09-16 13:56 ` [meta-oe][PATCH 07/10] xorg-app: use xorg-app-common.inc from oe-core Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 09/10] task-x11: define better default XSERVER/XSERVER_COMMON values and make whole recipe MACHINE_ARCH Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 10/10] libdrm-2.4.25: drop from meta-oe, now there is 2.4.26 in oe-core Martin Jansa
9 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xf86-input-tslib_0.0.6.bb | 4 +-
.../xorg-driver/xf86-input-void_1.4.0.bb | 4 +-
.../xorg-driver/xf86-video-fbdev_0.4.2.bb | 5 +-
.../xorg-driver/xf86-video-geode_2.11.12.bb | 4 +-
.../xorg-driver/xf86-video-glamo_git.bb | 4 +-
.../xorg-driver/xf86-video-omapfb_git.bb | 5 +--
.../xorg-driver/xorg-driver-common.inc | 40 --------------------
.../xorg-driver/xorg-driver-input.inc | 4 --
.../xorg-driver/xorg-driver-video.inc | 4 --
9 files changed, 11 insertions(+), 63 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xorg-driver-common.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xorg-driver-input.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xorg-driver-video.inc
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
index d5d11ce..fa59036 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -1,4 +1,4 @@
-require xorg-driver-input.inc
+require recipes-graphics/xorg-driver/xf86-input-common.inc
DESCRIPTION = "X.Org X server -- tslib input driver"
DEPENDS += "tslib"
RRECOMMENDS_${PN} += "tslib-calibrate"
@@ -8,7 +8,7 @@ RSUGGESTS_${PN} += "hal"
LIC_FILES_CHKSUM = "file://src/tslib.c;endline=28;md5=bd62eaef222dcf5cd59e490a12bd795e \
file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
-PR = "${INC_PR}.1"
+PR = "r16"
SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \
file://double-free-crash.patch \
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
index 32ebbeb..71b7cbc 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
@@ -1,6 +1,6 @@
-require xorg-driver-input.inc
+require recipes-graphics/xorg-driver/xf86-input-common.inc
DESCRIPTION = "X.Org X server -- void input driver"
-PR = "${INC_PR}.0"
+PR = "r16"
LIC_FILES_CHKSUM = "file://COPYING;md5=4be6a915bfbf111cd88706fc6a6f141b"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
index d555fbc..4c85704 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
@@ -1,9 +1,8 @@
-require xorg-driver-video.inc
+require recipes-graphics/xorg-driver/xf86-video-common.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
DESCRIPTION = "X.Org X server -- fbdev display driver"
-PE = "1"
-PR = "${INC_PR}.1"
+PR = "r16"
SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074"
SRC_URI[sha256sum] = "93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
index 595ebee..e44cf49 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
@@ -1,8 +1,8 @@
-require xorg-driver-video.inc
+require recipes-graphics/xorg-driver/xf86-video-common.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=f8ad89d9d9a024f19d7dcc5acb044a42"
DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PR = "${INC_PR}.0"
+PR = "r16"
SRC_URI[md5sum] = "a99c521db731c2f1df309057a8465e4c"
SRC_URI[sha256sum] = "28d845d727d99bfa4d4b93c5486ec01b72eb222e0910a766089db1103b1c2d92"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index b1030d9..3608fb2 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -1,4 +1,4 @@
-require xorg-driver-video.inc
+require recipes-graphics/xorg-driver/xf86-video-common.inc
DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"
DEPENDS += "libdrm"
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
PE = "2"
PV = "1.0.0+gitr${SRCPV}"
-PR = "${INC_PR}.6"
+PR = "r16"
SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 2cc744f..e30972c 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -1,11 +1,8 @@
require recipes-graphics/xorg-driver/xf86-driver-common.inc
-INC_PR ?= "r15"
-
DESCRIPTION = "X.Org X server -- OMAP display driver"
-PE = "1"
PV = "0.1.1+${PR}+gitr${SRCREV}"
-PR = "${INC_PR}.4"
+PR = "r16"
LICENSE = "MIT-X"
LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta-oe/recipes-graphics/xorg-driver/xorg-driver-common.inc
deleted file mode 100644
index c0f4a15..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "X driver"
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/drivers"
-LICENSE = "MIT-X"
-INC_PR = "r15"
-
-DEPENDS = "randrproto virtual/xserver-xf86 xproto"
-
-SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-FILES_${PN} += " ${libdir}/xorg/modules"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/*/.debug"
-
-inherit autotools pkgconfig
-
-TARGET_CPPFLAGS += "-I${STAGING_DIR_HOST}/usr/include/xorg"
-
-# Another sucky behavor from Xorg configure scripts.
-# They use AC_CHECK_FILE to check for DRI headers. Yuck!
-# Of course this will blow up when cross compiling.
-
-do_configure_prepend() {
- incdir=${layout_includedir}/xorg
- for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do
- path="$incdir/$f"
- if [ -f "${STAGING_DIR_HOST}/$path" ]; then
- p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
- eval "export ac_cv_file_$p=yes"
- fi
- done
-}
-
-# 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-oe/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta-oe/recipes-graphics/xorg-driver/xorg-driver-input.inc
deleted file mode 100644
index e44dbd5..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-include xorg-driver-common.inc
-
-DEPENDS = "randrproto inputproto xserver-xorg xproto"
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xorg-driver-video.inc b/meta-oe/recipes-graphics/xorg-driver/xorg-driver-video.inc
deleted file mode 100644
index 36b5b75..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xorg-driver-video.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-include xorg-driver-common.inc
-
-DEPENDS = "randrproto renderproto videoproto xextproto fontsproto xserver-xorg xproto"
-
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 09/10] task-x11: define better default XSERVER/XSERVER_COMMON values and make whole recipe MACHINE_ARCH
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
` (7 preceding siblings ...)
2011-09-16 13:56 ` [meta-oe][PATCH 08/10] xorg-driver: use .inc files " Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 10/10] libdrm-2.4.25: drop from meta-oe, now there is 2.4.26 in oe-core Martin Jansa
9 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-core/tasks/task-x11.bb | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-core/tasks/task-x11.bb b/meta-oe/recipes-core/tasks/task-x11.bb
index 66af8bd..a7faa00 100644
--- a/meta-oe/recipes-core/tasks/task-x11.bb
+++ b/meta-oe/recipes-core/tasks/task-x11.bb
@@ -3,7 +3,7 @@ SECTION = "x11/server"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PV = "1.0"
-PR = "r7"
+PR = "r8"
# WORK IN PROGRESS
@@ -21,12 +21,10 @@ RRECOMMENDS_${PN} = "\
# Some machines don't set a *runtime* provider for X, so default to Xfbdev here
# virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages
-XSERVER ?= "xserver-kdrive-fbdev"
-XSERVER_COMMON ?= "xserver-kdrive-common"
-XSERVER_COMMON_shr = "xserver-common"
+XSERVER ?= "xserver-xorg"
+XSERVER_COMMON ?= "xserver-common"
-# This is also the reason why we have to make this package machine specific :/
-PACKAGE_ARCH_${PN}-server = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
RDEPENDS_${PN}-server = "\
${XSERVER} \
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-oe][PATCH 10/10] libdrm-2.4.25: drop from meta-oe, now there is 2.4.26 in oe-core
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
` (8 preceding siblings ...)
2011-09-16 13:56 ` [meta-oe][PATCH 09/10] task-x11: define better default XSERVER/XSERVER_COMMON values and make whole recipe MACHINE_ARCH Martin Jansa
@ 2011-09-16 13:56 ` Martin Jansa
9 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 13:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-graphics/drm/libdrm-2.4.25/glamo.patch | 1095 --------------------
.../drm/libdrm-2.4.25/installtests.patch | 49 -
meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb | 37 -
3 files changed, 0 insertions(+), 1181 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/drm/libdrm-2.4.25/glamo.patch
delete mode 100644 meta-oe/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
delete mode 100644 meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb
diff --git a/meta-oe/recipes-graphics/drm/libdrm-2.4.25/glamo.patch b/meta-oe/recipes-graphics/drm/libdrm-2.4.25/glamo.patch
deleted file mode 100644
index b397ded..0000000
--- a/meta-oe/recipes-graphics/drm/libdrm-2.4.25/glamo.patch
+++ /dev/null
@@ -1,1095 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 25d1747..f384228 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -41,7 +41,11 @@ if HAVE_RADEON
- RADEON_SUBDIR = radeon
- endif
-
--SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) tests include
-+if HAVE_GLAMO
-+GLAMO_SUBDIR = glamo
-+endif
-+
-+SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(GLAMO_SUBDIR) tests include
-
- libdrm_la_LTLIBRARIES = libdrm.la
- libdrm_ladir = $(libdir)
-diff --git a/configure.ac b/configure.ac
-index 62db817..0b2a33e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,6 +73,11 @@ AC_ARG_ENABLE(nouveau-experimental-api,
- [NOUVEAU=$enableval], [NOUVEAU=no])
-
-
-+AC_ARG_ENABLE(glamo-experimental-api,
-+ AS_HELP_STRING([--enable-glamo-experimental-api],
-+ [Enable support for Glamo's KMS API (default: disabled)]),
-+ [GLAMO=$enableval], [GLAMO=no])
-+
- dnl ===========================================================================
- dnl check compiler flags
- AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
-@@ -169,6 +174,11 @@ if test "x$NOUVEAU" = xyes; then
- AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau (nvidia) support])
- fi
-
-+AM_CONDITIONAL(HAVE_GLAMO, [test "x$GLAMO" = xyes])
-+if test "x$GLAMO" = xyes; then
-+ AC_DEFINE(HAVE_GLAMO, 1, [Have glamo support])
-+fi
-+
- PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
- if test "x$HAVE_CAIRO" = xyes; then
- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
-@@ -262,6 +272,8 @@ AC_OUTPUT([
- radeon/libdrm_radeon.pc
- nouveau/Makefile
- nouveau/libdrm_nouveau.pc
-+ glamo/Makefile
-+ glamo/libdrm_glamo.pc
- tests/Makefile
- tests/modeprint/Makefile
- tests/modetest/Makefile
-diff --git a/glamo/Makefile.am b/glamo/Makefile.am
-new file mode 100644
-index 0000000..1f17aa3
---- /dev/null
-+++ b/glamo/Makefile.am
-@@ -0,0 +1,52 @@
-+# Copyright (c) 2009 Thomas Whtie <taw@bitwiz.org.uk>
-+# Based on libdrm-glamo Copyright © 2008 Jérôme Glisse
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-+# IN THE SOFTWARE.
-+#
-+# Authors:
-+# Jérôme Glisse <glisse@freedesktop.org>
-+# Thomas White <taw@bitwiz.org.uk>
-+
-+AM_CFLAGS = \
-+ $(WARN_CFLAGS) \
-+ -I$(top_srcdir) \
-+ -I$(top_srcdir)/glamo \
-+ $(PTHREADSTUBS_CFLAGS) \
-+ -I$(top_srcdir)/include/drm
-+
-+libdrm_glamo_la_LTLIBRARIES = libdrm_glamo.la
-+libdrm_glamo_ladir = $(libdir)
-+libdrm_glamo_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-+libdrm_glamo_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+
-+libdrm_glamo_la_SOURCES = \
-+ glamo_bo_gem.c \
-+ glamo_track.c
-+
-+libdrm_glamoincludedir = ${includedir}/libdrm
-+libdrm_glamoinclude_HEADERS = \
-+ glamo_bo.h \
-+ glamo_bo_gem.h \
-+ glamo_track.h
-+
-+pkgconfigdir = @pkgconfigdir@
-+pkgconfig_DATA = libdrm_glamo.pc
-+
-+EXTRA_DIST = libdrm_glamo.pc.in
-diff --git a/glamo/glamo_bo.h b/glamo/glamo_bo.h
-new file mode 100644
-index 0000000..8ef2a18
---- /dev/null
-+++ b/glamo/glamo_bo.h
-@@ -0,0 +1,183 @@
-+/*
-+ * Copyright (c) 2009 Thomas White
-+ *
-+ * Heavily based on radeon_bo.h
-+ * Copyright © 2008 Jérôme Glisse
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
-+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ */
-+/*
-+ * Authors:
-+ * Jérôme Glisse <glisse@freedesktop.org>
-+ * Thomas White <taw@bitwiz.org.uk>
-+ */
-+#ifndef GLAMO_BO_H
-+#define GLAMO_BO_H
-+
-+#include <stdio.h>
-+#include <stdint.h>
-+#include "glamo_track.h"
-+
-+/* bo object */
-+#define GLAMO_BO_FLAGS_MACRO_TILE 1
-+#define GLAMO_BO_FLAGS_MICRO_TILE 2
-+
-+struct glamo_bo_manager;
-+
-+struct glamo_bo {
-+ uint32_t alignment;
-+ uint32_t handle;
-+ uint32_t size;
-+ uint32_t domains;
-+ uint32_t flags;
-+ unsigned cref;
-+#ifdef GLAMO_BO_TRACK
-+ struct glamo_track *track;
-+#endif
-+ struct glamo_bo_manager *bom;
-+ void *virtual;
-+ uint32_t space_accounted;
-+};
-+
-+/* bo functions */
-+struct glamo_bo_funcs {
-+ struct glamo_bo *(*bo_open)(struct glamo_bo_manager *bom,
-+ uint32_t handle,
-+ uint32_t size,
-+ uint32_t alignment,
-+ uint32_t domains,
-+ uint32_t flags);
-+ void (*bo_ref)(struct glamo_bo *bo);
-+ struct glamo_bo *(*bo_unref)(struct glamo_bo *bo);
-+ int (*bo_map)(struct glamo_bo *bo, int write);
-+ int (*bo_unmap)(struct glamo_bo *bo);
-+ int (*bo_wait)(struct glamo_bo *bo);
-+};
-+
-+struct glamo_bo_manager {
-+ struct glamo_bo_funcs *funcs;
-+ int fd;
-+ struct glamo_tracker tracker;
-+};
-+
-+static inline void _glamo_bo_debug(struct glamo_bo *bo,
-+ const char *op,
-+ const char *file,
-+ const char *func,
-+ int line)
-+{
-+ fprintf(stderr, "%s %p 0x%08X 0x%08X 0x%08X [%s %s %d]\n",
-+ op, (void *)bo, bo->handle, bo->size, bo->cref, file, func, line);
-+}
-+
-+static inline struct glamo_bo *_glamo_bo_open(struct glamo_bo_manager *bom,
-+ uint32_t handle,
-+ uint32_t size,
-+ uint32_t alignment,
-+ uint32_t domains,
-+ uint32_t flags,
-+ const char *file,
-+ const char *func,
-+ int line)
-+{
-+ struct glamo_bo *bo;
-+
-+ bo = bom->funcs->bo_open(bom, handle, size, alignment, domains, flags);
-+#ifdef GLAMO_BO_TRACK
-+ if (bo) {
-+ bo->track = glamo_tracker_add_track(&bom->tracker, bo->handle);
-+ glamo_track_add_event(bo->track, file, func, "open", line);
-+ }
-+#endif
-+ return bo;
-+}
-+
-+static inline void _glamo_bo_ref(struct glamo_bo *bo,
-+ const char *file,
-+ const char *func,
-+ int line)
-+{
-+ bo->cref++;
-+#ifdef GLAMO_BO_TRACK
-+ glamo_track_add_event(bo->track, file, func, "ref", line);
-+#endif
-+ bo->bom->funcs->bo_ref(bo);
-+}
-+
-+static inline struct glamo_bo *_glamo_bo_unref(struct glamo_bo *bo,
-+ const char *file,
-+ const char *func,
-+ int line)
-+{
-+ bo->cref--;
-+#ifdef GLAMO_BO_TRACK
-+ glamo_track_add_event(bo->track, file, func, "unref", line);
-+ if (bo->cref <= 0) {
-+ glamo_tracker_remove_track(&bo->bom->tracker, bo->track);
-+ bo->track = NULL;
-+ }
-+#endif
-+ return bo->bom->funcs->bo_unref(bo);
-+}
-+
-+static inline int _glamo_bo_map(struct glamo_bo *bo,
-+ int write,
-+ const char *file,
-+ const char *func,
-+ int line)
-+{
-+ return bo->bom->funcs->bo_map(bo, write);
-+}
-+
-+static inline int _glamo_bo_unmap(struct glamo_bo *bo,
-+ const char *file,
-+ const char *func,
-+ int line)
-+{
-+ return bo->bom->funcs->bo_unmap(bo);
-+}
-+
-+static inline int _glamo_bo_wait(struct glamo_bo *bo,
-+ const char *file,
-+ const char *func,
-+ int line)
-+{
-+ return bo->bom->funcs->bo_wait(bo);
-+}
-+
-+#define glamo_bo_open(bom, h, s, a, d, f)\
-+ _glamo_bo_open(bom, h, s, a, d, f, __FILE__, __FUNCTION__, __LINE__)
-+#define glamo_bo_ref(bo)\
-+ _glamo_bo_ref(bo, __FILE__, __FUNCTION__, __LINE__)
-+#define glamo_bo_unref(bo)\
-+ _glamo_bo_unref(bo, __FILE__, __FUNCTION__, __LINE__)
-+#define glamo_bo_map(bo, w)\
-+ _glamo_bo_map(bo, w, __FILE__, __FUNCTION__, __LINE__)
-+#define glamo_bo_unmap(bo)\
-+ _glamo_bo_unmap(bo, __FILE__, __FUNCTION__, __LINE__)
-+#define glamo_bo_debug(bo, opcode)\
-+ _glamo_bo_debug(bo, opcode, __FILE__, __FUNCTION__, __LINE__)
-+#define glamo_bo_wait(bo) \
-+ _glamo_bo_wait(bo, __FILE__, __func__, __LINE__)
-+
-+#endif
-diff --git a/glamo/glamo_bo_gem.c b/glamo/glamo_bo_gem.c
-new file mode 100644
-index 0000000..38a4436
---- /dev/null
-+++ b/glamo/glamo_bo_gem.c
-@@ -0,0 +1,336 @@
-+/*
-+ * Copyright © 2009 Thomas White
-+ *
-+ * Based on radeon_bo_gem.c, to which the following notice applies:
-+ *
-+ * Copyright © 2008 Dave Airlie
-+ * Copyright © 2008 Jérôme Glisse
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
-+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ */
-+/*
-+ * Authors:
-+ * Dave Airlie
-+ * Jérôme Glisse <glisse@freedesktop.org>
-+ *
-+ *
-+ * Memory mapping functions are based on intel_bufmgr_gem.c, to which the
-+ * following notice applies:
-+ *
-+ * Copyright © 2007 Red Hat Inc.
-+ * Copyright © 2007 Intel Corporation
-+ * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ *
-+ **************************************************************************/
-+/*
-+ * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
-+ * Keith Whitwell <keithw-at-tungstengraphics-dot-com>
-+ * Eric Anholt <eric@anholt.net>
-+ * Dave Airlie <airlied@linux.ie>
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <stdio.h>
-+#include <stdint.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/mman.h>
-+#include <sys/ioctl.h>
-+#include <errno.h>
-+
-+#include "xf86drm.h"
-+#include "drm.h"
-+#include "glamo_drm.h"
-+#include "glamo_bo.h"
-+#include "glamo_bo_gem.h"
-+
-+struct glamo_bo_gem {
-+ struct glamo_bo base;
-+ uint32_t name;
-+ int map_count;
-+};
-+
-+struct bo_manager_gem {
-+ struct glamo_bo_manager base;
-+};
-+
-+static struct glamo_bo *bo_open(struct glamo_bo_manager *bom,
-+ uint32_t handle,
-+ uint32_t size,
-+ uint32_t alignment,
-+ uint32_t domains,
-+ uint32_t flags)
-+{
-+ struct glamo_bo_gem *bo;
-+ int r;
-+
-+ bo = (struct glamo_bo_gem*)calloc(1, sizeof(struct glamo_bo_gem));
-+ if (bo == NULL) {
-+ return NULL;
-+ }
-+
-+ bo->base.bom = bom;
-+ bo->base.handle = 0;
-+ bo->base.size = size;
-+ bo->base.alignment = alignment;
-+ bo->base.domains = domains;
-+ bo->base.flags = flags;
-+ bo->base.cref = 0;
-+ bo->map_count = 0;
-+ bo->base.virtual = NULL;
-+ if (handle) {
-+ struct drm_gem_open open_arg;
-+
-+ memset(&open_arg, 0, sizeof(open_arg));
-+ open_arg.name = handle;
-+ r = ioctl(bom->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
-+ if (r != 0) {
-+ free(bo);
-+ return NULL;
-+ }
-+ bo->base.handle = open_arg.handle;
-+ bo->base.size = open_arg.size;
-+ bo->name = handle;
-+ } else {
-+ struct drm_glamo_gem_create args;
-+
-+ args.size = size;
-+ args.alignment = alignment;
-+ args.initial_domain = bo->base.domains;
-+ args.no_backing_store = 0;
-+ args.handle = 0;
-+ r = drmCommandWriteRead(bom->fd, DRM_GLAMO_GEM_CREATE,
-+ &args, sizeof(args));
-+ bo->base.handle = args.handle;
-+ if (r) {
-+ fprintf(stderr, "Failed to allocate :\n");
-+ fprintf(stderr, " size : %d bytes\n", size);
-+ fprintf(stderr, " alignment : %d bytes\n", alignment);
-+ free(bo);
-+ return NULL;
-+ }
-+ }
-+ glamo_bo_ref((struct glamo_bo*)bo);
-+ return (struct glamo_bo*)bo;
-+}
-+
-+static void bo_ref(struct glamo_bo *bo)
-+{
-+}
-+
-+static struct glamo_bo *bo_unref(struct glamo_bo *bo)
-+{
-+ struct glamo_bo_gem *bo_gem = (struct glamo_bo_gem*)bo;
-+ struct drm_gem_close args;
-+
-+ if (bo == NULL) {
-+ return NULL;
-+ }
-+ if (bo->cref) {
-+ return bo;
-+ }
-+ if (bo_gem->map_count) {
-+ munmap(bo->virtual, bo->size);
-+ }
-+
-+ /* close object */
-+ args.handle = bo->handle;
-+ ioctl(bo->bom->fd, DRM_IOCTL_GEM_CLOSE, &args);
-+ memset(bo_gem, 0, sizeof(struct glamo_bo_gem));
-+ free(bo_gem);
-+ return NULL;
-+}
-+
-+static int bo_map(struct glamo_bo *bo, int write)
-+{
-+ struct glamo_bo_gem *bo_gem;
-+ struct glamo_bo_manager *bufmgr;
-+ int ret;
-+
-+ bo_gem = (struct glamo_bo_gem *)bo;
-+ bufmgr = (struct glamo_bo_manager*)bo->bom;
-+
-+ /* Get a mapping of the buffer if we haven't before. */
-+ if (bo->virtual == NULL) {
-+
-+ struct drm_glamo_gem_mmap mmap_arg;
-+
-+ memset(&mmap_arg, 0, sizeof(mmap_arg));
-+ mmap_arg.handle = bo->handle;
-+
-+ /* Get the fake offset back... */
-+ ret = ioctl(bufmgr->fd, DRM_IOCTL_GLAMO_GEM_MMAP, &mmap_arg);
-+ if (ret != 0) {
-+ fprintf(stderr,
-+ "%s:%d: Error preparing BO map %d (%d): %s .\n",
-+ __FILE__, __LINE__,
-+ bo->handle, bo_gem->name,
-+ strerror(errno));
-+ return ret;
-+ }
-+ /* and mmap it */
-+ bo->virtual = mmap(0, bo->size, PROT_READ | PROT_WRITE,
-+ MAP_SHARED, bufmgr->fd,
-+ mmap_arg.offset);
-+ if (bo->virtual == MAP_FAILED) {
-+ fprintf(stderr,
-+ "%s:%d: Error mapping buffer %d (%d): %s .\n",
-+ __FILE__, __LINE__,
-+ bo->handle, bo_gem->name,
-+ strerror(errno));
-+ return errno;
-+ }
-+ }
-+ bo_gem->map_count++;
-+
-+ return 0;
-+}
-+
-+static int bo_unmap(struct glamo_bo *bo)
-+{
-+ struct glamo_bo_gem *bo_gem = (struct glamo_bo_gem*)bo;
-+
-+ if ( bo_gem->map_count == 0 ) {
-+ fprintf(stderr, "Not unmapping %p, because its map count"
-+ " is already zero.\n", bo_gem);
-+ return 0;
-+ }
-+
-+ if (--bo_gem->map_count > 0) {
-+ return 0;
-+ }
-+ munmap(bo->virtual, bo->size);
-+ bo->virtual = NULL;
-+ return 0;
-+}
-+
-+static int bo_wait(struct glamo_bo *bo)
-+{
-+ struct drm_glamo_gem_wait_rendering args;
-+ int ret;
-+
-+ args.handle = bo->handle;
-+ args.have_handle = 1;
-+ do {
-+ ret = drmCommandWriteRead(bo->bom->fd,
-+ DRM_GLAMO_GEM_WAIT_RENDERING,
-+ &args, sizeof(args));
-+ } while (ret == -EAGAIN);
-+ return ret;
-+}
-+
-+static struct glamo_bo_funcs bo_gem_funcs = {
-+ bo_open,
-+ bo_ref,
-+ bo_unref,
-+ bo_map,
-+ bo_unmap,
-+ bo_wait
-+};
-+
-+struct glamo_bo_manager *glamo_bo_manager_gem_ctor(int fd)
-+{
-+ struct bo_manager_gem *bomg;
-+
-+ bomg = (struct bo_manager_gem*)calloc(1, sizeof(struct bo_manager_gem));
-+ if (bomg == NULL) return NULL;
-+
-+ bomg->base.funcs = &bo_gem_funcs;
-+ bomg->base.fd = fd;
-+ return (struct glamo_bo_manager*)bomg;
-+}
-+
-+void glamo_bo_manager_gem_dtor(struct glamo_bo_manager *bom)
-+{
-+ struct bo_manager_gem *bomg = (struct bo_manager_gem*)bom;
-+
-+ if (bom == NULL) return;
-+ free(bomg);
-+}
-+
-+uint32_t glamo_gem_get_name(struct glamo_bo *bo)
-+{
-+ struct glamo_bo_gem *bo_gem = (struct glamo_bo_gem*)bo;
-+ return bo_gem->name;
-+}
-+
-+int glamo_gem_name_buffer(struct glamo_bo *bo, uint32_t *name)
-+{
-+ struct drm_gem_flink flink;
-+ int r;
-+
-+ if ( !bo ) {
-+ fprintf(stderr, "No buffer object!\n");
-+ return -1;
-+ }
-+
-+ flink.handle = bo->handle;
-+ r = ioctl(bo->bom->fd, DRM_IOCTL_GEM_FLINK, &flink);
-+ if (r) return r;
-+
-+ *name = flink.name;
-+ return 0;
-+}
-+
-+int glamo_bo_subdata(struct glamo_bo *bo, unsigned long offset,
-+ unsigned long size, const void *data)
-+{
-+ int ret;
-+
-+ if (size == 0 || data == NULL)
-+ return 0;
-+
-+ ret = bo_map(bo, 1);
-+ if ( ret ) return ret;
-+
-+ memcpy((unsigned char *)bo->virtual + offset, data, size);
-+
-+ bo_unmap(bo);
-+
-+ return 0;
-+}
-diff --git a/glamo/glamo_bo_gem.h b/glamo/glamo_bo_gem.h
-new file mode 100644
-index 0000000..05b5fb9
---- /dev/null
-+++ b/glamo/glamo_bo_gem.h
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright © 2008 Dave Airlie
-+ * Copyright © 2008 Jérôme Glisse
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
-+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ */
-+/*
-+ * Authors:
-+ * Dave Airlie
-+ * Jérôme Glisse <glisse@freedesktop.org>
-+ */
-+#ifndef GLAMO_BO_GEM_H
-+#define GLAMO_BO_GEM_H
-+
-+#include "glamo_bo.h"
-+
-+struct glamo_bo_manager *glamo_bo_manager_gem_ctor(int fd);
-+void glamo_bo_manager_gem_dtor(struct glamo_bo_manager *bom);
-+int glamo_gem_name_buffer(struct glamo_bo *bo, uint32_t *name);
-+uint32_t glamo_gem_get_name(struct glamo_bo *bo);
-+extern int glamo_bo_subdata(struct glamo_bo *bo, unsigned long offset,
-+ unsigned long size, const void *data);
-+#endif
-diff --git a/glamo/glamo_track.c b/glamo/glamo_track.c
-new file mode 100644
-index 0000000..27ffe41
---- /dev/null
-+++ b/glamo/glamo_track.c
-@@ -0,0 +1,140 @@
-+/*
-+ * Copyright © 2008 Jérôme Glisse
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
-+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ */
-+/*
-+ * Authors:
-+ * Jérôme Glisse <glisse@freedesktop.org>
-+ */
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include "glamo_track.h"
-+
-+void glamo_track_add_event(struct glamo_track *track,
-+ const char *file,
-+ const char *func,
-+ const char *op,
-+ unsigned line)
-+{
-+ struct glamo_track_event *event;
-+
-+ if (track == NULL) {
-+ return;
-+ }
-+ event = (void*)calloc(1,sizeof(struct glamo_track_event));
-+ if (event == NULL) {
-+ return;
-+ }
-+ event->line = line;
-+ event->file = strdup(file);
-+ event->func = strdup(func);
-+ event->op = strdup(op);
-+ if (event->file == NULL || event->func == NULL || event->op == NULL) {
-+ free(event->file);
-+ free(event->func);
-+ free(event->op);
-+ free(event);
-+ return;
-+ }
-+ event->next = track->events;
-+ track->events = event;
-+}
-+
-+struct glamo_track *glamo_tracker_add_track(struct glamo_tracker *tracker,
-+ unsigned key)
-+{
-+ struct glamo_track *track;
-+
-+ track = (struct glamo_track*)calloc(1, sizeof(struct glamo_track));
-+ if (track) {
-+ track->next = tracker->tracks.next;
-+ track->prev = &tracker->tracks;
-+ tracker->tracks.next = track;
-+ if (track->next) {
-+ track->next->prev = track;
-+ }
-+ track->key = key;
-+ track->events = NULL;
-+ }
-+ return track;
-+}
-+
-+void glamo_tracker_remove_track(struct glamo_tracker *tracker,
-+ struct glamo_track *track)
-+{
-+ struct glamo_track_event *event;
-+ void *tmp;
-+
-+ if (track == NULL) {
-+ return;
-+ }
-+ track->prev->next = track->next;
-+ if (track->next) {
-+ track->next->prev = track->prev;
-+ }
-+ track->next = track->prev = NULL;
-+ event = track->events;
-+ while (event) {
-+ tmp = event;
-+ free(event->file);
-+ free(event->func);
-+ free(event->op);
-+ event = event->next;
-+ free(tmp);
-+ }
-+ track->events = NULL;
-+ free(track);
-+}
-+
-+void glamo_tracker_print(struct glamo_tracker *tracker, FILE *file)
-+{
-+ struct glamo_track *track;
-+ struct glamo_track_event *event;
-+ void *tmp;
-+
-+ track = tracker->tracks.next;
-+ while (track) {
-+ event = track->events;
-+ fprintf(file, "[0x%08X] :\n", track->key);
-+ while (event) {
-+ tmp = event;
-+ fprintf(file, " [0x%08X:%s](%s:%s:%d)\n",
-+ track->key, event->op, event->file,
-+ event->func, event->line);
-+ free(event->file);
-+ free(event->func);
-+ free(event->op);
-+ event->file = NULL;
-+ event->func = NULL;
-+ event->op = NULL;
-+ event = event->next;
-+ free(tmp);
-+ }
-+ track->events = NULL;
-+ tmp = track;
-+ track = track->next;
-+ free(tmp);
-+ }
-+}
-diff --git a/glamo/glamo_track.h b/glamo/glamo_track.h
-new file mode 100644
-index 0000000..fedead7
---- /dev/null
-+++ b/glamo/glamo_track.h
-@@ -0,0 +1,64 @@
-+/*
-+ * Copyright © 2008 Jérôme Glisse
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
-+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ */
-+/*
-+ * Authors:
-+ * Jérôme Glisse <glisse@freedesktop.org>
-+ */
-+#ifndef GLAMO_TRACK_H
-+#define GLAMO_TRACK_H
-+
-+struct glamo_track_event {
-+ struct glamo_track_event *next;
-+ char *file;
-+ char *func;
-+ char *op;
-+ unsigned line;
-+};
-+
-+struct glamo_track {
-+ struct glamo_track *next;
-+ struct glamo_track *prev;
-+ unsigned key;
-+ struct glamo_track_event *events;
-+};
-+
-+struct glamo_tracker {
-+ struct glamo_track tracks;
-+};
-+
-+void glamo_track_add_event(struct glamo_track *track,
-+ const char *file,
-+ const char *func,
-+ const char *op,
-+ unsigned line);
-+struct glamo_track *glamo_tracker_add_track(struct glamo_tracker *tracker,
-+ unsigned key);
-+void glamo_tracker_remove_track(struct glamo_tracker *tracker,
-+ struct glamo_track *track);
-+void glamo_tracker_print(struct glamo_tracker *tracker,
-+ FILE *file);
-+
-+#endif
-diff --git a/glamo/libdrm_glamo.pc.in b/glamo/libdrm_glamo.pc.in
-new file mode 100644
-index 0000000..d4d8e70
---- /dev/null
-+++ b/glamo/libdrm_glamo.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libdrm_glamo
-+Description: Userspace interface to kernel DRM services for Glamo
-+Version: 1.0.1
-+Libs: -L${libdir} -ldrm_glamo
-+Cflags: -I${includedir} -I${includedir}/libdrm
-diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am
-index 43695bd..f3f7edf 100644
---- a/include/drm/Makefile.am
-+++ b/include/drm/Makefile.am
-@@ -35,6 +35,7 @@ klibdrminclude_HEADERS = \
- savage_drm.h \
- sis_drm.h \
- via_drm.h \
-+ glamo_drm.h \
- mach64_drm.h
-
-
-diff --git a/include/drm/glamo_drm.h b/include/drm/glamo_drm.h
-new file mode 100644
-index 0000000..7629ebc
---- /dev/null
-+++ b/include/drm/glamo_drm.h
-@@ -0,0 +1,153 @@
-+/* glamo_drm.h -- Public header for the Glamo driver
-+ *
-+ * Copyright 2009 Thomas White
-+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
-+ * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
-+ * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
-+ * All rights reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Authors:
-+ * Thomas White <taw@bitwiz.org.uk>
-+ * Kevin E. Martin <martin@valinux.com>
-+ * Gareth Hughes <gareth@valinux.com>
-+ * Keith Whitwell <keith@tungstengraphics.com>
-+ */
-+
-+#ifndef __GLAMO_DRM_H__
-+#define __GLAMO_DRM_H__
-+
-+#include "drm.h"
-+
-+#define GLAMO_GEM_DOMAIN_VRAM (0x1)
-+
-+/* Glamo specific ioctls */
-+#define DRM_GLAMO_CMDBUF 0x01
-+#define DRM_GLAMO_SWAP 0x02
-+#define DRM_GLAMO_CMDBURST 0x03
-+
-+#define DRM_GLAMO_GEM_INFO 0x1c
-+#define DRM_GLAMO_GEM_CREATE 0x1d
-+#define DRM_GLAMO_GEM_MMAP 0x1e
-+#define DRM_GLAMO_GEM_PIN 0x1f
-+#define DRM_GLAMO_GEM_UNPIN 0x20
-+#define DRM_GLAMO_GEM_PREAD 0x21
-+#define DRM_GLAMO_GEM_PWRITE 0x22
-+#define DRM_GLAMO_GEM_WAIT_RENDERING 0x24
-+
-+#define DRM_IOCTL_GLAMO_CMDBUF DRM_IOW(DRM_COMMAND_BASE + DRM_GLAMO_CMDBUF, drm_glamo_cmd_buffer_t)
-+#define DRM_IOCTL_GLAMO_SWAP DRM_IO(DRM_COMMAND_BASE + DRM_GLAMO_SWAP)
-+#define DRM_IOCTL_GLAMO_CMDBURST DRM_IOW(DRM_COMMAND_BASE + DRM_GLAMO_CMDBURST, drm_glamo_cmd_burst_t)
-+
-+#define DRM_IOCTL_GLAMO_GEM_INFO DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_INFO, struct drm_glamo_gem_info)
-+#define DRM_IOCTL_GLAMO_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_CREATE, struct drm_glamo_gem_create)
-+#define DRM_IOCTL_GLAMO_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_MMAP, struct drm_glamo_gem_mmap)
-+#define DRM_IOCTL_GLAMO_GEM_PIN DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_PIN, struct drm_glamo_gem_pin)
-+#define DRM_IOCTL_GLAMO_GEM_UNPIN DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_UNPIN, struct drm_glamo_gem_unpin)
-+#define DRM_IOCTL_GLAMO_GEM_PREAD DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_PREAD, struct drm_glamo_gem_pread)
-+#define DRM_IOCTL_GLAMO_GEM_PWRITE DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_PWRITE, struct drm_glamo_gem_pwrite)
-+#define DRM_IOCTL_GLAMO_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_GLAMO_GEM_WAIT_RENDERING, struct drm_glamo_gem_wait_rendering)
-+
-+
-+/* Simple command submission - a list of 16-bit address-data pairs */
-+typedef struct drm_glamo_cmd_buffer {
-+ unsigned int bufsz; /* Size of buffer, in bytes */
-+ char *buf; /* Buffer of stuff to go onto the ring buffer */
-+ unsigned int *obj_pos; /* Offsets (in bytes) at which to put objs */
-+ uint32_t *objs; /* List of buffer object (handles) to use */
-+ unsigned int nobjs; /* Number of objects referenced */
-+ int nbox;
-+ struct drm_clip_rect *boxes;
-+} drm_glamo_cmd_buffer_t;
-+
-+
-+/* Burst command submission - base address and data:
-+ * - Data can be 32-bit (more easily)
-+ * - Easier for the kernel to validate */
-+typedef struct drm_glamo_cmd_burst {
-+ uint16_t base; /* Base address (command) */
-+ int bufsz; /* Size of data, in bytes */
-+ uint16_t *data; /* Pointer to data */
-+ unsigned int *obj_pos; /* Offsets (in bytes) at which to put objs */
-+ uint32_t *objs; /* List of buffer object (handles) to use */
-+ unsigned int nobjs; /* Number of objects referenced */
-+} drm_glamo_cmd_burst_t;
-+
-+struct drm_glamo_gem_info {
-+ uint64_t vram_start;
-+ uint64_t vram_size;
-+};
-+
-+struct drm_glamo_gem_create {
-+ uint64_t size;
-+ uint64_t alignment;
-+ uint32_t handle;
-+ uint32_t initial_domain; // to allow VRAM to be created
-+ uint32_t no_backing_store;
-+};
-+
-+struct drm_glamo_gem_mmap {
-+ uint32_t handle; /* Handle goes in... */
-+ uint64_t offset; /* ...offset comes out */
-+};
-+
-+struct drm_glamo_gem_wait_rendering {
-+ uint32_t handle;
-+ int have_handle;
-+};
-+
-+struct drm_glamo_gem_pin {
-+ uint32_t handle;
-+ uint32_t pin_domain;
-+ uint64_t alignment;
-+ uint64_t offset;
-+};
-+
-+struct drm_glamo_gem_unpin {
-+ uint32_t handle;
-+ uint32_t pad;
-+};
-+
-+struct drm_glamo_gem_pread {
-+ /** Handle for the object being read. */
-+ uint32_t handle;
-+ uint32_t pad;
-+ /** Offset into the object to read from */
-+ uint64_t offset;
-+ /** Length of data to read */
-+ uint64_t size;
-+ /** Pointer to write the data into. */
-+ uint64_t data_ptr; /* void *, but pointers are not 32/64 compatible */
-+};
-+
-+struct drm_glamo_gem_pwrite {
-+ /** Handle for the object being written to. */
-+ uint32_t handle;
-+ uint32_t pad;
-+ /** Offset into the object to write to */
-+ uint64_t offset;
-+ /** Length of data to write */
-+ uint64_t size;
-+ /** Pointer to read the data from. */
-+ uint64_t data_ptr; /* void *, but pointers are not 32/64 compatible */
-+};
-+
-+#endif
diff --git a/meta-oe/recipes-graphics/drm/libdrm-2.4.25/installtests.patch b/meta-oe/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
deleted file mode 100644
index 2704ee6..0000000
--- a/meta-oe/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-tests: also install tests app
-
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bf1987f..d909e19 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -6,10 +6,11 @@ AM_CPPFLAGS = \
-
- LDADD = $(top_builddir)/libdrm.la
-
--check_PROGRAMS = \
-+bin_PROGRAMS = \
- dristat \
- drmstat
-
-+check_PROGRAMS =
- SUBDIRS = modeprint
-
- if HAVE_LIBKMS
-diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
-index c4862ac..7db76ea 100644
---- a/tests/modeprint/Makefile.am
-+++ b/tests/modeprint/Makefile.am
-@@ -2,7 +2,7 @@ AM_CFLAGS = \
- -I$(top_srcdir)/include/drm \
- -I$(top_srcdir)
-
--noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- modeprint
-
- modeprint_SOURCES = \
-diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
-index 2191242..1d2c1b0 100644
---- a/tests/modetest/Makefile.am
-+++ b/tests/modetest/Makefile.am
-@@ -4,7 +4,7 @@ AM_CFLAGS = \
- -I$(top_srcdir) \
- $(CAIRO_CFLAGS)
-
--noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- modetest
-
- modetest_SOURCES = \
diff --git a/meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb b/meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb
deleted file mode 100644
index 4ffdcac..0000000
--- a/meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Userspace interface to the kernel DRM services"
-DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \
-stands for \"Direct Rendering Manager\", which is the kernel portion of the \
-\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \
-accelerated OpenGL drivers."
-HOMEPAGE = "http://dri.freedesktop.org"
-SECTION = "x11/base"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
-DEPENDS = "libpthread-stubs udev cairo virtual/libx11"
-
-inherit autotools pkgconfig
-
-PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms ${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}"
-FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
-FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
-FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
-FILES_${PN}-kms = "${libdir}/libkms*.so.*"
-
-LEAD_SONAME = "libdrm.so"
-
-EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel --disable-radeon',d)}"
-EXTRA_OECONF_append_shr = " --enable-glamo-experimental-api"
-
-SRC_URI += "file://installtests.patch"
-SRC_URI += "file://glamo.patch"
-
-SRC_URI[md5sum] = "f53dc4c72109b17908e4113c3b8addfe"
-SRC_URI[sha256sum] = "51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f"
-
-do_compile_prepend_libc-uclibc() {
- eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/d" ${S}/libkms/intel.c', d)}"
- eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/d" ${S}/libkms/vmwgfx.c', d)}"
- eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/d" ${S}/libkms/nouveau.c', d)}"
-}
--
1.7.6.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [meta-oe][PATCH 02/10] vlc: drop depends not yet in meta-oe
2011-09-16 13:56 ` [meta-oe][PATCH 02/10] vlc: drop depends not yet in meta-oe Martin Jansa
@ 2011-09-16 14:06 ` Gary Thomas
2011-09-16 14:12 ` Martin Jansa
0 siblings, 1 reply; 16+ messages in thread
From: Gary Thomas @ 2011-09-16 14:06 UTC (permalink / raw)
To: openembedded-devel; +Cc: Martin Jansa
On 2011-09-16 07:56, Martin Jansa wrote:
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> meta-oe/recipes-multimedia/vlc/vlc.inc | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
> index ce608dc..aecfb3a 100644
> --- a/meta-oe/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
> @@ -4,7 +4,8 @@ LICENSE = "GPLv2"
> SECTION = "multimedia"
>
> DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
> - ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
> +"
> +# ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
>
> SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
>
Is this such a good idea, given that bitbake support for commented continuation lines is deprecated?
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [meta-oe][PATCH 02/10] vlc: drop depends not yet in meta-oe
2011-09-16 14:06 ` Gary Thomas
@ 2011-09-16 14:12 ` Martin Jansa
0 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 14:12 UTC (permalink / raw)
To: Gary Thomas; +Cc: Joel A Fernandes, openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]
On Fri, Sep 16, 2011 at 08:06:21AM -0600, Gary Thomas wrote:
> On 2011-09-16 07:56, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > ---
> > meta-oe/recipes-multimedia/vlc/vlc.inc | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
> > index ce608dc..aecfb3a 100644
> > --- a/meta-oe/recipes-multimedia/vlc/vlc.inc
> > +++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
> > @@ -4,7 +4,8 @@ LICENSE = "GPLv2"
> > SECTION = "multimedia"
> >
> > DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
> > - ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
> > +"
> > +# ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
> >
> > SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> >
>
> Is this such a good idea, given that bitbake support for commented continuation lines is deprecated?
This isn't comment in multiline variable and it doesn't even end with
backslash..
so such line is pretty safe and I hope that Joel will reply to my issues
with vlc.inc:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/034954.html
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/034957.html
and fix it properly later..
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [meta-oe][PATCH 03/10] xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to RDEPENDS on xserver-xf86-config from oe-core and bsp layers
2011-09-16 13:56 ` [meta-oe][PATCH 03/10] xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to RDEPENDS on xserver-xf86-config from oe-core and bsp layers Martin Jansa
@ 2011-09-16 14:16 ` Koen Kooi
2011-09-16 14:33 ` Martin Jansa
0 siblings, 1 reply; 16+ messages in thread
From: Koen Kooi @ 2011-09-16 14:16 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 16-09-11 15:56, Martin Jansa schreef:
> xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to
> RDEPENDS on xserver-xf86-config from oe-core and bsp layers
Which BSP layers are that? Do you have an example on how to convert from
xserver-xorg-conf to xserver-xf86-config while keeping upgrade paths sane?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFOc1pCMkyGM64RGpERAo9NAKCI2bHqJkOz8S/3iiclI7YmoYSOKgCdE+iq
5/ncCRm2sMkS1Y+PnQN630k=
=A1II
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [meta-oe][PATCH 03/10] xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to RDEPENDS on xserver-xf86-config from oe-core and bsp layers
2011-09-16 14:16 ` Koen Kooi
@ 2011-09-16 14:33 ` Martin Jansa
2011-09-17 9:54 ` Koen Kooi
0 siblings, 1 reply; 16+ messages in thread
From: Martin Jansa @ 2011-09-16 14:33 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1764 bytes --]
On Fri, Sep 16, 2011 at 04:16:34PM +0200, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 16-09-11 15:56, Martin Jansa schreef:
>
> > xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to
> > RDEPENDS on xserver-xf86-config from oe-core and bsp layers
>
> Which BSP layers are that? Do you have an example on how to convert from
> xserver-xorg-conf to xserver-xf86-config while keeping upgrade paths sane?
I've converted only meta-smartphone BSP layers:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=50dca4e19704fcc4f43df97d616a04b648dfa703
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=97f63c45f744a5af13664f8e84167dc629fb6382
But tested upgrade paths only together with switch from xorg-xserver to
xserver-xf86 (on all 3 layers oe-core/meta-oe/meta-sp)
xserver-xf86: upgrade to 1.11.0 and move shared definitions to .inc files
http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/commit/?h=jansa/x11&id=9ac74def4a67094ded2d27823ba87cd6c2cf3b5d
task-x11: use xserver-xf86-lite as default XSERVER
http://git.openembedded.org/cgit.cgi/meta-openembedded-contrib/commit/?h=jansa/x11&id=3788736bad0e2ede2530187b17997770cf4679e9
BSPs: switch from xserver-xorg to xserver-xf86(-dri)-lite
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=66ce099bd0512eb56db61df25856612d7d89a8d0
But if we ever want meta-x11 layer then we should at least use only one
set of xserver recipes.. and as I know you've proposed to use xorg-*
recipes from old oe.dev in oe-core few times and it always ended without
warm welcome.. (if I remember tsc minutes right..)
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] 16+ messages in thread
* Re: [meta-oe][PATCH 03/10] xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to RDEPENDS on xserver-xf86-config from oe-core and bsp layers
2011-09-16 14:33 ` Martin Jansa
@ 2011-09-17 9:54 ` Koen Kooi
0 siblings, 0 replies; 16+ messages in thread
From: Koen Kooi @ 2011-09-17 9:54 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 16-09-11 16:33, Martin Jansa schreef:
> On Fri, Sep 16, 2011 at 04:16:34PM +0200, Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>>
>> Op 16-09-11 15:56, Martin Jansa schreef:
>>
>>> xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc
>>> to RDEPENDS on xserver-xf86-config from oe-core and bsp layers
>>
>> Which BSP layers are that? Do you have an example on how to convert
>> from xserver-xorg-conf to xserver-xf86-config while keeping upgrade
>> paths sane?
>
> I've converted only meta-smartphone BSP layers:
> http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=50dca4e19704fcc4f43df97d616a04b648dfa703
>
>
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=97f63c45f744a5af13664f8e84167dc629fb6382
That didn't work for me, I had to do:
http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-texasinstruments/diff/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
Which I suspect it a layer ordering issue.
Anyway, your series has been applied.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFOdG4+MkyGM64RGpERAvQ4AJ4jkZfJ1I+C/81Vkf+ApY2rInhPBgCdFqIe
tVc0xETx3ktdMnNyzs0ddF4=
=j6Z/
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2011-09-17 9:59 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-16 13:56 [meta-oe][PATCH 00/10] Pull request #22 Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 01/10] connman: drop initscript file used by SHR Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 02/10] vlc: drop depends not yet in meta-oe Martin Jansa
2011-09-16 14:06 ` Gary Thomas
2011-09-16 14:12 ` Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 03/10] xserver-xorg-conf: drop from meta-oe, update xorg-xserver-common.inc to RDEPENDS on xserver-xf86-config from oe-core and bsp layers Martin Jansa
2011-09-16 14:16 ` Koen Kooi
2011-09-16 14:33 ` Martin Jansa
2011-09-17 9:54 ` Koen Kooi
2011-09-16 13:56 ` [meta-oe][PATCH 04/10] pointercal-xinput: move machine specific files to their bsp layers, remove SECTION Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 05/10] xserver-xorg: drop 1.9.4 and git version Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 06/10] xcb: drop from meta-oe, now it's in oe-core Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 07/10] xorg-app: use xorg-app-common.inc from oe-core Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 08/10] xorg-driver: use .inc files " Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 09/10] task-x11: define better default XSERVER/XSERVER_COMMON values and make whole recipe MACHINE_ARCH Martin Jansa
2011-09-16 13:56 ` [meta-oe][PATCH 10/10] libdrm-2.4.25: drop from meta-oe, now there is 2.4.26 in oe-core Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.