* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2016-02-09 7:41 Lars Wendler
0 siblings, 0 replies; 23+ messages in thread
From: Lars Wendler @ 2016-02-09 7:41 UTC (permalink / raw
To: gentoo-commits
commit: fce413c87208a0690ad78d7289a02de313ddbca5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 9 07:29:04 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 07:41:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce413c8
media-video/vlc: Bump to version 2.2.2
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-video/vlc/Manifest | 1 +
media-video/vlc/files/qt4-select.patch | 4 +-
media-video/vlc/vlc-2.2.2.ebuild | 496 +++++++++++++++++++++++++++++++++
3 files changed, 499 insertions(+), 2 deletions(-)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index d7f6c6a..62c067f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1,3 @@
DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75abbbbf38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de WHIRLPOOL 5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885
+DIST vlc-2.2.2.tar.xz 22253152 SHA256 9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5 SHA512 14f26f380925cdf68495ef0b7fba96fbc7a6bfb8ad16e624c2e50773bc8f5b17fb928de27d4052b79553e1a160c952ef8be3fbb1d2f11865f68f3ffb82a35ce8 WHIRLPOOL 1521d53287051c3d252c0ef6f782ca8728be2ec26858aceccb83791fdf34a53754aa4a1c27e1b906eb39ce2a4e4c8f3e1b90e9cb1a64b4e5dde705ba6e88e127
diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch
index 5fcabae..fb1526a 100644
--- a/media-video/vlc/files/qt4-select.patch
+++ b/media-video/vlc/files/qt4-select.patch
@@ -1,7 +1,7 @@
https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54
For use until upstream ever accepts this patch or fixes it themsleves
---- configure.ac.orig 2015-03-01 02:28:48.983932684 +0100
-+++ configure.ac 2015-03-01 02:41:29.641927072 +0100
+--- a/configure.ac
++++ b/configure.ac
@@ -3709,7 +3709,8 @@
])
])
diff --git a/media-video/vlc/vlc-2.2.2.ebuild b/media-video/vlc/vlc-2.2.2.ebuild
new file mode 100644
index 0000000..e930d06
--- /dev/null
+++ b/media-video/vlc/vlc-2.2.2.ebuild
@@ -0,0 +1,496 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+
+ if [ "${PV%.9999}" != "${PV}" ] ; then
+ EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
+ else
+ EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+ fi
+fi
+
+inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+elif [[ "${MY_P}" == "${P}" ]]; then
+ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+else
+ SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+fi
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+if [[ ${PV} != *9999 ]] ; then
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+
+IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
+ +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
+ directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
+ fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
+ growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+ +libsamplerate libtiger linsys libtar lirc live lua
+ macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+ matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg
+ mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
+ png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+ schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
+ taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
+ vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
+
+RDEPEND="
+ !<media-video/ffmpeg-1.2:0
+ dev-libs/libgpg-error:0
+ net-dns/libidn:0
+ >=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+ virtual/libintl:0
+ a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+ aalib? ( media-libs/aalib:0 )
+ alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+ avcodec? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( >=media-video/libav-11:0= )
+ )
+ avformat? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:0= )
+ )
+ bidi? ( >=dev-libs/fribidi-0.10.4:0 )
+ bluray? ( >=media-libs/libbluray-0.3:0 )
+ cddb? ( >=media-libs/libcddb-1.2:0 )
+ chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+ dbus? ( >=sys-apps/dbus-1.6:0 )
+ dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+ directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+ dts? ( >=media-libs/libdca-0.0.5:0 )
+ dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= )
+ dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+ elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+ faad? ( >=media-libs/faad2-2.6.1:0 )
+ fdk? ( media-libs/fdk-aac:0 )
+ flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+ fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+ fontconfig? ( media-libs/fontconfig:1.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
+ gme? ( media-libs/game-music-emu:0 )
+ gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
+ gnutls? ( >=net-libs/gnutls-3.0.20:0 )
+ ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
+ jpeg? ( virtual/jpeg:0 )
+ kate? ( >=media-libs/libkate-0.3:0 )
+ libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
+ libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+ libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+ libsamplerate? ( media-libs/libsamplerate:0 )
+ libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+ libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+ linsys? ( >=media-libs/zvbi-0.2.28:0 )
+ lirc? ( app-misc/lirc:0 )
+ live? ( >=media-plugins/live-2011.12.23:0 )
+ lua? ( >=dev-lang/lua-5.1:0 )
+ matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+ modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+ mp3? ( media-libs/libmad:0 )
+ mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+ mtp? ( >=media-libs/libmtp-1:0 )
+ musepack? ( >=media-sound/musepack-tools-444:0 )
+ ncurses? ( sys-libs/ncurses:0=[unicode] )
+ ogg? ( >=media-libs/libogg-1:0 )
+ opencv? ( >media-libs/opencv-2:0 )
+ opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+ opus? ( >=media-libs/opus-1.0.3:0 )
+ png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+ postproc? (
+ !libav? ( >=media-video/ffmpeg-2.2:0= )
+ libav? ( media-libs/libpostproc:0= )
+ )
+ projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+ pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+ qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
+ qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5
+ >=dev-qt/qtx11extras-5.1:5 )
+ rdp? ( >=net-misc/freerdp-1.0.1:0=[client] )
+ samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
+ >=net-fs/samba-4.0.0_alpha1:0[client] ) )
+ schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+ sdl? ( >=media-libs/libsdl-1.2.10:0
+ sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+ sftp? ( net-libs/libssh2:0 )
+ shout? ( >=media-libs/libshout-2.1:0 )
+ sid? ( media-libs/libsidplay:2 )
+ skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+ speex? ( media-libs/speex:0 )
+ svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+ swscale? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:0= )
+ )
+ taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+ theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+ tremor? ( media-libs/tremor:0 )
+ truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+ !fontconfig? ( media-fonts/dejavu:0 ) )
+ twolame? ( media-sound/twolame:0 )
+ udev? ( >=virtual/udev-142:0 )
+ upnp? ( net-libs/libupnp:0 )
+ v4l? ( media-libs/libv4l:0 )
+ vaapi? (
+ x11-libs/libva:0[X,drm]
+ !libav? ( media-video/ffmpeg:0=[vaapi] )
+ libav? ( media-video/libav:0=[vaapi] )
+ )
+ vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+ zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+"
+
+# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
+# thus we'll have to wait for a new release there.
+RDEPEND="${RDEPEND}
+ vdpau? (
+ >=x11-libs/libvdpau-0.6:0
+ !libav? ( >=media-video/ffmpeg-2.2:0= )
+ libav? ( >=media-video/libav-10:0= )
+ )
+ vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+ vorbis? ( >=media-libs/libvorbis-1.1:0 )
+ vpx? ( media-libs/libvpx:0 )
+ X? ( x11-libs/libX11:0 )
+ x264? ( >=media-libs/x264-0.0.20090923:0= )
+ x265? ( media-libs/x265:0= )
+ xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
+ xml? ( >=dev-libs/libxml2-2.5:2 )
+ zvbi? ( >=media-libs/zvbi-0.2.25:0 )
+"
+
+DEPEND="${RDEPEND}
+ kde? ( >=kde-base/kdelibs-4:4 )
+ xcb? ( x11-proto/xproto:0 )
+ app-arch/xz-utils:0
+ x86? ( dev-lang/yasm:* )
+ amd64? ( dev-lang/yasm:* )
+ >=sys-devel/gettext-0.18.3:*
+ virtual/pkgconfig:*
+"
+
+REQUIRED_USE="
+ aalib? ( X )
+ bidi? ( truetype )
+ cddb? ( cdda )
+ dvb? ( dvbpsi )
+ dxva2? ( avcodec )
+ ffmpeg? ( avcodec avformat swscale )
+ fontconfig? ( truetype )
+ gnutls? ( gcrypt )
+ httpd? ( lua )
+ libcaca? ( X )
+ libtar? ( skins )
+ libtiger? ( kate )
+ qt4? ( X !qt5 )
+ qt5? ( X !qt4 )
+ sdl? ( X )
+ skins? ( truetype X xml ^^ ( qt4 qt5 ) )
+ vaapi? ( avcodec X )
+ vdpau? ( xcb )
+ vlm? ( encode )
+ xv? ( xcb )
+"
+
+PATCHES=(
+ # Fix build system mistake.
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+ # Patch up incompatibilities and reconfigure autotools.
+ "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
+
+ # Fix up broken audio when skipping using a fixed reversed bisected commit.
+ "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+
+ # Bug #541678
+ "${FILESDIR}"/qt4-select.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
+ if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
+ die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
+ fi
+ fi
+}
+
+src_unpack() {
+ if [ "${PV%9999}" != "${PV}" ] ; then
+ git-r3_src_unpack
+ else
+ unpack ${A}
+ fi
+}
+
+src_prepare() {
+ # Remove unnecessary warnings about unimplemented pragmas on gcc for now.
+ # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
+ #
+ # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
+ # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
+ #
+ # https://gcc.gnu.org/c99status.html
+ if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+ sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
+ fi
+
+ # Bootstrap when we are on a git checkout.
+ if [[ "${PV%9999}" != "${PV}" ]] ; then
+ ./bootstrap
+ fi
+
+ # Make it build with libtool 1.5
+ rm -f m4/lt* m4/libtool.m4 || die
+
+ # We are not in a real git checkout due to the absence of a .git directory.
+ touch src/revision.txt || die
+
+ default
+
+ # Don't use --started-from-file when not using dbus.
+ if ! use dbus ; then
+ sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+ fi
+
+ eautoreconf
+
+ # Disable automatic running of tests.
+ find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+ # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
+ # Setting QT_SELECT environment variable will enforce correct binaries.
+ if use qt4; then
+ export QT_SELECT=qt4
+ elif use qt5; then
+ export QT_SELECT=qt5
+ fi
+}
+
+src_configure() {
+ # Compatibility fix for Samba 4.
+ use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+ # We need to disable -fstack-check if use >=gcc 4.8.0.
+ # See bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+ # Needs libresid-builder from libsidplay:2 which is in another directory...
+ # FIXME!
+ append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+ if use truetype || use projectm ; then
+ local dejavu="/usr/share/fonts/dejavu/"
+ myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+ --with-default-font-family=Sans \
+ --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+ --with-default-monospace-font-family=Monospace"
+ fi
+
+ local qt_flag=""
+ if use qt4 ; then
+ qt_flag="--enable-qt=4"
+ elif use qt5 ; then
+ qt_flag="--enable-qt=5"
+ else
+ qt_flag="--disable-qt"
+ fi
+
+ econf \
+ ${myconf} \
+ --enable-vlc \
+ --docdir=/usr/share/doc/${PF} \
+ --disable-dependency-tracking \
+ --disable-optimizations \
+ --disable-update-check \
+ --enable-fast-install \
+ --enable-screen \
+ $(use_enable a52) \
+ $(use_enable aalib aa) \
+ $(use_enable alsa) \
+ $(use_enable altivec) \
+ $(use_enable atmo) \
+ $(use_enable audioqueue) \
+ $(use_enable avcodec) \
+ $(use_enable avformat) \
+ $(use_enable bidi fribidi) \
+ $(use_enable bluray) \
+ $(use_enable cdda vcd) \
+ $(use_enable cddb libcddb) \
+ $(use_enable chromaprint) \
+ $(use_enable dbus) \
+ $(use_enable directfb) \
+ $(use_enable directx) \
+ $(use_enable dc1394) \
+ $(use_enable debug) \
+ $(use_enable dts dca) \
+ $(use_enable dvbpsi) \
+ $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+ $(use_enable dxva2) \
+ $(use_enable encode sout) \
+ $(use_enable faad) \
+ $(use_enable fdk fdkaac) \
+ $(use_enable flac) \
+ $(use_enable fluidsynth) \
+ $(use_enable fontconfig) \
+ $(use_enable gcrypt libgcrypt) \
+ $(use_enable gme) \
+ $(use_enable gnome gnomevfs) \
+ $(use_enable gnutls) \
+ $(use_enable growl) \
+ $(use_enable httpd) \
+ $(use_enable ieee1394 dv1394) \
+ $(use_enable jack) \
+ $(use_enable jpeg) \
+ $(use_enable kate) \
+ $(use_with kde kde-solid) \
+ $(use_enable libass) \
+ $(use_enable libcaca caca) \
+ $(use_enable libnotify notify) \
+ $(use_enable libsamplerate samplerate) \
+ $(use_enable libtar) \
+ $(use_enable libtiger tiger) \
+ $(use_enable linsys) \
+ $(use_enable lirc) \
+ $(use_enable live live555) \
+ $(use_enable lua) \
+ $(use_enable macosx-dialog-provider) \
+ $(use_enable macosx-eyetv) \
+ $(use_enable macosx-qtkit) \
+ $(use_enable macosx-quartztext) \
+ $(use_enable matroska mkv) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable modplug mod) \
+ $(use_enable mp3 mad) \
+ $(use_enable mpeg libmpeg2) \
+ $(use_enable mtp) \
+ $(use_enable musepack mpc) \
+ $(use_enable ncurses) \
+ $(use_enable neon) \
+ $(use_enable ogg) $(use_enable ogg mux_ogg) \
+ $(use_enable omxil) \
+ $(use_enable omxil omxil-vout) \
+ $(use_enable opencv) \
+ $(use_enable opengl glspectrum) \
+ $(use_enable opus) \
+ $(use_enable optimisememory optimize-memory) \
+ $(use_enable png) \
+ $(use_enable postproc) \
+ $(use_enable projectm) \
+ $(use_enable pulseaudio pulse) \
+ ${qt_flag} \
+ $(use_enable rdp freerdp) \
+ $(use_enable rtsp realrtsp) \
+ $(use_enable run-as-root) \
+ $(use_enable samba smbclient) \
+ $(use_enable schroedinger) \
+ $(use_enable sdl) \
+ $(use_enable sdl-image) \
+ $(use_enable sid) \
+ $(use_enable sftp) \
+ $(use_enable shout) \
+ $(use_enable skins skins2) \
+ $(use_enable speex) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable svg) \
+ $(use_enable svg svgdec) \
+ $(use_enable swscale) \
+ $(use_enable taglib) \
+ $(use_enable theora) \
+ $(use_enable tremor) \
+ $(use_enable truetype freetype) \
+ $(use_enable twolame) \
+ $(use_enable udev) \
+ $(use_enable upnp) \
+ $(use_enable v4l v4l2) \
+ $(use_enable vaapi libva) \
+ $(use_enable vcdx) \
+ $(use_enable vdpau) \
+ $(use_enable vlm) \
+ $(use_enable vnc) \
+ $(use_enable vorbis) \
+ $(use_enable vpx) \
+ $(use_enable wma-fixed) \
+ $(use_with X x) \
+ $(use_enable x264) \
+ $(use_enable x265) \
+ $(use_enable xcb) \
+ $(use_enable xml libxml2) \
+ $(use_enable xv xvideo) \
+ $(use_enable zeroconf bonjour) \
+ $(use_enable zvbi) $(use_enable !zvbi telx) \
+ --disable-asdcp \
+ --disable-coverage \
+ --disable-cprof \
+ --disable-crystalhd \
+ --disable-decklink \
+ --disable-gles1 \
+ --disable-gles2 \
+ --disable-goom \
+ --disable-kai \
+ --disable-kva \
+ --disable-maintainer-mode \
+ --disable-merge-ffmpeg \
+ --disable-mfx \
+ --disable-mmal-codec \
+ --disable-mmal-vout \
+ --disable-opensles \
+ --disable-oss \
+ --disable-quicktime \
+ --disable-rpi-omxil \
+ --disable-shine \
+ --disable-sndio \
+ --disable-vda \
+ --disable-vsxu \
+ --disable-wasapi
+
+ # ^ We don't have these disabled libraries in the Portage tree yet.
+
+ # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+ # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+ sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+ virtx emake check-TESTS
+}
+
+DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
+
+src_install() {
+ default
+
+ # Punt useless libtool's .la files
+ find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+ if [ "$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" -f "/usr/$(get_libdir)/vlc/plugins/"
+ else
+ ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+ ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+ ewarn "If you do not do it, vlc will take a long time to load."
+ fi
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2016-02-09 19:51 Lars Wendler
0 siblings, 0 replies; 23+ messages in thread
From: Lars Wendler @ 2016-02-09 19:51 UTC (permalink / raw
To: gentoo-commits
commit: fe5dc79e3f08966ed5dedeffbce7446995351b8f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 9 19:50:52 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 19:51:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5dc79e
media-video/vlc: Fixed compilation with qt5 (bug #574256).
Patch provided by Nick Andrade in bug #574064
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-video/vlc/files/vlc-2.2.2-qt5widgets.patch | 13 +++++++++++++
media-video/vlc/vlc-2.2.2.ebuild | 3 +++
2 files changed, 16 insertions(+)
diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
new file mode 100644
index 0000000..a024d00
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
@@ -0,0 +1,13 @@
+--- vlc-2.2.2/configure.ac
++++ vlc-2.2.2/configure.ac
+@@ -3754,10 +3754,6 @@
+ AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
+ ])
+
+- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
+- AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
+- ])
+-
+ QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
+ QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
+ AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
diff --git a/media-video/vlc/vlc-2.2.2.ebuild b/media-video/vlc/vlc-2.2.2.ebuild
index e930d06..b263cf5 100644
--- a/media-video/vlc/vlc-2.2.2.ebuild
+++ b/media-video/vlc/vlc-2.2.2.ebuild
@@ -222,6 +222,9 @@ PATCHES=(
# Bug #541678
"${FILESDIR}"/qt4-select.patch
+
+ # Allow QT5.5 since Gentoo has a patched QTwidgets
+ "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2016-09-02 9:19 Alexis Ballier
0 siblings, 0 replies; 23+ messages in thread
From: Alexis Ballier @ 2016-09-02 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 1e7e5cf5b4395cb2ff0207ca4749d11b95a6d4d5
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 09:18:37 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 09:18:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7e5cf5
media-video/vlc: add patches to build with ffmpeg3, bug #574788
Package-Manager: portage-2.3.0
media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch | 160 +++++++++++++++++++++
media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch | 45 ++++++
media-video/vlc/vlc-2.2.4.ebuild | 15 +-
3 files changed, 213 insertions(+), 7 deletions(-)
diff --git a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
new file mode 100644
index 00000000..3bc5954
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
@@ -0,0 +1,160 @@
+Index: vlc-2.2.4/configure.ac
+===================================================================
+--- vlc-2.2.4.orig/configure.ac
++++ vlc-2.2.4/configure.ac
+@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec,
+ [ --enable-avcodec libavcodec codec (default enabled)])
+ AS_IF([test "${enable_avcodec}" != "no"], [
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
+- PKG_CHECK_EXISTS([libavutil < 55],, [
+- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
++ PKG_CHECK_EXISTS([libavutil < 56],, [
++ AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
+ ])
+ VLC_SAVE_FLAGS
+ CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
+Index: vlc-2.2.4/modules/codec/avcodec/audio.c
+===================================================================
+--- vlc-2.2.4.orig/modules/codec/avcodec/audio.c
++++ vlc-2.2.4/modules/codec/avcodec/audio.c
+@@ -39,8 +39,6 @@
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/mem.h>
+
+-#include <libavutil/audioconvert.h>
+-
+ #include "avcodec.h"
+
+ /*****************************************************************************
+Index: vlc-2.2.4/modules/codec/avcodec/encoder.c
+===================================================================
+--- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c
++++ vlc-2.2.4/modules/codec/avcodec/encoder.c
+@@ -41,7 +41,6 @@
+ #include <vlc_cpu.h>
+
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+
+ #include "avcodec.h"
+ #include "avcommon.h"
+@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
+ else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
+ &psz_namecodec ) )
+ {
+- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
++ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
+ return VLC_EGENERIC; /* handed chroma output */
+
+ i_cat = VIDEO_ES;
+@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
+
+ if( p_codec->pix_fmts )
+ {
+- const enum PixelFormat *p = p_codec->pix_fmts;
++ const enum AVPixelFormat *p = p_codec->pix_fmts;
+ for( ; *p != -1; p++ )
+ {
+ if( *p == p_context->pix_fmt ) break;
+@@ -1017,7 +1016,7 @@ errmsg:
+ }
+ }
+
+- p_sys->frame = avcodec_alloc_frame();
++ p_sys->frame = av_frame_alloc();
+ if( !p_sys->frame )
+ {
+ goto error;
+@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
+ AVFrame *frame = NULL;
+ if( likely(p_pict) ) {
+ frame = p_sys->frame;
+- avcodec_get_frame_defaults( frame );
++ av_frame_unref( frame );
+ for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
+ {
+ p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
+@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
+ //How much we need to copy from new packet
+ const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
+
+- avcodec_get_frame_defaults( p_sys->frame );
++ av_frame_unref( p_sys->frame );
+ p_sys->frame->format = p_sys->p_context->sample_fmt;
+ p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
+
+@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
+ while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
+ ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
+ {
+- avcodec_get_frame_defaults( p_sys->frame );
++ av_frame_unref( p_sys->frame );
+ if( p_sys->b_variable )
+ p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
+ else
+Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c
+===================================================================
+--- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c
++++ vlc-2.2.4/modules/codec/avcodec/vaapi.c
+@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod
+ return err;
+
+ /* Only VLD supported */
+- p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
++ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
+ p_va->setup = Setup;
+ p_va->get = Get;
+ p_va->release = Release;
+Index: vlc-2.2.4/modules/codec/avcodec/video.c
+===================================================================
+--- vlc-2.2.4.orig/modules/codec/avcodec/video.c
++++ vlc-2.2.4/modules/codec/avcodec/video.c
+@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
+ static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
+ static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
+ #endif
+-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
+- const enum PixelFormat * );
++static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
++ const enum AVPixelFormat * );
+
+ static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
+ {
+@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
+ p_sys->p_codec = p_codec;
+ p_sys->i_codec_id = i_codec_id;
+ p_sys->psz_namecodec = psz_namecodec;
+- p_sys->p_ff_pic = avcodec_alloc_frame();
++ p_sys->p_ff_pic = av_frame_alloc();
+ p_sys->b_delayed_open = true;
+ p_sys->p_va = NULL;
+ vlc_sem_init( &p_sys->sem_mt, 0 );
+@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
+ if( ffmpeg_OpenCodec( p_dec ) < 0 )
+ {
+ msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+- avcodec_free_frame( &p_sys->p_ff_pic );
++ av_frame_free( &p_sys->p_ff_pic );
+ vlc_sem_destroy( &p_sys->sem_mt );
+ free( p_sys );
+ return VLC_EGENERIC;
+@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
+ wait_mt( p_sys );
+
+ if( p_sys->p_ff_pic )
+- avcodec_free_frame( &p_sys->p_ff_pic );
++ av_frame_free( &p_sys->p_ff_pic );
+
+ if( p_sys->p_va )
+ vlc_va_Delete( p_sys->p_va );
+@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
+ }
+ #endif
+
+-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
+- const enum PixelFormat *pi_fmt )
++static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
++ const enum AVPixelFormat *pi_fmt )
+ {
+ decoder_t *p_dec = p_context->opaque;
+ decoder_sys_t *p_sys = p_dec->p_sys;
diff --git a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
new file mode 100644
index 00000000..218af58
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
@@ -0,0 +1,45 @@
+commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752
+Author: Rafaël Carré <funman@videolan.org>
+Date: Fri Feb 26 00:36:26 2016 +0000
+
+ Relax requirements for FFmpeg hwaccel
+
+ It doesn't error out anymore since 5edd1f62ca1
+
+Index: vlc-2.2.4/configure.ac
+===================================================================
+--- vlc-2.2.4.orig/configure.ac
++++ vlc-2.2.4/configure.ac
+@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
+ case "${avfork}" in
+ ffmpeg)
+ PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
++ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
++ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
++ ])
+ ])
+ ;;
+ esac
+@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"],
+ case "${avfork}" in
+ ffmpeg)
+ PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
++ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
++ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
++ ])
+ ])
+ ;;
+ esac
+@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
+ libav) av_vdpau_ver="55.26.0" ;;
+ ffmpeg) av_vdpau_ver="55.42.100"
+ PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
++ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
++ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
++ ])
+ ])
+ ;;
+ esac
diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild
index d1958ac..7e3bd58 100644
--- a/media-video/vlc/vlc-2.2.4.ebuild
+++ b/media-video/vlc/vlc-2.2.4.ebuild
@@ -63,15 +63,13 @@ RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
avcodec? (
!libav? (
- >=media-video/ffmpeg-2.2:0=
- <=media-video/ffmpeg-2.9:0=
+ >=media-video/ffmpeg-2.8:0=
)
libav? ( >=media-video/libav-11:0= )
)
avformat? (
!libav? (
- >=media-video/ffmpeg-2.2:0=
- <=media-video/ffmpeg-2.9:0=
+ >=media-video/ffmpeg-2.8:0=
)
libav? ( media-video/libav:0= )
)
@@ -157,7 +155,7 @@ RDEPEND="
v4l? ( media-libs/libv4l:0 )
vaapi? (
x11-libs/libva:0[X,drm]
- !libav? ( <=media-video/ffmpeg-2.9:0=[vaapi] )
+ !libav? ( >=media-video/ffmpeg-2.8:0=[vaapi] )
libav? ( media-video/libav:0=[vaapi] )
)
vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
@@ -170,8 +168,7 @@ RDEPEND="${RDEPEND}
vdpau? (
>=x11-libs/libvdpau-0.6:0
!libav? (
- >=media-video/ffmpeg-2.2:0=
- <=media-video/ffmpeg-2.9:0=
+ >=media-video/ffmpeg-2.8:0=
)
libav? ( >=media-video/libav-10:0= )
)
@@ -234,6 +231,10 @@ PATCHES=(
# Allow QT5.5 since Gentoo has a patched QTwidgets
"${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
+
+ # Bug #575072
+ "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
+ "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2016-12-19 13:38 Lars Wendler
0 siblings, 0 replies; 23+ messages in thread
From: Lars Wendler @ 2016-12-19 13:38 UTC (permalink / raw
To: gentoo-commits
commit: 5b56b99eeb7c29df23e317f9f3627ac7aa2eeb18
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Dec 14 23:50:39 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 13:38:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b56b99e
media-video/vlc: Fix build with libav-11.7
Gentoo-bug: 593460
Sync more changes from release -> live ebuilds
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3122
media-video/vlc/files/vlc-2.2.4-libav-11.7.patch | 10 +++++++++
media-video/vlc/vlc-2.2.9999.ebuild | 28 ++++++++++++++----------
media-video/vlc/vlc-9999.ebuild | 28 ++++++++++++++----------
3 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch b/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch
new file mode 100644
index 00000000..9322236
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch
@@ -0,0 +1,10 @@
+--- a/modules/codec/avcodec/audio.c 2016-09-10 13:46:51.066453337 -0700
++++ a/modules/codec/avcodec/audio.c 2016-09-10 13:42:26.061451090 -0700
+@@ -38,6 +38,7 @@
+
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/mem.h>
++#include <libavutil/channel_layout.h>
+
+ #include "avcodec.h"
+
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 8c5988f..fec5c52 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -5,7 +5,7 @@
EAPI=6
SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
+if [[ ${PV} = *9999 ]] ; then
SCM="git-r3"
if [ "${PV%.9999}" != "${PV}" ] ; then
@@ -23,7 +23,7 @@ MY_P="${PN}-${MY_PV}"
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+if [[ ${PV} = *9999 ]] ; then # Live ebuild
SRC_URI=""
elif [[ "${MY_P}" == "${P}" ]]; then
SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
@@ -47,10 +47,10 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
matroska cpu_flags_x86_mmx modplug mp3 mpeg
mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+ png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi zeroconf"
+ vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
RDEPEND="
dev-libs/libgpg-error:0
@@ -123,8 +123,9 @@ RDEPEND="
pulseaudio? ( >=media-sound/pulseaudio-1:0 )
!qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
- rdp? ( >=net-misc/freerdp-1.0.1:0= )
- samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
+ rdp? ( =net-misc/freerdp-1*:0=[client] )
+ samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
+ >=net-fs/samba-4.0.0_alpha1:0[client] ) )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
@@ -177,9 +178,10 @@ RDEPEND="${RDEPEND}
DEPEND="${RDEPEND}
!qt5? ( kde? ( kde-base/kdelibs:4 ) )
+ amd64? ( dev-lang/yasm:* )
+ x86? ( dev-lang/yasm:* )
xcb? ( x11-proto/xproto:0 )
app-arch/xz-utils:0
- dev-lang/yasm:*
>=sys-devel/gettext-0.18.3:*
virtual/pkgconfig:*
"
@@ -190,7 +192,7 @@ REQUIRED_USE="
cddb? ( cdda )
dvb? ( dvbpsi )
dxva2? ( avcodec )
- ffmpeg? ( avcodec avformat swscale postproc )
+ ffmpeg? ( avcodec avformat swscale )
fontconfig? ( truetype )
gnutls? ( gcrypt )
httpd? ( lua )
@@ -200,8 +202,9 @@ REQUIRED_USE="
qt4? ( X )
qt5? ( X )
sdl? ( X )
- skins? ( truetype X || ( qt4 qt5 ) )
+ skins? ( truetype X xml || ( qt4 qt5 ) )
vaapi? ( avcodec X )
+ vdpau? ( xcb )
vlm? ( encode )
xv? ( xcb )
"
@@ -228,6 +231,9 @@ PATCHES=(
# Bug #594126
"${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch
"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
+
+ # Bug #593460
+ "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
@@ -243,7 +249,7 @@ pkg_setup() {
}
src_unpack() {
- if [ "${PV%9999}" != "${PV}" ] ; then
+ if [[ ${PV} = *9999 ]] ; then
git-r3_src_unpack
else
unpack ${A}
@@ -263,7 +269,7 @@ src_prepare() {
fi
# Bootstrap when we are on a git checkout.
- if [[ "${PV%9999}" != "${PV}" ]] ; then
+ if [[ ${PV} = *9999 ]] ; then
./bootstrap
fi
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 7b61071..0836e19 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -5,7 +5,7 @@
EAPI=6
SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
+if [[ ${PV} = *9999 ]] ; then
SCM="git-r3"
if [ "${PV%.9999}" != "${PV}" ] ; then
@@ -23,7 +23,7 @@ MY_P="${PN}-${MY_PV}"
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+if [[ ${PV} = *9999 ]] ; then # Live ebuild
SRC_URI=""
elif [[ "${MY_P}" == "${P}" ]]; then
SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
@@ -47,10 +47,10 @@ IUSE="a52 aalib alsa altivec +audioqueue +avcodec
macosx-eyetv macosx-notifications macosx-qtkit
matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack
ncurses neon ogg omxil opencv opengl optimisememory opus
- png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+ png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi zeroconf"
+ vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
RDEPEND="
dev-libs/libgpg-error:0
@@ -123,8 +123,9 @@ RDEPEND="
pulseaudio? ( >=media-sound/pulseaudio-1:0 )
!qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
- rdp? ( >=net-misc/freerdp-1.0.1:0= )
- samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
+ rdp? ( =net-misc/freerdp-1*:0=[client] )
+ samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
+ >=net-fs/samba-4.0.0_alpha1:0[client] ) )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
@@ -177,9 +178,10 @@ RDEPEND="${RDEPEND}
DEPEND="${RDEPEND}
!qt5? ( kde? ( kde-base/kdelibs:4 ) )
+ amd64? ( dev-lang/yasm:* )
+ x86? ( dev-lang/yasm:* )
xcb? ( x11-proto/xproto:0 )
app-arch/xz-utils:0
- dev-lang/yasm:*
>=sys-devel/gettext-0.19.6:*
virtual/pkgconfig:*
"
@@ -189,7 +191,7 @@ REQUIRED_USE="
bidi? ( truetype )
dvb? ( dvbpsi )
dxva2? ( avcodec )
- ffmpeg? ( avcodec avformat swscale postproc )
+ ffmpeg? ( avcodec avformat swscale )
fontconfig? ( truetype )
gnutls? ( gcrypt )
httpd? ( lua )
@@ -199,8 +201,9 @@ REQUIRED_USE="
qt4? ( X )
qt5? ( X )
sdl? ( X )
- skins? ( truetype X || ( qt4 qt5 ) )
+ skins? ( truetype X xml || ( qt4 qt5 ) )
vaapi? ( avcodec X )
+ vdpau? ( xcb )
vlm? ( encode )
xv? ( xcb )
"
@@ -214,6 +217,9 @@ PATCHES=(
# Fix up broken audio when skipping using a fixed reversed bisected commit.
"${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+
+ # Bug #593460
+ "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -229,7 +235,7 @@ pkg_setup() {
}
src_unpack() {
- if [ "${PV%9999}" != "${PV}" ] ; then
+ if [[ ${PV} = *9999 ]] ; then
git-r3_src_unpack
else
unpack ${A}
@@ -249,7 +255,7 @@ src_prepare() {
fi
# Bootstrap when we are on a git checkout.
- if [[ "${PV%9999}" != "${PV}" ]] ; then
+ if [[ ${PV} = *9999 ]] ; then
./bootstrap
fi
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2017-01-16 4:06 Aaron Bauman
0 siblings, 0 replies; 23+ messages in thread
From: Aaron Bauman @ 2017-01-16 4:06 UTC (permalink / raw
To: gentoo-commits
commit: 46f399ae97a59276acb995eda82e08654cc37536
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 19:13:48 2017 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 04:05:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f399ae
media-video/vlc: Security cleanup (bug #584510)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3493
media-video/vlc/Manifest | 1 -
media-video/vlc/files/opencv-3.0.0.patch | 12 -
media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch | 23 -
media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch | 15 -
.../vlc/files/vlc-2.2.1-CVE-2015-5949.patch | 15 -
media-video/vlc/vlc-2.2.1-r1.ebuild | 506 ---------------------
6 files changed, 572 deletions(-)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 663e9d6..2d2aa09 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1 @@
-DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75abbbbf38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de WHIRLPOOL 5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885
DIST vlc-2.2.4.tar.xz 22199316 SHA256 1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be SHA512 2fc1fe957ba7903f2e0c9640884ed850cb10a60132d80658dee8da0b5abaf4a6ccdf95fa2b8c0a4a827be5e7e40341318bce44662a5248e04442f4779010f85c WHIRLPOOL 0d59d9c2a623f72a6c708f9face6f29b7c7e71a9b38faf3717b8f223641c6f599d1407a4976874226dbbd9e553ec528249dc4f301c5682bfb49f5745468934b2
diff --git a/media-video/vlc/files/opencv-3.0.0.patch b/media-video/vlc/files/opencv-3.0.0.patch
deleted file mode 100644
index b09b651..00000000
--- a/media-video/vlc/files/opencv-3.0.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b82416d7000a993b33e903095a590fe32212a85e
-diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
-index ae3af05..998f286 100644 (file)
---- a/modules/video_filter/opencv_example.cpp
-+++ b/modules/video_filter/opencv_example.cpp
-@@ -41,6 +41,8 @@
-
- #include <opencv2/core/core_c.h>
- #include <opencv2/core/core.hpp>
-+#include <opencv2/imgproc/imgproc_c.h>
-+#include <opencv2/imgproc/imgproc.hpp>
- #include <opencv2/objdetect/objdetect.hpp>
diff --git a/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch b/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch
deleted file mode 100644
index 19fc70f..00000000
--- a/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/modules/access/rdp.c 2014-11-22 01:40:52.044973648 -0800
-+++ b/modules/access/rdp.c 2014-11-22 01:36:44.291975380 -0800
-@@ -399,7 +404,9 @@
- if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
- p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
-
-+#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
- freerdp_channels_global_init();
-+#endif
-
- p_sys->p_instance = freerdp_new();
- if ( !p_sys->p_instance )
-@@ -475,7 +482,10 @@
-
- freerdp_disconnect( p_sys->p_instance );
- freerdp_free( p_sys->p_instance );
-+
-+#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
- freerdp_channels_global_uninit();
-+#endif
-
- if ( p_sys->p_block )
- block_Release( p_sys->p_block );
diff --git a/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch b/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch
deleted file mode 100644
index dec6c12..00000000
--- a/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- modules/hw/vdpau/Makefile.am.orig 2015-04-16 22:29:26.299342749 -0700
-+++ modules/hw/vdpau/Makefile.am 2015-04-16 22:31:40.886340950 -0700
-@@ -45,6 +45,7 @@
- libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
- vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la
-
-+if HAVE_XCB
- libvdpau_display_plugin_la_SOURCES = display.c
- libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../video_output/xcb
- libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
-@@ -52,3 +53,4 @@
- ../../video_output/libvlc_xcb_events.la \
- $(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
- vdpau_LTLIBRARIES += libvdpau_display_plugin.la
-+endif
diff --git a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
deleted file mode 100644
index 83a5258..00000000
--- a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commitdiff;h=ce91452460a75d7424b165c4dc8db98114c3cbd9;hp=9e12195d3e4316278af1fa4bcb6a705ff27456fd
---- a/modules/demux/mp4/libmp4.c
-+++ b/modules/demux/mp4/libmp4.c
-@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
- {
- for( i_index = 0; ; i_index++ )
- {
-+ if ( MP4_Box_Function[i_index].i_parent &&
-+ p_box->p_father &&
-+ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
-+ continue;
-+
- if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
- ( MP4_Box_Function[i_index].i_type == 0 ) )
- {
diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
deleted file mode 100644
index a4c25f8..00000000
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,506 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
- SCM="git-r3"
-
- if [ "${PV%.9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="git://git.videolan.org/vlc.git"
- fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
- SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
- SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
- SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-if [[ ${PV} != *9999 ]] ; then
- KEYWORDS="amd64 ~arm ppc ppc64 -sparc x86 ~x86-fbsd"
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
- +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
- directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
- fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
- growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
- +libsamplerate libtiger linsys libtar lirc live lua
- macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
- matroska cpu_flags_x86_mmx modplug mp3 mpeg
- mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
- schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
- taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
-
-RDEPEND="
- !>=media-video/ffmpeg-3.0:0
- dev-libs/libgpg-error:0
- net-dns/libidn:0
- >=sys-libs/zlib-1.2.5.1-r2:0[minizip]
- virtual/libintl:0
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
- aalib? ( media-libs/aalib:0 )
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
- avcodec? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( >=media-video/libav-11:0= )
- )
- avformat? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- bidi? ( >=dev-libs/fribidi-0.10.4:0 )
- bluray? ( >=media-libs/libbluray-0.3:0 )
- cddb? ( >=media-libs/libcddb-1.2:0 )
- chromaprint? ( >=media-libs/chromaprint-0.6:0 )
- dbus? ( >=sys-apps/dbus-1.6:0 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
- directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
- dts? ( >=media-libs/libdca-0.0.5:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= )
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
- elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
- faad? ( >=media-libs/faad2-2.6.1:0 )
- fdk? ( media-libs/fdk-aac:0 )
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
- fontconfig? ( media-libs/fontconfig:1.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
- gme? ( media-libs/game-music-emu:0 )
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
- gnutls? ( >=net-libs/gnutls-3.0.20:0 )
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- kate? ( >=media-libs/libkate-0.3:0 )
- libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
- libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
- libtiger? ( >=media-libs/libtiger-0.3.1:0 )
- linsys? ( >=media-libs/zvbi-0.2.28:0 )
- lirc? ( app-misc/lirc:0 )
- live? ( >=media-plugins/live-2011.12.23:0 )
- lua? ( >=dev-lang/lua-5.1:0 )
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
- mp3? ( media-libs/libmad:0 )
- mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
- mtp? ( >=media-libs/libmtp-1:0 )
- musepack? ( >=media-sound/musepack-tools-444:0 )
- ncurses? ( sys-libs/ncurses:0=[unicode] )
- ogg? ( >=media-libs/libogg-1:0 )
- opencv? ( >media-libs/opencv-2:0 )
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
- opus? ( >=media-libs/opus-1.0.3:0 )
- png? ( media-libs/libpng:0= sys-libs/zlib:0 )
- postproc? (
- !libav? ( >=media-video/ffmpeg-2.2:0= )
- libav? ( media-libs/libpostproc:0= )
- )
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
- pulseaudio? ( >=media-sound/pulseaudio-1:0 )
- !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
- qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
- rdp? ( >=net-misc/freerdp-1.0.1:0=[client] <net-misc/freerdp-2 )
- samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
- sdl? ( >=media-libs/libsdl-1.2.10:0
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
- sftp? ( net-libs/libssh2:0 )
- shout? ( >=media-libs/libshout-2.1:0 )
- sid? ( media-libs/libsidplay:2 )
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
- speex? ( media-libs/speex:0 )
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
- swscale? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
- theora? ( >=media-libs/libtheora-1.0_beta3:0 )
- tremor? ( media-libs/tremor:0 )
- truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
- !fontconfig? ( media-fonts/dejavu:0 ) )
- twolame? ( media-sound/twolame:0 )
- udev? ( >=virtual/udev-142:0 )
- upnp? ( net-libs/libupnp:0 )
- v4l? ( media-libs/libv4l:0 )
- vaapi? (
- x11-libs/libva:0[X,drm]
- !libav? ( media-video/ffmpeg:0=[vaapi] )
- libav? ( media-video/libav:0=[vaapi] )
- )
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-"
-
-# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
-# thus we'll have to wait for a new release there.
-RDEPEND="${RDEPEND}
- vdpau? (
- >=x11-libs/libvdpau-0.6:0
- !libav? ( >=media-video/ffmpeg-2.2:0= )
- libav? ( >=media-video/libav-10:0= )
- )
- vnc? ( >=net-libs/libvncserver-0.9.9:0 )
- vorbis? ( >=media-libs/libvorbis-1.1:0 )
- vpx? ( media-libs/libvpx:0= )
- X? ( x11-libs/libX11:0 )
- x264? ( >=media-libs/x264-0.0.20090923:0= )
- x265? ( media-libs/x265:0= )
- xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
- xml? ( >=dev-libs/libxml2-2.5:2 )
- zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
- !qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
- xcb? ( x11-proto/xproto:0 )
- app-arch/xz-utils:0
- x86? ( dev-lang/yasm:* )
- amd64? ( dev-lang/yasm:* )
- >=sys-devel/gettext-0.18.3:*
- virtual/pkgconfig:*
-"
-
-REQUIRED_USE="
- aalib? ( X )
- bidi? ( truetype )
- cddb? ( cdda )
- dvb? ( dvbpsi )
- dxva2? ( avcodec )
- ffmpeg? ( avcodec avformat swscale )
- fontconfig? ( truetype )
- gnutls? ( gcrypt )
- httpd? ( lua )
- libcaca? ( X )
- libtar? ( skins )
- libtiger? ( kate )
- qt4? ( X )
- qt5? ( X )
- sdl? ( X )
- skins? ( truetype X xml || ( qt4 qt5 ) )
- vaapi? ( avcodec X )
- vdpau? ( xcb )
- vlm? ( encode )
- xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
- if ! version_is_at_least 4.5 $(gcc-version) ; then
- die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
- fi
- fi
-}
-
-src_unpack() {
- if [ "${PV%9999}" != "${PV}" ] ; then
- git-r3_src_unpack
- else
- unpack ${A}
- fi
-}
-
-src_prepare() {
- # Remove unnecessary warnings about unimplemented pragmas on gcc for now.
- # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
- #
- # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
- # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
- #
- # https://gcc.gnu.org/c99status.html
- if tc-is-gcc ; then
- sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
- fi
-
- # Bootstrap when we are on a git checkout.
- if [[ "${PV%9999}" != "${PV}" ]] ; then
- ./bootstrap
- fi
-
- # Make it build with libtool 1.5
- rm -f m4/lt* m4/libtool.m4 || die
-
- # We are not in a real git checkout due to the absence of a .git directory.
- touch src/revision.txt || die
-
- # PATCHES
- # Fix build system mistake.
- epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
- # Patch up incompatibilities and reconfigure autotools.
- epatch "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
-
- # Patch for bug 542414
- epatch "${FILESDIR}"/${PN}-2.2.0-rdp-1.2.0.patch
-
- # Patch for bug 541928
- epatch "${FILESDIR}"/${PN}-2.2.0-xcb_vdpau.patch
-
- # Fix up broken audio when skipping using a fixed reversed bisected commit.
- epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-
- # Bug #541678
- epatch "${FILESDIR}"/qt4-select.patch
-
- # Add missed header imgproc_c.h, imgproc.hpp, bug #554562
- epatch "${FILESDIR}"/opencv-3.0.0.patch
-
- epatch "${FILESDIR}"//${P}-CVE-2015-5949.patch
-
- # Don't use --started-from-file when not using dbus.
- if ! use dbus ; then
- sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
- fi
-
- epatch_user
-
- eautoreconf
-
- # Disable automatic running of tests.
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
- # Setting QT_SELECT environment variable will enforce correct binaries.
- if use qt5; then
- export QT_SELECT=qt5
- elif use qt4; then
- export QT_SELECT=qt4
- fi
-}
-
-src_configure() {
- local myconf
-
- # Compatibility fix for Samba 4.
- use samba && append-cppflags "-I/usr/include/samba-4.0"
-
- # We need to disable -fstack-check if use >=gcc 4.8.0.
- # See bug #499996
- use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
- # Needs libresid-builder from libsidplay:2 which is in another directory...
- # FIXME!
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
- if use truetype || use projectm ; then
- local dejavu="/usr/share/fonts/dejavu/"
- myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
- --with-default-font-family=Sans \
- --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
- --with-default-monospace-font-family=Monospace"
- fi
-
- if use qt5 ; then
- myconf+=" --enable-qt=5"
- else
- if use qt4 ; then
- myconf+=" --enable-qt=4"
- else
- myconf+=" --disable-qt"
- fi
- use kde && myconf+=" --with-kde-solid"
- fi
-
- econf \
- ${myconf} \
- --enable-vlc \
- --docdir=/usr/share/doc/${PF} \
- --disable-dependency-tracking \
- --disable-optimizations \
- --disable-update-check \
- --enable-fast-install \
- --enable-screen \
- $(use_enable a52) \
- $(use_enable aalib aa) \
- $(use_enable alsa) \
- $(use_enable altivec) \
- $(use_enable atmo) \
- $(use_enable audioqueue) \
- $(use_enable avcodec) \
- $(use_enable avformat) \
- $(use_enable bidi fribidi) \
- $(use_enable bluray) \
- $(use_enable cdda vcd) \
- $(use_enable cddb libcddb) \
- $(use_enable chromaprint) \
- $(use_enable dbus) \
- $(use_enable directfb) \
- $(use_enable directx) \
- $(use_enable dc1394) \
- $(use_enable debug) \
- $(use_enable dts dca) \
- $(use_enable dvbpsi) \
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
- $(use_enable dxva2) \
- $(use_enable encode sout) \
- $(use_enable faad) \
- $(use_enable fdk fdkaac) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable fontconfig) \
- $(use_enable gcrypt libgcrypt) \
- $(use_enable gme) \
- $(use_enable gnome gnomevfs) \
- $(use_enable gnutls) \
- $(use_enable growl) \
- $(use_enable httpd) \
- $(use_enable ieee1394 dv1394) \
- $(use_enable jack) \
- $(use_enable jpeg) \
- $(use_enable kate) \
- $(use_enable libass) \
- $(use_enable libcaca caca) \
- $(use_enable libnotify notify) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable libtar) \
- $(use_enable libtiger tiger) \
- $(use_enable linsys) \
- $(use_enable lirc) \
- $(use_enable live live555) \
- $(use_enable lua) \
- $(use_enable macosx-dialog-provider) \
- $(use_enable macosx-eyetv) \
- $(use_enable macosx-qtkit) \
- $(use_enable macosx-quartztext) \
- $(use_enable matroska mkv) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable modplug mod) \
- $(use_enable mp3 mad) \
- $(use_enable mpeg libmpeg2) \
- $(use_enable mtp) \
- $(use_enable musepack mpc) \
- $(use_enable ncurses) \
- $(use_enable neon) \
- $(use_enable ogg) $(use_enable ogg mux_ogg) \
- $(use_enable omxil) \
- $(use_enable omxil omxil-vout) \
- $(use_enable opencv) \
- $(use_enable opengl glspectrum) \
- $(use_enable opus) \
- $(use_enable optimisememory optimize-memory) \
- $(use_enable png) \
- $(use_enable postproc) \
- $(use_enable projectm) \
- $(use_enable pulseaudio pulse) \
- $(use_enable rdp freerdp) \
- $(use_enable rtsp realrtsp) \
- $(use_enable run-as-root) \
- $(use_enable samba smbclient) \
- $(use_enable schroedinger) \
- $(use_enable sdl) \
- $(use_enable sdl-image) \
- $(use_enable sid) \
- $(use_enable sftp) \
- $(use_enable shout) \
- $(use_enable skins skins2) \
- $(use_enable speex) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable svg) \
- $(use_enable svg svgdec) \
- $(use_enable swscale) \
- $(use_enable taglib) \
- $(use_enable theora) \
- $(use_enable tremor) \
- $(use_enable truetype freetype) \
- $(use_enable twolame) \
- $(use_enable udev) \
- $(use_enable upnp) \
- $(use_enable v4l v4l2) \
- $(use_enable vaapi libva) \
- $(use_enable vcdx) \
- $(use_enable vdpau) \
- $(use_enable vlm) \
- $(use_enable vnc) \
- $(use_enable vorbis) \
- $(use_enable vpx) \
- $(use_enable wma-fixed) \
- $(use_with X x) \
- $(use_enable x264) \
- $(use_enable x265) \
- $(use_enable xcb) \
- $(use_enable xml libxml2) \
- $(use_enable xv xvideo) \
- $(use_enable zeroconf bonjour) \
- $(use_enable zvbi) $(use_enable !zvbi telx) \
- --disable-asdcp \
- --disable-coverage \
- --disable-cprof \
- --disable-crystalhd \
- --disable-decklink \
- --disable-gles1 \
- --disable-gles2 \
- --disable-goom \
- --disable-kai \
- --disable-kva \
- --disable-maintainer-mode \
- --disable-merge-ffmpeg \
- --disable-mfx \
- --disable-mmal-codec \
- --disable-mmal-vout \
- --disable-opensles \
- --disable-oss \
- --disable-quicktime \
- --disable-rpi-omxil \
- --disable-shine \
- --disable-sndio \
- --disable-vda \
- --disable-vsxu \
- --disable-wasapi
-
- # ^ We don't have these disabled libraries in the Portage tree yet.
-
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
- sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
- virtx emake check-TESTS
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
- default
-
- # Punt useless libtool's .la files
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if [ "$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" -f "/usr/$(get_libdir)/vlc/plugins/"
- else
- ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
- ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
- ewarn "If you do not do it, vlc will take a long time to load."
- fi
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2017-12-09 13:52 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2017-12-09 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 34c95024aab1cfb361746997c55e1e44e5f037ab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 13:27:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 13:52:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c95024
media-video/vlc: Fix <net-libs/libupnp-1.8 compat
Package-Manager: Portage-2.3.17, Repoman-2.3.6
.../vlc/files/vlc-2.2.8-libupnp-compat.patch | 28 ++++++++++++++++++++++
media-video/vlc/vlc-2.2.9999.ebuild | 2 ++
2 files changed, 30 insertions(+)
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
new file mode 100644
index 00000000000..57b66685ede
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
@@ -0,0 +1,28 @@
+From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth@videolan.org>
+Date: Wed, 29 Nov 2017 10:45:04 -0500
+Subject: [PATCH] upnp: don't clash with libupnp's own compat code
+
+Fixes build for upnp >= 1.6.23 and less than 1.8.
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/services_discovery/upnp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
+index bdd3c55ee5..82d43632f4 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -38,7 +38,7 @@
+ #include <set>
+ #include <string>
+
+-#if UPNP_VERSION < 10800
++#if UPNP_VERSION < 10623
+ /*
+ * Compat functions and typedefs for libupnp prior to 1.8
+ */
+--
+2.11.0
+
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 977724b1c27..40efb3e5ac1 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -213,6 +213,8 @@ PATCHES=(
# Bug #593460
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+
+ "${FILESDIR}"/${P}-libupnp-compat.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2017-12-25 17:42 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2017-12-25 17:42 UTC (permalink / raw
To: gentoo-commits
commit: ec5725f193f7752eefab93df39609beb7788f529
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 17:36:53 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 17:42:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5725f1
media-video/vlc: Fix libupnp-slot-1.8 patch for live
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../vlc/files/vlc-9999-libupnp-slot-1.8.patch | 24 ++++++++++++++++++++++
media-video/vlc/vlc-9999.ebuild | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
new file mode 100644
index 00000000000..893f936b729
--- /dev/null
+++ b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
@@ -0,0 +1,24 @@
+--- a/modules/services_discovery/upnp.hpp 2017-12-25 18:17:33.358015500 +0100
++++ b/modules/services_discovery/upnp.hpp 2017-12-25 18:30:45.158167813 +0100
+@@ -35,8 +35,8 @@
+ #include <windows.h>
+ #include <wincrypt.h>
+ #endif
+-#include <upnp/upnp.h>
+-#include <upnp/upnptools.h>
++#include <upnp-1.8/upnp.h>
++#include <upnp-1.8/upnptools.h>
+
+ #include <vlc_common.h>
+ #include <vlc_url.h>
+
+--- a/configure.ac 2017-12-09 14:09:12.956370304 +0100
++++ b/configure.ac 2017-12-09 14:13:25.236710362 +0100
+@@ -4046,7 +4046,7 @@
+ dnl
+ dnl UPnP Plugin (Intel SDK)
+ dnl
+-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto])
++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP SDK],[auto])
+
+ EXTEND_HELP_STRING([Misc options:])
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index e235fc8b947..be6ba65a29e 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -249,7 +249,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
default
- has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
# Bootstrap when we are on a git checkout.
if [[ ${PV} = *9999 ]] ; then
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2017-12-25 17:42 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2017-12-25 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 0e8a96e9d650485f3323e689edfe371cc11688f6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 17:06:29 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 17:42:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8a96e9
media-video/vlc: Fix build with >=net-misc/freerdp-2.0.0
Bug: https://bugs.gentoo.org/590164
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/vlc/files/vlc-2.2.8-freerdp-2.patch | 131 +++++++++++++++++++++
.../{vlc-2.2.9999.ebuild => vlc-2.2.8-r1.ebuild} | 7 +-
media-video/vlc/vlc-2.2.9999.ebuild | 5 +-
media-video/vlc/vlc-3.0.9999.ebuild | 10 +-
media-video/vlc/vlc-9999.ebuild | 10 +-
5 files changed, 148 insertions(+), 15 deletions(-)
diff --git a/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch b/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch
new file mode 100644
index 00000000000..5cee1336505
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch
@@ -0,0 +1,131 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1957,7 +1957,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [li
+
+ dnl RDP/Remote Desktop access module
+ dnl
+-PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) )
++PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) )
+
+ dnl
+ dnl Real RTSP plugin
+--- a/modules/access/rdp.c 2017-12-25 17:45:32.964429170 +0100
++++ b/modules/access/rdp.c 2017-12-25 17:53:15.114093670 +0100
+@@ -45,18 +45,6 @@
+ # include <freerdp/version.h>
+ #endif
+
+-#if !defined(FREERDP_VERSION_MAJOR) || \
+- (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)))
+-# define SoftwareGdi sw_gdi
+-# define Fullscreen fullscreen
+-# define ServerHostname hostname
+-# define Username username
+-# define Password password
+-# define ServerPort port
+-# define EncryptionMethods encryption
+-# define ContextSize context_size
+-#endif
+-
+ #include <errno.h>
+ #ifdef HAVE_POLL
+ # include <poll.h>
+@@ -140,6 +128,7 @@
+ vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context;
+ demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
+ rdpGdi *p_gdi = p_context->gdi;
++ unsigned bytesPerPixel;
+
+ if ( p_sys->es )
+ {
+@@ -149,19 +138,23 @@
+
+ /* Now init and fill es format */
+ vlc_fourcc_t i_chroma;
+- switch( p_gdi->bytesPerPixel )
++ switch( p_gdi->dstFormat )
+ {
+ default:
+- case 16:
++ msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat);
++ case PIXEL_FORMAT_BGR16:
+ i_chroma = VLC_CODEC_RGB16;
++ bytesPerPixel = 16;
+ break;
+- case 24:
++ case PIXEL_FORMAT_BGR24:
+ i_chroma = VLC_CODEC_RGB24;
++ bytesPerPixel = 24;
+ break;
+- case 32:
++ case PIXEL_FORMAT_BGRA32:
+ i_chroma = VLC_CODEC_RGB32;
++ bytesPerPixel = 32;
+ break;
+ }
+ es_format_t fmt;
+ es_format_Init( &fmt, VIDEO_ES, i_chroma );
+
+@@ -172,7 +165,7 @@
+ fmt.video.i_height = p_gdi->height;
+ fmt.video.i_frame_rate_base = 1000;
+ fmt.video.i_frame_rate = 1000 * p_sys->f_fps;
+- p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel;
++ p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel;
+
+ if ( p_sys->p_block )
+ p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize );
+@@ -233,28 +226,19 @@
+ vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
+
+ msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
+-#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))
+ p_instance->settings->DesktopWidth,
+ p_instance->settings->DesktopHeight,
+ p_instance->settings->ColorDepth
+-#else
+- p_instance->settings->width,
+- p_instance->settings->height,
+- p_instance->settings->color_depth
+-#endif
+ );
+
+ p_instance->update->DesktopResize = desktopResizeHandler;
+ p_instance->update->BeginPaint = beginPaintHandler;
+ p_instance->update->EndPaint = endPaintHandler;
+
+- gdi_init( p_instance,
+- CLRBUF_16BPP |
+-#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
+- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
+- CLRBUF_24BPP |
+-#endif
+- CLRBUF_32BPP, NULL );
++ if ( p_instance->settings->ColorDepth > 16 )
++ gdi_init( p_instance, PIXEL_FORMAT_XRGB32);
++ else
++ gdi_init( p_instance, PIXEL_FORMAT_RGB16);
+
+ desktopResizeHandler( p_instance->context );
+ return true;
+@@ -428,10 +412,6 @@
+ if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
+ p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
+
+-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
+- freerdp_channels_global_init();
+-#endif
+-
+ p_sys->p_instance = freerdp_new();
+ if ( !p_sys->p_instance )
+ {
+@@ -506,9 +486,6 @@
+
+ freerdp_disconnect( p_sys->p_instance );
+ freerdp_free( p_sys->p_instance );
+-#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
+- freerdp_channels_global_uninit();
+-#endif
+
+ if ( p_sys->p_block )
+ block_Release( p_sys->p_block );
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
similarity index 99%
copy from media-video/vlc/vlc-2.2.9999.ebuild
copy to media-video/vlc/vlc-2.2.8-r1.ebuild
index f36f6cfefe2..fc781d24d8f 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -133,7 +133,7 @@ RDEPEND="
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-1:0 )
qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
- rdp? ( =net-misc/freerdp-1*:0=[client] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
@@ -213,6 +213,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
"${FILESDIR}"/${P}-libupnp-compat.patch
+
+ # Bug 590164
+ "${FILESDIR}"/${P}-freerdp-2.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
@@ -222,7 +225,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
default
- has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
# Bootstrap when we are on a git checkout.
if [[ ${PV} = *9999 ]] ; then
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index f36f6cfefe2..ddbc6e4fd4a 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -133,7 +133,7 @@ RDEPEND="
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-1:0 )
qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
- rdp? ( =net-misc/freerdp-1*:0=[client] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
@@ -213,6 +213,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
"${FILESDIR}"/${P}-libupnp-compat.patch
+
+ # Bug 590164
+ "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index a425abcdf05..e235fc8b947 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -165,7 +165,7 @@ RDEPEND="
dev-qt/qtwidgets:5
X? ( dev-qt/qtx11extras:5 )
)
- rdp? ( =net-misc/freerdp-1*:0=[client] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
@@ -237,11 +237,9 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- # Fix build system mistake.
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
- # Bug #593460
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+ "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
+ "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a425abcdf05..e235fc8b947 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -165,7 +165,7 @@ RDEPEND="
dev-qt/qtwidgets:5
X? ( dev-qt/qtx11extras:5 )
)
- rdp? ( =net-misc/freerdp-1*:0=[client] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
@@ -237,11 +237,9 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- # Fix build system mistake.
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
- # Bug #593460
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+ "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
+ "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2018-02-27 22:51 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-02-27 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 01971664316881492a2982086b564112dc282ab2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 10:27:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 22:50:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01971664
media-video/vlc: Cleanup vulnerable 2.2.6
arm security stabilisation timeout.
Bug: https://bugs.gentoo.org/620176
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/vlc/Manifest | 1 -
...2.1.0-TomWij-bisected-PA-broken-underflow.patch | 23 -
.../vlc/files/vlc-2.2.4-decoder-lock-scope.patch | 47 --
.../vlc/files/vlc-9999-libva-1.2.1-compat.patch | 12 -
media-video/vlc/vlc-2.2.6.ebuild | 511 ---------------------
5 files changed, 594 deletions(-)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7de7a154668..b1a6a36d2b0 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,3 +1,2 @@
-DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1 SHA512 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7
diff --git a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
deleted file mode 100644
index 3163410353a..00000000000
--- a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-index 2debbcd..72e7fcf 100644
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -472,8 +472,17 @@ static void stream_underflow_cb(pa_stream *s, void *userdata)
- {
-+ uint32_t rate = pa_stream_get_sample_spec(s)->rate;
- audio_output_t *aout = userdata;
-
-- msg_Dbg(aout, "underflow");
-- (void) s;
-+ msg_Warn(aout, "underflow");
-+ stream_stop(s, aout);
-+
-+ aout_sys_t *sys = aout->sys;
-+ sys->first_pts = VLC_TS_INVALID;
-+
-+ pa_operation *op = pa_stream_update_sample_rate(s, rate, NULL, NULL);
-+ if (unlikely(op == NULL))
-+ return;
-+ pa_operation_unref(op);
- }
-
- static int stream_wait(pa_stream *stream, pa_threaded_mainloop *mainloop)
diff --git a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch
deleted file mode 100644
index 51a2cdcb16d..00000000000
--- a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
-
---- a/src/input/decoder.c
-+++ b/src/input/decoder.c
-@@ -1162,7 +1162,10 @@
- b_paused = p_owner->b_paused;
-
- if (!p_audio)
-+ {
-+ vlc_mutex_unlock( &p_owner->lock );
- break;
-+ }
-
- /* */
- int i_rate = INPUT_RATE_DEFAULT;
-@@ -1180,6 +1183,9 @@
-
- if( unlikely(p_owner->b_paused != b_paused) )
- continue; /* race with input thread? retry... */
-+
-+ vlc_mutex_unlock( &p_owner->lock );
-+
- if( p_aout == NULL )
- b_reject = true;
-
-@@ -1199,7 +1205,6 @@
-
- break;
- }
-- vlc_mutex_unlock( &p_owner->lock );
- }
-
- static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
-@@ -1961,11 +1966,10 @@
-
- /* Parameters changed, restart the aout */
- vlc_mutex_lock( &p_owner->lock );
--
-- aout_DecDelete( p_owner->p_aout );
- p_owner->p_aout = NULL;
--
- vlc_mutex_unlock( &p_owner->lock );
-+ aout_DecDelete( p_owner->p_aout );
-+
- input_resource_PutAout( p_owner->p_resource, p_aout );
- }
-
diff --git a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
deleted file mode 100644
index adfdefec56a..00000000000
--- a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/modules/codec/avcodec/vaapi.c
-+++ b/modules/codec/avcodec/vaapi.c
-@@ -34,6 +34,9 @@
- #ifdef VLC_VA_BACKEND_XLIB
- # include <vlc_xlib.h>
- # include <va/va_x11.h>
-+#if VA_MINOR_VERSION >= 34
-+# include <va/va_compat.h>
-+#endif
- #endif
- #ifdef VLC_VA_BACKEND_DRM
- # include <sys/types.h>
diff --git a/media-video/vlc/vlc-2.2.6.ebuild b/media-video/vlc/vlc-2.2.6.ebuild
deleted file mode 100644
index 8f50aca222d..00000000000
--- a/media-video/vlc/vlc-2.2.6.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [[ ${PV} = *9999 ]] ; then
- SCM="git-r3"
-
- if [ "${PV%.9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="git://git.videolan.org/vlc.git"
- fi
-fi
-
-inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-if [[ ${PV} = *9999 ]] ; then # Live ebuild
- SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
- SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
- SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-if [[ ${PV} != *9999 ]] ; then
- KEYWORDS="amd64 arm ppc ppc64 -sparc x86 ~x86-fbsd"
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
- +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
- directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
- fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
- growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify
- +libsamplerate libtiger linsys libtar lirc live lua
- macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
- matroska cpu_flags_x86_mmx modplug mp3 mpeg
- mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
- schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
- taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
-
-RDEPEND="
- dev-libs/libgpg-error:0
- net-dns/libidn:0
- sys-libs/zlib:0[minizip]
- virtual/libintl:0
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
- aalib? ( media-libs/aalib:0 )
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
- avcodec? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- avformat? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- bidi? ( dev-libs/fribidi:0 )
- bluray? ( >=media-libs/libbluray-0.3:0= )
- cddb? ( >=media-libs/libcddb-1.2:0 )
- chromaprint? ( >=media-libs/chromaprint-0.6:0 )
- dbus? ( >=sys-apps/dbus-1.6:0 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
- directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
- dts? ( >=media-libs/libdca-0.0.5:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
- elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
- faad? ( >=media-libs/faad2-2.6.1:0 )
- fdk? ( media-libs/fdk-aac:0 )
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
- fontconfig? ( media-libs/fontconfig:1.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
- gme? ( media-libs/game-music-emu:0 )
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
- gnutls? ( >=net-libs/gnutls-3.0.20:0 )
- gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- kate? ( >=media-libs/libkate-0.3:0 )
- libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
- libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
- libtiger? ( >=media-libs/libtiger-0.3.1:0 )
- linsys? ( >=media-libs/zvbi-0.2.28:0 )
- lirc? ( app-misc/lirc:0 )
- live? ( >=media-plugins/live-2011.12.23:0 )
- lua? ( >=dev-lang/lua-5.1:0 )
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
- mp3? ( media-libs/libmad:0 )
- mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
- mtp? ( >=media-libs/libmtp-1:0 )
- musepack? ( >=media-sound/musepack-tools-444:0 )
- ncurses? ( sys-libs/ncurses:0=[unicode] )
- ogg? ( >=media-libs/libogg-1:0 )
- opencv? ( >media-libs/opencv-2:0= )
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
- opus? ( >=media-libs/opus-1.0.3:0 )
- png? ( media-libs/libpng:0= sys-libs/zlib:0 )
- postproc? (
- !libav? ( >=media-video/ffmpeg-2.2:0= )
- libav? ( media-libs/libpostproc:0= )
- )
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
- pulseaudio? ( >=media-sound/pulseaudio-1:0 )
- !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
- qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
- rdp? ( =net-misc/freerdp-1*:0=[client] )
- samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
- sdl? ( >=media-libs/libsdl-1.2.10:0
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
- sftp? ( net-libs/libssh2:0 )
- shout? ( >=media-libs/libshout-2.1:0 )
- sid? ( media-libs/libsidplay:2 )
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
- speex? ( media-libs/speex:0 )
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
- swscale? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
- theora? ( >=media-libs/libtheora-1.0_beta3:0 )
- tremor? ( media-libs/tremor:0 )
- truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
- !fontconfig? ( media-fonts/dejavu:0 ) )
- twolame? ( media-sound/twolame:0 )
- udev? ( >=virtual/udev-142:0 )
- upnp? ( net-libs/libupnp:0 )
- v4l? ( media-libs/libv4l:0 )
- vaapi? (
- x11-libs/libva:0[X,drm]
- !libav? ( media-video/ffmpeg:0=[vaapi] )
- libav? ( media-video/libav:0=[vaapi] )
- )
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-"
-
-# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
-# thus we'll have to wait for a new release there.
-RDEPEND="${RDEPEND}
- vdpau? (
- x11-libs/libvdpau:0
- !libav? ( media-video/ffmpeg:0= )
- libav? ( >=media-video/libav-10:0= )
- )
- vnc? ( >=net-libs/libvncserver-0.9.9:0 )
- vorbis? ( media-libs/libvorbis:0 )
- vpx? ( media-libs/libvpx:0= )
- X? ( x11-libs/libX11:0 )
- x264? ( media-libs/x264:0= )
- x265? ( media-libs/x265:0= )
- xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
- xml? ( dev-libs/libxml2:2 )
- zvbi? ( media-libs/zvbi:0 )
-"
-
-DEPEND="${RDEPEND}
- amd64? ( dev-lang/yasm:* )
- x86? ( dev-lang/yasm:* )
- xcb? ( x11-proto/xproto:0 )
- app-arch/xz-utils:0
- >=sys-devel/gettext-0.18.3:*
- virtual/pkgconfig:*
-"
-
-REQUIRED_USE="
- aalib? ( X )
- bidi? ( truetype )
- cddb? ( cdda )
- dvb? ( dvbpsi )
- dxva2? ( avcodec )
- ffmpeg? ( avcodec avformat swscale )
- fontconfig? ( truetype )
- gnutls? ( gcrypt )
- httpd? ( lua )
- libcaca? ( X )
- libtar? ( skins )
- libtiger? ( kate )
- qt4? ( X )
- qt5? ( X )
- sdl? ( X )
- skins? ( truetype X xml || ( qt4 qt5 ) )
- vaapi? ( avcodec X )
- vdpau? ( X )
- vlm? ( encode )
- xv? ( xcb )
-"
-
-PATCHES=(
- # Fix build system mistake.
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
- # Patch up incompatibilities and reconfigure autotools.
- "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
-
- # Fix up broken audio when skipping using a fixed reversed bisected commit.
- "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-
- # Bug #541678
- "${FILESDIR}"/qt4-select.patch
-
- # Allow QT5.5 since Gentoo has a patched QTwidgets
- "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
-
- # Bug #575072
- "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
- "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
-
- # Bug #589396
- "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
-
- # Bug #594126
- "${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch
- "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
-
- # Bug #593460
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
- if ! version_is_at_least 4.5 $(gcc-version) ; then
- die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
- fi
- fi
-}
-
-src_unpack() {
- if [[ ${PV} = *9999 ]] ; then
- git-r3_src_unpack
- else
- unpack ${A}
- fi
-}
-
-src_prepare() {
- # Remove unnecessary warnings about unimplemented pragmas on gcc for now.
- # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
- #
- # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
- # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
- #
- # https://gcc.gnu.org/c99status.html
- if tc-is-gcc ; then
- sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
- fi
-
- # Bootstrap when we are on a git checkout.
- if [[ ${PV} = *9999 ]] ; then
- ./bootstrap
- fi
-
- # Make it build with libtool 1.5
- rm -f m4/lt* m4/libtool.m4 || die
-
- # We are not in a real git checkout due to the absence of a .git directory.
- touch src/revision.txt || die
-
- default
-
- # Don't use --started-from-file when not using dbus.
- if ! use dbus ; then
- sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
- fi
-
- eautoreconf
-
- # Disable automatic running of tests.
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
- # version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
- if use qt5; then
- export QT_SELECT=qt5
- elif use qt4; then
- export QT_SELECT=qt4
- fi
-}
-
-src_configure() {
- local myconf
-
- # Compatibility fix for Samba 4.
- use samba && append-cppflags "-I/usr/include/samba-4.0"
-
- # We need to disable -fstack-check if use >=gcc 4.8.0.
- # See bug #499996
- use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
- # Needs libresid-builder from libsidplay:2 which is in another directory...
- # FIXME!
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
- if use truetype || use projectm ; then
- local dejavu="/usr/share/fonts/dejavu/"
- myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
- --with-default-font-family=Sans \
- --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
- --with-default-monospace-font-family=Monospace"
- fi
-
- if use qt5 ; then
- myconf+=" --enable-qt=5"
- else
- if use qt4 ; then
- myconf+=" --enable-qt=4"
- else
- myconf+=" --disable-qt"
- fi
- fi
-
- econf \
- ${myconf} \
- --enable-vlc \
- --docdir=/usr/share/doc/${PF} \
- --disable-dependency-tracking \
- --disable-optimizations \
- --disable-update-check \
- --enable-fast-install \
- --enable-screen \
- $(use_enable a52) \
- $(use_enable aalib aa) \
- $(use_enable alsa) \
- $(use_enable altivec) \
- $(use_enable atmo) \
- $(use_enable audioqueue) \
- $(use_enable avcodec) \
- $(use_enable avformat) \
- $(use_enable bidi fribidi) \
- $(use_enable bluray) \
- $(use_enable cdda vcd) \
- $(use_enable cddb libcddb) \
- $(use_enable chromaprint) \
- $(use_enable dbus) \
- $(use_enable directfb) \
- $(use_enable directx) \
- $(use_enable dc1394) \
- $(use_enable debug) \
- $(use_enable dts dca) \
- $(use_enable dvbpsi) \
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
- $(use_enable dxva2) \
- $(use_enable encode sout) \
- $(use_enable faad) \
- $(use_enable fdk fdkaac) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable fontconfig) \
- $(use_enable gcrypt libgcrypt) \
- $(use_enable gme) \
- $(use_enable gnome gnomevfs) \
- $(use_enable gnutls) \
- $(use_enable growl) \
- $(use_enable gstreamer gst-decode) \
- $(use_enable httpd) \
- $(use_enable ieee1394 dv1394) \
- $(use_enable jack) \
- $(use_enable jpeg) \
- $(use_enable kate) \
- $(use_enable libass) \
- $(use_enable libcaca caca) \
- $(use_enable libnotify notify) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable libtar) \
- $(use_enable libtiger tiger) \
- $(use_enable linsys) \
- $(use_enable lirc) \
- $(use_enable live live555) \
- $(use_enable lua) \
- $(use_enable macosx-dialog-provider) \
- $(use_enable macosx-eyetv) \
- $(use_enable macosx-qtkit) \
- $(use_enable macosx-quartztext) \
- $(use_enable matroska mkv) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable modplug mod) \
- $(use_enable mp3 mad) \
- $(use_enable mpeg libmpeg2) \
- $(use_enable mtp) \
- $(use_enable musepack mpc) \
- $(use_enable ncurses) \
- $(use_enable neon) \
- $(use_enable ogg) $(use_enable ogg mux_ogg) \
- $(use_enable omxil) \
- $(use_enable omxil omxil-vout) \
- $(use_enable opencv) \
- $(use_enable opengl glspectrum) \
- $(use_enable opus) \
- $(use_enable optimisememory optimize-memory) \
- $(use_enable png) \
- $(use_enable postproc) \
- $(use_enable projectm) \
- $(use_enable pulseaudio pulse) \
- $(use_enable rdp freerdp) \
- $(use_enable rtsp realrtsp) \
- $(use_enable run-as-root) \
- $(use_enable samba smbclient) \
- $(use_enable schroedinger) \
- $(use_enable sdl) \
- $(use_enable sdl-image) \
- $(use_enable sid) \
- $(use_enable sftp) \
- $(use_enable shout) \
- $(use_enable skins skins2) \
- $(use_enable speex) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable svg) \
- $(use_enable svg svgdec) \
- $(use_enable swscale) \
- $(use_enable taglib) \
- $(use_enable theora) \
- $(use_enable tremor) \
- $(use_enable truetype freetype) \
- $(use_enable twolame) \
- $(use_enable udev) \
- $(use_enable upnp) \
- $(use_enable v4l v4l2) \
- $(use_enable vaapi libva) \
- $(use_enable vcdx) \
- $(use_enable vdpau) \
- $(use_enable vlm) \
- $(use_enable vnc) \
- $(use_enable vorbis) \
- $(use_enable vpx) \
- $(use_enable wma-fixed) \
- $(use_with X x) \
- $(use_enable x264) \
- $(use_enable x265) \
- $(use_enable xcb) \
- $(use_enable xml libxml2) \
- $(use_enable xv xvideo) \
- $(use_enable zeroconf bonjour) \
- $(use_enable zvbi) $(use_enable !zvbi telx) \
- --disable-asdcp \
- --disable-coverage \
- --disable-cprof \
- --disable-crystalhd \
- --disable-decklink \
- --disable-gles1 \
- --disable-gles2 \
- --disable-goom \
- --disable-kai \
- --disable-kva \
- --disable-maintainer-mode \
- --disable-merge-ffmpeg \
- --disable-mfx \
- --disable-mmal-codec \
- --disable-mmal-vout \
- --disable-opensles \
- --disable-oss \
- --disable-quicktime \
- --disable-rpi-omxil \
- --disable-shine \
- --disable-sndio \
- --disable-vda \
- --disable-vsxu \
- --disable-wasapi
-
- # ^ We don't have these disabled libraries in the Portage tree yet.
-
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
- sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
- virtx emake check-TESTS
-}
-
-src_install() {
- default
-
- # Punt useless libtool's .la files
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if [ "$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" -f "/usr/$(get_libdir)/vlc/plugins/"
- else
- ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
- ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
- ewarn "If you do not do it, vlc will take a long time to load."
- fi
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2018-04-10 21:45 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-04-10 21:45 UTC (permalink / raw
To: gentoo-commits
commit: 8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 21:39:20 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 10 21:45:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1c79dc
media-video/vlc: Fix build with arm
Thanks-to: tt_1 <herrtimson <AT> yahoo.de>
Tested-by: Alexey Korepanov <kaikaikai <AT> yandex.ru>
Closes: https://bugs.gentoo.org/649798
Package-Manager: Portage-2.3.28, Repoman-2.3.9
media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch | 65 ++++++++++++++++++++++
media-video/vlc/vlc-3.0.1-r1.ebuild | 1 +
2 files changed, 66 insertions(+)
diff --git a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch
new file mode 100644
index 00000000000..6ea45d5abf0
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch
@@ -0,0 +1,65 @@
+From: Janne Grunau <janne-vlc@jannau.net>
+Date: Mon, 19 Feb 2018 00:47:53 +0100
+Subject: arm: make the assembler functions compatible with non ELF/gas
+ platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Allow assembling arm neon functions for IOS and arm windows.
+
+Signed-off-by: Martin Storsjö <martin@martin.st>
+(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005)
+Signed-off-by: Thomas Guillem <thomas@gllm.fr>
+
+[Add modules/arm_neon/asm.S missing from orig tarball.]
+---
+ modules/arm_neon/asm.S | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+ create mode 100644 modules/arm_neon/asm.S
+
+diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S
+new file mode 100644
+index 0000000..728391e
+--- /dev/null
++++ b/modules/arm_neon/asm.S
+@@ -0,0 +1,39 @@
++/*
++ * Copyright (c) 2018 Janne Grunau <janne-libav@jannau.net>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifdef __APPLE__
++# define EXTERN_ASM _
++#else
++# define EXTERN_ASM
++#endif
++
++#if defined(__APPLE__) || defined(_WIN32)
++# define HAVE_AS_ARCH_DIRECTIVE 0
++# define HAVE_AS_FPU_DIRECTIVE 0
++#else
++# define HAVE_AS_ARCH_DIRECTIVE 1
++# define HAVE_AS_FPU_DIRECTIVE 1
++#endif
++
++.macro function name
++ .globl EXTERN_ASM\name
++#ifdef __ELF__
++ .type EXTERN_ASM\name, %function
++#endif
++EXTERN_ASM\name:
++.endm
diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild
index bc0c2a189e6..f4d4543afd5 100644
--- a/media-video/vlc/vlc-3.0.1-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.1-r1.ebuild
@@ -226,6 +226,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+ "${FILESDIR}"/${P}-arm-neon-fix.patch # bug 649798
"${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream
)
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2018-05-29 14:41 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-05-29 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 693736686b836589030cd38562bacf7ea492d545
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 14:40:37 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 29 14:41:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69373668
media-video/vlc: Drop 3.0.1-r1
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-video/vlc/Manifest | 1 -
media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch | 65 ---
media-video/vlc/vlc-3.0.1-r1.ebuild | 498 ---------------------
3 files changed, 564 deletions(-)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a5f18bc13c4..d3a85a7c167 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,3 +1,2 @@
DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
-DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca SHA512 f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c
DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
diff --git a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch
deleted file mode 100644
index 6ea45d5abf0..00000000000
--- a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Janne Grunau <janne-vlc@jannau.net>
-Date: Mon, 19 Feb 2018 00:47:53 +0100
-Subject: arm: make the assembler functions compatible with non ELF/gas
- platforms
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Allow assembling arm neon functions for IOS and arm windows.
-
-Signed-off-by: Martin Storsjö <martin@martin.st>
-(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005)
-Signed-off-by: Thomas Guillem <thomas@gllm.fr>
-
-[Add modules/arm_neon/asm.S missing from orig tarball.]
----
- modules/arm_neon/asm.S | 39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
- create mode 100644 modules/arm_neon/asm.S
-
-diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S
-new file mode 100644
-index 0000000..728391e
---- /dev/null
-+++ b/modules/arm_neon/asm.S
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (c) 2018 Janne Grunau <janne-libav@jannau.net>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifdef __APPLE__
-+# define EXTERN_ASM _
-+#else
-+# define EXTERN_ASM
-+#endif
-+
-+#if defined(__APPLE__) || defined(_WIN32)
-+# define HAVE_AS_ARCH_DIRECTIVE 0
-+# define HAVE_AS_FPU_DIRECTIVE 0
-+#else
-+# define HAVE_AS_ARCH_DIRECTIVE 1
-+# define HAVE_AS_FPU_DIRECTIVE 1
-+#endif
-+
-+.macro function name
-+ .globl EXTERN_ASM\name
-+#ifdef __ELF__
-+ .type EXTERN_ASM\name, %function
-+#endif
-+EXTERN_ASM\name:
-+.endm
diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild
deleted file mode 100644
index 1ac9c9a5b14..00000000000
--- a/media-video/vlc/vlc-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
- if [[ ${PV%.9999} != ${PV} ]] ; then
- EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
- fi
- SCM="git-r3"
-else
- if [[ ${MY_P} = ${P} ]] ; then
- SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
- else
- SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
- fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-fi
-inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
- debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
- +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
- libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
- macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
- omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
- run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg
- taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx
- wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
-"
-REQUIRED_USE="
- chromecast? ( encode )
- directx? ( ffmpeg )
- fontconfig? ( truetype )
- libcaca? ( X )
- libtar? ( skins )
- libtiger? ( kate )
- postproc? ( ffmpeg )
- skins? ( qt5 truetype X xml )
- ssl? ( gcrypt )
- vaapi? ( ffmpeg X )
- vdpau? ( ffmpeg X )
-"
-RDEPEND="
- net-dns/libidn:0
- sys-libs/zlib:0[minizip]
- virtual/libintl:0
- virtual/opengl
- a52? ( media-libs/a52dec:0 )
- alsa? ( media-libs/alsa-lib:0 )
- aom? ( media-libs/libaom:= )
- archive? ( app-arch/libarchive:= )
- bidi? (
- dev-libs/fribidi:0
- media-libs/freetype:2[harfbuzz]
- media-libs/harfbuzz
- virtual/ttf-fonts:0
- )
- bluray? ( media-libs/libbluray:0= )
- cddb? ( media-libs/libcddb:0 )
- chromaprint? ( media-libs/chromaprint:0= )
- chromecast? ( >=dev-libs/protobuf-2.5.0:= )
- dbus? ( sys-apps/dbus:0 )
- dc1394? (
- media-libs/libdc1394:2
- sys-libs/libraw1394:0
- )
- dts? ( media-libs/libdca:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
- dvd? (
- >=media-libs/libdvdnav-4.9:0
- >=media-libs/libdvdread-4.9:0
- )
- faad? ( media-libs/faad2:0 )
- fdk? ( media-libs/fdk-aac:0= )
- ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
- libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
- )
- flac? (
- media-libs/flac:0
- media-libs/libogg:0
- )
- fluidsynth? ( media-sound/fluidsynth:0 )
- fontconfig? ( media-libs/fontconfig:1.0 )
- gcrypt? (
- dev-libs/libgcrypt:0=
- dev-libs/libgpg-error:0
- )
- gme? ( media-libs/game-music-emu:0 )
- 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
- )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- kate? ( media-libs/libkate:0 )
- libass? (
- media-libs/fontconfig:1.0
- media-libs/libass:0=
- )
- libcaca? ( media-libs/libcaca:0 )
- libnotify? (
- dev-libs/glib:2
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libnotify:0
- )
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( dev-libs/libtar:0 )
- libtiger? ( media-libs/libtiger:0 )
- linsys? ( media-libs/zvbi )
- lirc? ( app-misc/lirc:0 )
- live? ( media-plugins/live:0 )
- lua? ( >=dev-lang/lua-5.1:0 )
- matroska? (
- dev-libs/libebml:0=
- media-libs/libmatroska:0=
- )
- microdns? ( >=net-libs/libmicrodns-0.0.9:= )
- modplug? ( media-libs/libmodplug:0 )
- mp3? ( media-libs/libmad:0 )
- mpeg? ( media-libs/libmpeg2:0 )
- mtp? ( media-libs/libmtp:0= )
- musepack? ( media-sound/musepack-tools:0 )
- 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 )
- png? ( media-libs/libpng:0= )
- postproc? ( libav? ( media-libs/libpostproc:0= ) )
- projectm? (
- media-fonts/dejavu:0
- media-libs/libprojectm:0
- )
- pulseaudio? ( media-sound/pulseaudio:0 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
- samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
- sdl-image? ( media-libs/sdl-image:0 )
- sftp? ( net-libs/libssh2:0 )
- shout? ( media-libs/libshout:0 )
- sid? ( media-libs/libsidplay:2 )
- skins? (
- x11-libs/libXext:0
- x11-libs/libXinerama:0
- x11-libs/libXpm:0
- )
- soxr? ( media-libs/soxr )
- speex? (
- >=media-libs/speex-1.2.0:0
- media-libs/speexdsp:0
- )
- ssl? ( net-libs/gnutls:0 )
- svg? (
- gnome-base/librsvg:2
- x11-libs/cairo:0
- )
- taglib? ( >=media-libs/taglib-1.9:0 )
- theora? ( media-libs/libtheora:0 )
- tremor? ( media-libs/tremor:0 )
- truetype? (
- media-libs/freetype:2
- virtual/ttf-fonts:0
- !fontconfig? ( media-fonts/dejavu:0 )
- )
- twolame? ( media-sound/twolame:0 )
- udev? ( virtual/udev:0 )
- upnp? ( net-libs/libupnp:= )
- v4l? ( media-libs/libv4l:0 )
- vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
- vcd? ( >=dev-libs/libcdio-0.78.2:0 )
- vdpau? ( x11-libs/libvdpau:0 )
- vnc? ( net-libs/libvncserver:0 )
- vorbis? ( media-libs/libvorbis:0 )
- vpx? ( media-libs/libvpx:0= )
- wayland? (
- dev-libs/wayland
- dev-libs/wayland-protocols
- )
- X? (
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/xcb-util
- x11-libs/xcb-util-keysyms
- )
- x264? ( media-libs/x264:0= )
- x265? ( media-libs/x265:0= )
- xml? ( dev-libs/libxml2:2 )
- 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 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
- "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
- "${FILESDIR}"/${P}-arm-neon-fix.patch # bug 649798
- "${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/647668
- if use chromecast && ! use microdns; then
- einfo "USE=microdns is required for Chromecast autodetection support"
- fi
-}
-
-src_prepare() {
- default
-
- has_version '>=net-libs/libupnp-1.8.0' && \
- eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
- # Bootstrap when we are on a git checkout.
- if [[ ${PV} = *9999 ]] ; then
- ./bootstrap
- fi
-
- # Make it build with libtool 1.5
- rm m4/lt* m4/libtool.m4 || die
-
- # We are not in a real git checkout due to the absence of a .git directory.
- touch src/revision.txt || die
-
- # Don't use --started-from-file when not using dbus.
- if ! use dbus ; then
- sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
- fi
-
- # Disable running of vlc-cache-gen, we do that in pkg_postinst
- sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
- -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
- eautoreconf
-
- # Disable automatic running of tests.
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-aa
- --disable-dependency-tracking
- --disable-optimizations
- --disable-update-check
- --enable-fast-install
- --enable-screen
- --enable-vlc
- $(use_enable a52)
- $(use_enable alsa)
- $(use_enable altivec)
- $(use_enable aom)
- $(use_enable archive)
- $(use_enable bidi fribidi)
- $(use_enable bidi harfbuzz)
- $(use_enable bluray)
- $(use_enable cddb libcddb)
- $(use_enable chromaprint)
- $(use_enable chromecast)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable dbus)
- $(use_enable dbus kwallet)
- $(use_enable dc1394)
- $(use_enable debug)
- $(use_enable directx)
- $(use_enable directx d3d11va)
- $(use_enable directx dxva2)
- $(use_enable dts dca)
- $(use_enable dvbpsi)
- $(use_enable dvd dvdnav)
- $(use_enable dvd dvdread)
- $(use_enable encode sout)
- $(use_enable encode vlm)
- $(use_enable faad)
- $(use_enable fdk fdkaac)
- $(use_enable ffmpeg avcodec)
- $(use_enable ffmpeg avformat)
- $(use_enable ffmpeg swscale)
- $(use_enable flac)
- $(use_enable fluidsynth)
- $(use_enable fontconfig)
- $(use_enable gcrypt libgcrypt)
- $(use_enable gme)
- $(use_enable gnome-keyring secret)
- $(use_enable gstreamer gst-decode)
- $(use_enable ieee1394 dv1394)
- $(use_enable jack)
- $(use_enable jpeg)
- $(use_enable kate)
- $(use_enable libass)
- $(use_enable libcaca caca)
- $(use_enable libnotify notify)
- $(use_enable libsamplerate samplerate)
- $(use_enable libtar)
- $(use_enable libtiger tiger)
- $(use_enable linsys)
- $(use_enable lirc)
- $(use_enable live live555)
- $(use_enable lua)
- $(use_enable macosx-notifications osx-notifications)
- $(use_enable macosx-qtkit)
- $(use_enable matroska)
- $(use_enable microdns)
- $(use_enable modplug mod)
- $(use_enable mp3 mad)
- $(use_enable mpeg libmpeg2)
- $(use_enable mtp)
- $(use_enable musepack mpc)
- $(use_enable ncurses)
- $(use_enable neon)
- $(use_enable ogg)
- $(use_enable omxil)
- $(use_enable omxil omxil-vout)
- $(use_enable opencv)
- $(use_enable optimisememory optimize-memory)
- $(use_enable opus)
- $(use_enable png)
- $(use_enable postproc)
- $(use_enable projectm)
- $(use_enable pulseaudio pulse)
- $(use_enable qt5 qt)
- $(use_enable rdp freerdp)
- $(use_enable rtsp realrtsp)
- $(use_enable run-as-root)
- $(use_enable samba smbclient)
- $(use_enable schroedinger)
- $(use_enable sdl-image)
- $(use_enable sftp)
- $(use_enable shout)
- $(use_enable sid)
- $(use_enable skins skins2)
- $(use_enable soxr)
- $(use_enable speex)
- $(use_enable ssl gnutls)
- $(use_enable svg)
- $(use_enable svg svgdec)
- $(use_enable taglib)
- $(use_enable theora)
- $(use_enable tremor)
- $(use_enable twolame)
- $(use_enable udev)
- $(use_enable upnp)
- $(use_enable v4l v4l2)
- $(use_enable vaapi libva)
- $(use_enable vcd)
- $(use_enable vdpau)
- $(use_enable vnc)
- $(use_enable vorbis)
- $(use_enable vpx)
- $(use_enable wayland)
- $(use_enable wma-fixed)
- $(use_with X x)
- $(use_enable X xcb)
- $(use_enable X xvideo)
- $(use_enable x264)
- $(use_enable x265)
- $(use_enable xml libxml2)
- $(use_enable zeroconf avahi)
- $(use_enable zvbi)
- $(use_enable !zvbi telx)
- --disable-asdcp
- --disable-coverage
- --disable-cprof
- --disable-crystalhd
- --disable-decklink
- --disable-gles2
- --disable-goom
- --disable-kai
- --disable-kva
- --disable-libplacebo
- --disable-maintainer-mode
- --disable-merge-ffmpeg
- --disable-mfx
- --disable-mmal
- --disable-opensles
- --disable-oss
- --disable-rpi-omxil
- --disable-shine
- --disable-sndio
- --disable-spatialaudio
- --disable-srt
- --disable-vsxu
- --disable-wasapi
- )
- # ^ We don't have these disabled libraries in the Portage tree yet.
-
- # Compatibility fix for Samba 4.
- use samba && append-cppflags "-I/usr/include/samba-4.0"
-
- if use x86; then
- # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
- append-cflags $(test-flags-CC -fno-stack-check)
- # Bug 569774
- replace-flags -Os -O2
- fi
-
- # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
- append-cxxflags -std=c++11
-
- # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
- xdg_environment_reset # bug 608256
-
- if use truetype || use bidi; then
- myeconfargs+=( --enable-freetype )
- else
- myeconfargs+=( --disable-freetype )
- fi
-
- if use truetype || use projectm; then
- local dejavu="/usr/share/fonts/dejavu/"
- myeconfargs+=(
- --with-default-font=${dejavu}/DejaVuSans.ttf
- --with-default-font-family=Sans
- --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
- --with-default-monospace-font-family=Monospace
- )
- fi
-
- 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.
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
- sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
- virtx emake check-TESTS
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if [[ "$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
- ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
- ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
- ewarn "If you do not do it, vlc will take a long time to load."
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
- rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2018-05-31 21:16 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-05-31 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 87ea358ab733755cd330c5d5191d79bf1be121e5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 31 21:04:35 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 31 21:16:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ea358a
media-video/vlc: 3.0.3 version bump
Closes: https://bugs.gentoo.org/649798
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-video/vlc/Manifest | 1 +
.../vlc/files/vlc-3.0.3-fix-disable-vlm.patch | 42 ++
media-video/vlc/vlc-3.0.3.ebuild | 499 +++++++++++++++++++++
3 files changed, 542 insertions(+)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index d3a85a7c167..86b22b14ecb 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1,3 @@
DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
+DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
diff --git a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch
new file mode 100644
index 00000000000..fe4eecb8e76
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch
@@ -0,0 +1,42 @@
+From 49450a4ab90bba8530764c5cdb95d648aeda7d52 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
+Date: Mon, 28 May 2018 18:25:15 +0200
+Subject: [PATCH] qt: Fix build with --disable-vlm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fix #20495
+
+(cherry picked from commit 44a635bd4ae16fec5295f6f8aee4dd2ffd7e97d8)
+Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
+---
+ modules/gui/qt/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
+index cb77b14d96..c67f4afc13 100644
+--- a/modules/gui/qt/Makefile.am
++++ b/modules/gui/qt/Makefile.am
+@@ -191,7 +191,6 @@ nodist_libqt_plugin_la_SOURCES = \
+ gui/qt/dialogs/open.moc.cpp \
+ gui/qt/dialogs/openurl.moc.cpp \
+ gui/qt/dialogs/podcast_configuration.moc.cpp \
+- gui/qt/dialogs/vlm.moc.cpp \
+ gui/qt/dialogs/firstrun.moc.cpp \
+ gui/qt/dialogs/extensions.moc.cpp \
+ gui/qt/dialogs/fingerprintdialog.moc.cpp \
+@@ -445,6 +444,10 @@ EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES)
+
+ nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp
+
++if ENABLE_VLM
++nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm.moc.cpp
++endif
++
+ gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES)
+ $(AM_V_GEN)$(RCC) -name vlc -o $@ $<
+
+--
+2.11.0
+
diff --git a/media-video/vlc/vlc-3.0.3.ebuild b/media-video/vlc/vlc-3.0.3.ebuild
new file mode 100644
index 00000000000..e884279f947
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.3.ebuild
@@ -0,0 +1,499 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+ if [[ ${PV%.9999} != ${PV} ]] ; then
+ EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+ else
+ EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+ fi
+ SCM="git-r3"
+else
+ if [[ ${MY_P} = ${P} ]] ; then
+ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+ else
+ SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
+ debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
+ +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
+ libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
+ macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
+ omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
+ run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg
+ taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx
+ wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+"
+REQUIRED_USE="
+ chromecast? ( encode )
+ directx? ( ffmpeg )
+ fontconfig? ( truetype )
+ libcaca? ( X )
+ libtar? ( skins )
+ libtiger? ( kate )
+ postproc? ( ffmpeg )
+ skins? ( qt5 truetype X xml )
+ ssl? ( gcrypt )
+ vaapi? ( ffmpeg X )
+ vdpau? ( ffmpeg X )
+"
+RDEPEND="
+ net-dns/libidn:=
+ sys-libs/zlib:0[minizip]
+ virtual/libintl:0
+ virtual/opengl
+ a52? ( media-libs/a52dec:0 )
+ alsa? ( media-libs/alsa-lib:0 )
+ aom? ( media-libs/libaom:= )
+ archive? ( app-arch/libarchive:= )
+ bidi? (
+ dev-libs/fribidi:0
+ media-libs/freetype:2[harfbuzz]
+ media-libs/harfbuzz
+ virtual/ttf-fonts:0
+ )
+ bluray? ( media-libs/libbluray:0= )
+ cddb? ( media-libs/libcddb:0 )
+ chromaprint? ( media-libs/chromaprint:0= )
+ chromecast? ( >=dev-libs/protobuf-2.5.0:= )
+ dbus? ( sys-apps/dbus:0 )
+ dc1394? (
+ media-libs/libdc1394:2
+ sys-libs/libraw1394:0
+ )
+ dts? ( media-libs/libdca:0 )
+ dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+ dvd? (
+ >=media-libs/libdvdnav-4.9:0
+ >=media-libs/libdvdread-4.9:0
+ )
+ faad? ( media-libs/faad2:0 )
+ fdk? ( media-libs/fdk-aac:0= )
+ ffmpeg? (
+ !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
+ )
+ flac? (
+ media-libs/flac:0
+ media-libs/libogg:0
+ )
+ fluidsynth? ( media-sound/fluidsynth:0 )
+ fontconfig? ( media-libs/fontconfig:1.0 )
+ gcrypt? (
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error:0
+ )
+ gme? ( media-libs/game-music-emu:0 )
+ 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
+ )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ kate? ( media-libs/libkate:0 )
+ libass? (
+ media-libs/fontconfig:1.0
+ media-libs/libass:0=
+ )
+ libcaca? ( media-libs/libcaca:0 )
+ libnotify? (
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libnotify:0
+ )
+ libsamplerate? ( media-libs/libsamplerate:0 )
+ libtar? ( dev-libs/libtar:0 )
+ libtiger? ( media-libs/libtiger:0 )
+ linsys? ( media-libs/zvbi )
+ lirc? ( app-misc/lirc:0 )
+ live? ( media-plugins/live:0 )
+ lua? ( >=dev-lang/lua-5.1:0 )
+ matroska? (
+ dev-libs/libebml:0=
+ media-libs/libmatroska:0=
+ )
+ microdns? ( >=net-libs/libmicrodns-0.0.9:= )
+ modplug? ( media-libs/libmodplug:0 )
+ mp3? ( media-libs/libmad:0 )
+ mpeg? ( media-libs/libmpeg2:0 )
+ mtp? ( media-libs/libmtp:0= )
+ musepack? ( media-sound/musepack-tools:0 )
+ 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 )
+ png? ( media-libs/libpng:0= )
+ postproc? ( libav? ( media-libs/libpostproc:0= ) )
+ projectm? (
+ media-fonts/dejavu:0
+ media-libs/libprojectm:0
+ )
+ pulseaudio? ( media-sound/pulseaudio:0 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
+ )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+ samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+ schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+ sdl-image? ( media-libs/sdl-image:0 )
+ sftp? ( net-libs/libssh2:0 )
+ shout? ( media-libs/libshout:0 )
+ sid? ( media-libs/libsidplay:2 )
+ skins? (
+ x11-libs/libXext:0
+ x11-libs/libXinerama:0
+ x11-libs/libXpm:0
+ )
+ soxr? ( media-libs/soxr )
+ speex? (
+ >=media-libs/speex-1.2.0:0
+ media-libs/speexdsp:0
+ )
+ srt? ( net-libs/srt )
+ ssl? ( net-libs/gnutls:0 )
+ svg? (
+ gnome-base/librsvg:2
+ x11-libs/cairo:0
+ )
+ taglib? ( >=media-libs/taglib-1.9:0 )
+ theora? ( media-libs/libtheora:0 )
+ tremor? ( media-libs/tremor:0 )
+ truetype? (
+ media-libs/freetype:2
+ virtual/ttf-fonts:0
+ !fontconfig? ( media-fonts/dejavu:0 )
+ )
+ twolame? ( media-sound/twolame:0 )
+ udev? ( virtual/udev:0 )
+ upnp? ( net-libs/libupnp:= )
+ v4l? ( media-libs/libv4l:0 )
+ vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
+ vcd? ( >=dev-libs/libcdio-0.78.2:0 )
+ vdpau? ( x11-libs/libvdpau:0 )
+ vnc? ( net-libs/libvncserver:0 )
+ vorbis? ( media-libs/libvorbis:0 )
+ vpx? ( media-libs/libvpx:0= )
+ wayland? (
+ dev-libs/wayland
+ dev-libs/wayland-protocols
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-keysyms
+ )
+ x264? ( media-libs/x264:0= )
+ x265? ( media-libs/x265:0= )
+ xml? ( dev-libs/libxml2:2 )
+ 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 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+ "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
+ "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+ "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream
+ "${FILESDIR}"/${P}-fix-disable-vlm.patch # bug 649798
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ # https://bugs.gentoo.org/647668
+ if use chromecast && ! use microdns; then
+ einfo "USE=microdns is required for Chromecast autodetection support"
+ fi
+}
+
+src_prepare() {
+ default
+
+ has_version '>=net-libs/libupnp-1.8.0' && \
+ eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+ # Bootstrap when we are on a git checkout.
+ if [[ ${PV} = *9999 ]] ; then
+ ./bootstrap
+ fi
+
+ # Make it build with libtool 1.5
+ rm m4/lt* m4/libtool.m4 || die
+
+ # We are not in a real git checkout due to the absence of a .git directory.
+ touch src/revision.txt || die
+
+ # Don't use --started-from-file when not using dbus.
+ if ! use dbus ; then
+ sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+ fi
+
+ # Disable running of vlc-cache-gen, we do that in pkg_postinst
+ sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+ -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+ eautoreconf
+
+ # Disable automatic running of tests.
+ find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-aa
+ --disable-dependency-tracking
+ --disable-optimizations
+ --disable-update-check
+ --enable-fast-install
+ --enable-screen
+ --enable-vlc
+ $(use_enable a52)
+ $(use_enable alsa)
+ $(use_enable altivec)
+ $(use_enable aom)
+ $(use_enable archive)
+ $(use_enable bidi fribidi)
+ $(use_enable bidi harfbuzz)
+ $(use_enable bluray)
+ $(use_enable cddb libcddb)
+ $(use_enable chromaprint)
+ $(use_enable chromecast)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable dbus)
+ $(use_enable dbus kwallet)
+ $(use_enable dc1394)
+ $(use_enable debug)
+ $(use_enable directx)
+ $(use_enable directx d3d11va)
+ $(use_enable directx dxva2)
+ $(use_enable dts dca)
+ $(use_enable dvbpsi)
+ $(use_enable dvd dvdnav)
+ $(use_enable dvd dvdread)
+ $(use_enable encode sout)
+ $(use_enable encode vlm)
+ $(use_enable faad)
+ $(use_enable fdk fdkaac)
+ $(use_enable ffmpeg avcodec)
+ $(use_enable ffmpeg avformat)
+ $(use_enable ffmpeg swscale)
+ $(use_enable flac)
+ $(use_enable fluidsynth)
+ $(use_enable fontconfig)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable gme)
+ $(use_enable gnome-keyring secret)
+ $(use_enable gstreamer gst-decode)
+ $(use_enable ieee1394 dv1394)
+ $(use_enable jack)
+ $(use_enable jpeg)
+ $(use_enable kate)
+ $(use_enable libass)
+ $(use_enable libcaca caca)
+ $(use_enable libnotify notify)
+ $(use_enable libsamplerate samplerate)
+ $(use_enable libtar)
+ $(use_enable libtiger tiger)
+ $(use_enable linsys)
+ $(use_enable lirc)
+ $(use_enable live live555)
+ $(use_enable lua)
+ $(use_enable macosx-notifications osx-notifications)
+ $(use_enable macosx-qtkit)
+ $(use_enable matroska)
+ $(use_enable microdns)
+ $(use_enable modplug mod)
+ $(use_enable mp3 mad)
+ $(use_enable mpeg libmpeg2)
+ $(use_enable mtp)
+ $(use_enable musepack mpc)
+ $(use_enable ncurses)
+ $(use_enable neon)
+ $(use_enable ogg)
+ $(use_enable omxil)
+ $(use_enable omxil omxil-vout)
+ $(use_enable opencv)
+ $(use_enable optimisememory optimize-memory)
+ $(use_enable opus)
+ $(use_enable png)
+ $(use_enable postproc)
+ $(use_enable projectm)
+ $(use_enable pulseaudio pulse)
+ $(use_enable qt5 qt)
+ $(use_enable rdp freerdp)
+ $(use_enable rtsp realrtsp)
+ $(use_enable run-as-root)
+ $(use_enable samba smbclient)
+ $(use_enable schroedinger)
+ $(use_enable sdl-image)
+ $(use_enable sftp)
+ $(use_enable shout)
+ $(use_enable sid)
+ $(use_enable skins skins2)
+ $(use_enable soxr)
+ $(use_enable speex)
+ $(use_enable srt)
+ $(use_enable ssl gnutls)
+ $(use_enable svg)
+ $(use_enable svg svgdec)
+ $(use_enable taglib)
+ $(use_enable theora)
+ $(use_enable tremor)
+ $(use_enable twolame)
+ $(use_enable udev)
+ $(use_enable upnp)
+ $(use_enable v4l v4l2)
+ $(use_enable vaapi libva)
+ $(use_enable vcd)
+ $(use_enable vdpau)
+ $(use_enable vnc)
+ $(use_enable vorbis)
+ $(use_enable vpx)
+ $(use_enable wayland)
+ $(use_enable wma-fixed)
+ $(use_with X x)
+ $(use_enable X xcb)
+ $(use_enable X xvideo)
+ $(use_enable x264)
+ $(use_enable x265)
+ $(use_enable xml libxml2)
+ $(use_enable zeroconf avahi)
+ $(use_enable zvbi)
+ $(use_enable !zvbi telx)
+ --disable-asdcp
+ --disable-coverage
+ --disable-cprof
+ --disable-crystalhd
+ --disable-decklink
+ --disable-gles2
+ --disable-goom
+ --disable-kai
+ --disable-kva
+ --disable-libplacebo
+ --disable-maintainer-mode
+ --disable-merge-ffmpeg
+ --disable-mfx
+ --disable-mmal
+ --disable-opensles
+ --disable-oss
+ --disable-rpi-omxil
+ --disable-shine
+ --disable-sndio
+ --disable-spatialaudio
+ --disable-vsxu
+ --disable-wasapi
+ )
+ # ^ We don't have these disabled libraries in the Portage tree yet.
+
+ # Compatibility fix for Samba 4.
+ use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+ if use x86; then
+ # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+ append-cflags $(test-flags-CC -fno-stack-check)
+ # Bug 569774
+ replace-flags -Os -O2
+ fi
+
+ # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+ append-cxxflags -std=c++11
+
+ # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+ append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+ xdg_environment_reset # bug 608256
+
+ if use truetype || use bidi; then
+ myeconfargs+=( --enable-freetype )
+ else
+ myeconfargs+=( --disable-freetype )
+ fi
+
+ if use truetype || use projectm; then
+ local dejavu="/usr/share/fonts/dejavu/"
+ myeconfargs+=(
+ --with-default-font=${dejavu}/DejaVuSans.ttf
+ --with-default-font-family=Sans
+ --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+ --with-default-monospace-font-family=Monospace
+ )
+ fi
+
+ 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.
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+ sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+ virtx emake check-TESTS
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if [[ "$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
+ ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+ ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+ ewarn "If you do not do it, vlc will take a long time to load."
+ fi
+
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+ rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+ fi
+
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2018-08-11 16:44 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-08-11 16:44 UTC (permalink / raw
To: gentoo-commits
commit: da6e5a8bc6d2a4598852471e692fefb94b71180a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 13:51:45 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 16:43:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6e5a8b
media-video/vlc: Fix build with >=dev-libs/fribidi-1
Thanks-to: Greg Turner <gmturner007 <AT> ameritech.net>
Closes: https://bugs.gentoo.org/662662
Package-Manager: Portage-2.3.45, Repoman-2.3.10
media-video/vlc/files/vlc-3.0.3-fribidi-1.patch | 80 +++++++++++++++++++++++++
media-video/vlc/vlc-3.0.3-r1.ebuild | 1 +
2 files changed, 81 insertions(+)
diff --git a/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch b/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch
new file mode 100644
index 00000000000..4431025a21e
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch
@@ -0,0 +1,80 @@
+From 26e2d3906658c30f2f88f4b1bc9630ec43bf5525 Mon Sep 17 00:00:00 2001
+From: Shaleen Jain <shaleen@jain.sh>
+Date: Sun, 25 Feb 2018 18:42:27 +0530
+Subject: [PATCH] fribidi: update for version 1.0
+
+Update functions deprecated in version 1.0 when building with release 1.0 and
+above.
+
+Signed-off-by: Thomas Guillem <thomas@gllm.fr>
+---
+ modules/text_renderer/freetype/text_layout.c | 24 ++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c
+index 13efd567b46..1a28786d097 100644
+--- a/modules/text_renderer/freetype/text_layout.c
++++ b/modules/text_renderer/freetype/text_layout.c
+@@ -153,6 +153,9 @@ typedef struct paragraph_t
+
+ #ifdef HAVE_FRIBIDI
+ FriBidiCharType *p_types;
++#if FRIBIDI_MAJOR_VERSION >= 1
++ FriBidiBracketType *p_btypes;
++#endif
+ FriBidiLevel *p_levels;
+ FriBidiStrIndex *pi_reordered_indices;
+ FriBidiParType paragraph_type;
+@@ -361,6 +364,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter,
+ #ifdef HAVE_FRIBIDI
+ p_paragraph->p_levels = vlc_alloc( i_size, sizeof( *p_paragraph->p_levels ) );
+ p_paragraph->p_types = vlc_alloc( i_size, sizeof( *p_paragraph->p_types ) );
++#if FRIBIDI_MAJOR_VERSION >= 1
++ p_paragraph->p_btypes = vlc_alloc( i_size, sizeof( *p_paragraph->p_btypes ) );
++#endif
+ p_paragraph->pi_reordered_indices =
+ vlc_alloc( i_size, sizeof( *p_paragraph->pi_reordered_indices ) );
+
+@@ -398,6 +404,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter,
+ #ifdef HAVE_FRIBIDI
+ if( p_paragraph->p_levels ) free( p_paragraph->p_levels );
+ if( p_paragraph->p_types ) free( p_paragraph->p_types );
++#if FRIBIDI_MAJOR_VERSION >= 1
++ if( p_paragraph->p_btypes ) free( p_paragraph->p_btypes );
++#endif
+ if( p_paragraph->pi_reordered_indices )
+ free( p_paragraph->pi_reordered_indices );
+ #endif
+@@ -424,6 +433,9 @@ static void FreeParagraph( paragraph_t *p_paragraph )
+ #ifdef HAVE_FRIBIDI
+ free( p_paragraph->pi_reordered_indices );
+ free( p_paragraph->p_types );
++#if FRIBIDI_MAJOR_VERSION >= 1
++ free( p_paragraph->p_btypes );
++#endif
+ free( p_paragraph->p_levels );
+ #endif
+
+@@ -436,10 +448,22 @@ static int AnalyzeParagraph( paragraph_t *p_paragraph )
+ fribidi_get_bidi_types( p_paragraph->p_code_points,
+ p_paragraph->i_size,
+ p_paragraph->p_types );
++#if FRIBIDI_MAJOR_VERSION >= 1
++ fribidi_get_bracket_types( p_paragraph->p_code_points,
++ p_paragraph->i_size,
++ p_paragraph->p_types,
++ p_paragraph->p_btypes );
++ fribidi_get_par_embedding_levels_ex( p_paragraph->p_types,
++ p_paragraph->p_btypes,
++ p_paragraph->i_size,
++ &p_paragraph->paragraph_type,
++ p_paragraph->p_levels );
++#else
+ fribidi_get_par_embedding_levels( p_paragraph->p_types,
+ p_paragraph->i_size,
+ &p_paragraph->paragraph_type,
+ p_paragraph->p_levels );
++#endif
+
+ #ifdef HAVE_HARFBUZZ
+ hb_unicode_funcs_t *p_funcs = hb_unicode_funcs_get_default();
diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild
index 3a76f2f5cf9..f446a714430 100644
--- a/media-video/vlc/vlc-3.0.3-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.3-r1.ebuild
@@ -230,6 +230,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream
"${FILESDIR}"/${P}-fix-disable-vlm.patch # bug 649798
+ "${FILESDIR}"/${P}-fribidi-1.patch # bug 662662
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2018-08-15 12:36 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-08-15 12:36 UTC (permalink / raw
To: gentoo-commits
commit: 3a1d816d9bd8cc13bf203fd4076ec8059596e8ca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 10 20:28:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 12:35:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1d816d
media-video/vlc: Drop 2.2.8-r1
Closes: https://bugs.gentoo.org/647606
Package-Manager: Portage-2.3.41, Repoman-2.3.9
media-video/vlc/Manifest | 1 -
media-video/vlc/files/qt4-select.patch | 51 ---
media-video/vlc/files/vlc-2.2.2-qt5widgets.patch | 13 -
.../vlc/files/vlc-2.2.4-alsa-large-buffers.patch | 47 --
media-video/vlc/files/vlc-2.2.4-cxx0x.patch | 11 -
media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch | 160 -------
media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch | 45 --
.../vlc/files/vlc-2.2.6-decoder-lock-scope.patch | 34 --
.../vlc/files/vlc-2.2.8-libupnp-compat.patch | 28 --
media-video/vlc/metadata.xml | 15 -
media-video/vlc/vlc-2.2.8-r1.ebuild | 480 ---------------------
11 files changed, 885 deletions(-)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 82d849bd006..06f4d1b15d5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1 @@
-DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch
deleted file mode 100644
index fb1526a30a7..00000000000
--- a/media-video/vlc/files/qt4-select.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54
-For use until upstream ever accepts this patch or fixes it themsleves
---- a/configure.ac
-+++ b/configure.ac
-@@ -3709,7 +3709,8 @@
- ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
-- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-+ AS_IF([test "${enable_qt}" != "4"], [
-+ PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
- PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
- VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-@@ -3721,20 +3722,23 @@
- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
- AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
- AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ enable_qt="5"
-- ], [
-- PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
-- AS_IF([test -n "${enable_qt}"],[
-- AC_MSG_ERROR([${QT_PKG_ERRORS}.])
-- ],[
-- AC_MSG_WARN([${QT_PKG_ERRORS}.])
-- ])
-- enable_qt="no"
-+ ])
-+ ])
-+ AS_IF([test "${enable_qt}" != "5"], [
-+ PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
-+ AS_IF([test -n "${enable_qt}"],[
-+ AC_MSG_ERROR([${QT_PKG_ERRORS}.])
-+ ],[
-+ AC_MSG_WARN([${QT_PKG_ERRORS}.])
- ])
-- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-- AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ enable_qt="no"
- ])
-+ QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
- VLC_ADD_PLUGIN([qt4])
-
diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
deleted file mode 100644
index a024d0032b6..00000000000
--- a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vlc-2.2.2/configure.ac
-+++ vlc-2.2.2/configure.ac
-@@ -3754,10 +3754,6 @@
- AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
- ])
-
-- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
-- AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
-- ])
--
- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
- QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
diff --git a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch b/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
deleted file mode 100644
index b5a9ff7267f..00000000000
--- a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=4e9fd53592d048baa8b57f30df15ab5806139d07;hp=2d1f99e9cb743bca12c6bdf32cc84a92d07fda8b;hb=47f74a83c161173b0d15e95dab8ceb7c97de51b4;hpb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a
-
-diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
-index 2d1f99e..4e9fd53 100644
---- a/modules/audio_output/alsa.c
-+++ b/modules/audio_output/alsa.c
-@@ -495,6 +495,15 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
- }
- sys->rate = fmt->i_rate;
-
-+#if 1 /* work-around for period-long latency outputs (e.g. PulseAudio): */
-+ param = AOUT_MIN_PREPARE_TIME;
-+ val = snd_pcm_hw_params_set_period_time_near (pcm, hw, ¶m, NULL);
-+ if (val)
-+ {
-+ msg_Err (aout, "cannot set period: %s", snd_strerror (val));
-+ goto error;
-+ }
-+#endif
- /* Set buffer size */
- param = AOUT_MAX_ADVANCE_TIME;
- val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, ¶m, NULL);
-@@ -503,14 +512,22 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
- msg_Err (aout, "cannot set buffer duration: %s", snd_strerror (val));
- goto error;
- }
--
-- param = AOUT_MIN_PREPARE_TIME;
-+#if 0
-+ val = snd_pcm_hw_params_get_buffer_time (hw, ¶m, NULL);
-+ if (val)
-+ {
-+ msg_Warn (aout, "cannot get buffer time: %s", snd_strerror(val));
-+ param = AOUT_MIN_PREPARE_TIME;
-+ }
-+ else
-+ param /= 2;
- val = snd_pcm_hw_params_set_period_time_near (pcm, hw, ¶m, NULL);
- if (val)
- {
- msg_Err (aout, "cannot set period: %s", snd_strerror (val));
- goto error;
- }
-+#endif
-
- /* Commit hardware parameters */
- val = snd_pcm_hw_params (pcm, hw);
diff --git a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch b/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
deleted file mode 100644
index cb3d63522de..00000000000
--- a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2016-09-21 07:10:58.885508665 +0200
-+++ b/configure.ac 2016-09-21 07:19:17.835725004 +0200
-@@ -3746,7 +3746,7 @@
- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
- PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
- VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
-- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-+ VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11 -std=c++0x])
- PKG_CHECK_MODULES([XI], [xi], [
- VLC_ADD_LIBS([qt4], [${XI_LIBS}])
- VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI])
diff --git a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
deleted file mode 100644
index 3bc5954920d..00000000000
--- a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: vlc-2.2.4/configure.ac
-===================================================================
---- vlc-2.2.4.orig/configure.ac
-+++ vlc-2.2.4/configure.ac
-@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec,
- [ --enable-avcodec libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
-- PKG_CHECK_EXISTS([libavutil < 55],, [
-- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
-+ PKG_CHECK_EXISTS([libavutil < 56],, [
-+ AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
- ])
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-Index: vlc-2.2.4/modules/codec/avcodec/audio.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/audio.c
-+++ vlc-2.2.4/modules/codec/avcodec/audio.c
-@@ -39,8 +39,6 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
-
--#include <libavutil/audioconvert.h>
--
- #include "avcodec.h"
-
- /*****************************************************************************
-Index: vlc-2.2.4/modules/codec/avcodec/encoder.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c
-+++ vlc-2.2.4/modules/codec/avcodec/encoder.c
-@@ -41,7 +41,6 @@
- #include <vlc_cpu.h>
-
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
-
- #include "avcodec.h"
- #include "avcommon.h"
-@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
- else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
- &psz_namecodec ) )
- {
-- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
-+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
- return VLC_EGENERIC; /* handed chroma output */
-
- i_cat = VIDEO_ES;
-@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
-
- if( p_codec->pix_fmts )
- {
-- const enum PixelFormat *p = p_codec->pix_fmts;
-+ const enum AVPixelFormat *p = p_codec->pix_fmts;
- for( ; *p != -1; p++ )
- {
- if( *p == p_context->pix_fmt ) break;
-@@ -1017,7 +1016,7 @@ errmsg:
- }
- }
-
-- p_sys->frame = avcodec_alloc_frame();
-+ p_sys->frame = av_frame_alloc();
- if( !p_sys->frame )
- {
- goto error;
-@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
- AVFrame *frame = NULL;
- if( likely(p_pict) ) {
- frame = p_sys->frame;
-- avcodec_get_frame_defaults( frame );
-+ av_frame_unref( frame );
- for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
- {
- p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
-@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
- //How much we need to copy from new packet
- const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
-
-- avcodec_get_frame_defaults( p_sys->frame );
-+ av_frame_unref( p_sys->frame );
- p_sys->frame->format = p_sys->p_context->sample_fmt;
- p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
-
-@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
- while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
- ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
- {
-- avcodec_get_frame_defaults( p_sys->frame );
-+ av_frame_unref( p_sys->frame );
- if( p_sys->b_variable )
- p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
- else
-Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c
-+++ vlc-2.2.4/modules/codec/avcodec/vaapi.c
-@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod
- return err;
-
- /* Only VLD supported */
-- p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
-+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
- p_va->setup = Setup;
- p_va->get = Get;
- p_va->release = Release;
-Index: vlc-2.2.4/modules/codec/avcodec/video.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/video.c
-+++ vlc-2.2.4/modules/codec/avcodec/video.c
-@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
- static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
- static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
- #endif
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
-- const enum PixelFormat * );
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
-+ const enum AVPixelFormat * );
-
- static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
- {
-@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
- p_sys->p_codec = p_codec;
- p_sys->i_codec_id = i_codec_id;
- p_sys->psz_namecodec = psz_namecodec;
-- p_sys->p_ff_pic = avcodec_alloc_frame();
-+ p_sys->p_ff_pic = av_frame_alloc();
- p_sys->b_delayed_open = true;
- p_sys->p_va = NULL;
- vlc_sem_init( &p_sys->sem_mt, 0 );
-@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
- if( ffmpeg_OpenCodec( p_dec ) < 0 )
- {
- msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
-- avcodec_free_frame( &p_sys->p_ff_pic );
-+ av_frame_free( &p_sys->p_ff_pic );
- vlc_sem_destroy( &p_sys->sem_mt );
- free( p_sys );
- return VLC_EGENERIC;
-@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
- wait_mt( p_sys );
-
- if( p_sys->p_ff_pic )
-- avcodec_free_frame( &p_sys->p_ff_pic );
-+ av_frame_free( &p_sys->p_ff_pic );
-
- if( p_sys->p_va )
- vlc_va_Delete( p_sys->p_va );
-@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
- }
- #endif
-
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-- const enum PixelFormat *pi_fmt )
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-+ const enum AVPixelFormat *pi_fmt )
- {
- decoder_t *p_dec = p_context->opaque;
- decoder_sys_t *p_sys = p_dec->p_sys;
diff --git a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
deleted file mode 100644
index 218af58281f..00000000000
--- a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752
-Author: Rafaël Carré <funman@videolan.org>
-Date: Fri Feb 26 00:36:26 2016 +0000
-
- Relax requirements for FFmpeg hwaccel
-
- It doesn't error out anymore since 5edd1f62ca1
-
-Index: vlc-2.2.4/configure.ac
-===================================================================
---- vlc-2.2.4.orig/configure.ac
-+++ vlc-2.2.4/configure.ac
-@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
- case "${avfork}" in
- ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+ ])
- ])
- ;;
- esac
-@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"],
- case "${avfork}" in
- ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+ ])
- ])
- ;;
- esac
-@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
- libav) av_vdpau_ver="55.26.0" ;;
- ffmpeg) av_vdpau_ver="55.42.100"
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+ ])
- ])
- ;;
- esac
diff --git a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
deleted file mode 100644
index 2e8064446d0..00000000000
--- a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
-
---- a/src/input/decoder.c
-+++ b/src/input/decoder.c
-@@ -1162,7 +1162,10 @@
- b_paused = p_owner->b_paused;
-
- if (!p_audio)
-+ {
-+ vlc_mutex_unlock( &p_owner->lock );
- break;
-+ }
-
- /* */
- int i_rate = INPUT_RATE_DEFAULT;
-@@ -1180,6 +1183,9 @@
-
- if( unlikely(p_owner->b_paused != b_paused) )
- continue; /* race with input thread? retry... */
-+
-+ vlc_mutex_unlock( &p_owner->lock );
-+
- if( p_aout == NULL )
- b_reject = true;
-
-@@ -1199,7 +1205,6 @@
-
- break;
- }
-- vlc_mutex_unlock( &p_owner->lock );
- }
-
- static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
-
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
deleted file mode 100644
index 57b66685ede..00000000000
--- a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001
-From: Tristan Matthews <tmatth@videolan.org>
-Date: Wed, 29 Nov 2017 10:45:04 -0500
-Subject: [PATCH] upnp: don't clash with libupnp's own compat code
-
-Fixes build for upnp >= 1.6.23 and less than 1.8.
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/services_discovery/upnp.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
-index bdd3c55ee5..82d43632f4 100644
---- a/modules/services_discovery/upnp.cpp
-+++ b/modules/services_discovery/upnp.cpp
-@@ -38,7 +38,7 @@
- #include <set>
- #include <string>
-
--#if UPNP_VERSION < 10800
-+#if UPNP_VERSION < 10623
- /*
- * Compat functions and typedefs for libupnp prior to 1.8
- */
---
-2.11.0
-
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 1ce2f06bd57..170d86d98e4 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -9,27 +9,19 @@
<flag name="aom">Enable experimental support for AV1 codec</flag>
<flag name="archive">Enable support for libarchive stream extractor</flag>
<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag>
- <flag name="atmo">Enable support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
- <flag name="audioqueue">Enable AudioQueue audio module for Mac OS X</flag>
- <flag name="avcodec">Enable libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg</flag>
- <flag name="avformat">Enable libformat support for reading and writing various media containers. libavformat is part of FFmpeg</flag>
<flag name="bluray">Enable libbluray for Blu-ray disc support</flag>
<flag name="chromaprint">Enable libchromaprint for Chromaprint based audio fingerprinter support</flag>
<flag name="chromecast">Enable experimental support for Google Chromecast</flag>
<flag name="dc1394">Enable IIDC cameras support</flag>
<flag name="directx">Enable Win32 DirectX support</flag>
<flag name="dvbpsi">Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg></flag>
- <flag name="dxva2">Enable Win32 DxVA2 support</flag>
<flag name="encode">Enable streaming-output support and videolan manager to control multiple streams from within one instance</flag>
<flag name="faad">Enable AAC audio decoding library support via media-libs/faad2</flag>
<flag name="fdk">Enable the Fraunhofer AAC codec library</flag>
<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis (with external sound fonts)</flag>
<flag name="gcrypt">Enable cryptography support via libgcrypt</flag>
<flag name="gme">Enable support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats</flag>
- <flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related</flag>
- <flag name="growl">Enable growl notification support (over UDP for remote access and native on OSX)</flag>
<flag name="gstreamer">Enable GStreamer based decoding support (currently supports only video decoding)</flag>
- <flag name="httpd">Enable a web based interface for vlc</flag>
<flag name="kate">Adds support for Ogg Kate subtitles via libkate</flag>
<flag name="kms">Enable kernel mode setting video output plugin via <pkg>x11-libs/libdrm</pkg></flag>
<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins</flag>
@@ -37,10 +29,7 @@
<flag name="linsys">Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards</flag>
<flag name="live">Enable live555 streaming media support (client support for rtsp)</flag>
<flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things</flag>
- <flag name="macosx-dialog-provider">Enable Mac OS X dialog module</flag>
- <flag name="macosx-eyetv">Enable Mac OS X EyeTV (TNT Tuner) module</flag>
<flag name="macosx-notifications">Enable Mac OS X notifications module (formerly growl)</flag>
- <flag name="macosx-quartztext">Enable Mac OS X quartz text module</flag>
<flag name="macosx-qtkit">Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module</flag>
<flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag>
@@ -61,17 +50,13 @@
<flag name="skins">Enable support for the skins2 interface</flag>
<flag name="soxr">Enable SoX Resampler support via <pkg>media-libs/soxr</pkg></flag>
<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
- <flag name="swscale">Enable image scaling and conversion via libswscale (part of FFmpeg)</flag>
<flag name="tremor">Enable tremor, a fixed-point version of the Ogg Vorbis decoder</flag>
<flag name="twolame">Enable twolame support (MPEG Audio Layer 2 encoder)</flag>
<flag name="upnp">Enable support for the Intel SDK stack based UPnP discovery module instead of CyberLink</flag>
- <flag name="vcdx">Enable VCD with navigation via libvcdinfo (depends on cdio)</flag>
- <flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC</flag>
<flag name="vpx">Enable the decoder(s) from the WebM VP8 / VP9 Codec SDK</flag>
<flag name="wma-fixed">Enable fixed point WMA decoder</flag>
<flag name="X">Enable support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface</flag>
<flag name="x265">Support X265 Encoder</flag>
- <flag name="xcb">Support the X C-language Binding, a replacement for Xlib; !!! you will need this option to be able to integrate video in the Qt interface, see bug #500678</flag>
<flag name="zeroconf">Enable support for zero-configuration networking via avahi</flag>
<flag name="zvbi">Enable support for teletext subtitles via the zvbi library</flag>
</use>
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
deleted file mode 100644
index df48927b371..00000000000
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ /dev/null
@@ -1,480 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
- if [[ ${PV%.9999} != ${PV} ]] ; then
- EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
- fi
- SCM="git-r3"
-else
- if [[ ${MY_P} = ${P} ]] ; then
- SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
- else
- SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
- fi
- KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
-fi
-inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
- cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2
- elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
- gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
- libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
- macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
- matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
- omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
- +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
- sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
- twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
- x264 x265 +xcb xml xv zeroconf zvbi
-"
-REQUIRED_USE="
- aalib? ( X )
- bidi? ( truetype )
- cddb? ( cdda )
- dvb? ( dvbpsi )
- dxva2? ( avcodec )
- ffmpeg? ( avcodec avformat swscale )
- fontconfig? ( truetype )
- gnutls? ( gcrypt )
- httpd? ( lua )
- libcaca? ( X )
- libtar? ( skins )
- libtiger? ( kate )
- qt5? ( X )
- sdl? ( X )
- skins? ( qt5 truetype X xml )
- vaapi? ( avcodec X )
- vdpau? ( X )
- vlm? ( encode )
- xv? ( xcb )
-"
-RDEPEND="
- dev-libs/libgpg-error:0
- net-dns/libidn:0
- sys-libs/zlib:0[minizip]
- virtual/libintl:0
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
- aalib? ( media-libs/aalib:0 )
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
- avcodec? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- avformat? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- bidi? ( dev-libs/fribidi:0 )
- bluray? ( >=media-libs/libbluray-0.3:0= )
- cddb? ( >=media-libs/libcddb-1.2:0 )
- chromaprint? ( >=media-libs/chromaprint-0.6:0 )
- dbus? ( >=sys-apps/dbus-1.6:0 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
- dts? ( >=media-libs/libdca-0.0.5:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
- elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
- faad? ( >=media-libs/faad2-2.6.1:0 )
- fdk? ( media-libs/fdk-aac:0 )
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
- fontconfig? ( media-libs/fontconfig:1.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
- gme? ( media-libs/game-music-emu:0 )
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
- gnutls? ( >=net-libs/gnutls-3.0.20:0 )
- gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- kate? ( >=media-libs/libkate-0.3:0 )
- libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
- libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
- libtiger? ( >=media-libs/libtiger-0.3.1:0 )
- linsys? ( >=media-libs/zvbi-0.2.28:0 )
- lirc? ( app-misc/lirc:0 )
- live? ( >=media-plugins/live-2011.12.23:0 )
- lua? ( >=dev-lang/lua-5.1:0 )
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
- mp3? ( media-libs/libmad:0 )
- mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
- mtp? ( >=media-libs/libmtp-1:0 )
- musepack? ( >=media-sound/musepack-tools-444:0 )
- ncurses? ( sys-libs/ncurses:0=[unicode] )
- ogg? ( >=media-libs/libogg-1:0 )
- opencv? ( >media-libs/opencv-2:0= )
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
- opus? ( >=media-libs/opus-1.0.3:0 )
- png? ( media-libs/libpng:0= )
- postproc? (
- !libav? ( >=media-video/ffmpeg-2.2:0= )
- libav? ( media-libs/libpostproc:0= )
- )
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
- pulseaudio? ( >=media-sound/pulseaudio-1:0 )
- qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
- samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
- sdl? ( >=media-libs/libsdl-1.2.10:0
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) )
- sftp? ( net-libs/libssh2:0 )
- shout? ( >=media-libs/libshout-2.1:0 )
- sid? ( media-libs/libsidplay:2 )
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
- speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
- swscale? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- taglib? ( >=media-libs/taglib-1.9:0 )
- theora? ( >=media-libs/libtheora-1.0_beta3:0 )
- tremor? ( media-libs/tremor:0 )
- truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
- !fontconfig? ( media-fonts/dejavu:0 ) )
- twolame? ( media-sound/twolame:0 )
- udev? ( >=virtual/udev-142:0 )
- upnp? ( net-libs/libupnp:= )
- v4l? ( media-libs/libv4l:0 )
- vaapi? (
- x11-libs/libva:0=[X,drm]
- !libav? ( media-video/ffmpeg:0=[vaapi] )
- libav? ( media-video/libav:0=[vaapi] )
- )
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
- vdpau? (
- x11-libs/libvdpau:0
- !libav? ( media-video/ffmpeg:0= )
- libav? ( >=media-video/libav-10:0= )
- )
- vnc? ( >=net-libs/libvncserver-0.9.9:0 )
- vorbis? ( media-libs/libvorbis:0 )
- vpx? ( media-libs/libvpx:0= )
- X? ( x11-libs/libX11:0 )
- x264? ( media-libs/x264:0= )
- x265? ( media-libs/x265:0= )
- xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
- xml? ( dev-libs/libxml2:2 )
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
- zvbi? ( media-libs/zvbi:0 )
-"
-DEPEND="${RDEPEND}
- app-arch/xz-utils:0
- >=sys-devel/gettext-0.18.3:*
- virtual/pkgconfig:*
- amd64? ( dev-lang/yasm:* )
- x86? ( dev-lang/yasm:* )
- xcb? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
- # Fix build system mistake.
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
- # Bug #541678
- "${FILESDIR}"/qt4-select.patch
-
- # Allow QT5.5 since Gentoo has a patched QTwidgets
- "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
-
- # Bug #575072
- "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
- "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
-
- # Bug #589396
- "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
-
- # Bug #594126, #629294
- "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
- "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
-
- # Bug #593460
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
-
- "${FILESDIR}"/${P}-libupnp-compat.patch
-
- # Bug 590164
- "${FILESDIR}"/${P}-freerdp-2.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
-
- # Bootstrap when we are on a git checkout.
- if [[ ${PV} = *9999 ]] ; then
- ./bootstrap
- fi
-
- # Make it build with libtool 1.5
- rm -f m4/lt* m4/libtool.m4 || die
-
- # We are not in a real git checkout due to the absence of a .git directory.
- touch src/revision.txt || die
-
- # Don't use --started-from-file when not using dbus.
- if ! use dbus ; then
- sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
- fi
-
- # Disable running of vlc-cache-gen, we do that in pkg_postinst
- sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
- -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
- eautoreconf
-
- # Disable automatic running of tests.
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
- # version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
- if use qt5; then
- export QT_SELECT=qt5
- fi
-}
-
-src_configure() {
- local myconf
-
- # Compatibility fix for Samba 4.
- use samba && append-cppflags "-I/usr/include/samba-4.0"
-
- if use x86; then
- # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
- append-cflags $(test-flags-CC -fno-stack-check)
- # Bug 569774
- replace-flags -Os -O2
- fi
-
- # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
- xdg_environment_reset # bug 608256
-
- if use truetype || use projectm ; then
- local dejavu="/usr/share/fonts/dejavu/"
- myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
- --with-default-font-family=Sans \
- --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
- --with-default-monospace-font-family=Monospace"
- fi
-
- if use qt5 ; then
- myconf+=" --enable-qt=5"
- else
- myconf+=" --disable-qt"
- fi
-
- econf \
- ${myconf} \
- --enable-vlc \
- --docdir=/usr/share/doc/${PF} \
- --disable-dependency-tracking \
- --disable-optimizations \
- --disable-update-check \
- --enable-fast-install \
- --enable-screen \
- $(use_enable a52) \
- $(use_enable aalib aa) \
- $(use_enable alsa) \
- $(use_enable altivec) \
- $(use_enable atmo) \
- $(use_enable audioqueue) \
- $(use_enable avcodec) \
- $(use_enable avformat) \
- $(use_enable bidi fribidi) \
- $(use_enable bluray) \
- $(use_enable cdda vcd) \
- $(use_enable cddb libcddb) \
- $(use_enable chromaprint) \
- $(use_enable dbus) \
- $(use_enable directx) \
- $(use_enable dc1394) \
- $(use_enable debug) \
- $(use_enable dts dca) \
- $(use_enable dvbpsi) \
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
- $(use_enable dxva2) \
- $(use_enable encode sout) \
- $(use_enable faad) \
- $(use_enable fdk fdkaac) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable fontconfig) \
- $(use_enable gcrypt libgcrypt) \
- $(use_enable gme) \
- $(use_enable gnome gnomevfs) \
- $(use_enable gnutls) \
- $(use_enable growl) \
- $(use_enable gstreamer gst-decode) \
- $(use_enable httpd) \
- $(use_enable ieee1394 dv1394) \
- $(use_enable jack) \
- $(use_enable jpeg) \
- $(use_enable kate) \
- $(use_enable libass) \
- $(use_enable libcaca caca) \
- $(use_enable libnotify notify) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable libtar) \
- $(use_enable libtiger tiger) \
- $(use_enable linsys) \
- $(use_enable lirc) \
- $(use_enable live live555) \
- $(use_enable lua) \
- $(use_enable macosx-dialog-provider) \
- $(use_enable macosx-eyetv) \
- $(use_enable macosx-qtkit) \
- $(use_enable macosx-quartztext) \
- $(use_enable matroska mkv) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable modplug mod) \
- $(use_enable mp3 mad) \
- $(use_enable mpeg libmpeg2) \
- $(use_enable mtp) \
- $(use_enable musepack mpc) \
- $(use_enable ncurses) \
- $(use_enable neon) \
- $(use_enable ogg) $(use_enable ogg mux_ogg) \
- $(use_enable omxil) \
- $(use_enable omxil omxil-vout) \
- $(use_enable opencv) \
- $(use_enable opengl glspectrum) \
- $(use_enable opus) \
- $(use_enable optimisememory optimize-memory) \
- $(use_enable png) \
- $(use_enable postproc) \
- $(use_enable projectm) \
- $(use_enable pulseaudio pulse) \
- $(use_enable rdp freerdp) \
- $(use_enable rtsp realrtsp) \
- $(use_enable run-as-root) \
- $(use_enable samba smbclient) \
- $(use_enable schroedinger) \
- $(use_enable sdl) \
- $(use_enable sdl-image) \
- $(use_enable sid) \
- $(use_enable sftp) \
- $(use_enable shout) \
- $(use_enable skins skins2) \
- $(use_enable speex) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable svg) \
- $(use_enable svg svgdec) \
- $(use_enable swscale) \
- $(use_enable taglib) \
- $(use_enable theora) \
- $(use_enable tremor) \
- $(use_enable truetype freetype) \
- $(use_enable twolame) \
- $(use_enable udev) \
- $(use_enable upnp) \
- $(use_enable v4l v4l2) \
- $(use_enable vaapi libva) \
- $(use_enable vcdx) \
- $(use_enable vdpau) \
- $(use_enable vlm) \
- $(use_enable vnc) \
- $(use_enable vorbis) \
- $(use_enable vpx) \
- $(use_enable wma-fixed) \
- $(use_with X x) \
- $(use_enable x264) \
- $(use_enable x265) \
- $(use_enable xcb) \
- $(use_enable xml libxml2) \
- $(use_enable xv xvideo) \
- $(use_enable zeroconf bonjour) \
- $(use_enable zvbi) $(use_enable !zvbi telx) \
- --disable-asdcp \
- --disable-coverage \
- --disable-cprof \
- --disable-crystalhd \
- --disable-decklink \
- --disable-directfb \
- --disable-gles1 \
- --disable-gles2 \
- --disable-goom \
- --disable-kai \
- --disable-kva \
- --disable-maintainer-mode \
- --disable-merge-ffmpeg \
- --disable-mfx \
- --disable-mmal-codec \
- --disable-mmal-vout \
- --disable-opensles \
- --disable-oss \
- --disable-quicktime \
- --disable-rpi-omxil \
- --disable-shine \
- --disable-sndio \
- --disable-vda \
- --disable-vsxu \
- --disable-wasapi
-
- # ^ We don't have these disabled libraries in the Portage tree yet.
-
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
- sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
- virtx emake check-TESTS
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if [[ "$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" -f "/usr/$(get_libdir)/vlc/plugins/"
- else
- ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
- ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
- ewarn "If you do not do it, vlc will take a long time to load."
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
- rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2019-04-06 20:34 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-04-06 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 6bc2447d478ecb43164615fc52b6248cf60d3671
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri Apr 5 08:46:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 6 20:28:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bc2447d
media-video/vlc: fix build with sftp
Closes: https://bugs.gentoo.org/681764
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11597
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/vlc/files/vlc-3.0.6-sftp.patch | 24 ++++++++++++++++++++++++
media-video/vlc/vlc-3.0.6-r1.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/media-video/vlc/files/vlc-3.0.6-sftp.patch b/media-video/vlc/files/vlc-3.0.6-sftp.patch
new file mode 100644
index 00000000000..3092bf5a47c
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-sftp.patch
@@ -0,0 +1,24 @@
+From 11449b5cd8b415768e010d9b7c1d6ba3cea21f82 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Wed, 20 Mar 2019 05:20:30 +0200
+Subject: [PATCH] sftp: fix version for ECDSA known hosts (fixes #22060)
+
+1.8.x is a stable branch, separate from the feature branch that contains
+the ECDSA support.
+---
+ modules/access/sftp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/access/sftp.c b/modules/access/sftp.c
+index e420b91ca93..dc7f6cc27f7 100644
+--- a/modules/access/sftp.c
++++ b/modules/access/sftp.c
+@@ -307,7 +307,7 @@ static int Open( vlc_object_t* p_this )
+ case LIBSSH2_HOSTKEY_TYPE_DSS:
+ knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_SSHDSS;
+ break;
+-#if LIBSSH2_VERSION_NUM >= 0x010801
++#if LIBSSH2_VERSION_NUM >= 0x010900
+ case LIBSSH2_HOSTKEY_TYPE_ECDSA_256:
+ knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_ECDSA_256;
+ break;
diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild
index e53ae722722..42b4075acb2 100644
--- a/media-video/vlc/vlc-3.0.6-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -234,6 +234,7 @@ PATCHES=(
"${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606
"${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${P}-libav.patch
+ "${FILESDIR}"/${P}-sftp.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2020-04-21 9:22 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-04-21 9:22 UTC (permalink / raw
To: gentoo-commits
commit: f9ed1719f97b18dc04892cc08b5d0324c152a150
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 08:31:42 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 09:22:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ed1719
media-video/vlc: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/vlc/files/vlc-3.0.8-qt-5.15.patch | 30 +++++++++++++++++++++++++++
media-video/vlc/vlc-3.0.8.ebuild | 1 +
media-video/vlc/vlc-3.0.9999.ebuild | 1 +
3 files changed, 32 insertions(+)
diff --git a/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch b/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch
new file mode 100644
index 00000000000..7bdc24de4af
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch
@@ -0,0 +1,30 @@
+--- a/modules/gui/qt/util/timetooltip.hpp 2018-05-03 14:03:21.000000000 +0200
++++ b/modules/gui/qt/util/timetooltip.hpp 2020-04-21 00:57:48.570508113 +0200
+@@ -24,6 +24,7 @@
+
+ #include "qt.hpp"
+
++#include <QPainterPath>
+ #include <QWidget>
+
+ class TimeTooltip : public QWidget
+--- a/modules/gui/qt/dialogs/plugins.cpp 2017-11-24 16:29:17.000000000 +0100
++++ b/modules/gui/qt/dialogs/plugins.cpp 2020-04-21 01:10:14.916737405 +0200
+@@ -53,6 +53,7 @@
+ #include <QListView>
+ #include <QListWidget>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOptionViewItem>
+ #include <QKeyEvent>
+ #include <QPushButton>
+--- a/modules/gui/qt/components/playlist/views.cpp 2017-11-24 16:29:17.000000000 +0100
++++ b/modules/gui/qt/components/playlist/views.cpp 2020-04-21 01:12:28.002665729 +0200
+@@ -27,6 +27,7 @@
+ #include "input_manager.hpp" /* THEMIM */
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRect>
+ #include <QStyleOptionViewItem>
+ #include <QFontMetrics>
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index ff05a37e121..090c04ddbb2 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -231,6 +231,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+ "${FILESDIR}"/${P}-qt-5.15.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 46be52b9fc5..8af1fe6e259 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -232,6 +232,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+ "${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2020-12-25 2:35 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2020-12-25 2:35 UTC (permalink / raw
To: gentoo-commits
commit: e014d41451b0d3fc3f9037d37703a20de1d197e3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 02:26:13 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 02:35:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e014d414
media-video/vlc: fix USE=srt with >=net-libs/srt-1.4.2
Thanks-to: Attila Tóth <atoth <AT> atoth.sote.hu>
Closes: https://bugs.gentoo.org/758062
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch | 25 ++++++++++++++++++++++
...3.0.11.1-r100.ebuild => vlc-3.0.11.1-r1.ebuild} | 18 ++++------------
...0.11.1-r100.ebuild => vlc-3.0.11.1-r101.ebuild} | 3 ++-
3 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
new file mode 100644
index 00000000000..d617a8357ff
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
@@ -0,0 +1,25 @@
+net-libs/srt renamed the SRTO_TSBPDDELAY constant to SRTRO_LATENCY.
+https://github.com/Haivision/srt/pull/1364
+https://bugs.gentoo.org/758062
+--- b/modules/access/srt.c
++++ a/modules/access/srt.c
+@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea
+
+ /* Set latency */
+ i_latency = var_InheritInteger( p_stream, "latency" );
+- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
+ &i_latency, sizeof( int ) );
+
+ psz_passphrase = var_InheritString( p_stream, "passphrase" );
+--- a/modules/access_output/srt.c
++++ b/modules/access_output/srt.c
+@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_
+
+ /* Set latency */
+ i_latency = var_InheritInteger( p_access, "latency" );
+- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
+ &i_latency, sizeof( int ) );
+
+ if ( psz_passphrase != NULL && psz_passphrase[0] != '\0')
diff --git a/media-video/vlc/vlc-3.0.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r1.ebuild
similarity index 97%
copy from media-video/vlc/vlc-3.0.11.1-r100.ebuild
copy to media-video/vlc/vlc-3.0.11.1-r1.ebuild
index 1c18dbda43a..5191f531572 100644
--- a/media-video/vlc/vlc-3.0.11.1-r100.ebuild
+++ b/media-video/vlc/vlc-3.0.11.1-r1.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..2} )
-
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
@@ -23,7 +21,7 @@ else
fi
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
fi
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
HOMEPAGE="https://www.videolan.org/vlc/"
@@ -49,7 +47,6 @@ REQUIRED_USE="
libcaca? ( X )
libtar? ( skins )
libtiger? ( kate )
- lua? ( ${LUA_REQUIRED_USE} )
skins? ( qt5 truetype X xml )
ssl? ( gcrypt )
vaapi? ( ffmpeg X )
@@ -58,7 +55,6 @@ REQUIRED_USE="
BDEPEND="
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
- lua? ( ${LUA_DEPS} )
amd64? ( dev-lang/yasm )
x86? ( dev-lang/yasm )
"
@@ -137,7 +133,7 @@ RDEPEND="
linsys? ( media-libs/zvbi )
lirc? ( app-misc/lirc )
live? ( media-plugins/live:= )
- lua? ( ${LUA_DEPS} )
+ lua? ( >=dev-lang/lua-5.1:0= )
mad? ( media-libs/libmad )
matroska? (
>=dev-libs/libebml-1.3.6:=
@@ -184,7 +180,7 @@ RDEPEND="
>=media-libs/speex-1.2.0
media-libs/speexdsp
)
- srt? ( net-libs/srt )
+ srt? ( >=net-libs/srt-1.4.2 )
ssl? ( net-libs/gnutls:= )
svg? (
gnome-base/librsvg:2
@@ -232,19 +228,13 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream
- "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+ "${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
S="${WORKDIR}/${MY_P}"
-pkg_setup() {
- if use lua; then
- lua-single_pkg_setup
- fi
-}
-
src_prepare() {
xdg_src_prepare # bug 608256
diff --git a/media-video/vlc/vlc-3.0.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r101.ebuild
similarity index 99%
rename from media-video/vlc/vlc-3.0.11.1-r100.ebuild
rename to media-video/vlc/vlc-3.0.11.1-r101.ebuild
index 1c18dbda43a..f07316c9278 100644
--- a/media-video/vlc/vlc-3.0.11.1-r100.ebuild
+++ b/media-video/vlc/vlc-3.0.11.1-r101.ebuild
@@ -184,7 +184,7 @@ RDEPEND="
>=media-libs/speex-1.2.0
media-libs/speexdsp
)
- srt? ( net-libs/srt )
+ srt? ( >=net-libs/srt-1.4.2 )
ssl? ( net-libs/gnutls:= )
svg? (
gnome-base/librsvg:2
@@ -233,6 +233,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream
"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+ "${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2021-05-04 22:47 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2021-05-04 22:47 UTC (permalink / raw
To: gentoo-commits
commit: 3c66c764661b65e66ebe69ef6d4cce3a544b6a85
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 22:46:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:46:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c66c764
media-video/vlc: allow building against newer net-libs/srt
Bug: https://bugs.gentoo.org/788226
Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch | 11 +++++++++++
media-video/vlc/vlc-3.0.13.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch b/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch
new file mode 100644
index 00000000000..c255689c1ca
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4016,7 +4016,7 @@
+ dnl
+ dnl SRT plugin
+ dnl
+-PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
++PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
+
+ EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
+ dnl
diff --git a/media-video/vlc/vlc-3.0.13.ebuild b/media-video/vlc/vlc-3.0.13.ebuild
index d9b5ab264cc..a706bd9e653 100644
--- a/media-video/vlc/vlc-3.0.13.ebuild
+++ b/media-video/vlc/vlc-3.0.13.ebuild
@@ -236,6 +236,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+ "${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2022-04-07 22:33 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2022-04-07 22:33 UTC (permalink / raw
To: gentoo-commits
commit: 57322daae014d657b2b063abff4af216f1d90151
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 22:32:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 22:33:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57322daa
media-video/vlc: add dav1d-1.0.0 patch
It's unmerged (pending upstream) but
nobody's complained of runtime issues and the
patch itself wasn't disputed; just whether there's
another separate runtime bug which people
noticed during review of the patch.
Closes: https://bugs.gentoo.org/835787
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch | 78 ++++
media-video/vlc/vlc-3.0.17.3-r2.ebuild | 515 +++++++++++++++++++++
2 files changed, 593 insertions(+)
diff --git a/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch b/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch
new file mode 100644
index 000000000000..deb748cdba92
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch
@@ -0,0 +1,78 @@
+https://code.videolan.org/videolan/vlc/-/merge_requests/1618.patch
+https://bugs.gentoo.org/835787
+
+From 0efdfe8799b0100f41c5b8d6e1b43451001386cb Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Fri, 18 Mar 2022 11:42:49 +0100
+Subject: [PATCH 1/2] dav1d: fix compilation with (upcoming) dav1d 1.0
+
+(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited)
+edited:
+- 3.0 has the 128 pixels padding elsewhere
+- 3.0 has an extra parameter for add_integer_with_range()
+- 3.0 was setting i_extra_picture_buffers further down in the code
+- 3.0 uses 16 threads max
+
+Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
+--- a/modules/codec/dav1d.c
++++ b/modules/codec/dav1d.c
+@@ -63,10 +63,16 @@ vlc_module_begin ()
+ set_category(CAT_INPUT)
+ set_subcategory(SUBCAT_INPUT_VCODEC)
+
++#if DAV1D_API_VERSION_MAJOR >= 6
++ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS,
++ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
++ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0
++#else
+ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS,
+ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
+ add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS,
+ THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false)
++#endif
+ vlc_module_end ()
+
+ /*****************************************************************************
+@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this)
+ return VLC_ENOMEM;
+
+ dav1d_default_settings(&p_sys->s);
++#if DAV1D_API_VERSION_MAJOR >= 6
++ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
++ if (p_sys->s.n_threads == 0)
++ p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16;
++#else
+ p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
+ if (p_sys->s.n_tile_threads == 0)
+ p_sys->s.n_tile_threads =
+@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this)
+ p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
+ if (p_sys->s.n_frame_threads == 0)
+ p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16;
++#endif
+ p_sys->s.allocator.cookie = dec;
+ p_sys->s.allocator.alloc_picture_callback = NewPicture;
+ p_sys->s.allocator.release_picture_callback = FreePicture;
+@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this)
+ return VLC_EGENERIC;
+ }
+
++#if DAV1D_API_VERSION_MAJOR >= 6
++ msg_Dbg(p_this, "Using dav1d version %s with %d threads",
++ dav1d_version(), p_sys->s.n_threads);
++
++ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1);
++#else
+ msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
+ dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
+
++ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
++#endif
++
+ dec->pf_decode = Decode;
+ dec->pf_flush = FlushDecoder;
+- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
+
+ dec->fmt_out.video.i_width = dec->fmt_in.video.i_width;
+ dec->fmt_out.video.i_height = dec->fmt_in.video.i_height;
+GitLab
diff --git a/media-video/vlc/vlc-3.0.17.3-r2.ebuild b/media-video/vlc/vlc-3.0.17.3-r2.ebuild
new file mode 100644
index 000000000000..33d9f2b17a26
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.17.3-r2.ebuild
@@ -0,0 +1,515 @@
+# Copyright 2000-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+ if [[ ${PV%.9999} != ${PV} ]] ; then
+ EGIT_BRANCH="3.0.x"
+ fi
+ EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"
+ inherit git-r3
+else
+ if [[ ${MY_P} = ${P} ]] ; then
+ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+ else
+ SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv -sparc ~x86"
+fi
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus
+ dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
+ fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate
+ libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
+ macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
+ omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image
+ sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
+ udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
+ cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
+"
+REQUIRED_USE="
+ chromecast? ( encode )
+ directx? ( ffmpeg )
+ fontconfig? ( truetype )
+ libcaca? ( X )
+ libtar? ( skins )
+ libtiger? ( kate )
+ lua? ( ${LUA_REQUIRED_USE} )
+ skins? ( gui truetype X xml )
+ ssl? ( gcrypt )
+ vaapi? ( ffmpeg X )
+ vdpau? ( ffmpeg X )
+"
+BDEPEND="
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ lua? ( ${LUA_DEPS} )
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/yasm )
+"
+RDEPEND="
+ media-libs/libvorbis
+ net-dns/libidn:=
+ sys-libs/zlib[minizip]
+ virtual/libintl
+ virtual/opengl
+ 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
+ media-libs/freetype:2[harfbuzz]
+ media-libs/harfbuzz:=
+ virtual/ttf-fonts
+ )
+ bluray? ( >=media-libs/libbluray-1.3.0:= )
+ cddb? ( media-libs/libcddb )
+ chromaprint? ( media-libs/chromaprint:= )
+ chromecast? (
+ >=dev-libs/protobuf-2.5.0:=
+ >=net-libs/libmicrodns-0.1.2:=
+ )
+ dav1d? ( media-libs/dav1d:= )
+ dbus? ( sys-apps/dbus )
+ dc1394? (
+ media-libs/libdc1394:2
+ sys-libs/libraw1394
+ )
+ dts? ( media-libs/libdca )
+ dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+ dvd? (
+ >=media-libs/libdvdnav-6.1.1:0=
+ >=media-libs/libdvdread-6.1.2:0=
+ )
+ faad? ( media-libs/faad2 )
+ fdk? ( media-libs/fdk-aac:= )
+ ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+ flac? (
+ media-libs/flac
+ media-libs/libogg
+ )
+ fluidsynth? ( media-sound/fluidsynth:= )
+ fontconfig? ( media-libs/fontconfig:1.0 )
+ gcrypt? (
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error
+ )
+ gme? ( media-libs/game-music-emu )
+ gnome-keyring? ( app-crypt/libsecret )
+ gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
+ )
+ ieee1394? (
+ sys-libs/libavc1394
+ sys-libs/libraw1394
+ )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ kate? ( media-libs/libkate )
+ libass? (
+ media-libs/fontconfig:1.0
+ media-libs/libass:=
+ )
+ libcaca? ( media-libs/libcaca )
+ libnotify? (
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+ )
+ libsamplerate? ( media-libs/libsamplerate )
+ libtar? ( dev-libs/libtar )
+ libtiger? ( media-libs/libtiger )
+ linsys? ( media-libs/zvbi )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live:= )
+ lua? ( ${LUA_DEPS} )
+ mad? ( media-libs/libmad )
+ matroska? (
+ >=dev-libs/libebml-1.4.2:=
+ media-libs/libmatroska:=
+ )
+ modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+ mp3? ( media-sound/mpg123 )
+ mpeg? ( media-libs/libmpeg2 )
+ mtp? ( media-libs/libmtp:= )
+ musepack? ( media-sound/musepack-tools )
+ ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+ nfs? ( >=net-fs/libnfs-0.10.0:= )
+ ogg? ( media-libs/libogg )
+ opus? ( >=media-libs/opus-1.0.3 )
+ png? ( media-libs/libpng:0= )
+ projectm? (
+ media-fonts/dejavu
+ >=media-libs/libprojectm-3.1.12:0=
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ 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 )
+ sftp? ( net-libs/libssh2 )
+ shout? ( media-libs/libshout )
+ sid? ( media-libs/libsidplay:2 )
+ skins? (
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXpm
+ )
+ soxr? ( >=media-libs/soxr-0.1.2 )
+ speex? (
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
+ )
+ srt? ( >=net-libs/srt-1.4.2:= )
+ ssl? ( net-libs/gnutls:= )
+ svg? (
+ gnome-base/librsvg:2
+ x11-libs/cairo
+ )
+ taglib? ( >=media-libs/taglib-1.9 )
+ theora? ( media-libs/libtheora )
+ tremor? ( media-libs/tremor )
+ truetype? (
+ media-libs/freetype:2
+ virtual/ttf-fonts
+ !fontconfig? ( media-fonts/dejavu )
+ )
+ twolame? ( media-sound/twolame )
+ udev? ( virtual/udev )
+ upnp? ( net-libs/libupnp:=[ipv6] )
+ v4l? ( media-libs/libv4l:= )
+ vaapi? ( x11-libs/libva:=[drm(+),wayland?,X?] )
+ vdpau? ( x11-libs/libvdpau )
+ vnc? ( net-libs/libvncserver )
+ vpx? ( media-libs/libvpx:= )
+ wayland? (
+ >=dev-libs/wayland-1.15
+ dev-libs/wayland-protocols
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-keysyms
+ )
+ x264? ( >=media-libs/x264-0.0.20190214:= )
+ x265? ( media-libs/x265:= )
+ xml? ( dev-libs/libxml2:2 )
+ zeroconf? ( net-dns/avahi[dbus] )
+ zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+ "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+ "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+ "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+ "${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 835072
+ "${FILESDIR}"/${PN}-3.0.17.3-dav1d-1.0.0.patch # bug 835787
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use lua; then
+ lua-single_pkg_setup
+ fi
+}
+
+src_prepare() {
+ xdg_src_prepare # bug 608256
+
+ has_version 'net-libs/libupnp:1.8' && \
+ eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+ # Bootstrap when we are on a git checkout.
+ if [[ ${PV} = *9999 ]] ; then
+ ./bootstrap
+ fi
+
+ # Make it build with libtool 1.5
+ rm m4/lt* m4/libtool.m4 || die
+
+ # We are not in a real git checkout due to the absence of a .git directory.
+ touch src/revision.txt || die
+
+ # Don't use --started-from-file when not using dbus.
+ if ! use dbus ; then
+ sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+ fi
+
+ # Disable running of vlc-cache-gen, we do that in pkg_postinst
+ sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+ -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+ # Fix gettext version mismatch errors.
+ sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+ eautoreconf
+
+ # Disable automatic running of tests.
+ find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+ local -x BUILDCC="$(tc-getBUILD_CC)"
+
+ local myeconfargs=(
+ --disable-aa
+ --disable-optimizations
+ --disable-rpath
+ --disable-update-check
+ --enable-fast-install
+ --enable-screen
+ --enable-vcd
+ --enable-vlc
+ --enable-vorbis
+ $(use_enable a52)
+ $(use_enable alsa)
+ $(use_enable aom)
+ $(use_enable archive)
+ $(use_enable aribsub)
+ $(use_enable bidi fribidi)
+ $(use_enable bidi harfbuzz)
+ $(use_enable bluray)
+ $(use_enable cddb libcddb)
+ $(use_enable chromaprint)
+ $(use_enable chromecast)
+ $(use_enable chromecast microdns)
+ $(use_enable cpu_flags_arm_neon neon)
+ $(use_enable cpu_flags_ppc_altivec altivec)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable dav1d)
+ $(use_enable dbus)
+ $(use_enable dbus kwallet)
+ $(use_enable dc1394)
+ $(use_enable debug)
+ $(use_enable directx)
+ $(use_enable directx d3d11va)
+ $(use_enable directx dxva2)
+ $(use_enable dts dca)
+ $(use_enable dvbpsi)
+ $(use_enable dvd dvdnav)
+ $(use_enable dvd dvdread)
+ $(use_enable encode sout)
+ $(use_enable encode vlm)
+ $(use_enable faad)
+ $(use_enable fdk fdkaac)
+ $(use_enable ffmpeg avcodec)
+ $(use_enable ffmpeg avformat)
+ $(use_enable ffmpeg postproc)
+ $(use_enable ffmpeg swscale)
+ $(use_enable flac)
+ $(use_enable fluidsynth)
+ $(use_enable fontconfig)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable gme)
+ $(use_enable gnome-keyring secret)
+ $(use_enable gstreamer gst-decode)
+ $(use_enable gui qt)
+ $(use_enable ieee1394 dv1394)
+ $(use_enable jack)
+ $(use_enable jpeg)
+ $(use_enable kate)
+ $(use_enable libass)
+ $(use_enable libcaca caca)
+ $(use_enable libnotify notify)
+ $(use_enable libsamplerate samplerate)
+ $(use_enable libtar)
+ $(use_enable libtiger tiger)
+ $(use_enable linsys)
+ $(use_enable lirc)
+ $(use_enable live live555)
+ $(use_enable lua)
+ $(use_enable macosx-notifications osx-notifications)
+ $(use_enable mad)
+ $(use_enable matroska)
+ $(use_enable modplug mod)
+ $(use_enable mp3 mpg123)
+ $(use_enable mpeg libmpeg2)
+ $(use_enable mtp)
+ $(use_enable musepack mpc)
+ $(use_enable ncurses)
+ $(use_enable nfs)
+ $(use_enable ogg)
+ $(use_enable omxil)
+ $(use_enable omxil omxil-vout)
+ $(use_enable optimisememory optimize-memory)
+ $(use_enable opus)
+ $(use_enable png)
+ $(use_enable projectm)
+ $(use_enable pulseaudio pulse)
+ $(use_enable rdp freerdp)
+ $(use_enable run-as-root)
+ $(use_enable samba smbclient)
+ $(use_enable sdl-image)
+ $(use_enable sftp)
+ $(use_enable shout)
+ $(use_enable sid)
+ $(use_enable skins skins2)
+ $(use_enable soxr)
+ $(use_enable speex)
+ $(use_enable srt)
+ $(use_enable ssl gnutls)
+ $(use_enable svg)
+ $(use_enable svg svgdec)
+ $(use_enable taglib)
+ $(use_enable theora)
+ $(use_enable tremor)
+ $(use_enable twolame)
+ $(use_enable udev)
+ $(use_enable upnp)
+ $(use_enable v4l v4l2)
+ $(use_enable vaapi libva)
+ $(use_enable vdpau)
+ $(use_enable vnc)
+ $(use_enable vpx)
+ $(use_enable wayland)
+ $(use_with X x)
+ $(use_enable X xcb)
+ $(use_enable X xvideo)
+ $(use_enable x264)
+ $(use_enable x264 x26410b)
+ $(use_enable x265)
+ $(use_enable xml libxml2)
+ $(use_enable zeroconf avahi)
+ $(use_enable zvbi)
+ $(use_enable !zvbi telx)
+ --with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+ --disable-asdcp
+ --disable-coverage
+ --disable-cprof
+ --disable-crystalhd
+ --disable-decklink
+ --disable-gles2
+ --disable-goom
+ --disable-kai
+ --disable-kva
+ --disable-libplacebo
+ --disable-maintainer-mode
+ --disable-merge-ffmpeg
+ --disable-mfx
+ --disable-mmal
+ --disable-opencv
+ --disable-opensles
+ --disable-oss
+ --disable-rpi-omxil
+ --disable-schroedinger
+ --disable-shine
+ --disable-sndio
+ --disable-spatialaudio
+ --disable-vsxu
+ --disable-wasapi
+ --disable-wma-fixed
+ )
+ # ^ We don't have these disabled libraries in the Portage tree yet.
+
+ # Compatibility fix for Samba 4.
+ use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+ if use x86; then
+ # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+ append-cflags $(test-flags-CC -fno-stack-check)
+ # Bug 569774
+ replace-flags -Os -O2
+ fi
+
+ # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+ append-cxxflags -std=c++11
+
+ if use omxil; then
+ # bug #723006
+ # https://trac.videolan.org/vlc/ticket/24617
+ append-cflags -fcommon
+ fi
+
+ # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+ append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/"
+
+ if use riscv; then
+ # bug #803473
+ append-libs -latomic
+ fi
+
+ if use truetype || use bidi; then
+ myeconfargs+=( --enable-freetype )
+ else
+ myeconfargs+=( --disable-freetype )
+ fi
+
+ if use truetype || use projectm; then
+ local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+ myeconfargs+=(
+ --with-default-font=${dejavu}/DejaVuSans.ttf
+ --with-default-font-family=Sans
+ --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+ --with-default-monospace-font-family=Monospace
+ )
+ fi
+
+ 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.
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+ sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+ virtx emake check-TESTS
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+ einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+ "${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+ else
+ ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+ ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+ ewarn "If you do not do it, vlc will take a long time to load."
+ fi
+
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+ rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+ fi
+
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2022-10-28 15:57 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2022-10-28 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 541281ddd0bef7dcefe265cec675ea8710e5fb68
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 15:56:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 15:56:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541281dd
media-video/vlc: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/875785
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/vlc/files/vlc-3.0.17.4-gcc13.patch | 20 ++++++++++++++++++++
media-video/vlc/vlc-3.0.17.4-r2.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch
new file mode 100644
index 000000000000..374cd5ada0ac
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch
@@ -0,0 +1,20 @@
+https://code.videolan.org/robUx4/vlc/-/commit/6fca76ebd76bf8fce9b111e31bda64015cdc770f
+https://bugs.gentoo.org/875785
+
+From 6fca76ebd76bf8fce9b111e31bda64015cdc770f Mon Sep 17 00:00:00 2001
+From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
+Date: Mon, 11 Jul 2022 19:35:57 +0000
+Subject: [PATCH] demux: dash: include cstdint, needed for uint64_t
+
+Fixes #27077.
+--- a/modules/demux/dash/mpd/TemplatedUri.hpp
++++ b/modules/demux/dash/mpd/TemplatedUri.hpp
+@@ -21,6 +21,7 @@
+ #ifndef TEMPLATEDURI_HPP
+ #define TEMPLATEDURI_HPP
+
++#include <cstdint>
+ #include <string>
+
+ namespace dash
+GitLab
diff --git a/media-video/vlc/vlc-3.0.17.4-r2.ebuild b/media-video/vlc/vlc-3.0.17.4-r2.ebuild
index 2d22452092cf..824a5c251898 100644
--- a/media-video/vlc/vlc-3.0.17.4-r2.ebuild
+++ b/media-video/vlc/vlc-3.0.17.4-r2.ebuild
@@ -232,6 +232,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 835072
"${FILESDIR}"/${PN}-3.0.17.3-dav1d-1.0.0.patch # bug 835787
+ "${FILESDIR}"/${PN}-3.0.17.4-gcc13.patch # bug 875785
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2023-06-03 21:01 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2023-06-03 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 3403638a3e4c2d6527a3e92da2b616afb831c16e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 3 21:00:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 21:00:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3403638a
media-video/vlc: drop stale minizip dep
Reported on IRC by nbgen. The configure check was dropped finally in
d22de99eb8c46786ca2feb4abca2e4f25ceeb0a8 upstream but the usage was dropped a while before that.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../vlc/files/vlc-3.0.18-drop-minizip-dep.patch | 38 ++++++++++++++++++++++
.../{vlc-3.0.18-r2.ebuild => vlc-3.0.18-r3.ebuild} | 3 +-
media-video/vlc/vlc-3.0.9999.ebuild | 3 +-
media-video/vlc/vlc-9999.ebuild | 2 +-
4 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch b/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch
new file mode 100644
index 000000000000..6cd7019f6ed0
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch
@@ -0,0 +1,38 @@
+Nothing uses this.
+
+From 6cd8ac42e8c296eb1c9e154b3e99dab8bffcad0a Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Thu, 12 Apr 2018 13:24:38 +0200
+Subject: [PATCH] configure: remove minizip check not referenced anywhere
+
+(cherry picked from commit d22de99eb8c46786ca2feb4abca2e4f25ceeb0a8)
+--- a/configure.ac
++++ b/configure.ac
+@@ -890,23 +890,14 @@ AS_IF([test -n "${PKG_CONFIG}" ],[
+
+
+ dnl
+-dnl Check for zlib.h and -lz along with system -lminizip if available
++dnl Check for zlib.h and -lz if available
+ dnl
+ AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
+ AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
+ if test "${have_zlib}" = "yes"
+ then
+ VLC_ADD_LIBS([sap],[-lz])
+- PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
+- AC_CHECK_HEADERS([unzip.h], [
+- have_minizip=yes
+- MINIZIP_LIBS="-lminizip -lz"
+- ], [
+- have_minizip=no
+- ])
+- ])
+ fi
+-AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
+
+
+ dnl
+--
+2.41.0
+
diff --git a/media-video/vlc/vlc-3.0.18-r2.ebuild b/media-video/vlc/vlc-3.0.18-r3.ebuild
similarity index 99%
rename from media-video/vlc/vlc-3.0.18-r2.ebuild
rename to media-video/vlc/vlc-3.0.18-r3.ebuild
index fda17b56a01a..8090dd85c579 100644
--- a/media-video/vlc/vlc-3.0.18-r2.ebuild
+++ b/media-video/vlc/vlc-3.0.18-r3.ebuild
@@ -64,7 +64,7 @@ BDEPEND="
RDEPEND="
media-libs/libvorbis
net-dns/libidn:=
- sys-libs/zlib[minizip]
+ sys-libs/zlib
virtual/libintl
virtual/opengl
a52? ( media-libs/a52dec )
@@ -234,6 +234,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+ "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
"${FILESDIR}"/${P}-flac-crc.patch
)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 1ada73f5cf53..345109f70eab 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -64,7 +64,7 @@ BDEPEND="
RDEPEND="
media-libs/libvorbis
net-dns/libidn:=
- sys-libs/zlib[minizip]
+ sys-libs/zlib
virtual/libintl
virtual/opengl
a52? ( media-libs/a52dec )
@@ -234,6 +234,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+ "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index d3a241d4baf7..712516931946 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -63,7 +63,7 @@ BDEPEND="
RDEPEND="
media-libs/libvorbis
net-dns/libidn:=
- sys-libs/zlib[minizip]
+ sys-libs/zlib
virtual/libintl
virtual/opengl
a52? ( media-libs/a52dec )
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2023-12-05 13:41 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2023-12-05 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 03edc44ac03874e3a5f3a86658a8bb8cd25a8acd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 5 13:40:45 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 5 13:40:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03edc44a
media-video/vlc: backport modern c fixes
Closes: https://bugs.gentoo.org/919068
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/vlc/files/vlc-3.0.20-c99.patch | 150 +++++++++
media-video/vlc/vlc-3.0.20-r2.ebuild | 518 +++++++++++++++++++++++++++++
2 files changed, 668 insertions(+)
diff --git a/media-video/vlc/files/vlc-3.0.20-c99.patch b/media-video/vlc/files/vlc-3.0.20-c99.patch
new file mode 100644
index 000000000000..135e1e6b9e5b
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.20-c99.patch
@@ -0,0 +1,150 @@
+https://bugs.gentoo.org/919068
+https://code.videolan.org/videolan/vlc/-/issues/28441
+https://code.videolan.org/videolan/vlc/-/merge_requests/4645
+
+From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001
+From: Thomas Guillem <thomas@gllm.fr>
+Date: Tue, 5 Dec 2023 09:23:35 +0100
+Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment
+
+Fixes #28441
+--- a/src/input/input_internal.h
++++ b/src/input/input_internal.h
+@@ -117,7 +117,7 @@ typedef struct input_thread_private_t
+
+ /* Title infos FIXME multi-input (not easy) ? */
+ int i_title;
+- const input_title_t **title;
++ input_title_t * const *title;
+
+ int i_title_offset;
+ int i_seekpoint_offset;
+--
+GitLab
+
+
+From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001
+From: Zhao Zhili <quinkblack@foxmail.com>
+Date: Thu, 1 Mar 2018 14:25:59 +0800
+Subject: [PATCH 2/5] yadif: fix variable type
+
+Signed-off-by: Thomas Guillem <thomas@gllm.fr>
+(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60)
+Signed-off-by: Thomas Guillem <thomas@gllm.fr>
+--- a/modules/video_filter/deinterlace/yadif.h
++++ b/modules/video_filter/deinterlace/yadif.h
+@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8
+ }
+
+ static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) {
+- uint8_t *dst = (uint8_t *)dst8;
+- uint8_t *prev = (uint8_t *)prev8;
+- uint8_t *cur = (uint8_t *)cur8;
+- uint8_t *next = (uint8_t *)next8;
++ uint16_t *dst = (uint16_t *)dst8;
++ uint16_t *prev = (uint16_t *)prev8;
++ uint16_t *cur = (uint16_t *)cur8;
++ uint16_t *next = (uint16_t *)next8;
+ int x;
+ uint16_t *prev2= parity ? prev : cur ;
+ uint16_t *next2= parity ? cur : next;
+--
+GitLab
+
+
+From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Sun, 3 Mar 2019 09:59:10 +0200
+Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion
+
+(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058)
+Signed-off-by: Thomas Guillem <thomas@gllm.fr>
+--- a/modules/video_chroma/swscale.c
++++ b/modules/video_chroma/swscale.c
+@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
+ {
+ filter_sys_t *p_sys = p_filter->p_sys;
+ uint8_t palette[AVPALETTE_SIZE];
+- uint8_t *src[4]; int src_stride[4];
+- uint8_t *dst[4]; int dst_stride[4];
++ uint8_t *src[4], *dst[4];
++ const uint8_t *csrc[4];
++ int src_stride[4], dst_stride[4];
+
+ GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video,
+ p_src, i_plane_count, b_swap_uvi );
+@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
+ GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video,
+ p_dst, i_plane_count, b_swap_uvo );
+
++ for (size_t i = 0; i < ARRAY_SIZE(src); i++)
++ csrc[i] = src[i];
++
+ #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
+- sws_scale( ctx, src, src_stride, 0, i_height,
++ sws_scale( ctx, csrc, src_stride, 0, i_height,
+ dst, dst_stride );
+ #else
+- sws_scale_ordered( ctx, src, src_stride, 0, i_height,
++ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height,
+ dst, dst_stride );
+ #endif
+ }
+--
+GitLab
+
+
+From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Sun, 3 Mar 2019 17:20:04 +0200
+Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing
+
+(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35)
+Signed-off-by: Thomas Guillem <thomas@gllm.fr>
+--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] =
+ void RegisterCommand( filter_t *p_filter )
+ {
+ filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
+- size_t i_index = 0;
+
+ p_sys->i_commands = ARRAY_SIZE(p_commands);
+ p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) );
+ if( !p_sys->pp_commands ) return;
+- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ )
++ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ )
+ {
+ p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) );
+ if( !p_sys->pp_commands[i_index] ) return;
+--
+GitLab
+
+
+From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Mon, 26 Feb 2018 20:43:03 +0200
+Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption
+
+Font alpha is 8-bits, not 32-bits.
+
+(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0)
+Signed-off-by: Thomas Guillem <thomas@gllm.fr>
+--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end,
+ skip_space( &psz_command );
+ if( isdigit( (unsigned char)*psz_command ) )
+ {
+- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC )
++ int32_t value;
++
++ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC )
+ return VLC_EGENERIC;
++
++ p_params->fontstyle.i_font_alpha = value;
+ }
+ return VLC_SUCCESS;
+ }
+--
+GitLab
diff --git a/media-video/vlc/vlc-3.0.20-r2.ebuild b/media-video/vlc/vlc-3.0.20-r2.ebuild
new file mode 100644
index 000000000000..b514804bc99c
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.20-r2.ebuild
@@ -0,0 +1,518 @@
+# Copyright 2000-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+ if [[ ${PV%.9999} != ${PV} ]] ; then
+ EGIT_BRANCH="3.0.x"
+ fi
+ EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"
+ inherit git-r3
+else
+ if [[ ${MY_P} = ${P} ]] ; then
+ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+ else
+ SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
+fi
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus
+ dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
+ fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate
+ libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
+ macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
+ omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image
+ sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
+ udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
+ cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
+"
+REQUIRED_USE="
+ chromecast? ( encode )
+ directx? ( ffmpeg )
+ fontconfig? ( truetype )
+ libcaca? ( X )
+ libtar? ( skins )
+ libtiger? ( kate )
+ lua? ( ${LUA_REQUIRED_USE} )
+ skins? ( archive gui truetype X xml )
+ ssl? ( gcrypt )
+ vaapi? ( ffmpeg X )
+ vdpau? ( ffmpeg X )
+"
+BDEPEND="
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ lua? ( ${LUA_DEPS} )
+ amd64? ( dev-lang/yasm )
+ wayland? ( dev-util/wayland-scanner )
+ x86? ( dev-lang/yasm )
+"
+# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721
+RDEPEND="
+ media-libs/libvorbis
+ net-dns/libidn:=
+ sys-libs/zlib
+ virtual/libintl
+ virtual/opengl
+ 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
+ media-libs/freetype:2[harfbuzz]
+ media-libs/harfbuzz:=
+ virtual/ttf-fonts
+ )
+ bluray? ( >=media-libs/libbluray-1.3.0:= )
+ cddb? ( media-libs/libcddb )
+ chromaprint? ( media-libs/chromaprint:= )
+ chromecast? (
+ >=dev-libs/protobuf-2.5.0:=
+ >=net-libs/libmicrodns-0.1.2:=
+ )
+ dav1d? ( media-libs/dav1d:= )
+ dbus? ( sys-apps/dbus )
+ dc1394? (
+ media-libs/libdc1394:2
+ sys-libs/libraw1394
+ )
+ dts? ( media-libs/libdca )
+ dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+ dvd? (
+ >=media-libs/libdvdnav-6.1.1:=
+ >=media-libs/libdvdread-6.1.2:=
+ )
+ faad? ( media-libs/faad2 )
+ fdk? ( media-libs/fdk-aac:= )
+ ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] )
+ flac? (
+ media-libs/flac:=
+ media-libs/libogg
+ )
+ fluidsynth? ( media-sound/fluidsynth:= )
+ fontconfig? ( media-libs/fontconfig:1.0 )
+ gcrypt? (
+ dev-libs/libgcrypt:=
+ dev-libs/libgpg-error
+ )
+ gme? ( media-libs/game-music-emu )
+ keyring? ( app-crypt/libsecret )
+ gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
+ )
+ ieee1394? (
+ sys-libs/libavc1394
+ sys-libs/libraw1394
+ )
+ jack? ( virtual/jack )
+ jpeg? ( media-libs/libjpeg-turbo:0 )
+ kate? ( media-libs/libkate )
+ libass? (
+ media-libs/fontconfig:1.0
+ media-libs/libass:=
+ )
+ libcaca? ( media-libs/libcaca )
+ libnotify? (
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+ )
+ libsamplerate? ( media-libs/libsamplerate )
+ libtar? ( dev-libs/libtar )
+ libtiger? ( media-libs/libtiger )
+ linsys? ( media-libs/zvbi )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live:= )
+ lua? ( ${LUA_DEPS} )
+ mad? ( media-libs/libmad )
+ matroska? (
+ >=dev-libs/libebml-1.4.2:=
+ media-libs/libmatroska:=
+ )
+ modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+ mp3? ( media-libs/libmpg123 )
+ mpeg? ( media-libs/libmpeg2 )
+ mtp? ( media-libs/libmtp:= )
+ musepack? ( media-sound/musepack-tools )
+ ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+ nfs? ( >=net-fs/libnfs-0.10.0:= )
+ ogg? ( media-libs/libogg )
+ opus? ( >=media-libs/opus-1.0.3 )
+ png? ( media-libs/libpng:0= )
+ projectm? (
+ media-fonts/dejavu
+ >=media-libs/libprojectm-3.1.12:0=
+ )
+ pulseaudio? ( media-libs/libpulse )
+ 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 )
+ sftp? ( net-libs/libssh2 )
+ shout? ( media-libs/libshout )
+ sid? ( media-libs/libsidplay:2 )
+ skins? (
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXpm
+ )
+ soxr? ( >=media-libs/soxr-0.1.2 )
+ speex? (
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
+ )
+ srt? ( >=net-libs/srt-1.4.2:= )
+ ssl? ( net-libs/gnutls:= )
+ svg? (
+ gnome-base/librsvg:2
+ x11-libs/cairo
+ )
+ taglib? ( >=media-libs/taglib-1.9 )
+ theora? ( media-libs/libtheora )
+ tremor? ( media-libs/tremor )
+ truetype? (
+ media-libs/freetype:2
+ virtual/ttf-fonts
+ !fontconfig? ( media-fonts/dejavu )
+ )
+ twolame? ( media-sound/twolame )
+ udev? ( virtual/udev )
+ upnp? ( net-libs/libupnp:=[ipv6(+)] )
+ v4l? ( media-libs/libv4l:= )
+ vaapi? (
+ <media-video/ffmpeg-5
+ media-libs/libva:=[drm(+),wayland?,X?]
+ )
+ vdpau? ( x11-libs/libvdpau )
+ vnc? ( net-libs/libvncserver )
+ vpx? ( media-libs/libvpx:= )
+ wayland? (
+ >=dev-libs/wayland-1.15
+ dev-libs/wayland-protocols
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-keysyms
+ )
+ x264? ( >=media-libs/x264-0.0.20190214:= )
+ x265? ( media-libs/x265:= )
+ xml? ( dev-libs/libxml2:2 )
+ zeroconf? ( net-dns/avahi[dbus] )
+ zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+ "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+ "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+ "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+ "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
+ "${FILESDIR}"/${PN}-3.0.20-c99.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use lua; then
+ lua-single_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+
+ # bug 608256
+ xdg_environment_reset
+
+ has_version 'net-libs/libupnp:1.8' && \
+ eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+ # Bootstrap when we are on a git checkout.
+ if [[ ${PV} = *9999 ]] ; then
+ ./bootstrap
+ fi
+
+ # Make it build with libtool 1.5
+ rm m4/lt* m4/libtool.m4 || die
+
+ # We are not in a real git checkout due to the absence of a .git directory.
+ touch src/revision.txt || die
+
+ # Don't use --started-from-file when not using dbus.
+ if ! use dbus ; then
+ sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+ fi
+
+ # Disable running of vlc-cache-gen, we do that in pkg_postinst
+ sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+ -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+ # Fix gettext version mismatch errors.
+ sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+ eautoreconf
+
+ # Disable automatic running of tests.
+ find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+ local -x BUILDCC="$(tc-getBUILD_CC)"
+
+ local myeconfargs=(
+ --disable-aa
+ --disable-optimizations
+ --disable-rpath
+ --disable-update-check
+ --enable-fast-install
+ --enable-screen
+ --enable-vcd
+ --enable-vlc
+ --enable-vorbis
+ $(use_enable a52)
+ $(use_enable alsa)
+ $(use_enable aom)
+ $(use_enable archive)
+ $(use_enable aribsub)
+ $(use_enable bidi fribidi)
+ $(use_enable bidi harfbuzz)
+ $(use_enable bluray)
+ $(use_enable cddb libcddb)
+ $(use_enable chromaprint)
+ $(use_enable chromecast)
+ $(use_enable chromecast microdns)
+ $(use_enable cpu_flags_arm_neon neon)
+ $(use_enable cpu_flags_ppc_altivec altivec)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable dav1d)
+ $(use_enable dbus)
+ $(use_enable dbus kwallet)
+ $(use_enable dc1394)
+ $(use_enable debug)
+ $(use_enable directx)
+ $(use_enable directx d3d11va)
+ $(use_enable directx dxva2)
+ $(use_enable dts dca)
+ $(use_enable dvbpsi)
+ $(use_enable dvd dvdnav)
+ $(use_enable dvd dvdread)
+ $(use_enable encode sout)
+ $(use_enable encode vlm)
+ $(use_enable faad)
+ $(use_enable fdk fdkaac)
+ $(use_enable ffmpeg avcodec)
+ $(use_enable ffmpeg avformat)
+ $(use_enable ffmpeg postproc)
+ $(use_enable ffmpeg swscale)
+ $(use_enable flac)
+ $(use_enable fluidsynth)
+ $(use_enable fontconfig)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable gme)
+ $(use_enable keyring secret)
+ $(use_enable gstreamer gst-decode)
+ $(use_enable gui qt)
+ $(use_enable ieee1394 dv1394)
+ $(use_enable jack)
+ $(use_enable jpeg)
+ $(use_enable kate)
+ $(use_enable libass)
+ $(use_enable libcaca caca)
+ $(use_enable libnotify notify)
+ $(use_enable libsamplerate samplerate)
+ $(use_enable libtar)
+ $(use_enable libtiger tiger)
+ $(use_enable linsys)
+ $(use_enable lirc)
+ $(use_enable live live555)
+ $(use_enable lua)
+ $(use_enable macosx-notifications osx-notifications)
+ $(use_enable mad)
+ $(use_enable matroska)
+ $(use_enable modplug mod)
+ $(use_enable mp3 mpg123)
+ $(use_enable mpeg libmpeg2)
+ $(use_enable mtp)
+ $(use_enable musepack mpc)
+ $(use_enable ncurses)
+ $(use_enable nfs)
+ $(use_enable ogg)
+ $(use_enable omxil)
+ $(use_enable omxil omxil-vout)
+ $(use_enable optimisememory optimize-memory)
+ $(use_enable opus)
+ $(use_enable png)
+ $(use_enable projectm)
+ $(use_enable pulseaudio pulse)
+ $(use_enable rdp freerdp)
+ $(use_enable run-as-root)
+ $(use_enable samba smbclient)
+ $(use_enable sdl-image)
+ $(use_enable sftp)
+ $(use_enable shout)
+ $(use_enable sid)
+ $(use_enable skins skins2)
+ $(use_enable soxr)
+ $(use_enable speex)
+ $(use_enable srt)
+ $(use_enable ssl gnutls)
+ $(use_enable svg)
+ $(use_enable svg svgdec)
+ $(use_enable taglib)
+ $(use_enable theora)
+ $(use_enable tremor)
+ $(use_enable twolame)
+ $(use_enable udev)
+ $(use_enable upnp)
+ $(use_enable v4l v4l2)
+ $(use_enable vaapi libva)
+ $(use_enable vdpau)
+ $(use_enable vnc)
+ $(use_enable vpx)
+ $(use_enable wayland)
+ $(use_with X x)
+ $(use_enable X xcb)
+ $(use_enable X xvideo)
+ $(use_enable x264)
+ $(use_enable x264 x26410b)
+ $(use_enable x265)
+ $(use_enable xml libxml2)
+ $(use_enable zeroconf avahi)
+ $(use_enable zvbi)
+ $(use_enable !zvbi telx)
+ --with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+ --disable-asdcp
+ --disable-coverage
+ --disable-cprof
+ --disable-crystalhd
+ --disable-decklink
+ --disable-gles2
+ --disable-goom
+ --disable-kai
+ --disable-kva
+ --disable-libplacebo
+ --disable-maintainer-mode
+ --disable-merge-ffmpeg
+ --disable-mfx
+ --disable-mmal
+ --disable-opencv
+ --disable-opensles
+ --disable-oss
+ --disable-rpi-omxil
+ --disable-schroedinger
+ --disable-shine
+ --disable-sndio
+ --disable-spatialaudio
+ --disable-vsxu
+ --disable-wasapi
+ --disable-wma-fixed
+ )
+ # ^ We don't have these disabled libraries in the Portage tree yet.
+
+ # https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143)
+ append-flags -fno-strict-aliasing
+ filter-lto
+
+ # Compatibility fix for Samba 4.
+ use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0"
+
+ if use x86; then
+ # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+ append-cflags $(test-flags-CC -fno-stack-check)
+ # Bug 569774
+ replace-flags -Os -O2
+ fi
+
+ # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+ append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/"
+
+ if use riscv; then
+ # bug #803473
+ append-libs -latomic
+ fi
+
+ if use truetype || use bidi; then
+ myeconfargs+=( --enable-freetype )
+ else
+ myeconfargs+=( --disable-freetype )
+ fi
+
+ if use truetype || use projectm; then
+ local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+ myeconfargs+=(
+ --with-default-font=${dejavu}/DejaVuSans.ttf
+ --with-default-font-family=Sans
+ --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+ --with-default-monospace-font-family=Monospace
+ )
+ fi
+
+ 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.
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+ sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+ virtx emake check-TESTS
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+ einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+ "${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+ else
+ ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+ ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+ ewarn "If you do not do it, vlc will take a long time to load."
+ fi
+
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+ rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+ fi
+
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
@ 2024-11-23 20:28 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2024-11-23 20:28 UTC (permalink / raw
To: gentoo-commits
commit: d73a80c2782da7ee89ef5fb4e3491ebf348ee8c8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 20:18:29 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 20:28:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73a80c2
media-video/vlc: Allow IUSE=vaapi without building avcodec_vaapi
Using a Fedora patch.
IUSE taglib: Restrict to <media-libs/taglib-2
Sync 3.0.9999 live ebuild, dropping obsolete patch.
Bug: https://bugs.gentoo.org/864721
Bug: https://bugs.gentoo.org/938946
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/vlc/files/vlc-2.2.8-freerdp-2.patch | 131 ---------------------
.../files/vlc-3.0.21-vaapi-without-ffmepg4.patch | 18 +++
.../{vlc-3.0.9999.ebuild => vlc-3.0.21-r1.ebuild} | 14 +--
media-video/vlc/vlc-3.0.9999.ebuild | 14 +--
4 files changed, 28 insertions(+), 149 deletions(-)
diff --git a/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch b/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch
deleted file mode 100644
index 5cee1336505f..000000000000
--- a/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1957,7 +1957,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [li
-
- dnl RDP/Remote Desktop access module
- dnl
--PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) )
-+PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) )
-
- dnl
- dnl Real RTSP plugin
---- a/modules/access/rdp.c 2017-12-25 17:45:32.964429170 +0100
-+++ b/modules/access/rdp.c 2017-12-25 17:53:15.114093670 +0100
-@@ -45,18 +45,6 @@
- # include <freerdp/version.h>
- #endif
-
--#if !defined(FREERDP_VERSION_MAJOR) || \
-- (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)))
--# define SoftwareGdi sw_gdi
--# define Fullscreen fullscreen
--# define ServerHostname hostname
--# define Username username
--# define Password password
--# define ServerPort port
--# define EncryptionMethods encryption
--# define ContextSize context_size
--#endif
--
- #include <errno.h>
- #ifdef HAVE_POLL
- # include <poll.h>
-@@ -140,6 +128,7 @@
- vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context;
- demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
- rdpGdi *p_gdi = p_context->gdi;
-+ unsigned bytesPerPixel;
-
- if ( p_sys->es )
- {
-@@ -149,19 +138,23 @@
-
- /* Now init and fill es format */
- vlc_fourcc_t i_chroma;
-- switch( p_gdi->bytesPerPixel )
-+ switch( p_gdi->dstFormat )
- {
- default:
-- case 16:
-+ msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat);
-+ case PIXEL_FORMAT_BGR16:
- i_chroma = VLC_CODEC_RGB16;
-+ bytesPerPixel = 16;
- break;
-- case 24:
-+ case PIXEL_FORMAT_BGR24:
- i_chroma = VLC_CODEC_RGB24;
-+ bytesPerPixel = 24;
- break;
-- case 32:
-+ case PIXEL_FORMAT_BGRA32:
- i_chroma = VLC_CODEC_RGB32;
-+ bytesPerPixel = 32;
- break;
- }
- es_format_t fmt;
- es_format_Init( &fmt, VIDEO_ES, i_chroma );
-
-@@ -172,7 +165,7 @@
- fmt.video.i_height = p_gdi->height;
- fmt.video.i_frame_rate_base = 1000;
- fmt.video.i_frame_rate = 1000 * p_sys->f_fps;
-- p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel;
-+ p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel;
-
- if ( p_sys->p_block )
- p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize );
-@@ -233,28 +226,19 @@
- vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
-
- msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
--#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))
- p_instance->settings->DesktopWidth,
- p_instance->settings->DesktopHeight,
- p_instance->settings->ColorDepth
--#else
-- p_instance->settings->width,
-- p_instance->settings->height,
-- p_instance->settings->color_depth
--#endif
- );
-
- p_instance->update->DesktopResize = desktopResizeHandler;
- p_instance->update->BeginPaint = beginPaintHandler;
- p_instance->update->EndPaint = endPaintHandler;
-
-- gdi_init( p_instance,
-- CLRBUF_16BPP |
--#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
-- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
-- CLRBUF_24BPP |
--#endif
-- CLRBUF_32BPP, NULL );
-+ if ( p_instance->settings->ColorDepth > 16 )
-+ gdi_init( p_instance, PIXEL_FORMAT_XRGB32);
-+ else
-+ gdi_init( p_instance, PIXEL_FORMAT_RGB16);
-
- desktopResizeHandler( p_instance->context );
- return true;
-@@ -428,10 +412,6 @@
- if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
- p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
-
--#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
-- freerdp_channels_global_init();
--#endif
--
- p_sys->p_instance = freerdp_new();
- if ( !p_sys->p_instance )
- {
-@@ -506,9 +486,6 @@
-
- freerdp_disconnect( p_sys->p_instance );
- freerdp_free( p_sys->p_instance );
--#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
-- freerdp_channels_global_uninit();
--#endif
-
- if ( p_sys->p_block )
- block_Release( p_sys->p_block );
diff --git a/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmepg4.patch b/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmepg4.patch
new file mode 100644
index 000000000000..c71a39910733
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmepg4.patch
@@ -0,0 +1,18 @@
+avcodec_vaapi requires ffmpeg-4, but other vaapi modules can be built
+
+diff --git a/configure.ac b/configure.ac
+index 69beb77..c7f7142 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2454,9 +2454,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
+ have_avcodec_vaapi="yes"
+ ],[
+ AS_IF([test -n "${enable_libva}"], [
+- AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])
++ AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing])
+ ], [
+- AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])
++ AC_MSG_NOTICE([libva is present but libavcodec/vaapi.h is missing ])
+ ])
+ ])
+ VLC_RESTORE_FLAGS
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.21-r1.ebuild
similarity index 98%
copy from media-video/vlc/vlc-3.0.9999.ebuild
copy to media-video/vlc/vlc-3.0.21-r1.ebuild
index c78279fbee98..863da84818a5 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.21-r1.ebuild
@@ -20,6 +20,7 @@ else
else
SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
fi
+ S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
fi
inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
@@ -61,7 +62,6 @@ BDEPEND="
wayland? ( dev-util/wayland-scanner )
x86? ( dev-lang/yasm )
"
-# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721
RDEPEND="
media-libs/libvorbis
net-dns/libidn:=
@@ -191,7 +191,7 @@ RDEPEND="
gnome-base/librsvg:2
x11-libs/cairo
)
- taglib? ( >=media-libs/taglib-1.9 )
+ taglib? ( <media-libs/taglib-2 )
theora? ( media-libs/libtheora )
tremor? ( media-libs/tremor )
truetype? (
@@ -203,10 +203,7 @@ RDEPEND="
udev? ( virtual/udev )
upnp? ( net-libs/libupnp:=[ipv6(+)] )
v4l? ( media-libs/libv4l:= )
- vaapi? (
- <media-video/ffmpeg-5
- media-libs/libva:=[drm(+),wayland?,X?]
- )
+ vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] )
vdpau? ( x11-libs/libvdpau )
vnc? ( net-libs/libvncserver )
vpx? ( media-libs/libvpx:= )
@@ -232,16 +229,15 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
- "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
+ "${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164
+ "${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmepg4.patch # bug 864721, thx Fedora
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-S="${WORKDIR}/${MY_P}"
-
pkg_setup() {
if use lua; then
lua-single_pkg_setup
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index c78279fbee98..863da84818a5 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -20,6 +20,7 @@ else
else
SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
fi
+ S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
fi
inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
@@ -61,7 +62,6 @@ BDEPEND="
wayland? ( dev-util/wayland-scanner )
x86? ( dev-lang/yasm )
"
-# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721
RDEPEND="
media-libs/libvorbis
net-dns/libidn:=
@@ -191,7 +191,7 @@ RDEPEND="
gnome-base/librsvg:2
x11-libs/cairo
)
- taglib? ( >=media-libs/taglib-1.9 )
+ taglib? ( <media-libs/taglib-2 )
theora? ( media-libs/libtheora )
tremor? ( media-libs/tremor )
truetype? (
@@ -203,10 +203,7 @@ RDEPEND="
udev? ( virtual/udev )
upnp? ( net-libs/libupnp:=[ipv6(+)] )
v4l? ( media-libs/libv4l:= )
- vaapi? (
- <media-video/ffmpeg-5
- media-libs/libva:=[drm(+),wayland?,X?]
- )
+ vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] )
vdpau? ( x11-libs/libvdpau )
vnc? ( net-libs/libvncserver )
vpx? ( media-libs/libvpx:= )
@@ -232,16 +229,15 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
- "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
+ "${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164
+ "${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmepg4.patch # bug 864721, thx Fedora
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-S="${WORKDIR}/${MY_P}"
-
pkg_setup() {
if use lua; then
lua-single_pkg_setup
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2024-11-23 20:28 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-10 21:45 [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-23 20:28 Andreas Sturmlechner
2023-12-05 13:41 Sam James
2023-06-03 21:01 Sam James
2022-10-28 15:57 Sam James
2022-04-07 22:33 Sam James
2021-05-04 22:47 Sam James
2020-12-25 2:35 Sam James
2020-04-21 9:22 Andreas Sturmlechner
2019-04-06 20:34 Andreas Sturmlechner
2018-08-15 12:36 Andreas Sturmlechner
2018-08-11 16:44 Andreas Sturmlechner
2018-05-31 21:16 Andreas Sturmlechner
2018-05-29 14:41 Andreas Sturmlechner
2018-02-27 22:51 Andreas Sturmlechner
2017-12-25 17:42 Andreas Sturmlechner
2017-12-25 17:42 Andreas Sturmlechner
2017-12-09 13:52 Andreas Sturmlechner
2017-01-16 4:06 Aaron Bauman
2016-12-19 13:38 Lars Wendler
2016-09-02 9:19 Alexis Ballier
2016-02-09 19:51 Lars Wendler
2016-02-09 7:41 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox