summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/vlc/patch-dvdnav-503.diff13
-rw-r--r--multimedia/vlc/patch-dvdread-503.diff15
-rw-r--r--multimedia/vlc/vlc.SlackBuild4
-rw-r--r--multimedia/vlc/vlc.info6
4 files changed, 34 insertions, 4 deletions
diff --git a/multimedia/vlc/patch-dvdnav-503.diff b/multimedia/vlc/patch-dvdnav-503.diff
new file mode 100644
index 0000000000..422fc53d03
--- /dev/null
+++ b/multimedia/vlc/patch-dvdnav-503.diff
@@ -0,0 +1,13 @@
+--- modules/access/dvdnav.c.orig 2020-04-07 23:35:05.000000000 +1000
++++ modules/access/dvdnav.c 2020-04-16 22:32:34.175000000 +1000
+@@ -59,6 +59,10 @@
+
+
+ #include <dvdnav/dvdnav.h>
++/* libdvdnav-5.0.3 doesn't define DVDNAV_VERSION */
++#ifndef DVDNAV_VERSION
++#define DVDNAV_VERSION (50003)
++#endif
+ /* Expose without patching headers */
+ dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *, uint64_t, int32_t);
+
diff --git a/multimedia/vlc/patch-dvdread-503.diff b/multimedia/vlc/patch-dvdread-503.diff
new file mode 100644
index 0000000000..81523e6829
--- /dev/null
+++ b/multimedia/vlc/patch-dvdread-503.diff
@@ -0,0 +1,15 @@
+--- modules/access/dvdread.c.orig 2020-03-28 23:39:33.000000000 +1000
++++ modules/access/dvdread.c 2020-04-16 22:10:43.065000000 +1000
+@@ -55,6 +55,12 @@
+ #include <unistd.h>
+
+ #include <dvdread/dvd_reader.h>
++#ifndef DVDREAD_VERSION_CODE
++#define DVDREAD_VERSION_CODE(major, minor, micro) \
++ (((major) * 10000) + \
++ ((minor) * 100) + \
++ ((micro) * 1))
++#endif
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/nav_read.h>
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 4f21102ecd..1631c72af8 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -28,7 +28,7 @@
# -----------------------------------------------------------------------------
PRGNAM=vlc
-VERSION=${VERSION:-3.0.8}
+VERSION=${VERSION:-3.0.9.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -81,6 +81,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
+patch -p0 < $CWD/patch-dvdread-503.diff
+patch -p0 < $CWD/patch-dvdnav-503.diff
patch -p0 < $CWD/patch-projectM-fontpath.diff
patch -p0 < $CWD/patch_vlc_cache_gen.diff
diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info
index 96f288ffb5..bb842c4a37 100644
--- a/multimedia/vlc/vlc.info
+++ b/multimedia/vlc/vlc.info
@@ -1,8 +1,8 @@
PRGNAM="vlc"
-VERSION="3.0.8"
+VERSION="3.0.9.2"
HOMEPAGE="https://www.videolan.org/vlc/"
-DOWNLOAD="https://get.videolan.org/vlc/3.0.8/vlc-3.0.8.tar.xz"
-MD5SUM="744442ec0c145453ea1d257914c8072e"
+DOWNLOAD="https://get.videolan.org/vlc/3.0.9.2/vlc-3.0.9.2.tar.xz"
+MD5SUM="bdedd425a7d41dc0664b1e65286c523c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus ffmpeg libwebp gsm libtar libkate faac libdca libmatroska libshout speex avahi projectM jack libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac gnome-vfs live555 qt5 rtmpdump libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray libnfs protobuf"