diff options
| -rw-r--r-- | .SRCINFO | 258 | ||||
| -rw-r--r-- | PKGBUILD | 482 | ||||
| -rw-r--r-- | taglib-2.patch | 63 | ||||
| -rw-r--r-- | vlc-2.2.6-fix-memleak.patch | 48 | ||||
| -rw-r--r-- | vlc-2.2.8-libupnp-1.6.24.patch | 32 | ||||
| -rw-r--r-- | vlc-3.0.11.1-srt_1.4.2.patch | 36 | ||||
| -rw-r--r-- | vlc-live-media-2021.patch | 26 |
7 files changed, 493 insertions, 452 deletions
@@ -1,160 +1,177 @@ pkgbase = vlc-nox pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (without X support) - pkgver = 3.0.13 - pkgrel = 1 + pkgver = 3.0.20 + pkgrel = 2 url = https://www.videolan.org/vlc/ arch = x86_64 - license = LGPL2.1 - license = GPL2 - makedepends = live-media - makedepends = libbluray + license = GPL-2.0-or-later + license = LGPL-2.1-or-later + makedepends = aalib + makedepends = alsa-lib + makedepends = aom + makedepends = aribb25 + makedepends = avahi + makedepends = dav1d makedepends = flac - makedepends = libdc1394 + makedepends = fluidsynth + makedepends = jack + makedepends = libass makedepends = libavc1394 + makedepends = libbluray makedepends = libcaca - makedepends = librsvg + makedepends = libdc1394 + makedepends = libdvdcss + makedepends = libdvdnav + makedepends = libdvdread makedepends = libgme - makedepends = xosd - makedepends = twolame - makedepends = aalib - makedepends = avahi - makedepends = systemd-libs - makedepends = libmtp - makedepends = libupnp + makedepends = libgoom2 + makedepends = libjpeg-turbo + makedepends = libkate makedepends = libmicrodns - makedepends = libdvdcss - makedepends = smbclient - makedepends = vcdimager - makedepends = libssh2 - makedepends = mesa - makedepends = protobuf + makedepends = libmodplug + makedepends = libmtp makedepends = libnfs - makedepends = mpg123 - makedepends = libdvdread - makedepends = libdvdnav makedepends = libogg - makedepends = libshout - makedepends = libmodplug - makedepends = libvpx - makedepends = libvorbis - makedepends = speex - makedepends = opus - makedepends = libtheora makedepends = libpng - makedepends = libjpeg-turbo - makedepends = libx265.so - makedepends = libx264.so - makedepends = zvbi - makedepends = libass - makedepends = libkate - makedepends = libtiger - makedepends = sdl_image makedepends = libpulse - makedepends = alsa-lib - makedepends = jack + makedepends = librsvg makedepends = libsamplerate + makedepends = libshout makedepends = libsoxr + makedepends = libssh2 + makedepends = libtheora + makedepends = libtiger + makedepends = libvorbis + makedepends = libvpx makedepends = lirc - makedepends = libgoom2 + makedepends = live-media + makedepends = mesa + makedepends = mpg123 + makedepends = opus + makedepends = pcsclite makedepends = projectm - makedepends = chromaprint - makedepends = aom + makedepends = protobuf + makedepends = sdl_image + makedepends = smbclient + makedepends = speex makedepends = srt - makedepends = dav1d - makedepends = aribb24 - makedepends = aribb25 - makedepends = pcsclite + makedepends = systemd-libs + makedepends = twolame + makedepends = vcdimager + makedepends = x264 + makedepends = libx264.so + makedepends = x265 + makedepends = libx265.so + makedepends = xosd + makedepends = zvbi depends = a52dec - depends = libdvbpsi - depends = libxpm + depends = abseil-cpp + depends = aribb24 + depends = bash + depends = cairo + depends = dbus + depends = faad2 + depends = ffmpeg4.4 + depends = fontconfig + depends = freetype2 + depends = fribidi + depends = gcc-libs + depends = gdk-pixbuf2 + depends = glib2 + depends = glibc + depends = gnutls + depends = harfbuzz + depends = hicolor-icon-theme + depends = libarchive depends = libdca - depends = libproxy - depends = lua + depends = libdvbpsi + depends = libglvnd depends = libidn + depends = libmad depends = libmatroska - depends = taglib depends = libmpcdec - depends = ffmpeg - depends = faad2 - depends = libmad depends = libmpeg2 - depends = xcb-util-keysyms - depends = libtar - depends = libxinerama + depends = libproxy depends = libsecret + depends = libtar depends = libupnp - depends = libarchive - depends = freetype2 - depends = fribidi - depends = harfbuzz - depends = fontconfig + depends = libixml.so + depends = libupnp.so + depends = libva + depends = libx11 + depends = libxcb + depends = libxinerama depends = libxml2 - depends = gnutls - depends = libplacebo - depends = aribb24 - optdepends = avahi: service discovery using bonjour protocol + depends = libxpm + depends = lua + depends = taglib + depends = xcb-util-keysyms + depends = zlib + optdepends = aalib: ASCII art video output + optdepends = alsa-lib: ALSA audio output optdepends = aom: AOM AV1 codec + optdepends = aribb25: aribcam support + optdepends = avahi: service discovery using bonjour protocol optdepends = dav1d: dav1d AV1 decoder - optdepends = libdvdcss: decoding encrypted DVDs + optdepends = flac: Free Lossless Audio Codec plugin + optdepends = fluidsynth: FluidSynth based MIDI playback plugin + optdepends = gnu-free-fonts: subtitle font + optdepends = jack: jack audio server + optdepends = libass: Subtitle support optdepends = libavc1394: devices using the 1394ta AV/C - optdepends = libdc1394: IEEE 1394 access plugin - optdepends = libva-vdpau-driver: vdpau backend nvidia - optdepends = libva-intel-driver: video backend intel optdepends = libbluray: Blu-Ray video input - optdepends = flac: Free Lossless Audio Codec plugin - optdepends = twolame: TwoLAME mpeg2 encoder plugin + optdepends = libcaca: colored ASCII art video output + optdepends = libcdio: audio CD playback + optdepends = libdc1394: IEEE 1394 access plugin + optdepends = libdvdcss: decoding encrypted DVDs + optdepends = libdvdnav: DVD with navigation input module + optdepends = libdvdread: DVD input module optdepends = libgme: Game Music Emu plugin - optdepends = vcdimager: navigate VCD with libvcdinfo + optdepends = libgoom2: Goom visualization + optdepends = libjpeg-turbo: JPEG support + optdepends = libkate: Kate codec + optdepends = libmicrodns: mDNS services discovery (chromecast etc) + optdepends = libmodplug: MOD output plugin optdepends = libmtp: MTP devices discovery - optdepends = systemd-libs: udev services discovery - optdepends = smbclient: SMB access plugin - optdepends = libcdio: audio CD playback - optdepends = ttf-freefont: subtitle font - optdepends = ttf-dejavu: subtitle font - optdepends = libssh2: sftp access optdepends = libnfs: NFS access - optdepends = mpg123: mpg123 codec - optdepends = protobuf: chromecast streaming - optdepends = libmicrodns: mDNS services discovery (chromecast etc) - optdepends = lua-socket: http interface - optdepends = live-media: RTSP input - optdepends = libdvdread: DVD input module - optdepends = libdvdnav: DVD with navigation input module + optdepends = libnotify: notification plugin optdepends = libogg: Ogg and OggSpots codec - optdepends = libshout: shoutcast/icecast output plugin - optdepends = libmodplug: MOD output plugin - optdepends = libvpx: VP8 and VP9 codec - optdepends = libvorbis: Vorbis decoder/encoder - optdepends = speex: Speex codec - optdepends = opus: opus codec - optdepends = libtheora: theora codec optdepends = libpng: PNG support - optdepends = libjpeg-turbo: JPEG support - optdepends = librsvg: SVG plugin - optdepends = libx264: H264 encoding - optdepends = x265: HEVC/H.265 encoder - optdepends = zvbi: VBI/Teletext decoding - optdepends = libass: Subtitle support - optdepends = libkate: Kate codec - optdepends = libtiger: Tiger rendering for Kate streams - optdepends = sdl_image: SDL image support - optdepends = srt: SRT input/output plugin - optdepends = aalib: ASCII art video output - optdepends = libcaca: colored ASCII art video output optdepends = libpulse: PulseAudio audio output - optdepends = alsa-lib: ALSA audio output - optdepends = jack: jack audio server + optdepends = libraw1394: IEEE 1394 access plugin + optdepends = librsvg: SVG plugin optdepends = libsamplerate: audio Resampler + optdepends = libshout: shoutcast/icecast output plugin optdepends = libsoxr: SoX audio Resampler - optdepends = chromaprint: Chromaprint audio fingerprinter + optdepends = libssh2: sftp access + optdepends = libtheora: theora codec + optdepends = libtiger: Tiger rendering for Kate streams + optdepends = libva-intel-driver: video backend intel + optdepends = libva-vdpau-driver: vdpau backend nvidia + optdepends = libvorbis: Vorbis decoder/encoder + optdepends = libvpx: VP8 and VP9 codec optdepends = lirc: lirc control - optdepends = libgoom2: Goom visualization - optdepends = projectm: ProjectM visualisation + optdepends = live-media: streaming over RTSP + optdepends = lua-socket: http interface + optdepends = mpg123: mpg123 codec optdepends = ncurses: ncurses interface - optdepends = libnotify: notification plugin - optdepends = aribb24: aribsub support - optdepends = aribb25: aribcam support + optdepends = opus: opus codec optdepends = pcsclite: aribcam support + optdepends = projectm: ProjectM visualisation + optdepends = protobuf: chromecast streaming + optdepends = sdl12-compat: SDL image support + optdepends = sdl_image: SDL image support + optdepends = smbclient: SMB access plugin + optdepends = speex: Speex codec + optdepends = speexdsp: Speex codec + optdepends = srt: SRT input/output plugin + optdepends = systemd-libs: udev services discovery + optdepends = ttf-dejavu: subtitle font + optdepends = twolame: TwoLAME mpeg2 encoder plugin + optdepends = vcdimager: navigate VCD with libvcdinfo + optdepends = x264: H264 encoding + optdepends = x265: HEVC/H.265 encoder + optdepends = zvbi: VBI/Teletext/webcam/v4l2 capture/decoding conflicts = vlc conflicts = vlc-plugin conflicts = vlc-git @@ -162,14 +179,11 @@ pkgbase = vlc-nox replaces = vlc-plugin replaces = vlc-git options = !emptydirs - source = http://download.videolan.org/vlc/3.0.13/vlc-3.0.13.tar.xz + source = http://download.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz source = update-vlc-plugin-cache.hook - source = vlc-3.0.11.1-srt_1.4.2.patch - source = vlc-live-media-2021.patch - sha512sums = 0badca9d71b682b1dd6f05acab48d77baffe22e6a00be6db2a790644bab74738f9807e889fd0348af72628694b5210896638ac2cd99d0efc0e1c2cef7ab28bff + source = taglib-2.patch + sha512sums = 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406 sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3 - sha512sums = ac1d33d434aca2a0ad6e70800073deeaefc02b8fd72656b682ca833ee0cffe10dfa19a9355388700cab46ffbf9421c007d00ed04c7fa562698ff81e70db5f283 - sha512sums = ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc + sha512sums = ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3 pkgname = vlc-nox - @@ -7,217 +7,323 @@ _pkgbase=vlc pkgname=vlc-nox -pkgver=3.0.13 -pkgrel=1 +pkgver=3.0.20 +pkgrel=2 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (without X support)' url='https://www.videolan.org/vlc/' arch=('x86_64') -license=('LGPL2.1' 'GPL2') -depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn' - 'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libmad' - 'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret' - 'libupnp' 'libarchive' 'freetype2' 'fribidi' 'harfbuzz' - 'fontconfig' 'libxml2' 'gnutls' 'libplacebo' 'aribb24') -makedepends=('live-media' 'libbluray' 'flac' 'libdc1394' 'libavc1394' 'libcaca' - 'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'systemd-libs' - 'libmtp' 'libupnp' 'libmicrodns' 'libdvdcss' 'smbclient' - 'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123' - 'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx' - 'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo' - 'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger' - 'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr' - 'lirc' 'libgoom2' 'projectm' 'chromaprint' 'aom' 'srt' 'dav1d' - 'aribb24' 'aribb25' 'pcsclite') -optdepends=('avahi: service discovery using bonjour protocol' - 'aom: AOM AV1 codec' - 'dav1d: dav1d AV1 decoder' - 'libdvdcss: decoding encrypted DVDs' - 'libavc1394: devices using the 1394ta AV/C' - 'libdc1394: IEEE 1394 access plugin' - 'libva-vdpau-driver: vdpau backend nvidia' - 'libva-intel-driver: video backend intel' - 'libbluray: Blu-Ray video input' - 'flac: Free Lossless Audio Codec plugin' - 'twolame: TwoLAME mpeg2 encoder plugin' - 'libgme: Game Music Emu plugin' - 'vcdimager: navigate VCD with libvcdinfo' - 'libmtp: MTP devices discovery' - 'systemd-libs: udev services discovery' - 'smbclient: SMB access plugin' - 'libcdio: audio CD playback' - 'ttf-freefont: subtitle font ' - 'ttf-dejavu: subtitle font' - 'libssh2: sftp access' - 'libnfs: NFS access' - 'mpg123: mpg123 codec' - 'protobuf: chromecast streaming' - 'libmicrodns: mDNS services discovery (chromecast etc)' - 'lua-socket: http interface' - 'live-media: RTSP input' - 'libdvdread: DVD input module' - 'libdvdnav: DVD with navigation input module' - 'libogg: Ogg and OggSpots codec' - 'libshout: shoutcast/icecast output plugin' - 'libmodplug: MOD output plugin' - 'libvpx: VP8 and VP9 codec' - 'libvorbis: Vorbis decoder/encoder' - 'speex: Speex codec' - 'opus: opus codec' - 'libtheora: theora codec' - 'libpng: PNG support' - 'libjpeg-turbo: JPEG support' - 'librsvg: SVG plugin' - 'libx264: H264 encoding' - 'x265: HEVC/H.265 encoder' - 'zvbi: VBI/Teletext decoding' - 'libass: Subtitle support' - 'libkate: Kate codec' - 'libtiger: Tiger rendering for Kate streams' - 'sdl_image: SDL image support' - 'srt: SRT input/output plugin' - 'aalib: ASCII art video output' - 'libcaca: colored ASCII art video output' - 'libpulse: PulseAudio audio output' - 'alsa-lib: ALSA audio output' - 'jack: jack audio server' - 'libsamplerate: audio Resampler' - 'libsoxr: SoX audio Resampler' - 'chromaprint: Chromaprint audio fingerprinter' - 'lirc: lirc control' - 'libgoom2: Goom visualization' - 'projectm: ProjectM visualisation' - 'ncurses: ncurses interface' - 'libnotify: notification plugin' - 'aribb24: aribsub support' - 'aribb25: aribcam support' - 'pcsclite: aribcam support') +license=( + 'GPL-2.0-or-later' + 'LGPL-2.1-or-later' +) +depends=( + 'a52dec' + 'abseil-cpp' + 'aribb24' + 'bash' + 'cairo' + 'dbus' + 'faad2' + 'ffmpeg4.4' # NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4) + 'fontconfig' + 'freetype2' + 'fribidi' + 'gcc-libs' + 'gdk-pixbuf2' + 'glib2' + 'glibc' + 'gnutls' + 'harfbuzz' + 'hicolor-icon-theme' + 'libarchive' + 'libdca' + 'libdvbpsi' + 'libglvnd' + 'libidn' + 'libmad' + 'libmatroska' + 'libmpcdec' + 'libmpeg2' + 'libproxy' + 'libsecret' + 'libtar' + 'libupnp' 'libixml.so' 'libupnp.so' + 'libva' + 'libx11' + 'libxcb' + 'libxinerama' + 'libxml2' + 'libxpm' + 'lua' + 'taglib' + 'xcb-util-keysyms' + 'zlib' +) +makedepends=( + 'aalib' + 'alsa-lib' + 'aom' + 'aribb25' + 'avahi' + 'dav1d' + 'flac' + 'fluidsynth' + 'jack' + 'libass' + 'libavc1394' + 'libbluray' + 'libcaca' + 'libdc1394' + 'libdvdcss' + 'libdvdnav' + 'libdvdread' + 'libgme' + 'libgoom2' + 'libjpeg-turbo' + 'libkate' + 'libmicrodns' + 'libmodplug' + 'libmtp' + 'libnfs' + 'libogg' + 'libpng' + 'libpulse' + 'librsvg' + 'libsamplerate' + 'libshout' + 'libsoxr' + 'libssh2' + 'libtheora' + 'libtiger' + 'libvorbis' + 'libvpx' + 'lirc' + 'live-media' + 'mesa' + 'mpg123' + 'opus' + 'pcsclite' + 'projectm' + 'protobuf' + 'sdl_image' + 'smbclient' + 'speex' + 'srt' + 'systemd-libs' + 'twolame' + 'vcdimager' + 'x264' 'libx264.so' + 'x265' 'libx265.so' + 'xosd' + 'zvbi' +) +optdepends=( + 'aalib: ASCII art video output' + 'alsa-lib: ALSA audio output' + 'aom: AOM AV1 codec' + 'aribb25: aribcam support' + 'avahi: service discovery using bonjour protocol' + 'dav1d: dav1d AV1 decoder' + 'flac: Free Lossless Audio Codec plugin' + 'fluidsynth: FluidSynth based MIDI playback plugin' + 'gnu-free-fonts: subtitle font' + 'jack: jack audio server' + 'libass: Subtitle support' + 'libavc1394: devices using the 1394ta AV/C' + 'libbluray: Blu-Ray video input' + 'libcaca: colored ASCII art video output' + 'libcdio: audio CD playback' + 'libdc1394: IEEE 1394 access plugin' + 'libdvdcss: decoding encrypted DVDs' + 'libdvdnav: DVD with navigation input module' + 'libdvdread: DVD input module' + 'libgme: Game Music Emu plugin' + 'libgoom2: Goom visualization' + 'libjpeg-turbo: JPEG support' + 'libkate: Kate codec' + 'libmicrodns: mDNS services discovery (chromecast etc)' + 'libmodplug: MOD output plugin' + 'libmtp: MTP devices discovery' + 'libnfs: NFS access' + 'libnotify: notification plugin' + 'libogg: Ogg and OggSpots codec' + 'libpng: PNG support' + 'libpulse: PulseAudio audio output' + 'libraw1394: IEEE 1394 access plugin' + 'librsvg: SVG plugin' + 'libsamplerate: audio Resampler' + 'libshout: shoutcast/icecast output plugin' + 'libsoxr: SoX audio Resampler' + 'libssh2: sftp access' + 'libtheora: theora codec' + 'libtiger: Tiger rendering for Kate streams' + 'libva-intel-driver: video backend intel' + 'libva-vdpau-driver: vdpau backend nvidia' + 'libvorbis: Vorbis decoder/encoder' + 'libvpx: VP8 and VP9 codec' + 'lirc: lirc control' + 'live-media: streaming over RTSP' + 'lua-socket: http interface' + 'mpg123: mpg123 codec' + 'ncurses: ncurses interface' + 'opus: opus codec' + 'pcsclite: aribcam support' + 'projectm: ProjectM visualisation' + 'protobuf: chromecast streaming' + 'sdl12-compat: SDL image support' + 'sdl_image: SDL image support' + 'smbclient: SMB access plugin' + 'speex: Speex codec' + 'speexdsp: Speex codec' + 'srt: SRT input/output plugin' + 'systemd-libs: udev services discovery' + 'ttf-dejavu: subtitle font' + 'twolame: TwoLAME mpeg2 encoder plugin' + 'vcdimager: navigate VCD with libvcdinfo' + 'x264: H264 encoding' + 'x265: HEVC/H.265 encoder' + 'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding' +) conflicts=('vlc' 'vlc-plugin' 'vlc-git') replaces=('vlc' 'vlc-plugin' 'vlc-git') options=('!emptydirs') -source=(http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz - update-vlc-plugin-cache.hook - vlc-3.0.11.1-srt_1.4.2.patch - vlc-live-media-2021.patch) -sha512sums=('0badca9d71b682b1dd6f05acab48d77baffe22e6a00be6db2a790644bab74738f9807e889fd0348af72628694b5210896638ac2cd99d0efc0e1c2cef7ab28bff' +source=( + http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz + update-vlc-plugin-cache.hook + taglib-2.patch +) +sha512sums=('02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406' 'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3' - 'ac1d33d434aca2a0ad6e70800073deeaefc02b8fd72656b682ca833ee0cffe10dfa19a9355388700cab46ffbf9421c007d00ed04c7fa562698ff81e70db5f283' - 'ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc') + 'ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3') prepare() { cd "${srcdir}/${_pkgbase}-${pkgver}" sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp sed -e 's|-Werror-implicit-function-declaration||g' -i configure - patch -Np1 < "${srcdir}/vlc-3.0.11.1-srt_1.4.2.patch" - patch -Np1 < "${srcdir}/vlc-live-media-2021.patch" sed 's|whoami|echo builduser|g' -i configure sed 's|hostname -f|echo arch|g' -i configure + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done autoreconf -vf } build() { cd "${srcdir}/${_pkgbase}-${pkgver}" - export CFLAGS+=" -I/usr/include/samba-4.0" + export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects" export CPPFLAGS+=" -I/usr/include/samba-4.0" - export CXXFLAGS+=" -std=c++11" + export CXXFLAGS+=" -std=c++17" + export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig" export LUAC=/usr/bin/luac export LUA_LIBS="$(pkg-config --libs lua)" + export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig/:$PKG_CONFIG_PATH" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-rpath \ + --enable-nls \ + --enable-archive \ + --enable-live555 \ + --enable-dc1394 \ + --enable-dv1394 \ + --enable-dvdread \ + --enable-dvdnav \ + --enable-bluray \ + --disable-opencv \ + --enable-smbclient \ + --enable-sftp \ + --enable-nfs \ + --enable-realrtsp \ + --enable-dvbpsi \ + --enable-gme \ + --enable-ogg \ + --enable-shout \ + --enable-matroska \ + --enable-mod \ + --enable-mpc \ + --enable-mad \ + --enable-mpg123 \ + --enable-gst-decode \ + --enable-avcodec \ + --enable-libva \ + --enable-avformat \ + --enable-postproc \ + --enable-faad \ + --enable-vpx \ + --enable-twolame \ + --disable-fdkaac \ + --enable-a52 \ + --enable-dca \ + --enable-flac \ + --enable-fluidsynth \ + --enable-libmpeg2 \ + --enable-vorbis \ + --enable-speex \ + --enable-opus \ + --enable-oggspots \ + --disable-schroedinger \ + --enable-png \ + --enable-jpeg \ + --enable-x264 \ + --enable-x265 \ + --enable-zvbi \ + --enable-libass \ + --enable-kate \ + --enable-tiger \ + --enable-vdpau \ + --disable-wayland \ + --enable-sdl-image \ + --enable-freetype \ + --enable-fribidi \ + --enable-harfbuzz \ + --enable-fontconfig \ + --enable-svg \ + --enable-svgdec \ + --enable-aa \ + --enable-caca \ + --enable-pulse \ + --enable-alsa \ + --enable-jack \ + --enable-samplerate \ + --enable-soxr \ + --disable-chromaprint \ + --enable-chromecast \ + --disable-qt \ + --disable-skins2 \ + --enable-libtar \ + --enable-ncurses \ + --enable-lirc \ + --enable-goom \ + --enable-projectm \ + --enable-avahi \ + --enable-mtp \ + --enable-upnp \ + --enable-microdns \ + --enable-libxml2 \ + --disable-libgcrypt \ + --enable-gnutls \ + --enable-taglib \ + --enable-secret \ + --disable-kwallet \ + --disable-update-check \ + --disable-notify \ + --disable-libplacebo \ + --enable-vlc \ + --enable-aribsub \ + --enable-aribcam \ + --enable-aom \ + --enable-srt \ + --enable-dav1d - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-rpath \ - --enable-nls \ - --enable-archive \ - --enable-live555 \ - --enable-dc1394 \ - --enable-dv1394 \ - --enable-dvdread \ - --enable-dvdnav \ - --enable-bluray \ - --disable-opencv \ - --enable-smbclient \ - --enable-sftp \ - --enable-nfs \ - --enable-realrtsp \ - --enable-dvbpsi \ - --enable-gme \ - --enable-ogg \ - --enable-shout \ - --enable-matroska \ - --enable-mod \ - --enable-mpc \ - --enable-mad \ - --enable-mpg123 \ - --enable-gst-decode \ - --enable-avcodec \ - --enable-libva \ - --enable-avformat \ - --enable-postproc \ - --enable-faad \ - --enable-vpx \ - --enable-twolame \ - --disable-fdkaac \ - --enable-a52 \ - --enable-dca \ - --enable-flac \ - --enable-libmpeg2 \ - --enable-vorbis \ - --enable-speex \ - --enable-opus \ - --enable-oggspots \ - --disable-schroedinger \ - --enable-png \ - --enable-jpeg \ - --enable-x264 \ - --enable-x265 \ - --enable-zvbi \ - --enable-libass \ - --enable-kate \ - --enable-tiger \ - --enable-vdpau \ - --disable-wayland \ - --enable-sdl-image \ - --enable-freetype \ - --enable-fribidi \ - --enable-harfbuzz \ - --enable-fontconfig \ - --enable-svg \ - --enable-svgdec \ - --enable-aa \ - --enable-caca \ - --enable-pulse \ - --enable-alsa \ - --enable-jack \ - --enable-samplerate \ - --enable-soxr \ - --enable-chromaprint \ - --enable-chromecast \ - --disable-qt \ - --disable-skins2 \ - --enable-libtar \ - --enable-ncurses \ - --enable-lirc \ - --enable-goom \ - --enable-projectm \ - --enable-avahi \ - --enable-mtp \ - --enable-upnp \ - --enable-microdns \ - --enable-libxml2 \ - --disable-libgcrypt \ - --enable-gnutls \ - --enable-taglib \ - --enable-secret \ - --disable-kwallet \ - --disable-update-check \ - --disable-notify \ - --enable-libplacebo \ - --enable-vlc \ - --enable-aribsub \ - --enable-aribcam \ - --enable-aom \ - --enable-srt \ - --enable-dav1d + # prevent excessive overlinking due to libtool + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } @@ -226,7 +332,7 @@ package() { make DESTDIR="${pkgdir}" install - for res in 16 32 48 128; do + for res in 16 32 48 128 256; do install -Dm 644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" done diff --git a/taglib-2.patch b/taglib-2.patch new file mode 100644 index 000000000000..862ef586bcc3 --- /dev/null +++ b/taglib-2.patch @@ -0,0 +1,63 @@ +diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp +index 84b401c795..f371485008 100644 +--- a/modules/meta_engine/taglib.cpp ++++ b/modules/meta_engine/taglib.cpp +@@ -185,7 +185,7 @@ public: + ByteVector res(length, 0); + ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length); + if (i_read < 0) +- return ByteVector::null; ++ return ByteVector(); + else if ((size_t)i_read != length) + res.resize(i_read); + return res; +@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta + static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest) + { + #define SET( accessor, meta ) \ +- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \ ++ if( !tag->accessor().isEmpty() ) \ + vlc_meta_Set##meta( dest, tag->accessor().toCString(true) ) + #define SETINT( accessor, meta ) \ + if( tag->accessor() ) \ +@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta + { + MP4::Item list; + #define SET( keyName, metaName ) \ +- if( tag->itemListMap().contains(keyName) ) \ ++ if( tag->itemMap().contains(keyName) ) \ + { \ +- list = tag->itemListMap()[keyName]; \ ++ list = tag->itemMap()[keyName]; \ + vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \ + } + #define SET_EXTRA( keyName, metaName ) \ +- if( tag->itemListMap().contains(keyName) ) \ ++ if( tag->itemMap().contains(keyName) ) \ + { \ +- list = tag->itemListMap()[keyName]; \ ++ list = tag->itemMap()[keyName]; \ + vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \ + } + +@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta + #undef SET + #undef SET_EXTRA + +- if( tag->itemListMap().contains("covr") ) ++ if( tag->itemMap().contains("covr") ) + { +- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList(); ++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList(); + const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg"; + + msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes", +@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this ) + if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) ) + WriteMetaToId3v2( riff_aiff->tag(), p_item ); + else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) ) +- WriteMetaToId3v2( riff_wav->tag(), p_item ); ++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item ); + } + else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) ) + { diff --git a/vlc-2.2.6-fix-memleak.patch b/vlc-2.2.6-fix-memleak.patch deleted file mode 100644 index de5c1ac153b2..000000000000 --- a/vlc-2.2.6-fix-memleak.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 66dc09662ae33d44c21a5159885afdcaabb0cbb0 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Filip=20Ros=C3=A9en?= <filip@atch.se> -Date: Fri, 23 Sep 2016 13:52:31 +0200 -Subject: [PATCH] video_output/xcb: fix memory-leak in ReleaseDrawable - -The problem with the previous implementation is that "n" will never -be equal to 0 at the relevant part of the code (given the -unconditional pre-increment a few lines earlier). - -These changes fixes the issue by freeing the allocated memory if the -first element of "used" is NULL (meaning that there are no more -entities referred to by it). - -fixes #17112 -fixes #17293 - -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/video_output/xcb/window.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c -index 02c9dd11e3..0c4f86f68c 100644 ---- a/modules/video_output/xcb/window.c -+++ b/modules/video_output/xcb/window.c -@@ -538,12 +538,15 @@ static void ReleaseDrawable (vlc_object_t *obj, xcb_window_t window) - used[n] = used[n + 1]; - while (used[++n]); - -- if (n == 0) -- var_SetAddress (obj->p_libvlc, "xid-in-use", NULL); -+ if (!used[0]) -+ var_SetAddress (obj->p_libvlc, "xid-in-use", NULL); -+ else -+ used = NULL; -+ - vlc_mutex_unlock (&serializer); - -- if (n == 0) -- free (used); -+ free( used ); -+ - /* Variables are reference-counted... */ - var_Destroy (obj->obj.libvlc, "xid-in-use"); - } --- -2.11.0 - diff --git a/vlc-2.2.8-libupnp-1.6.24.patch b/vlc-2.2.8-libupnp-1.6.24.patch deleted file mode 100644 index 4878550e182b..000000000000 --- a/vlc-2.2.8-libupnp-1.6.24.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9288c513fd7288ea85cd162aa610ca6d7e083992 Mon Sep 17 00:00:00 2001 -From: anthraxx <levente@leventepolyak.net> -Date: Fri, 11 Jan 2018 23:57:53 +0100 -Subject: [PATCH] avoid defining getter functions present in libupnp 1.6.24 - ---- - modules/services_discovery/upnp.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp -index b265113..f18afd6 100644 ---- a/modules/services_discovery/upnp.cpp -+++ b/modules/services_discovery/upnp.cpp -@@ -50,6 +50,7 @@ typedef Upnp_Action_Complete UpnpActionComplete; - typedef Upnp_Event UpnpEvent; - typedef Upnp_Event_Subscribe UpnpEventSubscribe; - -+#if UPNP_VERSION < 10624 - static const char* UpnpDiscovery_get_Location_cstr( const UpnpDiscovery* p_discovery ) - { - return p_discovery->Location; -@@ -74,6 +75,7 @@ static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_ - { - return p_s->Sid; - } -+#endif - #else - typedef const void* UpnpEventPtr; - #endif --- -2.15.1 - diff --git a/vlc-3.0.11.1-srt_1.4.2.patch b/vlc-3.0.11.1-srt_1.4.2.patch deleted file mode 100644 index 0bc3822e7a9d..000000000000 --- a/vlc-3.0.11.1-srt_1.4.2.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac ---- vlc-3.0.13.orig/configure.ac 2021-04-27 15:18:39.000000000 +0200 -+++ vlc-3.0.13/configure.ac 2021-05-03 16:10:00.342592591 +0200 -@@ -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 -ruN a/modules/access/srt.c b/modules/access/srt.c ---- a/modules/access/srt.c 2018-04-23 10:03:39.000000000 +0200 -+++ b/modules/access/srt.c 2020-09-26 10:35:18.830149487 +0200 -@@ -165,7 +165,7 @@ - - /* 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" ); -diff -ruN a/modules/access_output/srt.c b/modules/access_output/srt.c ---- a/modules/access_output/srt.c 2018-04-06 11:22:51.000000000 +0200 -+++ b/modules/access_output/srt.c 2020-09-26 10:35:03.386828120 +0200 -@@ -162,7 +162,7 @@ - - /* 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/vlc-live-media-2021.patch b/vlc-live-media-2021.patch deleted file mode 100644 index 5ca5cb30cd63..000000000000 --- a/vlc-live-media-2021.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac ---- vlc-3.0.13.orig/configure.ac 2021-04-27 15:18:39.000000000 +0200 -+++ vlc-3.0.13/configure.ac 2021-05-03 16:26:26.691200904 +0200 -@@ -1825,7 +1825,7 @@ - AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.]) - ]) - ], [ -- other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" -+ other_libs="-lcrypto -lssl -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" - other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" - AS_IF([test "${SYS}" = "mingw32"], [ - # add ws2_32 for closesocket, select, recv -diff -ru vlc-3.0.13.orig/modules/access/live555.cpp vlc-3.0.13/modules/access/live555.cpp ---- vlc-3.0.13.orig/modules/access/live555.cpp 2019-03-29 20:01:15.000000000 +0100 -+++ vlc-3.0.13/modules/access/live555.cpp 2021-05-03 16:04:38.030121796 +0200 -@@ -852,7 +852,9 @@ - if( !p_sys->b_multicast ) - { - /* We need different rollover behaviour for multicast */ -- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() ); -+ struct sockaddr_storage tempAddr; -+ sub->getConnectionEndpointAddress(tempAddr); -+ p_sys->b_multicast = IsMulticastAddress( tempAddr ); - } - - tk = (live_track_t*)malloc( sizeof( live_track_t ) ); |