From 71fc43d7cb7c6bb5a1d270cd00ccf1b458e32321 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 31 Dec 2008 16:06:12 +0000 Subject: [PATCH] xorg-proto: Upgrade various packages to the latest releases --- .../include/preferred-xorg-versions.inc | 20 +++++++++---------- ...wmproto_1.0.3.bb => applewmproto_1.1.0.bb} | 0 ...o-sdk_1.2.1.bb => randrproto-sdk_1.2.2.bb} | 0 ...andrproto_1.2.1.bb => randrproto_1.2.2.bb} | 0 .../xorg-proto/renderproto-sdk_0.9.2.bb | 3 --- meta/packages/xorg-proto/renderproto_0.9.2.bb | 7 ------- .../xorg-proto/xextproto-native_7.0.3.bb | 3 --- ...ive_7.0.2.bb => xextproto-native_7.0.4.bb} | 0 .../xorg-proto/xextproto-sdk_7.0.3.bb | 3 --- ...to-sdk_7.0.2.bb => xextproto-sdk_7.0.4.bb} | 0 meta/packages/xorg-proto/xextproto_7.0.2.bb | 6 ------ ...{xextproto_7.0.3.bb => xextproto_7.0.4.bb} | 0 ...riproto_2.0.3.bb => xf86driproto_2.0.4.bb} | 0 .../xorg-proto/xproto-native_7.0.13.bb | 3 --- ...tive_7.0.12.bb => xproto-native_7.0.14.bb} | 0 meta/packages/xorg-proto/xproto-sdk_7.0.13.bb | 3 --- ...oto-sdk_7.0.12.bb => xproto-sdk_7.0.14.bb} | 0 meta/packages/xorg-proto/xproto_7.0.13.bb | 6 ------ .../{xproto_7.0.12.bb => xproto_7.0.14.bb} | 0 19 files changed, 10 insertions(+), 44 deletions(-) rename meta/packages/xorg-proto/{applewmproto_1.0.3.bb => applewmproto_1.1.0.bb} (100%) rename meta/packages/xorg-proto/{randrproto-sdk_1.2.1.bb => randrproto-sdk_1.2.2.bb} (100%) rename meta/packages/xorg-proto/{randrproto_1.2.1.bb => randrproto_1.2.2.bb} (100%) delete mode 100644 meta/packages/xorg-proto/renderproto-sdk_0.9.2.bb delete mode 100644 meta/packages/xorg-proto/renderproto_0.9.2.bb delete mode 100644 meta/packages/xorg-proto/xextproto-native_7.0.3.bb rename meta/packages/xorg-proto/{xextproto-native_7.0.2.bb => xextproto-native_7.0.4.bb} (100%) delete mode 100644 meta/packages/xorg-proto/xextproto-sdk_7.0.3.bb rename meta/packages/xorg-proto/{xextproto-sdk_7.0.2.bb => xextproto-sdk_7.0.4.bb} (100%) delete mode 100644 meta/packages/xorg-proto/xextproto_7.0.2.bb rename meta/packages/xorg-proto/{xextproto_7.0.3.bb => xextproto_7.0.4.bb} (100%) rename meta/packages/xorg-proto/{xf86driproto_2.0.3.bb => xf86driproto_2.0.4.bb} (100%) delete mode 100644 meta/packages/xorg-proto/xproto-native_7.0.13.bb rename meta/packages/xorg-proto/{xproto-native_7.0.12.bb => xproto-native_7.0.14.bb} (100%) delete mode 100644 meta/packages/xorg-proto/xproto-sdk_7.0.13.bb rename meta/packages/xorg-proto/{xproto-sdk_7.0.12.bb => xproto-sdk_7.0.14.bb} (100%) delete mode 100644 meta/packages/xorg-proto/xproto_7.0.13.bb rename meta/packages/xorg-proto/{xproto_7.0.12.bb => xproto_7.0.14.bb} (100%) diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index e3e2cad384..157c2d9e69 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -2,7 +2,7 @@ # The latest Xorg package versions # -PREFERRED_VERSION_applewmproto ?= "1.0.3" +PREFERRED_VERSION_applewmproto ?= "1.1.0" PREFERRED_VERSION_bigreqsproto ?= "1.0.2" PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2" PREFERRED_VERSION_bigreqsproto-sdk ?= "1.0.2" @@ -85,8 +85,8 @@ PREFERRED_VERSION_makedepend ?= "1.0.1" PREFERRED_VERSION_makedepend-native ?= "1.0.1" PREFERRED_VERSION_pixman ?= "0.13.2" PREFERRED_VERSION_printproto ?= "1.0.4" -PREFERRED_VERSION_randrproto ?= "1.2.1" -PREFERRED_VERSION_randrproto-sdk ?= "1.2.1" +PREFERRED_VERSION_randrproto ?= "1.2.2" +PREFERRED_VERSION_randrproto-sdk ?= "1.2.2" PREFERRED_VERSION_recordproto ?= "1.13.2" PREFERRED_VERSION_renderproto ?= "0.9.3" PREFERRED_VERSION_renderproto-sdk ?= "0.9.3" @@ -104,14 +104,14 @@ PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2" PREFERRED_VERSION_xcmiscproto-sdk ?= "1.1.2" PREFERRED_VERSION_xdpyinfo ?= "1.0.3" PREFERRED_VERSION_xev ?= "1.0.3" -PREFERRED_VERSION_xextproto ?= "7.0.3" -PREFERRED_VERSION_xextproto-native ?= "7.0.3" -PREFERRED_VERSION_xextproto-sdk ?= "7.0.3" +PREFERRED_VERSION_xextproto ?= "7.0.4" +PREFERRED_VERSION_xextproto-native ?= "7.0.4" +PREFERRED_VERSION_xextproto-sdk ?= "7.0.4" PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" PREFERRED_VERSION_xf86bigfontproto-sdk ?= "1.1.2" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" -PREFERRED_VERSION_xf86driproto ?= "2.0.3" +PREFERRED_VERSION_xf86driproto ?= "2.0.4" PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" PREFERRED_VERSION_xf86miscproto ?= "0.9.2" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" @@ -122,9 +122,9 @@ PREFERRED_VERSION_xineramaproto ?= "1.1.2" PREFERRED_VERSION_xmodmap ?= "1.0.3" PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" PREFERRED_VERSION_xprop ?= "1.0.4" -PREFERRED_VERSION_xproto ?= "7.0.13" -PREFERRED_VERSION_xproto-native ?= "7.0.13" -PREFERRED_VERSION_xproto-sdk ?= "7.0.13" +PREFERRED_VERSION_xproto ?= "7.0.14" +PREFERRED_VERSION_xproto-native ?= "7.0.14" +PREFERRED_VERSION_xproto-sdk ?= "7.0.14" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2" PREFERRED_VERSION_xrandr ?= "1.2.3" PREFERRED_VERSION_xrdb ?= "1.0.5" diff --git a/meta/packages/xorg-proto/applewmproto_1.0.3.bb b/meta/packages/xorg-proto/applewmproto_1.1.0.bb similarity index 100% rename from meta/packages/xorg-proto/applewmproto_1.0.3.bb rename to meta/packages/xorg-proto/applewmproto_1.1.0.bb diff --git a/meta/packages/xorg-proto/randrproto-sdk_1.2.1.bb b/meta/packages/xorg-proto/randrproto-sdk_1.2.2.bb similarity index 100% rename from meta/packages/xorg-proto/randrproto-sdk_1.2.1.bb rename to meta/packages/xorg-proto/randrproto-sdk_1.2.2.bb diff --git a/meta/packages/xorg-proto/randrproto_1.2.1.bb b/meta/packages/xorg-proto/randrproto_1.2.2.bb similarity index 100% rename from meta/packages/xorg-proto/randrproto_1.2.1.bb rename to meta/packages/xorg-proto/randrproto_1.2.2.bb diff --git a/meta/packages/xorg-proto/renderproto-sdk_0.9.2.bb b/meta/packages/xorg-proto/renderproto-sdk_0.9.2.bb deleted file mode 100644 index 25ab90827f..0000000000 --- a/meta/packages/xorg-proto/renderproto-sdk_0.9.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require renderproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/renderproto_0.9.2.bb b/meta/packages/xorg-proto/renderproto_0.9.2.bb deleted file mode 100644 index d4e0983a8b..0000000000 --- a/meta/packages/xorg-proto/renderproto_0.9.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -CONFLICTS = "renderext" -PR = "r1" -PE = "1" - -XORG_PN = "renderproto" diff --git a/meta/packages/xorg-proto/xextproto-native_7.0.3.bb b/meta/packages/xorg-proto/xextproto-native_7.0.3.bb deleted file mode 100644 index 2529e62ca2..0000000000 --- a/meta/packages/xorg-proto/xextproto-native_7.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xextproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/xextproto-native_7.0.2.bb b/meta/packages/xorg-proto/xextproto-native_7.0.4.bb similarity index 100% rename from meta/packages/xorg-proto/xextproto-native_7.0.2.bb rename to meta/packages/xorg-proto/xextproto-native_7.0.4.bb diff --git a/meta/packages/xorg-proto/xextproto-sdk_7.0.3.bb b/meta/packages/xorg-proto/xextproto-sdk_7.0.3.bb deleted file mode 100644 index 3b182a02ff..0000000000 --- a/meta/packages/xorg-proto/xextproto-sdk_7.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xextproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/xextproto-sdk_7.0.2.bb b/meta/packages/xorg-proto/xextproto-sdk_7.0.4.bb similarity index 100% rename from meta/packages/xorg-proto/xextproto-sdk_7.0.2.bb rename to meta/packages/xorg-proto/xextproto-sdk_7.0.4.bb diff --git a/meta/packages/xorg-proto/xextproto_7.0.2.bb b/meta/packages/xorg-proto/xextproto_7.0.2.bb deleted file mode 100644 index 829d3cbe1e..0000000000 --- a/meta/packages/xorg-proto/xextproto_7.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" - -XORG_PN = "xextproto" diff --git a/meta/packages/xorg-proto/xextproto_7.0.3.bb b/meta/packages/xorg-proto/xextproto_7.0.4.bb similarity index 100% rename from meta/packages/xorg-proto/xextproto_7.0.3.bb rename to meta/packages/xorg-proto/xextproto_7.0.4.bb diff --git a/meta/packages/xorg-proto/xf86driproto_2.0.3.bb b/meta/packages/xorg-proto/xf86driproto_2.0.4.bb similarity index 100% rename from meta/packages/xorg-proto/xf86driproto_2.0.3.bb rename to meta/packages/xorg-proto/xf86driproto_2.0.4.bb diff --git a/meta/packages/xorg-proto/xproto-native_7.0.13.bb b/meta/packages/xorg-proto/xproto-native_7.0.13.bb deleted file mode 100644 index 5dde8a7d4a..0000000000 --- a/meta/packages/xorg-proto/xproto-native_7.0.13.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/xproto-native_7.0.12.bb b/meta/packages/xorg-proto/xproto-native_7.0.14.bb similarity index 100% rename from meta/packages/xorg-proto/xproto-native_7.0.12.bb rename to meta/packages/xorg-proto/xproto-native_7.0.14.bb diff --git a/meta/packages/xorg-proto/xproto-sdk_7.0.13.bb b/meta/packages/xorg-proto/xproto-sdk_7.0.13.bb deleted file mode 100644 index 1c1a934bb0..0000000000 --- a/meta/packages/xorg-proto/xproto-sdk_7.0.13.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/xproto-sdk_7.0.12.bb b/meta/packages/xorg-proto/xproto-sdk_7.0.14.bb similarity index 100% rename from meta/packages/xorg-proto/xproto-sdk_7.0.12.bb rename to meta/packages/xorg-proto/xproto-sdk_7.0.14.bb diff --git a/meta/packages/xorg-proto/xproto_7.0.13.bb b/meta/packages/xorg-proto/xproto_7.0.13.bb deleted file mode 100644 index 1adf55d97a..0000000000 --- a/meta/packages/xorg-proto/xproto_7.0.13.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" - -XORG_PN = "xproto" diff --git a/meta/packages/xorg-proto/xproto_7.0.12.bb b/meta/packages/xorg-proto/xproto_7.0.14.bb similarity index 100% rename from meta/packages/xorg-proto/xproto_7.0.12.bb rename to meta/packages/xorg-proto/xproto_7.0.14.bb -- 2.40.1