commit: 5a5d59b0e82846b4fd789e76578347e0e2c64525
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri May 11 23:11:22 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 12 00:32:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5d59b0
media-plugins/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild | 5 ++---
.../gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild | 7 ++-----
.../gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild | 7 ++-----
.../gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild | 5 +----
.../gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild | 6 ++----
media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild | 4 ++--
media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild | 4 ++--
.../vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild | 4 ++--
.../vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild | 4 ++--
media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild | 4 ++--
10 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
index 99e52cef5e3..bc72aa24507 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,8 +12,7 @@ IUSE=""
RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+ x11-base/xorg-proto"
# xshm is a compile time option of ximage, which is in libXext
GST_PLUGINS_BUILD="x xshm"
diff --git
a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
index 6e3450be613..1b1b38a13ef 100644
---
a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
+++
b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -18,10 +18,7 @@ RDEPEND="
>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
"
# xshm is a compile time option of ximage
diff --git
a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
index 46d150ccc6a..e9a0f3958ff 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,10 +18,7 @@ RDEPEND="
>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
"
# xshm is a compile time option of ximage
diff --git
a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
index 572d5865e96..5beb37b776a 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
@@ -18,10 +18,7 @@ RDEPEND="
>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
"
# xshm is a compile time option of ximage
diff --git
a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild
b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild
index e66e5e0c87f..56fece1ff40 100644
--- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,9 +12,7 @@ IUSE=""
RDEPEND=">=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
- >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+ x11-base/xorg-proto"
# xshm is a compile time option of xvideo
# x is needed to build any X plugins, but we build/install only xv anyway
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
index 5eace810e33..22ecc06ccdd 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )
xine? (
X? (
- x11-proto/xproto
+ x11-base/xorg-proto
x11-libs/libXxf86vm
)
)"
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
index 570df0c7c24..d594f721d33 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )
xine? (
X? (
- x11-proto/xproto
+ x11-base/xorg-proto
x11-libs/libXxf86vm
)
)"
diff --git
a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
index ba800d6eb61..6f3eb19458b 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )
xine? (
X? (
- x11-proto/xproto
+ x11-base/xorg-proto
x11-libs/libXxf86vm
)
)"
diff --git
a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
index 6f0aac3f5d5..d383380175c 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )
xine? (
X? (
- x11-proto/xproto
+ x11-base/xorg-proto
x11-libs/libXxf86vm
)
)"
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index b3c8f7c0eda..bca8332076f 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -49,7 +49,7 @@ DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )
xine? (
X? (
- x11-proto/xproto
+ x11-base/xorg-proto
x11-libs/libXxf86vm
)
)"
