commit: 29d5a14368ab3434dbc1e0f61d951a5e3170a602
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 30 20:27:32 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 20:50:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d5a143
media-video/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
media-video/alevt/alevt-1.6.2.ebuild | 4 ++--
media-video/cheese/cheese-3.24.0.ebuild | 2 +-
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 12 ++++--------
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 12 ++++--------
media-video/mplayer/mplayer-9999.ebuild | 12 ++++--------
media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild | 4 ++--
media-video/nvidia-settings/nvidia-settings-340.58.ebuild | 4 ++--
media-video/nvidia-settings/nvidia-settings-355.11.ebuild | 4 ++--
media-video/nvidia-settings/nvidia-settings-358.16.ebuild | 4 ++--
media-video/parole/parole-0.8.1.ebuild | 4 ++--
media-video/parole/parole-1.0.0.ebuild | 2 +-
media-video/parole/parole-1.0.1.ebuild | 2 +-
.../recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild | 12 +++++-------
.../recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild | 10 ++++------
media-video/totem/totem-3.24.0.ebuild | 3 +--
media-video/vlc/vlc-2.2.8-r1.ebuild | 2 +-
media-video/vlc/vlc-3.0.1-r1.ebuild | 2 +-
media-video/vlc/vlc-3.0.2.ebuild | 2 +-
media-video/vlc/vlc-3.0.9999.ebuild | 2 +-
media-video/vlc/vlc-9999.ebuild | 2 +-
media-video/xanim-export/xanim-export-2.80.1-r5.ebuild | 7 +++----
media-video/xine-ui/xine-ui-0.99.10.ebuild | 4 +---
media-video/xine-ui/xine-ui-0.99.9.ebuild | 6 ++----
23 files changed, 48 insertions(+), 70 deletions(-)
diff --git a/media-video/alevt/alevt-1.6.2.ebuild
b/media-video/alevt/alevt-1.6.2.ebuild
index 5e65dbcd0b4..d93fd6f0ccb 100644
--- a/media-video/alevt/alevt-1.6.2.ebuild
+++ b/media-video/alevt/alevt-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -16,7 +16,7 @@ IUSE=""
RDEPEND="x11-libs/libX11
>=media-libs/libpng-1.4"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
RESTRICT="strip"
diff --git a/media-video/cheese/cheese-3.24.0.ebuild
b/media-video/cheese/cheese-3.24.0.ebuild
index c4355c816aa..b9978f7735b 100644
--- a/media-video/cheese/cheese-3.24.0.ebuild
+++ b/media-video/cheese/cheese-3.24.0.ebuild
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.50
dev-util/itstool
virtual/pkgconfig
- x11-proto/xf86vidmodeproto
+ x11-base/xorg-proto
test? ( dev-libs/glib:2[utils] )
"
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index db84aec79d5..c52e83c38b3 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -130,17 +130,13 @@ RDEPEND+="
xvmc? ( x11-libs/libXvMC )
"
-X_DEPS="
- x11-proto/videoproto
- x11-proto/xf86vidmodeproto
-"
ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
- dga? ( x11-proto/xf86dgaproto )
- X? ( ${X_DEPS} )
- xinerama? ( x11-proto/xineramaproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
+ dga? ( x11-base/xorg-proto )
+ X? ( x11-base/xorg-proto )
+ xinerama? ( x11-base/xorg-proto )
+ xscreensaver? ( x11-base/xorg-proto )
amd64? ( ${ASM_DEP} )
doc? (
dev-libs/libxslt app-text/docbook-xml-dtd
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 7f4d347dd71..1e14de1f1ea 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -129,17 +129,13 @@ RDEPEND+="
xvmc? ( x11-libs/libXvMC )
"
-X_DEPS="
- x11-proto/videoproto
- x11-proto/xf86vidmodeproto
-"
ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
- dga? ( x11-proto/xf86dgaproto )
- X? ( ${X_DEPS} )
- xinerama? ( x11-proto/xineramaproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
+ dga? ( x11-base/xorg-proto )
+ X? ( x11-base/xorg-proto )
+ xinerama? ( x11-base/xorg-proto )
+ xscreensaver? ( x11-base/xorg-proto )
amd64? ( ${ASM_DEP} )
doc? (
dev-libs/libxslt app-text/docbook-xml-dtd
diff --git a/media-video/mplayer/mplayer-9999.ebuild
b/media-video/mplayer/mplayer-9999.ebuild
index 0ca08a83c5c..252dcec7163 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -129,17 +129,13 @@ RDEPEND+="
xvmc? ( x11-libs/libXvMC )
"
-X_DEPS="
- x11-proto/videoproto
- x11-proto/xf86vidmodeproto
-"
ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
- dga? ( x11-proto/xf86dgaproto )
- X? ( ${X_DEPS} )
- xinerama? ( x11-proto/xineramaproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
+ dga? ( x11-base/xorg-proto )
+ X? ( x11-base/xorg-proto )
+ xinerama? ( x11-base/xorg-proto )
+ xscreensaver? ( x11-base/xorg-proto )
amd64? ( ${ASM_DEP} )
doc? (
dev-libs/libxslt app-text/docbook-xml-dtd
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
index 5062a31c59b..10851bb2c8f 100644
--- a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-340.58-r1.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
@@ -32,7 +32,7 @@ RDEPEND="
x11-libs/libvdpau"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_compile() {
einfo "Building libXNVCtrl..."
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
index c20dca0ad41..5e890a832b1 100644
--- a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-340.58.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
@@ -32,7 +32,7 @@ RDEPEND="
x11-libs/libvdpau"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_compile() {
einfo "Building libXNVCtrl..."
diff --git a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
index 373cf95cc30..8225afc77a3 100644
--- a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-355.11.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
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND}
x11-drivers/nvidia-drivers:0/355"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_compile() {
einfo "Building libXNVCtrl..."
diff --git a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
index c2b74e3d2af..1ef8e7edc4b 100644
--- a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-358.16.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
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND}
x11-drivers/nvidia-drivers:0/358"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_compile() {
einfo "Building libXNVCtrl..."
diff --git a/media-video/parole/parole-0.8.1.ebuild
b/media-video/parole/parole-0.8.1.ebuild
index a8dd869c52d..dda831291c0 100644
--- a/media-video/parole/parole-0.8.1.ebuild
+++ b/media-video/parole/parole-0.8.1.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
@@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
pkg_setup() {
XFCONF=(
diff --git a/media-video/parole/parole-1.0.0.ebuild
b/media-video/parole/parole-1.0.0.ebuild
index 377232165ea..ba3fa0b882e 100644
--- a/media-video/parole/parole-1.0.0.ebuild
+++ b/media-video/parole/parole-1.0.0.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( AUTHORS ChangeLog README THANKS TODO )
diff --git a/media-video/parole/parole-1.0.1.ebuild
b/media-video/parole/parole-1.0.1.ebuild
index 3fe9a536f39..c6703982894 100644
--- a/media-video/parole/parole-1.0.1.ebuild
+++ b/media-video/parole/parole-1.0.1.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( AUTHORS ChangeLog README THANKS TODO )
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
index 51d0a0b43c4..fba38e965e1 100644
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=2
@@ -26,14 +26,12 @@ RDEPEND="sys-libs/zlib
alsa? ( media-libs/alsa-lib )
jack? ( media-sound/jack-audio-connection-kit )"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_prepare() {
- if has_version ">=x11-proto/xextproto-7.1.1"; then
- sed -i \
- -e 's:shmstr.h:shmproto.h:g' \
- src/rmd_{getzpixmap.c,update_image.c} || die
- fi
+ sed -i \
+ -e 's:shmstr.h:shmproto.h:g' \
+ src/rmd_{getzpixmap.c,update_image.c} || die
# fix weird Framerates with new libtheora
epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
index 8fd17ae7e35..5247e79de06 100644
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
@@ -26,14 +26,12 @@ RDEPEND="sys-libs/zlib
alsa? ( media-libs/alsa-lib )
jack? ( virtual/jack )"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_prepare() {
- if has_version ">=x11-proto/xextproto-7.1.1"; then
- sed -i \
- -e 's:shmstr.h:shmproto.h:g' \
- src/rmd_{getzpixmap.c,update_image.c} || die
- fi
+ sed -i \
+ -e 's:shmstr.h:shmproto.h:g' \
+ src/rmd_{getzpixmap.c,update_image.c} || die
# fix weird Framerates with new libtheora
epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
diff --git a/media-video/totem/totem-3.24.0.ebuild
b/media-video/totem/totem-3.24.0.ebuild
index e0494408ed4..127a2007f2e 100644
--- a/media-video/totem/totem-3.24.0.ebuild
+++ b/media-video/totem/totem-3.24.0.ebuild
@@ -71,8 +71,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.50.1
sys-devel/gettext
virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
dev-libs/gobject-introspection-common
gnome-base/gnome-common
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild
b/media-video/vlc/vlc-2.2.8-r1.ebuild
index 39a11351871..df48927b371 100644
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -184,7 +184,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig:*
amd64? ( dev-lang/yasm:* )
x86? ( dev-lang/yasm:* )
- xcb? ( x11-proto/xproto:0 )
+ xcb? ( x11-base/xorg-proto )
"
PATCHES=(
diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild
b/media-video/vlc/vlc-3.0.1-r1.ebuild
index f4d4543afd5..1ac9c9a5b14 100644
--- a/media-video/vlc/vlc-3.0.1-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.1-r1.ebuild
@@ -219,7 +219,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig:*
amd64? ( dev-lang/yasm:* )
x86? ( dev-lang/yasm:* )
- X? ( x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
"
PATCHES=(
diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild
index 2c2154219fe..212e34f012a 100644
--- a/media-video/vlc/vlc-3.0.2.ebuild
+++ b/media-video/vlc/vlc-3.0.2.ebuild
@@ -219,7 +219,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig:*
amd64? ( dev-lang/yasm:* )
x86? ( dev-lang/yasm:* )
- X? ( x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
"
PATCHES=(
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild
b/media-video/vlc/vlc-3.0.9999.ebuild
index 2c2154219fe..212e34f012a 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -219,7 +219,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig:*
amd64? ( dev-lang/yasm:* )
x86? ( dev-lang/yasm:* )
- X? ( x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
"
PATCHES=(
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 03048823470..f09e4c9d6e9 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -220,7 +220,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig:*
amd64? ( dev-lang/yasm:* )
x86? ( dev-lang/yasm:* )
- X? ( x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
"
PATCHES=(
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
index 3b7acf11a3c..f07331fb724 100644
--- a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
+++ b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit flag-o-matic eutils toolchain-funcs
@@ -68,9 +68,8 @@ RDEPEND="virtual/jpeg
media-libs/libquicktime"
DEPEND="${RDEPEND}
app-arch/ncompress
- x11-proto/xextproto
- x11-proto/xproto
- virtual/pkgconfig"
+ virtual/pkgconfig
+ x11-base/xorg-proto"
S=${WORKDIR}/${MY_P}
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild
b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index e030de84625..a01737dad30 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -39,10 +39,8 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive )
DEPEND="${RDEPEND}
nls? ( >=sys-devel/gettext-0.18.3 )
X? (
+ x11-base/xorg-proto
x11-libs/libXt
- x11-proto/inputproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
)
virtual/pkgconfig"
diff --git a/media-video/xine-ui/xine-ui-0.99.9.ebuild
b/media-video/xine-ui/xine-ui-0.99.9.ebuild
index 3bed5b2be50..1740be0f676 100644
--- a/media-video/xine-ui/xine-ui-0.99.9.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.9.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
@@ -39,10 +39,8 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive )
DEPEND="${RDEPEND}
nls? ( >=sys-devel/gettext-0.18.3 )
X? (
+ x11-base/xorg-proto
x11-libs/libXt
- x11-proto/inputproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
)
virtual/pkgconfig"
