summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2018-03-11 20:49:30 +0100
committerMartchus2018-03-11 20:49:30 +0100
commitc7f4d8042e775e64e4fd5c1a3b8d859d76c464bc (patch)
treec71acb9af9d0061259b445cb07502c5d09613fc1
parentb5d706f2ad72977e706e9e093a56c2ba64382697 (diff)
downloadaur-c7f4d8042e775e64e4fd5c1a3b8d859d76c464bc.tar.gz
Update vlc-nightly to 4.0.0v20180311
* Sync with regular vlc package * Fix compatibility with OpenCV 3.4.1
-rw-r--r--.SRCINFO220
-rw-r--r--0001-lua-fix-build-using-lua-5.3.patch21
-rw-r--r--0002-Fix-compatibility-with-OpenCV-3.4.1.patch75
-rw-r--r--PKGBUILD262
-rw-r--r--vlc30
5 files changed, 438 insertions, 170 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fbb298c5e90..20731301676 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,112 +1,188 @@
# Generated by mksrcinfo v8
-# Tue Mar 6 16:49:13 UTC 2018
+# Sun Mar 11 19:49:30 UTC 2018
pkgbase = vlc-nightly
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot
- pkgver = 4.0.0v20180306
+ pkgver = 4.0.0v20180311
pkgrel = 1
url = https://www.videolan.org/vlc/
arch = x86_64
license = LGPL2.1
license = GPL2
- makedepends = aalib
+ makedepends = gst-plugins-base-libs
+ makedepends = live-media
+ makedepends = libnotify
+ makedepends = libbluray
makedepends = flac
- makedepends = git
+ makedepends = kdelibs
+ makedepends = libdc1394
makedepends = libavc1394
- makedepends = libbluray
makedepends = libcaca
- makedepends = libdc1394
- makedepends = libdvdcss
+ makedepends = gtk3
+ makedepends = librsvg
makedepends = libgme
- makedepends = libgoom2
+ makedepends = xosd
+ makedepends = twolame
+ makedepends = aalib
+ makedepends = avahi
+ makedepends = libsystemd
makedepends = libmtp
- makedepends = libnotify
- makedepends = librsvg
+ makedepends = libmicrodns
+ makedepends = libdvdcss
+ makedepends = smbclient
+ makedepends = vcdimager
makedepends = libssh2
- makedepends = lirc
- makedepends = live-media
+ makedepends = mesa
+ makedepends = protobuf
+ makedepends = opencv
+ makedepends = libnfs
+ makedepends = mpg123
+ makedepends = libdvdread
+ makedepends = libdvdnav
+ makedepends = libogg
+ makedepends = libshout
+ makedepends = libmodplug
+ makedepends = libvpx
+ makedepends = libvorbis
+ makedepends = speex
makedepends = opus
- makedepends = portaudio
+ 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 = libsamplerate
+ makedepends = libsoxr
+ makedepends = lirc
+ makedepends = libgoom2
makedepends = projectm
- makedepends = twolame
- makedepends = vcdimager
- makedepends = smbclient
- depends = libmatroska
+ makedepends = chromaprint
+ makedepends = libfdk-aac
+ makedepends = portaudio
+ makedepends = sidplay2-libs
+ makedepends = daala-git
+ makedepends = sndio
depends = a52dec
- depends = sidplay2-libs
- depends = libfdk-aac
- depends = faad2
- depends = ffmpeg
- depends = libdca
- depends = daala-git
depends = libdvbpsi
- depends = libdvdnav
- depends = libmad
- depends = libmpcdec
- depends = libmpeg2
+ depends = libxpm
+ depends = libdca
depends = libproxy
- depends = libshout
- depends = libtar
depends = libtiger
- depends = libupnp
- depends = libxinerama
- depends = libxpm
depends = lua
- depends = sdl_image
- depends = mesa
- depends = sndio
- depends = wayland
- depends = wayland-protocols
+ depends = libmatroska
depends = taglib
+ depends = libmpcdec
+ depends = ffmpeg
+ depends = faad2
+ depends = libupnp
+ depends = libmad
+ depends = libmpeg2
depends = xcb-util-keysyms
- depends = zvbi
+ depends = libtar
+ depends = libxinerama
depends = libsecret
depends = libarchive
depends = qt5-base
- depends = qt5-svg
- depends = libglvnd
- depends = hicolor-icon-theme
depends = qt5-x11extras
- optdepends = aalib: for ASCII art plugin
- optdepends = avahi: for service discovery using bonjour protocol
- optdepends = flac: for Free Lossless Audio Codec plugin
+ depends = qt5-svg
+ depends = freetype2
+ depends = fribidi
+ depends = harfbuzz
+ depends = fontconfig
+ depends = libxml2
+ depends = gnutls
+ depends = libplacebo
+ depends = wayland-protocols
+ optdepends = avahi: service discovery using bonjour protocol
+ optdepends = gst-plugins-base-libs: for libgst plugins
+ optdepends = libdvdcss: decoding encrypted DVDs
+ optdepends = libavc1394: devices using the 1394ta AV/C
+ optdepends = libdc1394: IEEE 1394 access plugin
optdepends = kdelibs: KDE Solid hardware integration
- optdepends = libavc1394: for devices using the 1394ta AV/C
- optdepends = libbluray: for Blu-Ray support
- optdepends = libcaca: for colored ASCII art video output
- optdepends = libcdio: for audio CD playback support
- optdepends = libdc1394: for IEEE 1394 plugin
- optdepends = libdvdcss: for decoding encrypted DVDs
- optdepends = libgme: for libgme plugin
- optdepends = libgoom2: for libgoom plugin
- optdepends = libmtp: for MTP devices support
- optdepends = libnotify: for notification plugin
- optdepends = librsvg: for SVG plugin
- optdepends = libssh2: for sftp support
- optdepends = libva-intel-driver: back-end for intel cards
- optdepends = libva-vdpau-driver: vdpau back-end for nvidia
- optdepends = lirc: for lirc plugin
- optdepends = lua-socket: for http interface
- optdepends = ncurses: for ncurses interface support
- optdepends = opus: for opus support
- optdepends = portaudio: for portaudio support
- optdepends = projectm: for ProjectM visualisation plugin
- optdepends = smbclient: for SMB access plugin
- optdepends = ttf-dejavu: for subtitle font
- optdepends = ttf-freefont: for subtitle font
- optdepends = twolame: for TwoLAME mpeg2 encoder plugin
+ optdepends = kwallet: kwallet keystore
+ 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 = libgme: Game Music Emu plugin
+ optdepends = vcdimager: navigate VCD with libvcdinfo
+ optdepends = libmtp: MTP devices discovery
+ optdepends = libsystemd: 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 = opencv: opencv video
+ 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 = 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 = 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 = libsamplerate: audio Resampler
+ optdepends = libsoxr: SoX audio Resampler
+ optdepends = chromaprint: Chromaprint audio fingerprinter
+ optdepends = lirc: lirc control
+ optdepends = libgoom2: Goom visualization
+ optdepends = projectm: ProjectM visualisation
+ optdepends = ncurses: ncurses interface
+ optdepends = libnotify: notification plugin
+ optdepends = gtk3: notification plugin
+ optdepends = libfdk-aac: FDK AAC codec
+ optdepends = portaudio: portaudio support
optdepends = vcdimager: navigate VCD with libvcdinfo
+ optdepends = schroedinger: schroedinger codec support
+ optdepends = sidplay2-libs: for C64 sid demuxer
+ optdepends = daala-git: for Daala video support
+ optdepends = sndio: for OpenBSD sndio audio output
provides = vlc
conflicts = vlc-plugin
conflicts = vlc
replaces = vlc-plugin
options = !emptydirs
- source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20180306-1038-dev.tar.xz
+ source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20180311-0236-dev.tar.xz
source = update-vlc-plugin-cache.hook
- source = https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc
+ source = 0001-lua-fix-build-using-lua-5.3.patch
+ source = 0002-Fix-compatibility-with-OpenCV-3.4.1.patch
source = find-deps.py
- sha256sums = 11fc458a8e5ecfafa9ee2604406de52d0ab3cb0d3449dc27ae1d79fe2ed31d9a
+ sha256sums = 822e8b447522d9ce67f46fca84cd3cb55109d4088efac2a5eb2b72150e4ef4d1
sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
- sha256sums = d1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa
+ sha256sums = 75ad8802bad1a79754e40fd107f5a6922c54f7467dadef8b439b49d410c8f7d2
+ sha256sums = 4e5c7582b2c1090e598710a6afa6062348f4e87b3909c3d9f12f12e08e0eea6c
sha256sums = 90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7
pkgname = vlc-nightly
diff --git a/0001-lua-fix-build-using-lua-5.3.patch b/0001-lua-fix-build-using-lua-5.3.patch
new file mode 100644
index 00000000000..0acbb211f71
--- /dev/null
+++ b/0001-lua-fix-build-using-lua-5.3.patch
@@ -0,0 +1,21 @@
+From 5824efb5fbb8aa00773aa2ff891645d17e68efc8 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 24 Feb 2018 01:32:40 +0100
+Subject: [PATCH] lua: fix build using lua 5.3
+
+---
+ modules/lua/vlc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index 71f381d334a..b46b5f67a1b 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h> /* Low level lua C API */
+ #include <lauxlib.h> /* Higher level C API */
diff --git a/0002-Fix-compatibility-with-OpenCV-3.4.1.patch b/0002-Fix-compatibility-with-OpenCV-3.4.1.patch
new file mode 100644
index 00000000000..d44a4fa940c
--- /dev/null
+++ b/0002-Fix-compatibility-with-OpenCV-3.4.1.patch
@@ -0,0 +1,75 @@
+From 5897545a4149c68e3996cfbe1e13894f03aaa307 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 11 Mar 2018 20:23:42 +0100
+Subject: [PATCH 2/2] Fix compatibility with OpenCV 3.4.1
+
+---
+ modules/video_filter/Makefile.am | 2 +-
+ modules/video_filter/{opencv_wrapper.c => opencv_wrapper.cpp} | 6 +++---
+ po/POTFILES.in | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+ rename modules/video_filter/{opencv_wrapper.c => opencv_wrapper.cpp} (98%)
+
+diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am
+index af190d16e3..d1703a7ed3 100644
+--- a/modules/video_filter/Makefile.am
++++ b/modules/video_filter/Makefile.am
+@@ -147,7 +147,7 @@ endif
+ libdeinterlace_plugin_la_LIBADD = libdeinterlace_common.la
+ video_filter_LTLIBRARIES += libdeinterlace_plugin.la
+
+-libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.c
++libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.cpp
+ libopencv_wrapper_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
+ libopencv_wrapper_plugin_la_LIBADD = $(OPENCV_LIBS)
+ libopencv_wrapper_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
+diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.cpp
+similarity index 98%
+rename from modules/video_filter/opencv_wrapper.c
+rename to modules/video_filter/opencv_wrapper.cpp
+index 525e55db1b..1e4f19c871 100644
+--- a/modules/video_filter/opencv_wrapper.c
++++ b/modules/video_filter/opencv_wrapper.cpp
+@@ -154,7 +154,7 @@ static int Create( vlc_object_t *p_this )
+ char *psz_chroma, *psz_output;
+
+ /* Allocate structure */
+- p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
++ p_filter->p_sys = reinterpret_cast<filter_sys_t*>( malloc( sizeof( filter_sys_t ) ) );
+ if( p_filter->p_sys == NULL )
+ return VLC_ENOMEM;
+
+@@ -167,7 +167,7 @@ static int Create( vlc_object_t *p_this )
+ * We don't need to set up video formats for this filter as it not
+ * actually using a picture_t.
+ */
+- p_filter->p_sys->p_opencv = vlc_object_create( p_filter, sizeof(filter_t) );
++ p_filter->p_sys->p_opencv = reinterpret_cast<filter_t*>( vlc_object_create( p_filter, sizeof(filter_t) ) );
+ if( !p_filter->p_sys->p_opencv ) {
+ free( p_filter->p_sys );
+ return VLC_ENOMEM;
+@@ -315,7 +315,7 @@ static void VlcPictureToIplImage( filter_t* p_filter, picture_t* p_in )
+ {
+ int planes = p_in->i_planes; //num input video planes
+ // input video size
+- CvSize sz = cvSize(abs(p_in->format.i_width), abs(p_in->format.i_height));
++ CvSize sz = cvSize(abs(static_cast<int>(p_in->format.i_width)), abs(static_cast<int>(p_in->format.i_height)));
+ video_format_t fmt_out;
+ filter_sys_t* p_sys = p_filter->p_sys;
+
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 528249a98c..78d2128373 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1145,7 +1145,7 @@ modules/video_filter/motionblur.c
+ modules/video_filter/motiondetect.c
+ modules/video_filter/oldmovie.c
+ modules/video_filter/opencv_example.cpp
+-modules/video_filter/opencv_wrapper.c
++modules/video_filter/opencv_wrapper.cpp
+ modules/video_filter/posterize.c
+ modules/video_filter/postproc.c
+ modules/video_filter/psychedelic.c
+--
+2.16.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 6ec48acdbf3..9f4c8f90bd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@
_appname_=vlc
pkgname=${_appname_}-nightly
-pkgver=4.0.0v20180306
+pkgver=4.0.0v20180311
_pkgver=4.0.0
-_snapshot_=20180306
-_snapver_=1038
+_snapshot_=20180311
+_snapver_=0236
_suffix_=dev
_nightly_=${_snapshot_}-${_snapver_}
pkgrel=1
@@ -16,54 +16,103 @@ pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot'
url='https://www.videolan.org/vlc/'
arch=('x86_64')
license=('LGPL2.1' 'GPL2')
-_undetected_depends=()
-depends=('libmatroska' 'a52dec' 'sidplay2-libs' 'libfdk-aac' 'faad2' 'ffmpeg' 'libdca' 'daala-git' 'libdvbpsi'
- 'libdvdnav' 'libmad' 'libmpcdec' 'libmpeg2'
- 'libproxy' 'libshout' 'libtar' 'libtiger' 'libupnp'
- 'libxinerama' 'libxpm' 'lua' 'sdl_image' 'mesa' 'sndio' 'wayland' 'wayland-protocols'
- 'taglib' 'xcb-util-keysyms' 'zvbi' 'libsecret' 'libarchive' 'qt5-base' 'qt5-svg' 'libglvnd'
- 'hicolor-icon-theme' 'qt5-x11extras' "${_detected_depends[@]}")
-makedepends=('aalib' 'flac' 'git'
- 'libavc1394' 'libbluray' 'libcaca' 'libdc1394' 'libdvdcss'
- 'libgme' 'libgoom2' 'libmtp' 'libnotify' 'librsvg'
- 'libssh2' 'lirc' 'live-media' 'opus'
- 'portaudio' 'projectm' 'twolame' 'vcdimager' 'smbclient')
-optdepends=('aalib: for ASCII art plugin'
- 'avahi: for service discovery using bonjour protocol'
- 'flac: for Free Lossless Audio Codec plugin'
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'libtiger' 'lua'
+ 'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libmad'
+ 'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
+ 'libarchive' 'qt5-base' 'qt5-x11extras' 'qt5-svg' 'freetype2'
+ 'fribidi' 'harfbuzz' 'fontconfig' 'libxml2' 'gnutls' 'libplacebo'
+ 'wayland-protocols')
+makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
+ 'flac' 'kdelibs' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
+ 'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'libsystemd'
+ 'libmtp' 'libmicrodns' 'libdvdcss' 'smbclient'
+ 'vcdimager' 'libssh2' 'mesa' 'protobuf' 'opencv' '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'
+
+ 'libfdk-aac' 'portaudio' 'sidplay2-libs' 'daala-git' 'sndio')
+optdepends=('avahi: service discovery using bonjour protocol'
+ 'gst-plugins-base-libs: for libgst plugins'
+ 'libdvdcss: decoding encrypted DVDs'
+ 'libavc1394: devices using the 1394ta AV/C'
+ 'libdc1394: IEEE 1394 access plugin'
'kdelibs: KDE Solid hardware integration'
- 'libavc1394: for devices using the 1394ta AV/C'
- 'libbluray: for Blu-Ray support'
- 'libcaca: for colored ASCII art video output'
- 'libcdio: for audio CD playback support'
- 'libdc1394: for IEEE 1394 plugin'
- 'libdvdcss: for decoding encrypted DVDs'
- 'libgme: for libgme plugin'
- 'libgoom2: for libgoom plugin'
- 'libmtp: for MTP devices support'
- 'libnotify: for notification plugin'
- 'librsvg: for SVG plugin'
- 'libssh2: for sftp support'
- 'libva-intel-driver: back-end for intel cards'
- 'libva-vdpau-driver: vdpau back-end for nvidia'
- 'lirc: for lirc plugin'
- 'lua-socket: for http interface'
- 'ncurses: for ncurses interface support'
- 'opus: for opus support'
- 'portaudio: for portaudio support'
- 'projectm: for ProjectM visualisation plugin'
- 'smbclient: for SMB access plugin'
- 'ttf-dejavu: for subtitle font'
- 'ttf-freefont: for subtitle font'
- 'twolame: for TwoLAME mpeg2 encoder plugin'
- 'vcdimager: navigate VCD with libvcdinfo')
+ 'kwallet: kwallet keystore'
+ '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'
+ 'libsystemd: udev services discovery'
+ 'smbclient: SMB access plugin'
+ 'libcdio: audio CD playback'
+ 'ttf-freefont: subtitle font '
+ 'ttf-dejavu: subtitle font'
+ 'libssh2: sftp access'
+ 'opencv: opencv video'
+ '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'
+ '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'
+ 'gtk3: notification plugin'
+
+ 'libfdk-aac: FDK AAC codec'
+ 'portaudio: portaudio support'
+ 'vcdimager: navigate VCD with libvcdinfo'
+ 'schroedinger: schroedinger codec support'
+ 'sidplay2-libs: for C64 sid demuxer'
+ 'daala-git: for Daala video support'
+ 'sndio: for OpenBSD sndio audio output')
conflicts=("${_appname_}-plugin" "${_appname_}")
provides=("${_appname_}")
replaces=("${_appname_}-plugin")
options=('!emptydirs')
source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-${_suffix_}.tar.xz"
'update-vlc-plugin-cache.hook'
- 'https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc'
+ '0001-lua-fix-build-using-lua-5.3.patch'
+ '0002-Fix-compatibility-with-OpenCV-3.4.1.patch'
'find-deps.py')
pkgver() {
@@ -75,9 +124,12 @@ prepare() {
./bootstrap
- patch -Np1 -i "${srcdir}/vlc"
+ patch -Np1 -i "${srcdir}/0001-lua-fix-build-using-lua-5.3.patch"
+ patch -Np1 -i "${srcdir}/0002-Fix-compatibility-with-OpenCV-3.4.1.patch"
sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype/freetype.c
+ sed 's|whoami|echo builduser|g' -i configure
+ sed 's|hostname -f|echo arch|g' -i configure
}
build() {
@@ -90,27 +142,100 @@ build() {
export LUA_LIBS="`pkg-config --libs lua`"
export RCC=/usr/bin/rcc-qt5
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --disable-rpath \
- --disable-fribidi \
- --enable-faad \
- --enable-nls \
- --enable-lirc \
- --enable-ncurses \
- --enable-realrtsp \
- --enable-aa \
- --enable-upnp \
- --enable-opus \
- --enable-sftp \
- --enable-fdkaac \
- --enable-archive \
- --enable-bluray \
- --enable-daala
-
- ./compile
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-rpath \
+ --enable-nls \
+ --enable-archive \
+ --enable-live555 \
+ --enable-dc1394 \
+ --enable-dv1394 \
+ --enable-dvdread \
+ --enable-dvdnav \
+ --enable-bluray \
+ --enable-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 \
+ --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 \
+ --enable-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 \
+ --enable-qt \
+ --enable-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 \
+ --enable-kwallet \
+ --disable-update-check \
+ --enable-notify \
+ --enable-libplacebo \
+ --enable-vlc \
+ \
+ --libexecdir=/usr/lib \
+ --enable-daala \
+ --enable-fdkaac
+ make V=1
}
package() {
@@ -133,7 +258,8 @@ package() {
# depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
}
-sha256sums=('11fc458a8e5ecfafa9ee2604406de52d0ab3cb0d3449dc27ae1d79fe2ed31d9a'
+sha256sums=('822e8b447522d9ce67f46fca84cd3cb55109d4088efac2a5eb2b72150e4ef4d1'
'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
- 'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa'
+ '75ad8802bad1a79754e40fd107f5a6922c54f7467dadef8b439b49d410c8f7d2'
+ '4e5c7582b2c1090e598710a6afa6062348f4e87b3909c3d9f12f12e08e0eea6c'
'90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')
diff --git a/vlc b/vlc
deleted file mode 100644
index aeff7b2fd77..00000000000
--- a/vlc
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
-Author: Vinson Lee <vlee@freedesktop.org>
-Date: Thu Feb 5 14:48:53 2015 -0800
-
- lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
-
- In Lua 5.3.0, luaL_checkint was deprecated.
-
- This patch fixes this build error with Lua 5.3.0.
-
- lua/demux.c: In function ‘vlclua_demux_peek’:
- lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
- int n = luaL_checkint( L, 1 );
- ^
-
- Signed-off-by: Vinson Lee <vlee@freedesktop.org>
- Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
-
-diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
-index efd94f1..85c7fc1 100644
---- a/modules/lua/vlc.h
-+++ b/modules/lua/vlc.h
-@@ -38,6 +38,7 @@
- #include <vlc_stream.h>
- #include <vlc_demux.h>
-
-+#define LUA_COMPAT_APIINTCASTS
- #define LUA_COMPAT_MODULE
- #include <lua.h> /* Low level lua C API */
- #include <lauxlib.h> /* Higher level C API */