Skip to contentSkip to conversation

xserver-xorg upgrade to 1.10

PATCH New Martin Jansa 1 participant 6 messages May 13, 2011

lore
Share & tools
lore
#0 lore raw

Hi,

later today I plan to push this, so if someone else want to join xserver-1.10 it's good time to do so, to save at least one INC_PR bump in xorg-driver-common.inc..

BTW: first 2 patches (with slightly older version) were sent to ML more then month ago even when it's not marked as PATCHv2..

Tested on om-gta02/nokia900 and also used in meta-oe..

Later I plan to replace pointercal-xinput files (xinput calls) with xorg.conf.d variants which are supported since xinput-calibrator-0.7

Cheers,

#1 lore raw

PATCH 1/5 xserver-xorg: upgrade to 1.10.1.901 and make it default for SHR

* bump xorg-driver-common INC_PR to rebuild drivers against new ABI from xserver-1.10

---
 recipes/xorg-driver/xorg-driver-common.inc         |    2 +-
 ...ack-assume-pixman-supports-overlapped-blt.patch |   14 -------
 .../hack-fbdev-ignore-return-mode.patch            |   39 --------------------
 ...ack-assume-pixman-supports-overlapped-blt.patch |   14 +++++++
 .../hack-fbdev-ignore-return-mode.patch            |   39 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb    |   31 ----------------
 recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb    |   32 ++++++++++++++++
 7 files changed, 86 insertions(+), 85 deletions(-)
 delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch
 delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch
 create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.1.901/hack-assume-pixman-supports-overlapped-blt.patch
 create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.1.901/hack-fbdev-ignore-return-mode.patch
 delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb
 create mode 100644 recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb
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"
 
recipes/xorg-xserver/xserver-xorg-1.10.0.902/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.10.0.902/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.10.1.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.1.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.902.bb deleted +0 -31
deleted file mode 100644
index 9ac0c41..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"
-
-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 "
recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb new file +32 -0
new file mode 100644
index 0000000..9978153
@@ -0,0 +1,32 @@
+# 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"
+DEFAULT_PREFERENCE_shr = "1"
+
+SRC_URI += " \
+            file://hack-fbdev-ignore-return-mode.patch \
+            file://hack-assume-pixman-supports-overlapped-blt.patch \
+           "
+SRC_URI[archive.md5sum] = "64585a28abb18726d950cf1005bbcce4"
+SRC_URI[archive.sha256sum] = "b7d775891e7e7fc3001763cf5727995b81bf07b72e12d9d41db282fe625298e6"
+
+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.5.rc3
#2 lore raw

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

In reply to Martin Jansa

* not compatible with xserver-1.10 ABI
* elfe is not compatible with EmulateRightButton option too

---
 conf/machine/om-gta01.conf                         |    1 -
 conf/machine/om-gta02.conf                         |    1 -
 recipes/tasks/task-x11.bb                          |    2 +-
 .../xserver-xorg-conf/om-gta01/xorg.conf           |    3 +--
 .../xserver-xorg-conf/om-gta02/xorg.conf           |    3 +--
 recipes/xorg-xserver/xserver-xorg-conf_0.1.bb      |    2 +-
 6 files changed, 4 insertions(+), 8 deletions(-)
conf/machine/om-gta01.conf +0 -1
index d952ad7..d14b0fd 100644
@@ -21,7 +21,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 d7a968a..033190c 100644
@@ -23,7 +23,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/tasks/task-x11.bb +1 -1
index 1021bfb..107f0d1 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r7"
+PR = "r8"
 
 # WORK IN PROGRESS
 
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"
recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +1 -1
index 5de24be..7cc8a5d 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r46"
+PR = "r47"
 
 SRC_URI = "file://xorg.conf"
 
Signature · 1 line
1.7.5.rc3
#3 lore raw

PATCH 3/5 pointercal-xinput: sync koen's changes from meta-oe

In reply to Martin Jansa
---
 recipes/xinput-calibrator/pointercal-xinput_0.0.bb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
recipes/xinput-calibrator/pointercal-xinput_0.0.bb +5 -3
index 2d62f20..993a75d 100644
@@ -1,8 +1,11 @@
 DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
-LICENSE = "MIT/X11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
 SECTION = "base"
 
-PR = "r2"
+PR = "r3"
+
 SRC_URI = "file://pointercal.xinput"
 S = "${WORKDIR}"
 
@@ -14,6 +17,5 @@ do_install() {
 	fi
 }
 
-ALLOW_EMPTY_${PN} = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
Signature · 1 line
1.7.5.rc3
#4 lore raw

PATCH 4/5 xinput-calibrator: add 0.7.5 from meta-oe

In reply to Martin Jansa
---
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   22 ++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.7.5.bb
recipes/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +22 -0
new file mode 100644
index 0000000..4024883
@@ -0,0 +1,22 @@
+DESCRIPTION = "A generic touchscreen calibration program for X.Org"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
+LICENSE = "MIT/X11"
+LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
+DEPENDS = "virtual/libx11 libxi"
+
+inherit autotools
+
+RDEPENDS_${PN} = "xinput"
+RRECOMMENDS_${PN} = "pointercal-xinput"
+
+SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"
+SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
+SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
+
+S = "${WORKDIR}/xinput_calibrator-${PV}"
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
+        install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
+}
Signature · 1 line
1.7.5.rc3
#5 lore raw

PATCH 5/5 xinput-calibrator: drop older versions

In reply to Martin Jansa
---
 .../xinput-calibrator.desktop                      |   11 ------
 .../xinput_calibrator_once.sh                      |   11 ------
 ...orgPrint.cpp-fix-miny-and-maxx-printing-o.patch |   36 --------------------
 recipes/xinput-calibrator/xinput-calibrator.inc    |    8 ----
 .../xinput-calibrator/xinput-calibrator_0.5.0.bb   |   19 ----------
 .../xinput-calibrator/xinput-calibrator_0.6.0.bb   |   18 ----------
 .../xinput-calibrator/xinput-calibrator_0.6.1.bb   |   16 ---------
 recipes/xinput-calibrator/xinput-calibrator_git.bb |   20 -----------
 8 files changed, 0 insertions(+), 139 deletions(-)
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput-calibrator.desktop
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput_calibrator_once.sh
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator.inc
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator_git.bb
recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput-calibrator.desktop deleted +0 -11
deleted file mode 100644
index 813d7c1..0000000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Calibrate Xinput Touchscreen
-Name[de]=Xinput Touchscreen Kalibrieren
-Comment=Run the calibration tool for Xinput touchscreens
-Encoding=UTF-8
-Exec=/usr/bin/xinput_calibrator
-Terminal=false
-Type=Application
-Icon=calibrate
-StartupNotify=true
-Categories=System;Settings;
recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput_calibrator_once.sh deleted +0 -11
deleted file mode 100644
index 82fcfc6..0000000
@@ -1,11 +0,0 @@
-#!/bin/sh
-if [ -e /etc/pointercal.xinput ] ; then
-  echo Using calibration data stored in /etc/pointercal.xinput
-  . /etc/pointercal.xinput
-else
-  CAL=`/usr/bin/xinput_calibrator | tee /etc/pointercal.xinput.log | grep xinput| sed 's/^ //g; s/$/;/g'`
-  if [ ! -z "$CAL" ] ; then
-    echo $CAL > /etc/pointercal.xinput
-    echo Calibration data stored in /etc/pointercal.xinput
-  fi
-fi
recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch deleted +0 -36
deleted file mode 100644
index fa03147..0000000
@@ -1,36 +0,0 @@
-From 383a3a8523814d1b108d2dc1ed812f80d6c9f050 Mon Sep 17 00:00:00 2001
-From: Mario Domenech Goulart <[email protected]>
-Date: Thu, 11 Mar 2010 11:05:18 -0300
-Subject: [PATCH] calibratorXorgPrint.cpp: fix miny and maxx printing order for UDEV and HAL
-
-
-Signed-off-by: Mario Domenech Goulart <[email protected]>
----
- src/calibrator/calibratorXorgPrint.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/calibrator/calibratorXorgPrint.cpp b/src/calibrator/calibratorXorgPrint.cpp
-index 92d297a..1f74de0 100644
---- a/src/calibrator/calibratorXorgPrint.cpp
-+++ b/src/calibrator/calibratorXorgPrint.cpp
-@@ -69,7 +69,7 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy)
- \tENV{x11_options.miny}=\"%d\"\n\
- \tENV{x11_options.maxx}=\"%d\"\n\
- \tENV{x11_options.maxy}=\"%d\"\n"
--         , new_axys.x_min, new_axys.x_max, new_axys.y_min, new_axys.y_max);
-+         , new_axys.x_min, new_axys.y_min, new_axys.x_max, new_axys.y_max);
-     if (swap_xy != 0)
-         printf("\tENV{x11_options.swapxy}=\"%d\"\n", swap_xy);
-     printf("\tLABEL=\"xorg_touchscreen_end\"\n");
-@@ -81,7 +81,7 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy)
- \t  <merge key=\"input.x11_options.miny\" type=\"string\">%d</merge>\n\
- \t  <merge key=\"input.x11_options.maxx\" type=\"string\">%d</merge>\n\
- \t  <merge key=\"input.x11_options.maxy\" type=\"string\">%d</merge>\n"
--         , new_axys.x_min, new_axys.x_max, new_axys.y_min, new_axys.y_max);
-+         , new_axys.x_min, new_axys.y_min, new_axys.x_max, new_axys.y_max);
-     if (swap_xy != 0)
-         printf("\t  <merge key=\"input.x11_options.swapxy\" type=\"string\">%d</merge>\n", swap_xy);
-     printf("\t</match>\n");
--- 
-1.6.3.3.444.g4ecbc
-
recipes/xinput-calibrator/xinput-calibrator.inc deleted +0 -8
deleted file mode 100644
index 357b0e5..0000000
@@ -1,8 +0,0 @@
-DESCRIPTION = "A generic touchscreen calibration program for X.Org"
-HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
-LICENSE = "MIT/X11"
-DEPENDS = "virtual/libx11 libxi"
-RDEPENDS_${PN} = "xinput pointercal-xinput"
-INC_PR = "r7"
-
-inherit autotools
recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb deleted +0 -19
deleted file mode 100644
index ba04865..0000000
@@ -1,19 +0,0 @@
-require xinput-calibrator.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
-           file://xinput-calibrator.desktop \
-           file://xinput_calibrator_once.sh \
-"
-
-SRCREV = "1c715824334c5d33085dba02f195c9720c2883b5"
-S = "${WORKDIR}/git/"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 src/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
-        install -m 0755 ${WORKDIR}/xinput_calibrator_once.sh ${D}${bindir}/xinput_calibrator_once.sh
-        install -d ${D}${datadir}/applications/
-        install -m 0755 ${WORKDIR}/xinput-calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop
-}
recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb deleted +0 -18
deleted file mode 100644
index 06f46d0..0000000
@@ -1,18 +0,0 @@
-require xinput-calibrator.inc
-
-SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
-           file://0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch"
-
-SRCREV = "d6e01d780001948f55006698e8e9e48c12894810"
-S = "${WORKDIR}/git/"
-
-PR = "${INC_PR}.0"
-
-do_install_append() {
-        install -d ${D}${bindir}
-        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
-        ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
-        install -d ${D}${datadir}/applications/
-        install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop
-        install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
-}
recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb deleted +0 -16
deleted file mode 100644
index 7dc6f29..0000000
@@ -1,16 +0,0 @@
-require xinput-calibrator.inc
-
-SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git"
-
-SRCREV = "d2ce98b3f638667dd64b6d718721379b2dc750a7"
-PR = "${INC_PR}.0"
-S = "${WORKDIR}/git/"
-
-do_install_append() {
-        install -d ${D}${bindir}
-        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
-        ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
-        install -d ${D}${datadir}/applications/
-        install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop
-        install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
-}
recipes/xinput-calibrator/xinput-calibrator_git.bb deleted +0 -20
deleted file mode 100644
index c6188e6..0000000
@@ -1,20 +0,0 @@
-require xinput-calibrator.inc
-
-PV = "0.6.0+gitr${SRCPV}"
-PR = "${INC_PR}.0"
-
-SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git;branch=misclick"
-
-SRCREV = "496d4401731c6e5ed550e446cc2fc4b12d999ad8"
-S = "${WORKDIR}/git/"
-
-do_install_append() {
-        install -d ${D}${bindir}
-        install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
-        ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
-        install -d ${D}${datadir}/applications/
-        install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop
-}
-
-# remove this after misclick branch is well-tested and merged to master
-DEFAULT_PREFERENCE = "-1"
Signature · 1 line
1.7.5.rc3