[oe-commits] org.oe.dev xserver-common 1.14, 1.15: Apply calibrate-only-if-ts.patch (from 1.13).

[pfalcon commit]

xserver-common 1.14, 1.15: Apply calibrate-only-if-ts.patch (from 1.13).

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: b9d878678330e8fde2184c15a027c58026fe4fba
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b9d878678330e8fde2184c15a027c58026fe4fba
Files:
1
packages/xserver-common/xserver-common_1.14.bb
packages/xserver-common/xserver-common_1.15.bb
Diffs:

#
# mt diff -r9b860048ee37af02f834a987bb9fb64ca90d2374 -rb9d878678330e8fde2184c15a027c58026fe4fba
#
# 
# 
# patch "packages/xserver-common/xserver-common_1.14.bb"
#  from [37238b056267f95a66c8b30af847a875e066ecdc]
#    to [924d74db820b37e3a413f6fd4245053d0c5c9336]
# 
# patch "packages/xserver-common/xserver-common_1.15.bb"
#  from [37238b056267f95a66c8b30af847a875e066ecdc]
#    to [924d74db820b37e3a413f6fd4245053d0c5c9336]
# 
============================================================
--- packages/xserver-common/xserver-common_1.14.bb	37238b056267f95a66c8b30af847a875e066ecdc
+++ packages/xserver-common/xserver-common_1.14.bb	924d74db820b37e3a413f6fd4245053d0c5c9336
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinf
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
@@ -10,7 +10,8 @@ SRC_URI_append = " file://setDPI.sh \
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
-                   file://xserver-imageon.patch;patch=1"
+                   file://xserver-imageon.patch;patch=1 \
+                   file://calibrate-only-if-ts.patch;patch=1"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
============================================================
--- packages/xserver-common/xserver-common_1.15.bb	37238b056267f95a66c8b30af847a875e066ecdc
+++ packages/xserver-common/xserver-common_1.15.bb	924d74db820b37e3a413f6fd4245053d0c5c9336
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinf
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
@@ -10,7 +10,8 @@ SRC_URI_append = " file://setDPI.sh \
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
-                   file://xserver-imageon.patch;patch=1"
+                   file://xserver-imageon.patch;patch=1 \
+                   file://calibrate-only-if-ts.patch;patch=1"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"