Skip to contentSkip to conversation

xserver-common 1.34: make it work with xserver-nodm-init

PATCH New Koen Kooi 1 participant 3 messages Apr 21, 2011

lore
Share & tools
lore

Koen Kooi

author
#0 lore raw

PATCH 1/3 xserver-common 1.34: make it work with xserver-nodm-init

* Move SHR patches to main SRC_URI, they are generic and good enough for everyone
* Start x-window-manager
* Run through oe-stylize
* Remove duplicated LICENSE
* Add reconflicts with x11-common as well

---
 .../xserver-common/xserver-common_1.34.bb          |   38 ++++++++++----------
 1 files changed, 19 insertions(+), 19 deletions(-)
meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +19 -19
index b994dfb..0d59ab7 100644
@@ -1,14 +1,8 @@
 DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo fbset"
-PR = "r1"
 
-PACKAGE_ARCH = "all"
-
-RCONFLICTS_${PN} = "xserver-kdrive-common"
-RREPLACES_${PN} = "xserver-kdrive-common"
+PR = "r2"
 
 # we are using a gpe-style Makefile
 inherit gpe
@@ -19,20 +13,26 @@ SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166c
 SRC_URI_append = " \
                    file://gplv2-license.patch \
                    file://setDPI.sh \
-                   file://89xdgautostart.sh"
+                   file://89xdgautostart.sh \
+                   file://89xTs_Calibrate.xinput_calibrator.patch \
+                   file://90xXWindowManager.patch \
+                   file://Xserver.add.xserver-system.patch \
+                   file://Xserver.add.nocursor.for.gta.patch \
+                   file://Xserver.add.dpi.for.gta.patch \
+                   file://Xserver.n900.patch \
+"
 
-RDEPENDS_${PN}_append_shr = " xinput-calibrator "
-
-SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch \
-                       file://90xXWindowManager.patch \
-                       file://Xserver.add.nocursor.for.gta.patch \
-                       file://Xserver.add.xserver-system.patch \
-                       file://Xserver.add.dpi.for.gta.patch \
-		       file://Xserver.n900.patch"
 
 do_install_append() {
-	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-	install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart"
-	sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common
+        install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+        install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart"
+        sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common
 }
 
+PACKAGE_ARCH = "all"
+
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo fbset xinput-calibrator"
+
+RCONFLICTS_${PN} = "xserver-kdrive-common x11-common"
+RREPLACES_${PN} = "xserver-kdrive-common x11-common"
+
Signature · 1 line
1.6.6.1
author
#1 lore raw

PATCH 2/3 xinput-calibrator: make pointercal-xinput a soft dependency

pointercal-xinput is machine specific and empty for most machines, so it it's only a soft dependency.

---
 .../xinput-calibrator/xinput-calibrator.inc        |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc +6 -2
index 357b0e5..691a45c 100644
@@ -2,7 +2,11 @@ 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"
+
+INC_PR = "r8"
 
 inherit autotools
+
+RDEPENDS_${PN} = "xinput"
+RRECOMMENDS_${PN} = "pointercal-xinput"
+
Signature · 1 line
1.6.6.1
author
#2 lore raw

PATCH 3/3 pointercal-xinput: don't allow empty packages

Now that it is a soft dependency for xinput-calibrator only generate packages for machines with actual calibration data

---
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +2 -2
index 10360f7..993a75d 100644
@@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SECTION = "base"
 
-PR = "r2"
+PR = "r3"
+
 SRC_URI = "file://pointercal.xinput"
 S = "${WORKDIR}"
 
@@ -16,6 +17,5 @@ do_install() {
 	fi
 }
 
-ALLOW_EMPTY_${PN} = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
Signature · 1 line
1.6.6.1