summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD24
-rw-r--r--aom-remove-unsupported-pixel-formats.patch37
3 files changed, 27 insertions, 53 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5a7a1c442ef0..e6b8e0bfa27e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jul 15 06:53:14 UTC 2018
+# Tue Jan 22 18:34:11 UTC 2019
pkgbase = vlc-nox
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (without X support)
- pkgver = 3.0.3
- pkgrel = 2
+ pkgver = 3.0.6
+ pkgrel = 1
url = https://www.videolan.org/vlc/
arch = x86_64
license = LGPL2.1
@@ -60,12 +60,16 @@ pkgbase = vlc-nox
makedepends = libgoom2
makedepends = projectm
makedepends = chromaprint
+ makedepends = aom
+ makedepends = srt
+ makedepends = dav1d
depends = a52dec
depends = libdvbpsi
depends = libxpm
depends = libdca
depends = libproxy
depends = lua
+ depends = libidn
depends = libmatroska
depends = taglib
depends = libmpcdec
@@ -86,7 +90,10 @@ pkgbase = vlc-nox
depends = libxml2
depends = gnutls
depends = libplacebo
+ depends = aribb24
optdepends = avahi: service discovery using bonjour protocol
+ optdepends = aom: AOM AV1 codec
+ optdepends = dav1d: dav1d AV1 decoder
optdepends = libdvdcss: decoding encrypted DVDs
optdepends = libavc1394: devices using the 1394ta AV/C
optdepends = libdc1394: IEEE 1394 access plugin
@@ -130,6 +137,7 @@ pkgbase = vlc-nox
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
@@ -150,11 +158,10 @@ pkgbase = vlc-nox
replaces = vlc-plugin
replaces = vlc-git
options = !emptydirs
- source = http://download.videolan.org/vlc/3.0.3/vlc-3.0.3.tar.xz
+ source = http://download.videolan.org/vlc/3.0.6/vlc-3.0.6.tar.xz
source = update-vlc-plugin-cache.hook
- source = aom-remove-unsupported-pixel-formats.patch
source = lua53_compat.patch
- sha512sums = 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
+ sha512sums = 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
sha512sums = 80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df
sha512sums = 5757a6f35e106883072c31d137fd247c65a544f730cf736ca2e81a31357305b5c002b52349337d8e1667fbe68628bc253ec69eee727f268aee7902a5bef82dce
sha512sums = 33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f
diff --git a/PKGBUILD b/PKGBUILD
index e269dfef9c58..baa8df45b139 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,17 +7,17 @@
_pkgbase=vlc
pkgname=vlc-nox
-pkgver=3.0.3
-pkgrel=2
+pkgver=3.0.6
+pkgrel=1
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'
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn'
'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libmad'
'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
'libarchive' 'freetype2' 'fribidi' 'harfbuzz' 'fontconfig' 'libxml2'
- 'gnutls' 'libplacebo')
+ 'gnutls' 'libplacebo' 'aribb24')
makedepends=('live-media' 'libbluray' 'flac' 'libdc1394' 'libavc1394' 'libcaca'
'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'libsystemd'
'libmtp' 'libupnp' 'libmicrodns' 'libdvdcss' 'smbclient'
@@ -26,8 +26,10 @@ makedepends=('live-media' 'libbluray' 'flac' 'libdc1394' 'libavc1394' 'libcaca'
'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')
+ 'lirc' 'libgoom2' 'projectm' 'chromaprint' 'aom' 'srt' 'dav1d')
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'
@@ -71,6 +73,7 @@ optdepends=('avahi: service discovery using bonjour protocol'
'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'
@@ -89,18 +92,15 @@ replaces=('vlc' 'vlc-plugin' 'vlc-git')
options=('!emptydirs')
source=(http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz
update-vlc-plugin-cache.hook
- aom-remove-unsupported-pixel-formats.patch
lua53_compat.patch)
-sha512sums=('1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab'
+sha512sums=('7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52'
'80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df'
- '5757a6f35e106883072c31d137fd247c65a544f730cf736ca2e81a31357305b5c002b52349337d8e1667fbe68628bc253ec69eee727f268aee7902a5bef82dce'
'33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f')
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}/aom-remove-unsupported-pixel-formats.patch"
patch -Np1 < "${srcdir}/lua53_compat.patch"
sed 's|whoami|echo builduser|g' -i configure
sed 's|hostname -f|echo arch|g' -i configure
@@ -204,7 +204,11 @@ build() {
--disable-update-check \
--disable-notify \
--enable-libplacebo \
- --enable-vlc
+ --enable-vlc \
+ --enable-aribsub \
+ --enable-aom \
+ --enable-srt
+ #--enable-dav1d
make
}
diff --git a/aom-remove-unsupported-pixel-formats.patch b/aom-remove-unsupported-pixel-formats.patch
deleted file mode 100644
index 0a75d424f477..000000000000
--- a/aom-remove-unsupported-pixel-formats.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 622360c2c4335fff793f81f5e673326a581f5c0c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Thu, 19 Apr 2018 18:25:07 +0300
-Subject: [PATCH] aom: Remove unsupported pixel formats
-
-Support for these was apparently never in the codebase, and the enum
-values were recently removed from the public headers [1].
-
-This fixes build with latest libaom build.
-
-[1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12
----
- modules/codec/aom.c | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/modules/codec/aom.c b/modules/codec/aom.c
-index 5bb442b5d50..60034158c47 100644
---- a/modules/codec/aom.c
-+++ b/modules/codec/aom.c
-@@ -116,17 +116,6 @@ static const struct
-
- { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
- { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
-- { VLC_CODEC_YUYV, AOM_IMG_FMT_YUY2, 8, 0 },
-- { VLC_CODEC_UYVY, AOM_IMG_FMT_UYVY, 8, 0 },
-- { VLC_CODEC_YVYU, AOM_IMG_FMT_YVYU, 8, 0 },
--
-- { VLC_CODEC_RGB15, AOM_IMG_FMT_RGB555, 8, 0 },
-- { VLC_CODEC_RGB16, AOM_IMG_FMT_RGB565, 8, 0 },
-- { VLC_CODEC_RGB24, AOM_IMG_FMT_RGB24, 8, 0 },
-- { VLC_CODEC_RGB32, AOM_IMG_FMT_RGB32, 8, 0 },
--
-- { VLC_CODEC_ARGB, AOM_IMG_FMT_ARGB, 8, 0 },
-- { VLC_CODEC_BGRA, AOM_IMG_FMT_ARGB_LE, 8, 0 },
-
- { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
- { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },