[oe-commits] org.oe.dev calibrateproto, libxcalibrate: Update recipes to SRCREV and a new tag since the patches were merged upstream

rpurdie commit openembedded-commits at lists.openembedded.org
Mon Feb 18 16:43:25 UTC 2008 

calibrateproto, libxcalibrate: Update recipes to SRCREV and a new tag since the patches were merged upstream

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 43addc773eb2d829793d8d5a25ea84a32b61f665
ViewMTN: http://monotone.openembedded.org/revision/info/43addc773eb2d829793d8d5a25ea84a32b61f665
Files:
1
packages/xorg-lib/libxcalibrate
packages/xorg-lib/libxcalibrate/coords.patch
packages/xorg-proto/calibrateproto
packages/xorg-proto/calibrateproto/coords.patch
conf/distro/include/preferred-xorg-versions-X11R7.0.inc
conf/distro/include/preferred-xorg-versions-X11R7.1.inc
conf/distro/include/preferred-xorg-versions-X11R7.2.inc
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
conf/distro/include/preferred-xorg-versions.inc
packages/xorg-lib/libxcalibrate_git.bb
packages/xorg-proto/calibrateproto_git.bb
Diffs:

#
# mt diff -r0c9d8645601f52222aeb4d6f45dc18edc57250eb -r43addc773eb2d829793d8d5a25ea84a32b61f665
#
# 
# 
# delete "packages/xorg-lib/libxcalibrate"
# 
# delete "packages/xorg-lib/libxcalibrate/coords.patch"
# 
# delete "packages/xorg-proto/calibrateproto"
# 
# delete "packages/xorg-proto/calibrateproto/coords.patch"
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.0.inc"
#  from [e17d1ac473c7551aa878a4025a0c72d1299ddee1]
#    to [0414701d17a1c2f342d391ce49ccd43dbdf2f92d]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.1.inc"
#  from [22d02a23b97d863397deca71f6cf47ac842a3041]
#    to [be10d29bb8807639b7ec4fff641a33f48a5d33fb]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.2.inc"
#  from [e56e290af0c2177e02d83403e1a8719853127dba]
#    to [554e0995c7ce93e7c76bf2affe531b1e77fd7e1d]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
#  from [f0d0e9e8047b09eef4e513465a8e27652b9757d0]
#    to [5f058c2bfda8331944c60e4241fb698a16acae65]
# 
# patch "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
#  from [2bd8404a566895df3ee956c8fec2fb169386ffc9]
#    to [1c80460587c91260a4733ef34bf4747aef7fc19b]
# 
# patch "conf/distro/include/preferred-xorg-versions.inc"
#  from [defa236a54b9b69361fb032b1fe6ec8b63cdc8e4]
#    to [20bb18b5b3e0c5b530f74f5b0d3b9b050fcf972c]
# 
# patch "packages/xorg-lib/libxcalibrate_git.bb"
#  from [0c3313cd068d23c4d45e05f4b6f53a709eafce09]
#    to [df9536d5608ab607d9b6bda50bf32fd193a87a41]
# 
# patch "packages/xorg-proto/calibrateproto_git.bb"
#  from [98eeef1d63972f77c5d646db9e0db9e5b0ebdf7e]
#    to [ed72aebe4fa009216a6b40e35b228cd1d2fd61bb]
# 
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.0.inc	e17d1ac473c7551aa878a4025a0c72d1299ddee1
+++ conf/distro/include/preferred-xorg-versions-X11R7.0.inc	0414701d17a1c2f342d391ce49ccd43dbdf2f92d
@@ -339,3 +339,9 @@ PREFERRED_VERSION_xserver-xorg = "X11R7.
 PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1"
 PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1"
 PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1"
+
+# Unreleased Packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.1.inc	22d02a23b97d863397deca71f6cf47ac842a3041
+++ conf/distro/include/preferred-xorg-versions-X11R7.1.inc	be10d29bb8807639b7ec4fff641a33f48a5d33fb
@@ -183,3 +183,9 @@ PREFERRED_VERSION_xserver-xorg ?= "X11R7
 PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0"
 PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.2.inc	e56e290af0c2177e02d83403e1a8719853127dba
+++ conf/distro/include/preferred-xorg-versions-X11R7.2.inc	554e0995c7ce93e7c76bf2affe531b1e77fd7e1d
@@ -269,3 +269,8 @@ PREFERRED_VERSION_xserver-xorg ?= "1.2.0
 PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
 PREFERRED_VERSION_xserver-xorg ?= "1.2.0"
 
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.3.inc	f0d0e9e8047b09eef4e513465a8e27652b9757d0
+++ conf/distro/include/preferred-xorg-versions-X11R7.3.inc	5f058c2bfda8331944c60e4241fb698a16acae65
@@ -280,3 +280,8 @@ PREFERRED_VERSION_xserver-xorg ?= "1.4"
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
 PREFERRED_VERSION_xserver-xorg ?= "1.4"
 
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.4.inc	2bd8404a566895df3ee956c8fec2fb169386ffc9
+++ conf/distro/include/preferred-xorg-versions-X11R7.4.inc	1c80460587c91260a4733ef34bf4747aef7fc19b
@@ -284,3 +284,9 @@ PREFERRED_VERSION_xserver-xorg ?= "1.4"
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
 PREFERRED_VERSION_xserver-xorg ?= "1.4"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
============================================================
--- conf/distro/include/preferred-xorg-versions.inc	defa236a54b9b69361fb032b1fe6ec8b63cdc8e4
+++ conf/distro/include/preferred-xorg-versions.inc	20bb18b5b3e0c5b530f74f5b0d3b9b050fcf972c
@@ -109,3 +109,7 @@ PREFERRED_VERSION_xev ?= "1.0.2"
 PREFERRED_VERSION_xtrans-native ?= "1.0.3"
 PREFERRED_VERSION_xinit ?= "1.0.4"
 PREFERRED_VERSION_xev ?= "1.0.2"
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
============================================================
--- packages/xorg-lib/libxcalibrate_git.bb	0c3313cd068d23c4d45e05f4b6f53a709eafce09
+++ packages/xorg-lib/libxcalibrate_git.bb	df9536d5608ab607d9b6bda50bf32fd193a87a41
@@ -1,13 +1,11 @@ DEPENDS = "virtual/libx11 calibrateproto
 require xorg-lib-common.inc
 
 DESCRIPTION = "	Touchscreen calibration client library"
 LICENSE = "BSD-X"
 DEPENDS = "virtual/libx11 calibrateproto libxext"
-PV = "0.0+git${SRCDATE}"
-PR = "r2"
+PV = "0.0+git${SRCREV}"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62 \
-           file://coords.patch;patch=1"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
 
 S = "${WORKDIR}/git"
 
============================================================
--- packages/xorg-proto/calibrateproto_git.bb	98eeef1d63972f77c5d646db9e0db9e5b0ebdf7e
+++ packages/xorg-proto/calibrateproto_git.bb	ed72aebe4fa009216a6b40e35b228cd1d2fd61bb
@@ -1,11 +1,9 @@ DESCRIPTION = "Touchscreen calibration p
 require xorg-proto-common.inc
 
 DESCRIPTION = "Touchscreen calibration protocol"
 
-PV = "0.0+git${SRCDATE}"
+PV = "0.0+git${SRCREV}"
 PR = "r1"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \
-           file://coords.patch;patch=1"
-
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
 S = "${WORKDIR}/git"

More information about the Openembedded-commits mailing list