| 1 |
commit: 2ef8acc2dc59f474dff36d315c1bc6f59971e1e4 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 9 16:51:51 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 9 16:52:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef8acc2 |
| 7 |
|
| 8 |
media-video/vlc: 2.2*: Drop USE=qt4 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-video/vlc/vlc-2.2.8.ebuild | 14 +++----------- |
| 13 |
media-video/vlc/vlc-2.2.9999.ebuild | 14 +++----------- |
| 14 |
2 files changed, 6 insertions(+), 22 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild |
| 17 |
index e7da531419b..4ce203a7999 100644 |
| 18 |
--- a/media-video/vlc/vlc-2.2.8.ebuild |
| 19 |
+++ b/media-video/vlc/vlc-2.2.8.ebuild |
| 20 |
@@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdd |
| 21 |
macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit |
| 22 |
matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg |
| 23 |
omxil opencv opengl optimisememory opus png postproc projectm pulseaudio |
| 24 |
- qt4 +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout |
| 25 |
+ +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout |
| 26 |
sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype |
| 27 |
twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X |
| 28 |
x264 x265 +xcb xml xv zeroconf zvbi |
| 29 |
@@ -55,10 +55,9 @@ REQUIRED_USE=" |
| 30 |
libcaca? ( X ) |
| 31 |
libtar? ( skins ) |
| 32 |
libtiger? ( kate ) |
| 33 |
- qt4? ( X ) |
| 34 |
qt5? ( X ) |
| 35 |
sdl? ( X ) |
| 36 |
- skins? ( truetype X xml || ( qt4 qt5 ) ) |
| 37 |
+ skins? ( qt5 truetype X xml ) |
| 38 |
vaapi? ( avcodec X ) |
| 39 |
vdpau? ( X ) |
| 40 |
vlm? ( encode ) |
| 41 |
@@ -133,7 +132,6 @@ RDEPEND=" |
| 42 |
) |
| 43 |
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
| 44 |
pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
| 45 |
- !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) |
| 46 |
qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
| 47 |
rdp? ( =net-misc/freerdp-1*:0=[client] ) |
| 48 |
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) |
| 49 |
@@ -251,8 +249,6 @@ src_prepare() { |
| 50 |
# version may be used. Setting QT_SELECT environment variable will enforce correct binaries. |
| 51 |
if use qt5; then |
| 52 |
export QT_SELECT=qt5 |
| 53 |
- elif use qt4; then |
| 54 |
- export QT_SELECT=qt4 |
| 55 |
fi |
| 56 |
} |
| 57 |
|
| 58 |
@@ -279,11 +275,7 @@ src_configure() { |
| 59 |
if use qt5 ; then |
| 60 |
myconf+=" --enable-qt=5" |
| 61 |
else |
| 62 |
- if use qt4 ; then |
| 63 |
- myconf+=" --enable-qt=4" |
| 64 |
- else |
| 65 |
- myconf+=" --disable-qt" |
| 66 |
- fi |
| 67 |
+ myconf+=" --disable-qt" |
| 68 |
fi |
| 69 |
|
| 70 |
econf \ |
| 71 |
|
| 72 |
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild |
| 73 |
index 62f545c2ce8..443d35b4c45 100644 |
| 74 |
--- a/media-video/vlc/vlc-2.2.9999.ebuild |
| 75 |
+++ b/media-video/vlc/vlc-2.2.9999.ebuild |
| 76 |
@@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdd |
| 77 |
macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit |
| 78 |
matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg |
| 79 |
omxil opencv opengl optimisememory opus png postproc projectm pulseaudio |
| 80 |
- qt4 +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout |
| 81 |
+ +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout |
| 82 |
sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype |
| 83 |
twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X |
| 84 |
x264 x265 +xcb xml xv zeroconf zvbi |
| 85 |
@@ -55,10 +55,9 @@ REQUIRED_USE=" |
| 86 |
libcaca? ( X ) |
| 87 |
libtar? ( skins ) |
| 88 |
libtiger? ( kate ) |
| 89 |
- qt4? ( X ) |
| 90 |
qt5? ( X ) |
| 91 |
sdl? ( X ) |
| 92 |
- skins? ( truetype X xml || ( qt4 qt5 ) ) |
| 93 |
+ skins? ( qt5 truetype X xml ) |
| 94 |
vaapi? ( avcodec X ) |
| 95 |
vdpau? ( X ) |
| 96 |
vlm? ( encode ) |
| 97 |
@@ -133,7 +132,6 @@ RDEPEND=" |
| 98 |
) |
| 99 |
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
| 100 |
pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
| 101 |
- !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) |
| 102 |
qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
| 103 |
rdp? ( =net-misc/freerdp-1*:0=[client] ) |
| 104 |
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) |
| 105 |
@@ -251,8 +249,6 @@ src_prepare() { |
| 106 |
# version may be used. Setting QT_SELECT environment variable will enforce correct binaries. |
| 107 |
if use qt5; then |
| 108 |
export QT_SELECT=qt5 |
| 109 |
- elif use qt4; then |
| 110 |
- export QT_SELECT=qt4 |
| 111 |
fi |
| 112 |
} |
| 113 |
|
| 114 |
@@ -279,11 +275,7 @@ src_configure() { |
| 115 |
if use qt5 ; then |
| 116 |
myconf+=" --enable-qt=5" |
| 117 |
else |
| 118 |
- if use qt4 ; then |
| 119 |
- myconf+=" --enable-qt=4" |
| 120 |
- else |
| 121 |
- myconf+=" --disable-qt" |
| 122 |
- fi |
| 123 |
+ myconf+=" --disable-qt" |
| 124 |
fi |
| 125 |
|
| 126 |
econf \ |
Archives