diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-04-06 10:37:22 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-04-11 15:12:26 +0200 |
| commit | a39e33b7a508849a6dffe577370d7a80fbf26511 (patch) | |
| tree | 9f92e55829e201f855c917c677029e8184734c99 /recipes | |
| parent | 69f50f3c0314532d823dc2ce56b87de4ad24b04c (diff) | |
| download | openembedded-a39e33b7a508849a6dffe577370d7a80fbf26511.tar.gz | |
xorg: add new versions
* xserver-xorg-1.10 is added with D_P -1 until xf86-input-tslib is
ported, so 1.9.4 is still default version
* xserver-xorg-1.10, dolt was removed in upstream a769f4c22a9cfb5ba248c924a66c31ec966bd8a0
* xserver-xorg-1.10, randr-support needs to be updated, but maybe won't
be needed when new xinput-calibrator with config in xorg.conf.d is
used (waiting for Marco)
* xf86-input-tslib needs to be ported to XINPUT 12 ABI or obsoleted
* tested only on om-gta02 and nokia900, please test xserver-xorg-1.10 on
other devices
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes')
26 files changed, 253 insertions, 138 deletions
diff --git a/recipes/xorg-doc/xorg-sgml-doctools_1.7.bb b/recipes/xorg-doc/xorg-sgml-doctools_1.7.bb new file mode 100644 index 0000000000..af85da3ff6 --- /dev/null +++ b/recipes/xorg-doc/xorg-sgml-doctools_1.7.bb @@ -0,0 +1,8 @@ +require xorg-doc-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "2588efb3f49f7fc6ecf41ce42e0b2e5e" +SRC_URI[archive.sha256sum] = "84fd94e5c50556e6f77501485f8a48724cf3c95c6d58480bc280258ba14580c8" + +FILES_${PN} += " /usr/share/sgml/X11" diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb b/recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb new file mode 100644 index 0000000000..b3a7538fb1 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb @@ -0,0 +1,8 @@ +require xorg-driver-input.inc +DESCRIPTION = "X.Org X server -- keyboard input driver" +DEPENDS += " kbproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "e2abe9f13e526a73cb68a7d257546eba" +SRC_URI[archive.sha256sum] = "c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.7.0.bb b/recipes/xorg-driver/xf86-input-mouse_1.7.0.bb new file mode 100644 index 0000000000..5b7b512129 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-mouse_1.7.0.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "7f31472689c15b6de62eff04d0fb57d7" +SRC_URI[archive.sha256sum] = "4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994" diff --git a/recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb b/recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb new file mode 100644 index 0000000000..fec482328c --- /dev/null +++ b/recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb @@ -0,0 +1,9 @@ +require xorg-driver-input.inc +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" +PR = "${INC_PR}.0" + +EXTRA_OEMAKE += " sdkdir=${STAGING_INCDIR}/xorg " + +SRC_URI[archive.md5sum] = "cbe487f9d22237d1e39c7d0b5812ab7e" +SRC_URI[archive.sha256sum] = "5874d979f028636dbddf14fffb84b496b006e63d5ea8dfa120820e58642812c2" diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb new file mode 100644 index 0000000000..9cbd99755b --- /dev/null +++ b/recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb @@ -0,0 +1,9 @@ +require xorg-driver-input.inc +DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "dc77181330f983c7d0ec1ea1592c2ca7" +SRC_URI[archive.sha256sum] = "00e5d527a0d97e6b2a6e8c519e1339427e66fa0a43af026858655c7c62bd9e35" + +COMPATIBLE_HOST = "i.86.*-linux" diff --git a/recipes/xorg-driver/xf86-video-ati_6.14.1.bb b/recipes/xorg-driver/xf86-video-ati_6.14.1.bb new file mode 100644 index 0000000000..f38847263b --- /dev/null +++ b/recipes/xorg-driver/xf86-video-ati_6.14.1.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc +DESCRIPTION = "X.Org X server -- ATI display driver" +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "395e23ad026e4246dd70bbd2143688b5" +SRC_URI[archive.sha256sum] = "e457285096e1e40f53ae5b58b948906c69add5160cc38ce510f0d15e82d91c75" diff --git a/recipes/xorg-driver/xf86-video-chips_1.2.4.bb b/recipes/xorg-driver/xf86-video-chips_1.2.4.bb new file mode 100644 index 0000000000..d505b820b0 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-chips_1.2.4.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DESCRIPTION = "X.Org X server -- Chips display driver" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "7aed07116e56c0630f62d7d34d7526e1" +SRC_URI[archive.sha256sum] = "fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25" diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.12.bb b/recipes/xorg-driver/xf86-video-geode_2.11.12.bb new file mode 100644 index 0000000000..3320bad811 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-geode_2.11.12.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc +DESCRIPTION = "X.org server -- Geode GX2/LX display driver" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "a99c521db731c2f1df309057a8465e4c" +SRC_URI[archive.sha256sum] = "28d845d727d99bfa4d4b93c5486ec01b72eb222e0910a766089db1103b1c2d92" + +COMPATIBLE_HOST = "i.86.*-linux" diff --git a/recipes/xorg-driver/xf86-video-intel_2.14.902.bb b/recipes/xorg-driver/xf86-video-intel_2.14.902.bb new file mode 100644 index 0000000000..20f47d01a9 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-intel_2.14.902.bb @@ -0,0 +1,11 @@ +require xorg-driver-video.inc +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto " +RDEPENDS_${PN} += "xserver-xorg-extension-dri \ + xserver-xorg-extension-dri2 \ + xserver-xorg-extension-glx" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "7c48151a87311beea39837812e7b9e2b" +SRC_URI[archive.sha256sum] = "da9ab33ad03c2a51d1c78d648d481f251b5fd3c13f0644a58a7f097b08d6a27f" diff --git a/recipes/xorg-driver/xf86-video-siliconmotion_1.7.5.bb b/recipes/xorg-driver/xf86-video-siliconmotion_1.7.5.bb new file mode 100644 index 0000000000..d358737d37 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-siliconmotion_1.7.5.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DESCRIPTION = "X.Org X server -- SiliconMotion display driver" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "9ca392e16028a2f7c3ebc57f0aa4c1aa" +SRC_URI[archive.sha256sum] = "97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913" diff --git a/recipes/xorg-lib/libx11-1.4.3/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.4.3/keysymdef_include.patch new file mode 100644 index 0000000000..1a30e345f9 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.4.3/keysymdef_include.patch @@ -0,0 +1,19 @@ +diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac +--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 ++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 +@@ -355,7 +355,14 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysym definitions]) +-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++AC_ARG_WITH(keysymdefdir, ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") ++ ++if test x$KEYSYMDEFDIR = x; then ++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++fi ++ + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" + for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/recipes/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch new file mode 100644 index 0000000000..9763313975 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch @@ -0,0 +1,29 @@ +Index: libX11-1.3.4/src/util/Makefile.am +=================================================================== +--- libX11-1.3.4.orig/src/util/Makefile.am ++++ libX11-1.3.4/src/util/Makefile.am +@@ -1,24 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/recipes/xorg-lib/libx11_1.4.3.bb b/recipes/xorg-lib/libx11_1.4.3.bb new file mode 100644 index 0000000000..11f44cba3e --- /dev/null +++ b/recipes/xorg-lib/libx11_1.4.3.bb @@ -0,0 +1,8 @@ +require libx11.inc +#--without-xcb is not an option anymore +#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8 +DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "85e942627aaa020813e0eb8433353563" +SRC_URI[archive.sha256sum] = "38b5ddd93291714a46a02cb8a5dd94b995a04ed76a608551c44d1598e113635a" diff --git a/recipes/xorg-lib/libxfixes_5.0.bb b/recipes/xorg-lib/libxfixes_5.0.bb new file mode 100644 index 0000000000..db80f66e0c --- /dev/null +++ b/recipes/xorg-lib/libxfixes_5.0.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc +DESCRIPTION = "X Fixes extension library." +LICENSE = "BSD-X" +DEPENDS += "virtual/libx11 xproto fixesproto xextproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "678071bd7f9f7467e2fc712d81022318" +SRC_URI[archive.sha256sum] = "537a2446129242737a35db40081be4bbcc126e56c03bf5f2b142b10a79cda2e3" + +BBCLASSEXTEND = "native" + +XORG_PN = "libXfixes" diff --git a/recipes/xorg-lib/libxi_1.4.2.bb b/recipes/xorg-lib/libxi_1.4.2.bb new file mode 100644 index 0000000000..c1d944b0e8 --- /dev/null +++ b/recipes/xorg-lib/libxi_1.4.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 Input extension library" +DEPENDS += "libxext inputproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "3d14f7bfc4a4335cf0144de9b67a5444" +SRC_URI[archive.sha256sum] = "272b8041efc0a0203fb0ba33481ddec989539aed862181b58c8c3e410e325691" + +XORG_PN = "libXi" diff --git a/recipes/xorg-lib/libxt_1.1.1.bb b/recipes/xorg-lib/libxt_1.1.1.bb new file mode 100644 index 0000000000..946d511d08 --- /dev/null +++ b/recipes/xorg-lib/libxt_1.1.1.bb @@ -0,0 +1,22 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 toolkit intrinsics library" +DEPENDS += "libsm virtual/libx11 kbproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "eb22c0a1f172b06b97a3f5ae89768412" +SRC_URI[archive.sha256sum] = "a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7" + +EXTRA_OECONF += "--disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) || exit 1 + oe_runmake +} + +BBCLASSEXTEND = "native" + +XORG_PN = "libXt" diff --git a/recipes/xorg-proto/fixesproto_5.0.bb b/recipes/xorg-proto/fixesproto_5.0.bb new file mode 100644 index 0000000000..9ca1543678 --- /dev/null +++ b/recipes/xorg-proto/fixesproto_5.0.bb @@ -0,0 +1,9 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "e7431ab84d37b2678af71e29355e101d" +SRC_URI[archive.sha256sum] = "ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce" + + +CONFLICTS = "fixesext" diff --git a/recipes/xorg-proto/xextproto_7.2.0.bb b/recipes/xorg-proto/xextproto_7.2.0.bb new file mode 100644 index 0000000000..37b4da2f74 --- /dev/null +++ b/recipes/xorg-proto/xextproto_7.2.0.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "220732210ceffb01bf1caf970e3b1bfb" +SRC_URI[archive.sha256sum] = "d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5" + diff --git a/recipes/xorg-proto/xproto_7.0.21.bb b/recipes/xorg-proto/xproto_7.0.21.bb new file mode 100644 index 0000000000..c9f1a8c517 --- /dev/null +++ b/recipes/xorg-proto/xproto_7.0.21.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "c5a93a69b701cf81925fab02b35b0d0e" +SRC_URI[archive.sha256sum] = "38ee2f032c3a9e30504593f8b5e6c1161a6629daba93748a71c6f70c16f65548" + diff --git a/recipes/xorg-util/util-macros_1.13.0.bb b/recipes/xorg-util/util-macros_1.13.0.bb new file mode 100644 index 0000000000..5ecba18c6e --- /dev/null +++ b/recipes/xorg-util/util-macros_1.13.0.bb @@ -0,0 +1,4 @@ +require util-macros.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "31e9ddcbc1d8bc8c09ab180443974dd1" +SRC_URI[archive.sha256sum] = "7bff944fb120192e7fe1706e9c0b7e41666e7983ce3e2bdef0b7734392d9e695" diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch index a947582f15..a947582f15 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-assume-pixman-supports-overlapped-blt.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch index d3661cbea2..d3661cbea2 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-fbdev-ignore-return-mode.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch b/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch deleted file mode 100644 index 1d57466ef6..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 04bb25e427ce9e407599af9141c8591e51c1750b Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 11 Nov 2010 12:09:00 +0100 -Subject: [PATCH] xf86Helper: fix LogVMessageVerb call - ---- - hw/xfree86/common/xf86Helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c -index 78e6b20..af08e00 100644 ---- a/hw/xfree86/common/xf86Helper.c -+++ b/hw/xfree86/common/xf86Helper.c -@@ -1190,7 +1190,7 @@ xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *forma - char *msg; - - msg = Xprintf("%s: %s: %s", dev->drv->driverName, dev->name, format); -- LogVMessageVerb(type, verb, "%s", msg); -+ LogVMessageVerb(type, verb, format, args); - free(msg); - } - --- -1.7.3.2 - diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.9.99.1/randr-support.patch deleted file mode 100644 index abc7db41eb..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/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/recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb b/recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb new file mode 100644 index 0000000000..9ac0c41843 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb @@ -0,0 +1,31 @@ +# 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 xorg-minimal-fonts font-util-native" +PE = "2" +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += " \ + file://hack-fbdev-ignore-return-mode.patch \ + file://hack-assume-pixman-supports-overlapped-blt.patch \ + " +SRC_URI[archive.md5sum] = "65e5db9e614cd75e97840247c3754521" +SRC_URI[archive.sha256sum] = "994ab87bb0cc9b56203e01e3294fddd502a96d074139496ea4ffc03c95b41b42" + +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/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb index 98831efe0b..d18bdd758b 100644 --- a/recipes/xorg-xserver/xserver-xorg_git.bb +++ b/recipes/xorg-xserver/xserver-xorg_git.bb @@ -3,24 +3,24 @@ 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 xorg-minimal-fonts font-util-native" -PV = "1.9.99.1" +PV = "1.10.0.902" PR = "${INC_PR}.0" PR_append = "+gitr${SRCPV}" PE = "2" DEFAULT_PREFERENCE = "-1" -SRCREV = "965e709f2b0b17f1e59e5aeb5e7717fede51ef97" -SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \ - file://0001-xf86Helper-fix-LogVMessageVerb-call.patch \ - file://randr-support.patch \ - file://hack-fbdev-ignore-return-mode.patch \ - " - -SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch" -SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch" +SRCREV = "ec6e1e45627de2bb851f135df0507a360d0d99e6" +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" @@ -33,6 +33,6 @@ 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 " +EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" export LDFLAGS += " -ldl " |