commit: 69f49a8fb697602e10d6486a0dbb12e2069495c5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 17:51:55 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:36:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f49a8f
media-video/vlc: EAPI-7 bump
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/vlc/vlc-3.0.6.ebuild | 23 ++---
media-video/vlc/vlc-3.0.9999.ebuild | 169 ++++++++++++++++++------------------
media-video/vlc/vlc-9999.ebuild | 169 ++++++++++++++++++------------------
3 files changed, 182 insertions(+), 179 deletions(-)
diff --git a/media-video/vlc/vlc-3.0.6.ebuild b/media-video/vlc/vlc-3.0.6.ebuild
index c73110b818f..c02c08eb816 100644
--- a/media-video/vlc/vlc-3.0.6.ebuild
+++ b/media-video/vlc/vlc-3.0.6.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-beta/-test}"
@@ -52,7 +52,14 @@ REQUIRED_USE="
vaapi? ( ffmpeg X )
vdpau? ( ffmpeg X )
"
-RDEPEND="
+BDEPEND="
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig:*
+ amd64? ( dev-lang/yasm:* )
+ x86? ( dev-lang/yasm:* )
+ X? ( x11-base/xorg-proto )
+"
+DEPEND="
net-dns/libidn:=
sys-libs/zlib:0[minizip]
virtual/libintl:0
@@ -218,13 +225,7 @@ RDEPEND="
zeroconf? ( net-dns/avahi:0[dbus] )
zvbi? ( media-libs/zvbi )
"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
- amd64? ( dev-lang/yasm:* )
- x86? ( dev-lang/yasm:* )
- X? ( x11-base/xorg-proto )
-"
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
@@ -452,7 +453,7 @@ src_configure() {
)
fi
- econf ${myeconfargs[@]}
+ econf "${myeconfargs[@]}"
# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default
value on Gentoo.
# Other values may break the build (bug 523144), so definition should
not be removed.
@@ -470,7 +471,7 @@ src_install() {
}
pkg_postinst() {
- if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen"
]] ; then
+ if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]]
; then
einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on
/usr/$(get_libdir)/vlc/plugins/"
"/usr/$(get_libdir)/vlc/vlc-cache-gen"
"/usr/$(get_libdir)/vlc/plugins/"
else
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild
b/media-video/vlc/vlc-3.0.9999.ebuild
index 0d0926c14c3..568e524aabb 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-beta/-test}"
@@ -52,107 +52,114 @@ REQUIRED_USE="
vaapi? ( ffmpeg X )
vdpau? ( ffmpeg X )
"
-RDEPEND="
+BDEPEND="
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig:*
+ amd64? ( dev-lang/yasm:* )
+ x86? ( dev-lang/yasm:* )
+ X? ( x11-base/xorg-proto )
+"
+DEPEND="
net-dns/libidn:=
- sys-libs/zlib:0[minizip]
- virtual/libintl:0
+ sys-libs/zlib[minizip]
+ virtual/libintl
virtual/opengl
- a52? ( media-libs/a52dec:0 )
- alsa? ( media-libs/alsa-lib:0 )
+ a52? ( media-libs/a52dec )
+ alsa? ( media-libs/alsa-lib )
aom? ( media-libs/libaom:= )
archive? ( app-arch/libarchive:= )
aribsub? ( media-libs/aribb24 )
bidi? (
- dev-libs/fribidi:0
+ dev-libs/fribidi
media-libs/freetype:2[harfbuzz]
media-libs/harfbuzz
- virtual/ttf-fonts:0
+ virtual/ttf-fonts
)
- bluray? ( media-libs/libbluray:0= )
- cddb? ( media-libs/libcddb:0 )
- chromaprint? ( media-libs/chromaprint:0= )
+ bluray? ( media-libs/libbluray:= )
+ cddb? ( media-libs/libcddb )
+ chromaprint? ( media-libs/chromaprint:= )
chromecast? (
>=dev-libs/protobuf-2.5.0:=
>=net-libs/libmicrodns-0.0.9:=
)
dav1d? ( media-libs/dav1d )
- dbus? ( sys-apps/dbus:0 )
+ dbus? ( sys-apps/dbus )
dc1394? (
media-libs/libdc1394:2
- sys-libs/libraw1394:0
+ sys-libs/libraw1394
)
- dts? ( media-libs/libdca:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+ dts? ( media-libs/libdca )
+ dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
dvd? (
- >=media-libs/libdvdnav-4.9:0
- >=media-libs/libdvdread-4.9:0
+ >=media-libs/libdvdnav-4.9
+ >=media-libs/libdvdread-4.9
)
- faad? ( media-libs/faad2:0 )
- fdk? ( media-libs/fdk-aac:0= )
+ faad? ( media-libs/faad2 )
+ fdk? ( media-libs/fdk-aac:= )
ffmpeg? (
!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
)
flac? (
- media-libs/flac:0
- media-libs/libogg:0
+ media-libs/flac
+ media-libs/libogg
)
- fluidsynth? ( media-sound/fluidsynth:0 )
+ fluidsynth? ( media-sound/fluidsynth:= )
fontconfig? ( media-libs/fontconfig:1.0 )
gcrypt? (
dev-libs/libgcrypt:0=
- dev-libs/libgpg-error:0
+ dev-libs/libgpg-error
)
- gme? ( media-libs/game-music-emu:0 )
+ gme? ( media-libs/game-music-emu )
gnome-keyring? ( app-crypt/libsecret )
gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
ieee1394? (
- sys-libs/libavc1394:0
- sys-libs/libraw1394:0
+ sys-libs/libavc1394
+ sys-libs/libraw1394
)
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
- kate? ( media-libs/libkate:0 )
+ kate? ( media-libs/libkate )
libass? (
media-libs/fontconfig:1.0
- media-libs/libass:0=
+ media-libs/libass:=
)
- libcaca? ( media-libs/libcaca:0 )
+ libcaca? ( media-libs/libcaca )
libnotify? (
dev-libs/glib:2
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
- x11-libs/libnotify:0
+ x11-libs/libnotify
)
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( dev-libs/libtar:0 )
- libtiger? ( media-libs/libtiger:0 )
+ libsamplerate? ( media-libs/libsamplerate )
+ libtar? ( dev-libs/libtar )
+ libtiger? ( media-libs/libtiger )
linsys? ( media-libs/zvbi )
- lirc? ( app-misc/lirc:0 )
- live? ( media-plugins/live:0 )
- lua? ( >=dev-lang/lua-5.1:0 )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live:= )
+ lua? ( >=dev-lang/lua-5.1:0= )
mad? ( media-libs/libmad )
matroska? (
- dev-libs/libebml:0=
- media-libs/libmatroska:0=
+ dev-libs/libebml:=
+ media-libs/libmatroska:=
)
modplug? ( media-libs/libmodplug )
mp3? ( media-sound/mpg123 )
mpeg? ( media-libs/libmpeg2 )
- mtp? ( media-libs/libmtp:0= )
- musepack? ( media-sound/musepack-tools:0 )
+ mtp? ( media-libs/libmtp:= )
+ musepack? ( media-sound/musepack-tools )
ncurses? ( sys-libs/ncurses:0=[unicode] )
nfs? ( >=net-fs/libnfs-0.10.0:= )
- ogg? ( media-libs/libogg:0 )
- opencv? ( media-libs/opencv:0= )
- opus? ( >=media-libs/opus-1.0.3:0 )
+ ogg? ( media-libs/libogg )
+ opencv? ( media-libs/opencv:= )
+ opus? ( >=media-libs/opus-1.0.3 )
png? ( media-libs/libpng:0= )
- postproc? ( libav? ( media-libs/libpostproc:0= ) )
+ postproc? ( libav? ( media-libs/libpostproc ) )
projectm? (
- media-fonts/dejavu:0
- media-libs/libprojectm:0
+ media-fonts/dejavu
+ media-libs/libprojectm
)
- pulseaudio? ( media-sound/pulseaudio:0 )
+ pulseaudio? ( media-sound/pulseaudio )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -163,45 +170,45 @@ RDEPEND="
x11-libs/libX11
)
)
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
- sdl-image? ( media-libs/sdl-image:0 )
- sftp? ( net-libs/libssh2:0 )
- shout? ( media-libs/libshout:0 )
+ sdl-image? ( media-libs/sdl-image )
+ sftp? ( net-libs/libssh2 )
+ shout? ( media-libs/libshout )
sid? ( media-libs/libsidplay:2 )
skins? (
- x11-libs/libXext:0
- x11-libs/libXinerama:0
- x11-libs/libXpm:0
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXpm
)
soxr? ( media-libs/soxr )
speex? (
- >=media-libs/speex-1.2.0:0
- media-libs/speexdsp:0
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
)
srt? ( net-libs/srt )
- ssl? ( net-libs/gnutls:0 )
+ ssl? ( net-libs/gnutls:= )
svg? (
gnome-base/librsvg:2
- x11-libs/cairo:0
+ x11-libs/cairo
)
- taglib? ( >=media-libs/taglib-1.9:0 )
- theora? ( media-libs/libtheora:0 )
- tremor? ( media-libs/tremor:0 )
+ taglib? ( >=media-libs/taglib-1.9 )
+ theora? ( media-libs/libtheora )
+ tremor? ( media-libs/tremor )
truetype? (
media-libs/freetype:2
- virtual/ttf-fonts:0
- !fontconfig? ( media-fonts/dejavu:0 )
+ virtual/ttf-fonts
+ !fontconfig? ( media-fonts/dejavu )
)
- twolame? ( media-sound/twolame:0 )
- udev? ( virtual/udev:0 )
+ twolame? ( media-sound/twolame )
+ udev? ( virtual/udev )
upnp? ( net-libs/libupnp:= )
- v4l? ( media-libs/libv4l:0 )
- vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
- vdpau? ( x11-libs/libvdpau:0 )
- vnc? ( net-libs/libvncserver:0 )
- vorbis? ( media-libs/libvorbis:0 )
- vpx? ( media-libs/libvpx:0= )
+ v4l? ( media-libs/libv4l:= )
+ vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+ vdpau? ( x11-libs/libvdpau )
+ vnc? ( net-libs/libvncserver )
+ vorbis? ( media-libs/libvorbis )
+ vpx? ( media-libs/libvpx:= )
wayland? (
>=dev-libs/wayland-1.15
dev-libs/wayland-protocols
@@ -213,21 +220,15 @@ RDEPEND="
x11-libs/xcb-util-keysyms
)
x264? (
- !10bit? ( >=media-libs/x264-0.0.20160712:0= )
- 10bit? ( >=media-libs/x264-9999:0= )
+ !10bit? ( >=media-libs/x264-0.0.20160712:= )
+ 10bit? ( >=media-libs/x264-9999:= )
)
- x265? ( media-libs/x265:0= )
+ x265? ( media-libs/x265:= )
xml? ( dev-libs/libxml2:2 )
- zeroconf? ( net-dns/avahi:0[dbus] )
+ zeroconf? ( net-dns/avahi[dbus] )
zvbi? ( media-libs/zvbi )
"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
- amd64? ( dev-lang/yasm:* )
- x86? ( dev-lang/yasm:* )
- X? ( x11-base/xorg-proto )
-"
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
@@ -460,7 +461,7 @@ src_configure() {
)
fi
- econf ${myeconfargs[@]}
+ econf "${myeconfargs[@]}"
# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default
value on Gentoo.
# Other values may break the build (bug 523144), so definition should
not be removed.
@@ -478,7 +479,7 @@ src_install() {
}
pkg_postinst() {
- if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen"
]] ; then
+ if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]]
; then
einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on
/usr/$(get_libdir)/vlc/plugins/"
"/usr/$(get_libdir)/vlc/vlc-cache-gen"
"/usr/$(get_libdir)/vlc/plugins/"
else
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 4fbc7e4b60e..ae5fc318c57 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-beta/-test}"
@@ -52,108 +52,115 @@ REQUIRED_USE="
vaapi? ( ffmpeg X )
vdpau? ( ffmpeg X )
"
-RDEPEND="
+BDEPEND="
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig:*
+ amd64? ( dev-lang/yasm:* )
+ x86? ( dev-lang/yasm:* )
+ X? ( x11-base/xorg-proto )
+"
+DEPEND="
net-dns/libidn:=
- sys-libs/zlib:0[minizip]
- virtual/libintl:0
+ sys-libs/zlib[minizip]
+ virtual/libintl
virtual/opengl
- a52? ( media-libs/a52dec:0 )
- alsa? ( media-libs/alsa-lib:0 )
+ a52? ( media-libs/a52dec )
+ alsa? ( media-libs/alsa-lib )
aom? ( media-libs/libaom:= )
archive? ( app-arch/libarchive:= )
aribsub? ( media-libs/aribb24 )
bidi? (
- dev-libs/fribidi:0
+ dev-libs/fribidi
media-libs/freetype:2[harfbuzz]
media-libs/harfbuzz
- virtual/ttf-fonts:0
+ virtual/ttf-fonts
)
- bluray? ( media-libs/libbluray:0= )
- cddb? ( media-libs/libcddb:0 )
- chromaprint? ( media-libs/chromaprint:0= )
+ bluray? ( media-libs/libbluray:= )
+ cddb? ( media-libs/libcddb )
+ chromaprint? ( media-libs/chromaprint:= )
chromecast? (
>=dev-libs/protobuf-2.5.0:=
>=net-libs/libmicrodns-0.0.9:=
)
dav1d? ( media-libs/dav1d )
- dbus? ( sys-apps/dbus:0 )
+ dbus? ( sys-apps/dbus )
dc1394? (
media-libs/libdc1394:2
- sys-libs/libraw1394:0
+ sys-libs/libraw1394
)
- dts? ( media-libs/libdca:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+ dts? ( media-libs/libdca )
+ dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
dvd? (
- >=media-libs/libdvdnav-4.9:0
- >=media-libs/libdvdread-4.9:0
+ >=media-libs/libdvdnav-4.9
+ >=media-libs/libdvdread-4.9
)
- faad? ( media-libs/faad2:0 )
- fdk? ( media-libs/fdk-aac:0= )
+ faad? ( media-libs/faad2 )
+ fdk? ( media-libs/fdk-aac:= )
ffmpeg? (
!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
)
flac? (
- media-libs/flac:0
- media-libs/libogg:0
+ media-libs/flac
+ media-libs/libogg
)
- fluidsynth? ( media-sound/fluidsynth:0 )
+ fluidsynth? ( media-sound/fluidsynth:= )
fontconfig? ( media-libs/fontconfig:1.0 )
gcrypt? (
dev-libs/libgcrypt:0=
- dev-libs/libgpg-error:0
+ dev-libs/libgpg-error
)
- gme? ( media-libs/game-music-emu:0 )
+ gme? ( media-libs/game-music-emu )
gnome-keyring? ( app-crypt/libsecret )
gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
ieee1394? (
- sys-libs/libavc1394:0
- sys-libs/libraw1394:0
+ sys-libs/libavc1394
+ sys-libs/libraw1394
)
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
- kate? ( media-libs/libkate:0 )
+ kate? ( media-libs/libkate )
kms? ( x11-libs/libdrm )
libass? (
media-libs/fontconfig:1.0
- media-libs/libass:0=
+ media-libs/libass:=
)
- libcaca? ( media-libs/libcaca:0 )
+ libcaca? ( media-libs/libcaca )
libnotify? (
dev-libs/glib:2
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
- x11-libs/libnotify:0
+ x11-libs/libnotify
)
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( dev-libs/libtar:0 )
- libtiger? ( media-libs/libtiger:0 )
+ libsamplerate? ( media-libs/libsamplerate )
+ libtar? ( dev-libs/libtar )
+ libtiger? ( media-libs/libtiger )
linsys? ( media-libs/zvbi )
- lirc? ( app-misc/lirc:0 )
- live? ( media-plugins/live:0 )
- lua? ( >=dev-lang/lua-5.1:0 )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live:= )
+ lua? ( >=dev-lang/lua-5.1:0= )
mad? ( media-libs/libmad )
matroska? (
- dev-libs/libebml:0=
- media-libs/libmatroska:0=
+ dev-libs/libebml:=
+ media-libs/libmatroska:=
)
modplug? ( media-libs/libmodplug )
mp3? ( media-sound/mpg123 )
mpeg? ( media-libs/libmpeg2 )
- mtp? ( media-libs/libmtp:0= )
- musepack? ( media-sound/musepack-tools:0 )
+ mtp? ( media-libs/libmtp:= )
+ musepack? ( media-sound/musepack-tools )
ncurses? ( sys-libs/ncurses:0=[unicode] )
nfs? ( >=net-fs/libnfs-0.10.0:= )
- ogg? ( media-libs/libogg:0 )
- opencv? ( media-libs/opencv:0= )
- opus? ( >=media-libs/opus-1.0.3:0 )
+ ogg? ( media-libs/libogg )
+ opencv? ( media-libs/opencv:= )
+ opus? ( >=media-libs/opus-1.0.3 )
png? ( media-libs/libpng:0= )
- postproc? ( libav? ( media-libs/libpostproc:0= ) )
+ postproc? ( libav? ( media-libs/libpostproc ) )
projectm? (
- media-fonts/dejavu:0
- media-libs/libprojectm:0
+ media-fonts/dejavu
+ media-libs/libprojectm
)
- pulseaudio? ( media-sound/pulseaudio:0 )
+ pulseaudio? ( media-sound/pulseaudio )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -164,45 +171,45 @@ RDEPEND="
x11-libs/libX11
)
)
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
- sdl-image? ( media-libs/sdl-image:0 )
- sftp? ( net-libs/libssh2:0 )
- shout? ( media-libs/libshout:0 )
+ sdl-image? ( media-libs/sdl-image )
+ sftp? ( net-libs/libssh2 )
+ shout? ( media-libs/libshout )
sid? ( media-libs/libsidplay:2 )
skins? (
- x11-libs/libXext:0
- x11-libs/libXinerama:0
- x11-libs/libXpm:0
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXpm
)
soxr? ( media-libs/soxr )
speex? (
- >=media-libs/speex-1.2.0:0
- media-libs/speexdsp:0
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
)
srt? ( net-libs/srt )
- ssl? ( net-libs/gnutls:0 )
+ ssl? ( net-libs/gnutls:= )
svg? (
gnome-base/librsvg:2
- x11-libs/cairo:0
+ x11-libs/cairo
)
- taglib? ( >=media-libs/taglib-1.9:0 )
- theora? ( media-libs/libtheora:0 )
- tremor? ( media-libs/tremor:0 )
+ taglib? ( >=media-libs/taglib-1.9 )
+ theora? ( media-libs/libtheora )
+ tremor? ( media-libs/tremor )
truetype? (
media-libs/freetype:2
- virtual/ttf-fonts:0
- !fontconfig? ( media-fonts/dejavu:0 )
+ virtual/ttf-fonts
+ !fontconfig? ( media-fonts/dejavu )
)
- twolame? ( media-sound/twolame:0 )
- udev? ( virtual/udev:0 )
+ twolame? ( media-sound/twolame )
+ udev? ( virtual/udev )
upnp? ( net-libs/libupnp:= )
- v4l? ( media-libs/libv4l:0 )
- vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
- vdpau? ( x11-libs/libvdpau:0 )
- vnc? ( net-libs/libvncserver:0 )
- vorbis? ( media-libs/libvorbis:0 )
- vpx? ( media-libs/libvpx:0= )
+ v4l? ( media-libs/libv4l:= )
+ vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+ vdpau? ( x11-libs/libvdpau )
+ vnc? ( net-libs/libvncserver )
+ vorbis? ( media-libs/libvorbis )
+ vpx? ( media-libs/libvpx:= )
wayland? (
>=dev-libs/wayland-1.15
>=dev-libs/wayland-protocols-1.12
@@ -216,21 +223,15 @@ RDEPEND="
x11-libs/xcb-util-keysyms
)
x264? (
- !10bit? ( >=media-libs/x264-0.0.20160712:0= )
- 10bit? ( >=media-libs/x264-9999:0= )
+ !10bit? ( >=media-libs/x264-0.0.20160712:= )
+ 10bit? ( >=media-libs/x264-9999:= )
)
- x265? ( media-libs/x265:0= )
+ x265? ( media-libs/x265:= )
xml? ( dev-libs/libxml2:2 )
- zeroconf? ( net-dns/avahi:0[dbus] )
+ zeroconf? ( net-dns/avahi[dbus] )
zvbi? ( media-libs/zvbi )
"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
- amd64? ( dev-lang/yasm:* )
- x86? ( dev-lang/yasm:* )
- X? ( x11-base/xorg-proto )
-"
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
@@ -461,7 +462,7 @@ src_configure() {
)
fi
- econf ${myeconfargs[@]}
+ econf "${myeconfargs[@]}"
# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default
value on Gentoo.
# Other values may break the build (bug 523144), so definition should
not be removed.
@@ -479,7 +480,7 @@ src_install() {
}
pkg_postinst() {
- if [[ "$ROOT" = "/" ]] && [[ -x "/usr/libexec/vlc/vlc-cache-gen" ]] ;
then
+ if [[ -z ${ROOT} ]] && [[ -x "/usr/libexec/vlc/vlc-cache-gen" ]] ; then
einfo "Running /usr/libexec/vlc/vlc-cache-gen on
/usr/libexec/vlc/plugins/"
"/usr/libexec/vlc/vlc-cache-gen" "/usr/libexec/vlc/plugins/"
else
