Skip to contentSkip to conversation

xorg-xserver upgrade

RFC In review Martin Jansa 1 participant 7 messages Apr 6, 2011 – Apr 11, 2011

lore
Share & tools
lore
#0 lore raw

Please review and test following patches.

Last 2 are really WIP, I don't know if I'll find time to finish xserver-1.10.ABI.patch (volunteers welcome) or rather drop it from om-gta0*

#1 lore raw

PATCH 1/5 xorg: add new versions

* 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 for now, please test other devices

---
 recipes/xorg-doc/xorg-sgml-doctools_1.7.bb         |    8 ++++
 recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb   |    8 ++++
 recipes/xorg-driver/xf86-input-mouse_1.7.0.bb      |    7 ++++
 recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb  |    9 +++++
 recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb   |    9 +++++
 recipes/xorg-driver/xf86-video-ati_6.14.1.bb       |    8 ++++
 recipes/xorg-driver/xf86-video-chips_1.2.4.bb      |    7 ++++
 recipes/xorg-driver/xf86-video-geode_2.11.12.bb    |    9 +++++
 recipes/xorg-driver/xf86-video-intel_2.14.902.bb   |   11 ++++++
 .../xorg-driver/xf86-video-siliconmotion_1.7.5.bb  |    7 ++++
 .../xorg-lib/libx11-1.4.3/keysymdef_include.patch  |   19 ++++++++++
 .../libx11-1.4.3/x11_disable_makekeys.patch        |   29 +++++++++++++++
 recipes/xorg-lib/libx11_1.4.3.bb                   |    8 ++++
 recipes/xorg-lib/libxfixes_5.0.bb                  |   13 +++++++
 recipes/xorg-lib/libxi_1.4.2.bb                    |   10 +++++
 recipes/xorg-lib/libxt_1.1.1.bb                    |   22 +++++++++++
 recipes/xorg-proto/fixesproto_5.0.bb               |    9 +++++
 recipes/xorg-proto/xextproto_7.2.0.bb              |    7 ++++
 recipes/xorg-proto/xproto_7.0.21.bb                |    7 ++++
 recipes/xorg-util/util-macros_1.13.0.bb            |    4 ++
 ...ack-assume-pixman-supports-overlapped-blt.patch |   14 +++++++
 .../hack-fbdev-ignore-return-mode.patch            |   39 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg_1.10.0.901.bb    |   29 +++++++++++++++
 23 files changed, 293 insertions(+), 0 deletions(-)
 create mode 100644 recipes/xorg-doc/xorg-sgml-doctools_1.7.bb
 create mode 100644 recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb
 create mode 100644 recipes/xorg-driver/xf86-input-mouse_1.7.0.bb
 create mode 100644 recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb
 create mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb
 create mode 100644 recipes/xorg-driver/xf86-video-ati_6.14.1.bb
 create mode 100644 recipes/xorg-driver/xf86-video-chips_1.2.4.bb
 create mode 100644 recipes/xorg-driver/xf86-video-geode_2.11.12.bb
 create mode 100644 recipes/xorg-driver/xf86-video-intel_2.14.902.bb
 create mode 100644 recipes/xorg-driver/xf86-video-siliconmotion_1.7.5.bb
 create mode 100644 recipes/xorg-lib/libx11-1.4.3/keysymdef_include.patch
 create mode 100644 recipes/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
 create mode 100644 recipes/xorg-lib/libx11_1.4.3.bb
 create mode 100644 recipes/xorg-lib/libxfixes_5.0.bb
 create mode 100644 recipes/xorg-lib/libxi_1.4.2.bb
 create mode 100644 recipes/xorg-lib/libxt_1.1.1.bb
 create mode 100644 recipes/xorg-proto/fixesproto_5.0.bb
 create mode 100644 recipes/xorg-proto/xextproto_7.2.0.bb
 create mode 100644 recipes/xorg-proto/xproto_7.0.21.bb
 create mode 100644 recipes/xorg-util/util-macros_1.13.0.bb
 create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch
 create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch
 create mode 100644 recipes/xorg-xserver/xserver-xorg_1.10.0.901.bb
recipes/xorg-doc/xorg-sgml-doctools_1.7.bb new file +8 -0
new file mode 100644
index 0000000..af85da3
@@ -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"
recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb new file +8 -0
new file mode 100644
index 0000000..b3a7538
@@ -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"
recipes/xorg-driver/xf86-input-mouse_1.7.0.bb new file +7 -0
new file mode 100644
index 0000000..6783e06
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "7f31472689c15b6de62eff04d0fb57d7"
+SRC_URI[archive.sha256sum] = "4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994"
recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb new file +9 -0
new file mode 100644
index 0000000..17b9a33
@@ -0,0 +1,9 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.1"
+
+EXTRA_OEMAKE += " sdkdir=${STAGING_INCDIR}/xorg "
+
+SRC_URI[archive.md5sum] = "cbe487f9d22237d1e39c7d0b5812ab7e"
+SRC_URI[archive.sha256sum] = "5874d979f028636dbddf14fffb84b496b006e63d5ea8dfa120820e58642812c2"
recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb new file +9 -0
new file mode 100644
index 0000000..9cbd997
@@ -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"
recipes/xorg-driver/xf86-video-ati_6.14.1.bb new file +8 -0
new file mode 100644
index 0000000..f388472
@@ -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"
recipes/xorg-driver/xf86-video-chips_1.2.4.bb new file +7 -0
new file mode 100644
index 0000000..d505b82
@@ -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"
recipes/xorg-driver/xf86-video-geode_2.11.12.bb new file +9 -0
new file mode 100644
index 0000000..3320bad
@@ -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"
recipes/xorg-driver/xf86-video-intel_2.14.902.bb new file +11 -0
new file mode 100644
index 0000000..20f47d0
@@ -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"
recipes/xorg-driver/xf86-video-siliconmotion_1.7.5.bb new file +7 -0
new file mode 100644
index 0000000..d358737
@@ -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"
recipes/xorg-lib/libx11-1.4.3/keysymdef_include.patch new file +19 -0
new file mode 100644
index 0000000..1a30e34
@@ -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
recipes/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch new file +29 -0
new file mode 100644
index 0000000..9763313
@@ -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
recipes/xorg-lib/libx11_1.4.3.bb new file +8 -0
new file mode 100644
index 0000000..11f44cb
@@ -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"
recipes/xorg-lib/libxfixes_5.0.bb new file +13 -0
new file mode 100644
index 0000000..db80f66
@@ -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"
recipes/xorg-lib/libxi_1.4.2.bb new file +10 -0
new file mode 100644
index 0000000..c1d944b
@@ -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"
recipes/xorg-lib/libxt_1.1.1.bb new file +22 -0
new file mode 100644
index 0000000..946d511
@@ -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"
recipes/xorg-proto/fixesproto_5.0.bb new file +9 -0
new file mode 100644
index 0000000..9ca1543
@@ -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"
recipes/xorg-proto/xextproto_7.2.0.bb new file +7 -0
new file mode 100644
index 0000000..37b4da2
@@ -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"
+
recipes/xorg-proto/xproto_7.0.21.bb new file +7 -0
new file mode 100644
index 0000000..c9f1a8c
@@ -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"
+
recipes/xorg-util/util-macros_1.13.0.bb new file +4 -0
new file mode 100644
index 0000000..5ecba18
@@ -0,0 +1,4 @@
+require util-macros.inc
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "31e9ddcbc1d8bc8c09ab180443974dd1"
+SRC_URI[archive.sha256sum] = "7bff944fb120192e7fe1706e9c0b7e41666e7983ce3e2bdef0b7734392d9e695"
recipes/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch new file +14 -0
new file mode 100644
index 0000000..a947582
@@ -0,0 +1,14 @@
+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),
recipes/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch new file +39 -0
new file mode 100644
index 0000000..d3661cb
@@ -0,0 +1,39 @@
+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 <[email protected]>
+
+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)
recipes/xorg-xserver/xserver-xorg_1.10.0.901.bb new file +29 -0
new file mode 100644
index 0000000..99a32e9
@@ -0,0 +1,29 @@
+# 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"
+
+SRC_URI += " \
+            file://hack-fbdev-ignore-return-mode.patch \
+            file://hack-assume-pixman-supports-overlapped-blt.patch \
+           "
+SRC_URI[archive.md5sum] = "d750cf5f6342b548b7ac2be56e9d1841"
+SRC_URI[archive.sha256sum] = "de18f52c35fc3d3f18c7e905296f9de5ac42dc71e4e01da9ae8e154a78c7771c"
+
+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 "
Signature · 1 line
1.7.4.1
#2 lore raw

Re: [PATCH 1/5] xorg: add new versions

Quoted 6 lines · Martin Jansa

* 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 for now, please test other devices

pushed first 2 patches with xserver-xorg upgraded to 1.10.0.902 but with negative D_P, so 1.9.4 is kept as default version

Quoted 485 lines

---
 recipes/xorg-doc/xorg-sgml-doctools_1.7.bb         |    8 ++++ recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb   |    8 ++++ recipes/xorg-driver/xf86-input-mouse_1.7.0.bb      |    7 ++++ recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb  |    9 +++++ recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb   |    9 +++++ recipes/xorg-driver/xf86-video-ati_6.14.1.bb       |    8 ++++ recipes/xorg-driver/xf86-video-chips_1.2.4.bb      |    7 ++++ recipes/xorg-driver/xf86-video-geode_2.11.12.bb    |    9 +++++

 recipes/xorg-driver/xf86-video-intel_2.14.902.bb   |   11 ++++++
 .../xorg-driver/xf86-video-siliconmotion_1.7.5.bb  |    7 ++++
 .../xorg-lib/libx11-1.4.3/keysymdef_include.patch  |   19 ++++++++++

 .../libx11-1.4.3/x11_disable_makekeys.patch        |   29 +++++++++++++++ recipes/xorg-lib/libx11_1.4.3.bb                   |    8 ++++ recipes/xorg-lib/libxfixes_5.0.bb                  |   13 +++++++ recipes/xorg-lib/libxi_1.4.2.bb                    |   10 +++++ recipes/xorg-lib/libxt_1.1.1.bb                    |   22 +++++++++++ recipes/xorg-proto/fixesproto_5.0.bb               |    9 +++++ recipes/xorg-proto/xextproto_7.2.0.bb              |    7 ++++ recipes/xorg-proto/xproto_7.0.21.bb                |    7 ++++ recipes/xorg-util/util-macros_1.13.0.bb            |    4 ++ ...ack-assume-pixman-supports-overlapped-blt.patch |   14 +++++++ .../hack-fbdev-ignore-return-mode.patch            |   39 ++++++++++++++++++++ recipes/xorg-xserver/xserver-xorg_1.10.0.901.bb    |   29 +++++++++++++++

 23 files changed, 293 insertions(+), 0 deletions(-)

 create mode 100644 recipes/xorg-doc/xorg-sgml-doctools_1.7.bb
 create mode 100644 recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb
 create mode 100644 recipes/xorg-driver/xf86-input-mouse_1.7.0.bb
 create mode 100644 recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb
 create mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb
 create mode 100644 recipes/xorg-driver/xf86-video-ati_6.14.1.bb
 create mode 100644 recipes/xorg-driver/xf86-video-chips_1.2.4.bb
 create mode 100644 recipes/xorg-driver/xf86-video-geode_2.11.12.bb
 create mode 100644 recipes/xorg-driver/xf86-video-intel_2.14.902.bb
 create mode 100644 recipes/xorg-driver/xf86-video-siliconmotion_1.7.5.bb
 create mode 100644 recipes/xorg-lib/libx11-1.4.3/keysymdef_include.patch
 create mode 100644 recipes/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
 create mode 100644 recipes/xorg-lib/libx11_1.4.3.bb
 create mode 100644 recipes/xorg-lib/libxfixes_5.0.bb
 create mode 100644 recipes/xorg-lib/libxi_1.4.2.bb
 create mode 100644 recipes/xorg-lib/libxt_1.1.1.bb
 create mode 100644 recipes/xorg-proto/fixesproto_5.0.bb
 create mode 100644 recipes/xorg-proto/xextproto_7.2.0.bb
 create mode 100644 recipes/xorg-proto/xproto_7.0.21.bb
 create mode 100644 recipes/xorg-util/util-macros_1.13.0.bb
 create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch create mode 100644 recipes/xorg-xserver/xserver-xorg_1.10.0.901.bb

recipes/xorg-doc/xorg-sgml-doctools_1.7.bb new file +8 -0
new file mode 100644
index 0000000..af85da3
@@ -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"
recipes/xorg-driver/xf86-input-keyboard_1.6.0.bb new file +8 -0
new file mode 100644
index 0000000..b3a7538
@@ -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"
recipes/xorg-driver/xf86-input-mouse_1.7.0.bb new file +7 -0
new file mode 100644
index 0000000..6783e06
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "7f31472689c15b6de62eff04d0fb57d7"
+SRC_URI[archive.sha256sum] = "4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994"
recipes/xorg-driver/xf86-input-synaptics_1.4.0.bb new file +9 -0
new file mode 100644
index 0000000..17b9a33
@@ -0,0 +1,9 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.1"
+
+EXTRA_OEMAKE += " sdkdir=${STAGING_INCDIR}/xorg "
+
+SRC_URI[archive.md5sum] = "cbe487f9d22237d1e39c7d0b5812ab7e"
+SRC_URI[archive.sha256sum] = "5874d979f028636dbddf14fffb84b496b006e63d5ea8dfa120820e58642812c2"
recipes/xorg-driver/xf86-input-vmmouse_12.7.0.bb new file +9 -0
new file mode 100644
index 0000000..9cbd997
@@ -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"
recipes/xorg-driver/xf86-video-ati_6.14.1.bb new file +8 -0
new file mode 100644
index 0000000..f388472
@@ -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"
recipes/xorg-driver/xf86-video-chips_1.2.4.bb new file +7 -0
new file mode 100644
index 0000000..d505b82
@@ -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"
recipes/xorg-driver/xf86-video-geode_2.11.12.bb new file +9 -0
new file mode 100644
index 0000000..3320bad
@@ -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"
recipes/xorg-driver/xf86-video-intel_2.14.902.bb new file +11 -0
new file mode 100644
index 0000000..20f47d0
@@ -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"
recipes/xorg-driver/xf86-video-siliconmotion_1.7.5.bb new file +7 -0
new file mode 100644
index 0000000..d358737
@@ -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"
recipes/xorg-lib/libx11-1.4.3/keysymdef_include.patch new file +19 -0
new file mode 100644
index 0000000..1a30e34
@@ -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
recipes/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch new file +29 -0
new file mode 100644
index 0000000..9763313
@@ -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
recipes/xorg-lib/libx11_1.4.3.bb new file +8 -0
new file mode 100644
index 0000000..11f44cb
@@ -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"
recipes/xorg-lib/libxfixes_5.0.bb new file +13 -0
new file mode 100644
index 0000000..db80f66
@@ -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"
recipes/xorg-lib/libxi_1.4.2.bb new file +10 -0
new file mode 100644
index 0000000..c1d944b
@@ -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"
recipes/xorg-lib/libxt_1.1.1.bb new file +22 -0
new file mode 100644
index 0000000..946d511
@@ -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"
recipes/xorg-proto/fixesproto_5.0.bb new file +9 -0
new file mode 100644
index 0000000..9ca1543
@@ -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"
recipes/xorg-proto/xextproto_7.2.0.bb new file +7 -0
new file mode 100644
index 0000000..37b4da2
@@ -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"
+
recipes/xorg-proto/xproto_7.0.21.bb new file +7 -0
new file mode 100644
index 0000000..c9f1a8c
@@ -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"
+
recipes/xorg-util/util-macros_1.13.0.bb new file +4 -0
new file mode 100644
index 0000000..5ecba18
@@ -0,0 +1,4 @@
+require util-macros.inc
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "31e9ddcbc1d8bc8c09ab180443974dd1"
+SRC_URI[archive.sha256sum] = "7bff944fb120192e7fe1706e9c0b7e41666e7983ce3e2bdef0b7734392d9e695"
recipes/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch new file +14 -0
new file mode 100644
index 0000000..a947582
@@ -0,0 +1,14 @@
+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),
recipes/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch new file +39 -0
new file mode 100644
index 0000000..d3661cb
@@ -0,0 +1,39 @@
+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 <[email protected]>
+
+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)
recipes/xorg-xserver/xserver-xorg_1.10.0.901.bb new file +29 -1
new file mode 100644
index 0000000..99a32e9
@@ -0,0 +1,29 @@
+# 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"
+
+SRC_URI += " \
+            file://hack-fbdev-ignore-return-mode.patch \
+            file://hack-assume-pixman-supports-overlapped-blt.patch \
+           "
+SRC_URI[archive.md5sum] = "d750cf5f6342b548b7ac2be56e9d1841"
+SRC_URI[archive.sha256sum] = "de18f52c35fc3d3f18c7e905296f9de5ac42dc71e4e01da9ae8e154a78c7771c"
+
+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.4.1

#3 lore raw

PATCH 2/5 xorg: remove older versions

In reply to Martin Jansa
---
 recipes/xorg-doc/xorg-sgml-doctools_1.6.bb         |    8 --
 recipes/xorg-driver/xf86-input-keyboard_1.5.0.bb   |    8 --
 recipes/xorg-driver/xf86-input-mouse_1.6.0.bb      |    7 --
 recipes/xorg-driver/xf86-input-synaptics_1.3.0.bb  |    9 --
 recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb  |    9 --
 recipes/xorg-driver/xf86-video-ati_6.13.2.bb       |    8 --
 recipes/xorg-driver/xf86-video-chips_1.2.3.bb      |    7 --
 recipes/xorg-driver/xf86-video-geode_2.11.11.bb    |    9 --
 recipes/xorg-driver/xf86-video-intel_2.14.0.bb     |   11 --
 .../xorg-driver/xf86-video-siliconmotion_1.7.4.bb  |    7 --
 .../xorg-lib/libx11-1.4.1/keysymdef_include.patch  |   19 ----
 .../libx11-1.4.1/x11_disable_makekeys.patch        |   29 ------
 recipes/xorg-lib/libx11_1.4.1.bb                   |    8 --
 recipes/xorg-lib/libxfixes_4.0.5.bb                |   13 ---
 recipes/xorg-lib/libxi_1.4.1.bb                    |   10 --
 recipes/xorg-lib/libxt_1.0.9.bb                    |   22 ----
 recipes/xorg-proto/fixesproto_4.1.2.bb             |    9 --
 recipes/xorg-proto/xextproto_7.1.2.bb              |    7 --
 recipes/xorg-proto/xproto_7.0.20.bb                |    7 --
 recipes/xorg-util/util-macros_1.11.0.bb            |    4 -
 .../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 --------------------
 recipes/xorg-xserver/xserver-xorg_1.9.4.bb         |   31 ------
 25 files changed, 0 insertions(+), 419 deletions(-)
 delete mode 100644 recipes/xorg-doc/xorg-sgml-doctools_1.6.bb
 delete mode 100644 recipes/xorg-driver/xf86-input-keyboard_1.5.0.bb
 delete mode 100644 recipes/xorg-driver/xf86-input-mouse_1.6.0.bb
 delete mode 100644 recipes/xorg-driver/xf86-input-synaptics_1.3.0.bb
 delete mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb
 delete mode 100644 recipes/xorg-driver/xf86-video-ati_6.13.2.bb
 delete mode 100644 recipes/xorg-driver/xf86-video-chips_1.2.3.bb
 delete mode 100644 recipes/xorg-driver/xf86-video-geode_2.11.11.bb
 delete mode 100644 recipes/xorg-driver/xf86-video-intel_2.14.0.bb
 delete mode 100644 recipes/xorg-driver/xf86-video-siliconmotion_1.7.4.bb
 delete mode 100644 recipes/xorg-lib/libx11-1.4.1/keysymdef_include.patch
 delete mode 100644 recipes/xorg-lib/libx11-1.4.1/x11_disable_makekeys.patch
 delete mode 100644 recipes/xorg-lib/libx11_1.4.1.bb
 delete mode 100644 recipes/xorg-lib/libxfixes_4.0.5.bb
 delete mode 100644 recipes/xorg-lib/libxi_1.4.1.bb
 delete mode 100644 recipes/xorg-lib/libxt_1.0.9.bb
 delete mode 100644 recipes/xorg-proto/fixesproto_4.1.2.bb
 delete mode 100644 recipes/xorg-proto/xextproto_7.1.2.bb
 delete mode 100644 recipes/xorg-proto/xproto_7.0.20.bb
 delete mode 100644 recipes/xorg-util/util-macros_1.11.0.bb
 delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch
 delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch
 delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch
 delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch
 delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.9.4.bb
recipes/xorg-doc/xorg-sgml-doctools_1.6.bb deleted +0 -8
deleted file mode 100644
index 34c8fcf..0000000
@@ -1,8 +0,0 @@
-require xorg-doc-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fe333413fd4139de07ebfa36039b8a59"
-SRC_URI[archive.sha256sum] = "98d20476e8a3e413c9597a94c9a578768afb28211c0d030dc7b8256055d5ae6a"
-
-FILES_${PN} += " /usr/share/sgml/X11"
recipes/xorg-driver/xf86-input-keyboard_1.5.0.bb deleted +0 -8
deleted file mode 100644
index 765084d..0000000
@@ -1,8 +0,0 @@
-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] = "b74d7162db5ce7899c17927c6cfa9522"
-SRC_URI[archive.sha256sum] = "2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0"
recipes/xorg-driver/xf86-input-mouse_1.6.0.bb deleted +0 -7
deleted file mode 100644
index 6a23ed4..0000000
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- mouse input driver"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "cef849b1a2743d2e84de98422f372974"
-SRC_URI[archive.sha256sum] = "c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb"
recipes/xorg-driver/xf86-input-synaptics_1.3.0.bb deleted +0 -9
deleted file mode 100644
index c0e66f1..0000000
@@ -1,9 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- mouse input driver"
-PE = "1"
-PR = "${INC_PR}.1"
-
-EXTRA_OEMAKE += " sdkdir=${STAGING_INCDIR}/xorg "
-
-SRC_URI[archive.md5sum] = "b4e58eba1bdca13f0929a4b03b262135"
-SRC_URI[archive.sha256sum] = "30a33250c4f3d2daa8a61cab847dc7befd3248db0fca139d17fd7b890b5a8fd7"
recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb deleted +0 -9
deleted file mode 100644
index edf61b3..0000000
@@ -1,9 +0,0 @@
-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] = "49c6e77851e9f7bc5cb7d85f061992f8"
-SRC_URI[archive.sha256sum] = "a6369d5a860627f2a38842d5563045b263a459e534f6ae08df48f330f9a40910"
-
-COMPATIBLE_HOST = "i.86.*-linux"
recipes/xorg-driver/xf86-video-ati_6.13.2.bb deleted +0 -8
deleted file mode 100644
index f9e4748..0000000
@@ -1,8 +0,0 @@
-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] = "a8f92fe3c458e511f4e2ead7f92c02b0"
-SRC_URI[archive.sha256sum] = "d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee"
recipes/xorg-driver/xf86-video-chips_1.2.3.bb deleted +0 -7
deleted file mode 100644
index ec34736..0000000
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Chips display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e3e8b8661b3ba2159f83f64e2aa6e29f"
-SRC_URI[archive.sha256sum] = "0561278e06f84d4ee20317b19831cc8d42c952a1577c7865163ad2d6d900cb1d"
recipes/xorg-driver/xf86-video-geode_2.11.11.bb deleted +0 -9
deleted file mode 100644
index 9574523..0000000
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ea36cc51588a1ba73442237db2bf560b"
-SRC_URI[archive.sha256sum] = "861727b1f183060a2d0d89997e0fb3e1564c5d4c2e7b453ab2999f3d6c15400c"
-
-COMPATIBLE_HOST = "i.86.*-linux"
recipes/xorg-driver/xf86-video-intel_2.14.0.bb deleted +0 -11
deleted file mode 100644
index ae9b95f..0000000
@@ -1,11 +0,0 @@
-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] = "05f187582aeabda57fcd6f2782cfbf8e"
-SRC_URI[archive.sha256sum] = "e18c37a579a960516e69de5c6f74750ca02208c0e41cf763ae5630c84db507df"
recipes/xorg-driver/xf86-video-siliconmotion_1.7.4.bb deleted +0 -7
deleted file mode 100644
index 7a47c47..0000000
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- SiliconMotion display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3059e87586e16c34da89437cc6215b49"
-SRC_URI[archive.sha256sum] = "b47511480fab5c517e12bd67a332f452d1718b32d53a6201edfc1c279e6e04d7"
recipes/xorg-lib/libx11-1.4.1/keysymdef_include.patch deleted +0 -19
deleted file mode 100644
index 1a30e34..0000000
@@ -1,19 +0,0 @@
-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
recipes/xorg-lib/libx11-1.4.1/x11_disable_makekeys.patch deleted +0 -29
deleted file mode 100644
index 9763313..0000000
@@ -1,29 +0,0 @@
-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
recipes/xorg-lib/libx11_1.4.1.bb deleted +0 -8
deleted file mode 100644
index d07ee46..0000000
@@ -1,8 +0,0 @@
-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] = "4603bdbce1bd73cbc140de402fe6ed24"
-SRC_URI[archive.sha256sum] = "70f4e0f798645a0f269f362bfdbd4c7934dae3a2dd9ecbad28d6ede414f63ce2"
recipes/xorg-lib/libxfixes_4.0.5.bb deleted +0 -13
deleted file mode 100644
index 582cc9f..0000000
@@ -1,13 +0,0 @@
-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] = "1b4b8386bd5d1751b2c7177223ad4629"
-SRC_URI[archive.sha256sum] = "2e6cd020460e4ef5d5a1d9b5d21143e9f5e580036a79c7de26ae539d7bcb8d74"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfixes"
recipes/xorg-lib/libxi_1.4.1.bb deleted +0 -10
deleted file mode 100644
index 39f09a1..0000000
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Input extension library"
-DEPENDS += "libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e4b6fb1b08a92075469174f0cccde168"
-SRC_URI[archive.sha256sum] = "599f1c0930f94c2ae74711b2577a7f354c4a991cc97b5ec5bb655b855c1429a6"
-
-XORG_PN = "libXi"
recipes/xorg-lib/libxt_1.0.9.bb deleted +0 -22
deleted file mode 100644
index ce38bb8..0000000
@@ -1,22 +0,0 @@
-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] = "8a414f8f2327aaa616ca2dcac1f5d8c3"
-SRC_URI[archive.sha256sum] = "eab91b594b801f7f07a20f936dda70a629028858cbcf541becf94f2786ae6b01"
-
-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"
recipes/xorg-proto/fixesproto_4.1.2.bb deleted +0 -9
deleted file mode 100644
index a9ad0d5..0000000
@@ -1,9 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bdb58ecc313b509247036d5c11fa99df"
-SRC_URI[archive.sha256sum] = "de4cbfccb533c190073445eb2a891d997e89f6fb58204f68ae82871de044f857"
-
-
-CONFLICTS = "fixesext"
recipes/xorg-proto/xextproto_7.1.2.bb deleted +0 -7
deleted file mode 100644
index ecf23cb..0000000
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "263ae968b223c23b2986603d84e5c30e"
-SRC_URI[archive.sha256sum] = "f6f829e112c8eca7c2f10b2193e8d927b9b7722283d647cfd2aea09758159199"
-
recipes/xorg-proto/xproto_7.0.20.bb deleted +0 -7
deleted file mode 100644
index 8ab3380..0000000
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "65633168e5315c19defb4652cd3d83c1"
-SRC_URI[archive.sha256sum] = "3fe87fe47d9b795e60ba3715d71f90f9929d57e9048f1d2a6ebb558e5aee9e2a"
-
recipes/xorg-util/util-macros_1.11.0.bb deleted +0 -4
deleted file mode 100644
index 8392794..0000000
@@ -1,4 +0,0 @@
-require util-macros.inc
-PR = "${INC_PR}.0"
-SRC_URI[archive.md5sum] = "8580021f3a9e242ab09d23d62e475d53"
-SRC_URI[archive.sha256sum] = "212c3d14474d7cffdbc22437d4896211a5dce6b99b02b96229c9be7d963c90cf"
recipes/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch deleted +0 -22
deleted file mode 100644
index e332ce0..0000000
@@ -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__
- 
recipes/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch deleted +0 -14
deleted file mode 100644
index a947582..0000000
@@ -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),
recipes/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch deleted +0 -39
deleted file mode 100644
index d3661cb..0000000
@@ -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 <[email protected]>
-
-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)
recipes/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch deleted +0 -102

102 lines not on this page · raw message

recipes/xorg-xserver/xserver-xorg_1.9.4.bb deleted +0 -31
deleted file mode 100644
index 89e7a03..0000000
@@ -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 xorg-minimal-fonts 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[archive.md5sum] = "040f091dfdfb4e335116eb0032cc690b"
-SRC_URI[archive.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 "
Signature · 1 line
1.7.4.1
#4 lore raw

PATCH 3/5 xorg-driver-common: bump INC_PR to rebuild drivers against new ABI from xserver-1.10

In reply to Martin Jansa
---
 recipes/xorg-driver/xorg-driver-common.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/xorg-driver/xorg-driver-common.inc +1 -1
index 53b499e..f7878a9 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "X driver"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/drivers"
 LICENSE = "MIT-X"
-INC_PR = "r15"
+INC_PR = "r16"
 
 DEPENDS = "randrproto xorg-server xproto"
 
Signature · 1 line
1.7.4.1
#5 lore raw

PATCH 4/5 om-gta0*: drop xf86-input-tslib

In reply to Martin Jansa

* not compatible with xserver-1.10 ABI
* needs PR bump in xserver-xorg-conf/task-x11

---
 conf/machine/om-gta01.conf                         |    1 -
 conf/machine/om-gta02.conf                         |    1 -
 .../xserver-xorg-conf/om-gta01/xorg.conf           |    3 +--
 .../xserver-xorg-conf/om-gta02/xorg.conf           |    3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)
conf/machine/om-gta01.conf +0 -1
index 97ba716..3171797 100644
@@ -22,7 +22,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
 XSERVER ?= "xserver-xorg \
-           xf86-input-tslib \
            xf86-input-evdev \
            xf86-video-fbdev \
            xf86-input-keyboard \
conf/machine/om-gta02.conf +0 -1
index 002fd64..e28b47f 100644
@@ -24,7 +24,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
 XSERVER ?= "xserver-xorg \
-           xf86-input-tslib \
            xf86-input-evdev \
            xf86-video-glamo \
            xf86-input-keyboard \
recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf +1 -2
index e957e41..edb5e0e 100644
@@ -32,9 +32,8 @@ EndSection
 
 Section "InputDevice"
 	Identifier	"Touchscreen"
-	Driver		"tslib"
+	Driver		"evdev"
 	Option		"Device"	"/dev/input/event1"
-	Option		"EmulateRightButton"	"1"
 EndSection
 
 Section "ServerFlags"
recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf +1 -2
index 8b116fc..de6ed1c 100644
@@ -38,9 +38,8 @@ EndSection
 
 Section "InputDevice"
 	Identifier	"Touchscreen"
-	Driver		"tslib"
+	Driver		"evdev"
 	Option		"Device"	"/dev/input/event1"
-	Option          "EmulateRightButton"    "1"
 EndSection
 
 Section "ServerFlags"
Signature · 1 line
1.7.4.1
#6 lore raw

PATCH 5/5 xf86-input-tslib: WIP, start with xserver-1.10.ABI.patch

In reply to Martin Jansa

* but later dropped support for xf86-input-tslib
* https://bugs.launchpad.net/ubuntu/+source/xf86-input-tslib/+bug/714353

---
 .../xf86-input-tslib/xserver-1.10.ABI.patch        |   70 ++++++++++++++++++++
 recipes/xorg-driver/xf86-input-tslib_0.0.6.bb      |    1 +
 2 files changed, 71 insertions(+), 0 deletions(-)
 create mode 100644 recipes/xorg-driver/xf86-input-tslib/xserver-1.10.ABI.patch
recipes/xorg-driver/xf86-input-tslib/xserver-1.10.ABI.patch new file +70 -0
new file mode 100644
index 0000000..d73a2c6
@@ -0,0 +1,70 @@
+Index: xf86-input-tslib/src/tslib.c
+===================================================================
+--- xf86-input-tslib/src/tslib.c	(revision 48)
++++ xf86-input-tslib/src/tslib.c	(working copy)
+@@ -106,7 +106,7 @@
+ }
+ 
+ static Bool
+-ConvertProc( LocalDevicePtr local,
++ConvertProc( InputInfoPtr local,
+ 			 int first,
+ 			 int num,
+ 			 int v0,
+@@ -135,7 +135,7 @@
+     return t;
+ }
+ 
+-static void ReadInput (LocalDevicePtr local)
++static void ReadInput (InputInfoPtr local)
+ {
+ 	struct ts_priv *priv = (struct ts_priv *) (local->private);
+ 	struct ts_sample samp;
+@@ -382,7 +382,11 @@
+ 					       axiswidth - 1,	/* max val */
+ 					       axiswidth,	/* resolution */
+ 					       0,		/* min_res */
+-					       axiswidth);	/* max_res */
++					       axiswidth
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute	/* max_res */
++#endif
++					       );
+ 
+ 		InitValuatorAxisStruct(device, 1,
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+@@ -392,7 +396,11 @@
+ 					       axisheight - 1,	/* max val */
+ 					       axisheight,	/* resolution */
+ 					       0,		/* min_res */
+-					       axisheight);	/* max_res */
++					       axisheight       /* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute
++#endif
++					       );
+ 
+ 		if (InitProximityClassDeviceStruct (device) == FALSE) {
+ 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
+@@ -445,7 +453,7 @@
+  * called when the module subsection is found in XF86Config
+  */
+ static InputInfoPtr
+-xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
++xf86TslibInit(InputDriverPtr drv, InputInfoPtr dev, int flags)
+ {
+ 	struct ts_priv *priv;
+ 	char *s;
+@@ -455,10 +463,11 @@
+         if (!priv)
+                 return NULL;
+ 
+-	if (!(pInfo = xf86AllocateInput(drv, 0))) {
++	if (!(pInfo = xf86AllocateInput())) {
+ 		xfree(priv);
+ 		return NULL;
+ 	}
++	xf86AddInput(drv, pInfo);
+ 
+ 	/* Initialise the InputInfoRec. */
+ 	pInfo->name = dev->identifier;
recipes/xorg-driver/xf86-input-tslib_0.0.6.bb +1 -0
index a1cecaa..decd4a6 100644
@@ -10,6 +10,7 @@ SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-inp
            file://10-x11-input-tslib.fdi \
            file://xserver-174-XGetPointerControl.patch \
            file://99-xf86-input-tslib.rules \
+	   file://xserver-1.10.ABI.patch \
 "
 SRC_URI[archive.md5sum] = "b7a4d2f11637ee3fcf432e044b1d017f"
 SRC_URI[archive.sha256sum] = "5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105"
Signature · 1 line
1.7.4.1