xorg-proto: Upgrade various packages to the latest releases

19 files changed, 10 insertions, 44 deletions

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
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/applewmproto_1.0.3.bb
+++ b/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
index 2759cb00cc..2759cb00cc 100644
--- a/meta/packages/xorg-proto/randrproto-sdk_1.2.1.bb
+++ b/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
index 85000cc900..85000cc900 100644
--- a/meta/packages/xorg-proto/randrproto_1.2.1.bb
+++ b/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
index 2529e62ca2..2529e62ca2 100644
--- a/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
+++ b/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
index 3b182a02ff..3b182a02ff 100644
--- a/meta/packages/xorg-proto/xextproto-sdk_7.0.2.bb
+++ b/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
index ecb2e65f74..ecb2e65f74 100644
--- a/meta/packages/xorg-proto/xextproto_7.0.3.bb
+++ b/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
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86driproto_2.0.3.bb
+++ b/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
index 5dde8a7d4a..5dde8a7d4a 100644
--- a/meta/packages/xorg-proto/xproto-native_7.0.12.bb
+++ b/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
index 1c1a934bb0..1c1a934bb0 100644
--- a/meta/packages/xorg-proto/xproto-sdk_7.0.12.bb
+++ b/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
index 1adf55d97a..1adf55d97a 100644
--- a/meta/packages/xorg-proto/xproto_7.0.12.bb
+++ b/meta/packages/xorg-proto/xproto_7.0.14.bb