summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@iinet.net.au>2015-06-03 15:24:30 +0200
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-06-20 11:56:45 +0700
commitebbca960923bbc5aabc3f15e4c178eafbe8a3e1c (patch)
tree66baad09f0909376bdc8af673dcdb3dd2791d607
parent9b26285f8e2bd162233f4e01fb6c042f541c649b (diff)
downloadslackbuilds-ebbca960923bbc5aabc3f15e4c178eafbe8a3e1c.tar.gz
multimedia/vlc: Patch for ffmpeg-2.6.x.
Path to vlc-cache-gen shouldn't be absolute Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--multimedia/vlc/doinst.sh.in2
-rw-r--r--multimedia/vlc/patch_libavcodec_version.diff13
-rw-r--r--multimedia/vlc/patch_vlc_cache_gen.diff28
-rw-r--r--multimedia/vlc/vlc.SlackBuild6
4 files changed, 47 insertions, 2 deletions
diff --git a/multimedia/vlc/doinst.sh.in b/multimedia/vlc/doinst.sh.in
index 03a4d01e28..f62bb1cf80 100644
--- a/multimedia/vlc/doinst.sh.in
+++ b/multimedia/vlc/doinst.sh.in
@@ -13,5 +13,5 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
fi
if [ ! -e usr/lib%LIBDIRSUFFIX%/vlc/plugins*.dat ] ; then
- /usr/lib%LIBDIRSUFFIX%/vlc/vlc-cache-gen -f usr/lib%LIBDIRSUFFIX%/vlc
+ usr/lib%LIBDIRSUFFIX%/vlc/vlc-cache-gen -f usr/lib%LIBDIRSUFFIX%/vlc
fi
diff --git a/multimedia/vlc/patch_libavcodec_version.diff b/multimedia/vlc/patch_libavcodec_version.diff
new file mode 100644
index 0000000000..f48730d2f5
--- /dev/null
+++ b/multimedia/vlc/patch_libavcodec_version.diff
@@ -0,0 +1,13 @@
+--- configure.ac.orig 2015-02-27 06:25:58.000000000 +1000
++++ configure.ac 2015-06-02 23:10:53.544894508 +1000
+@@ -2243,8 +2243,8 @@
+ [ --enable-avcodec libavcodec codec (default enabled)])
+ AS_IF([test "${enable_avcodec}" != "no"], [
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
+- PKG_CHECK_EXISTS([libavcodec < 56],, [
+- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
++ PKG_CHECK_EXISTS([libavcodec < 57],, [
++ AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
+ ])
+ VLC_SAVE_FLAGS
+ CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
diff --git a/multimedia/vlc/patch_vlc_cache_gen.diff b/multimedia/vlc/patch_vlc_cache_gen.diff
new file mode 100644
index 0000000000..957e6e96df
--- /dev/null
+++ b/multimedia/vlc/patch_vlc_cache_gen.diff
@@ -0,0 +1,28 @@
+--- bin/Makefile.am.orig 2015-06-03 10:49:51.266282736 +1000
++++ bin/Makefile.am 2015-06-03 10:50:20.469282310 +1000
+@@ -72,6 +72,10 @@
+ vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
+ endif
+
++if HAVE_GOBJECT
++vlc_cache_gen_LDADD += $(GOBJECT_LIBS)
++endif
++
+ #
+ # Plug-ins cache
+ #
+--- configure.ac.orig 2015-06-03 10:53:22.299279657 +1000
++++ configure.ac 2015-06-03 09:44:33.338339889 +1000
+@@ -762,6 +762,12 @@
+ ])
+ ])
+
++dnl
++dnl Check for gobject
++dnl
++have_gobject="no"
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0], [ have_gobject="yes" ])
++AM_CONDITIONAL(HAVE_GOBJECT, [ test "${have_gobject}" = "yes" ])
+
+ dnl
+ dnl Check for zlib.h and -lz along with system -lminizip if available
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 0a2f924d7a..ef46374daf 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -29,7 +29,7 @@
PRGNAM=vlc
VERSION=${VERSION:-2.1.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -89,6 +89,10 @@ patch -p0 < $CWD/patch-freerdp.diff
patch -p0 < $CWD/patch-freerdp_1_2.diff
patch -p0 < $CWD/patch-projectM-fontpath.diff
+patch -p0 < $CWD/patch_libavcodec_version.diff
+patch -p0 < $CWD/patch_vlc_cache_gen.diff
+autoreconf -f
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \