Miroirs/SlackBuildsOrg
1
0
Fork 0
mirror of https://github.com/SlackBuildsOrg/slackbuilds synced 2024-09-30 05:39:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

multimedia/vlc: Patch for ffmpeg-2.6.x.

Browse source 
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>
This commit is contained in:
Christoph Willing 2015-06-03 15:24:30 +02:00 committed by Willy Sudiarto Raharjo
parent 9b26285f8e
commit ebbca96092
4 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/vlc/doinst.sh.in
View file

@ -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

13
multimedia/vlc/patch_libavcodec_version.diff Normal file
View file

@ -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}"

28
multimedia/vlc/patch_vlc_cache_gen.diff Normal file
View file

@ -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

6
multimedia/vlc/vlc.SlackBuild
View file

@ -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 \) \