diff options
Diffstat (limited to 'media-video/vlc/vlc-9999.ebuild')
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 92 |
1 files changed, 47 insertions, 45 deletions
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 62677697baa2..2d66aaaa613d 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2000-2021 Gentoo Authors +# Copyright 2000-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..2} ) @@ -10,10 +10,9 @@ 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" + 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 @@ -21,7 +20,7 @@ else 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" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86" fi inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg @@ -33,7 +32,7 @@ SLOT="0/12-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 kms + fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate kms libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba @@ -59,12 +58,13 @@ BDEPEND=" virtual/pkgconfig lua? ( ${LUA_DEPS} ) amd64? ( dev-lang/yasm ) + wayland? ( dev-util/wayland-scanner ) x86? ( dev-lang/yasm ) " RDEPEND=" media-libs/libvorbis net-dns/libidn:= - sys-libs/zlib[minizip] + sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) @@ -94,24 +94,24 @@ RDEPEND=" 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= + >=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:0=[postproc,vaapi?,vdpau?] ) + ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] ) flac? ( - media-libs/flac + media-libs/flac:= media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( - dev-libs/libgcrypt:0= + dev-libs/libgcrypt:= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) - gnome-keyring? ( app-crypt/libsecret ) + keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 @@ -128,7 +128,7 @@ RDEPEND=" sys-libs/libraw1394 ) jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( @@ -141,7 +141,7 @@ RDEPEND=" x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) - libplacebo? ( media-libs/libplacebo ) + libplacebo? ( media-libs/libplacebo:= ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) @@ -156,7 +156,7 @@ RDEPEND=" media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) - mp3? ( media-sound/mpg123 ) + mp3? ( media-sound/mpg123-base ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) @@ -169,8 +169,8 @@ RDEPEND=" media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) - pulseaudio? ( media-sound/pulseaudio ) - rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) + pulseaudio? ( media-libs/libpulse ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:2= ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) @@ -202,9 +202,9 @@ RDEPEND=" ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) - upnp? ( net-libs/libupnp:=[ipv6] ) + upnp? ( net-libs/libupnp:=[ipv6(+)] ) v4l? ( media-libs/libv4l:= ) - vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) + vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) @@ -214,7 +214,7 @@ RDEPEND=" ) X? ( x11-libs/libX11 - x11-libs/libxcb[xkb] + x11-libs/libxcb x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util @@ -231,12 +231,11 @@ 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}-configure_lua_version.patch + "${FILESDIR}"/${PN}-9999-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-9999-configure-lua-version.patch ) -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) +DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt ) S="${WORKDIR}/${MY_P}" @@ -247,7 +246,10 @@ pkg_setup() { } src_prepare() { - xdg_src_prepare # bug 608256 + default + + # bug 608256 + xdg_environment_reset has_version 'net-libs/libupnp:1.8' && \ eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch @@ -282,7 +284,7 @@ src_prepare() { } src_configure() { - local -x BUILDCC=$(tc-getBUILD_CC) + local -x BUILDCC="$(tc-getBUILD_CC)" local myeconfargs=( --disable-optimizations @@ -334,7 +336,7 @@ src_configure() { $(use_enable fontconfig) $(use_enable gcrypt libgcrypt) $(use_enable gme) - $(use_enable gnome-keyring secret) + $(use_enable keyring secret) $(use_enable gstreamer gst-decode) $(use_enable gui qt) $(use_enable ieee1394 dv1394) @@ -432,8 +434,12 @@ src_configure() { ) # ^ 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/usr/include/samba-4.0" + 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 @@ -442,18 +448,14 @@ src_configure() { 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${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/" - if use omxil; then - # bug #723006 - # https://trac.videolan.org/vlc/ticket/24617 - append-cflags -fcommon + if use riscv; then + # bug #803473 + append-libs -latomic fi - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" - if use truetype || use bidi; then myeconfargs+=( --enable-freetype ) else @@ -488,12 +490,12 @@ src_install() { } pkg_postinst() { - if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/libexec/vlc/vlc-cache-gen" ]] ; then - einfo "Running ${EROOT}/usr/libexec/vlc/vlc-cache-gen on ${EROOT}/usr/libexec/vlc/plugins/" - "${EROOT}/usr/libexec/vlc/vlc-cache-gen" "${EROOT}/usr/libexec/vlc/plugins/" + if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}"/usr/libexec/vlc/vlc-cache-gen ]] ; then + einfo "Running ${EPREFIX}/usr/libexec/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/" + "${EPREFIX}"/usr/libexec/vlc/vlc-cache-gen "${EROOT}/usr/$(get_libdir)/vlc/plugins/" else ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" - ewarn "Please run ${EROOT}/usr/libexec/vlc/vlc-cache-gen manually" + ewarn "Please run ${EPREFIX}/usr/libexec/vlc/vlc-cache-gen manually" ewarn "If you do not do it, vlc will take a long time to load." fi @@ -501,8 +503,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e "${EROOT}"/usr/libexec/vlc/plugins/plugins.dat ]]; then - rm "${EROOT}"/usr/libexec/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + 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 |