diff options
| -rw-r--r-- | multimedia/vlc/README | 8 | ||||
| -rw-r--r-- | multimedia/vlc/doinst.sh.in | 5 | ||||
| -rw-r--r-- | multimedia/vlc/qt4-select.patch | 51 | ||||
| -rw-r--r-- | multimedia/vlc/vlc.SlackBuild | 8 | ||||
| -rw-r--r-- | multimedia/vlc/vlc.info | 8 |
5 files changed, 18 insertions, 62 deletions
diff --git a/multimedia/vlc/README b/multimedia/vlc/README index 80eda6636e..7288e78811 100644 --- a/multimedia/vlc/README +++ b/multimedia/vlc/README @@ -16,3 +16,11 @@ The vsxu SlackBuild is now optional for x86 machines; removed from REQUIRES since it does not compile on arm machines at the moment. Please advise the maintainer to suggest support for any further options. + +*NOTES* +- the qt4 interface seems not to be working ATM so the qt5 one is + enabled by default: this means qt5 is a new mandatory dependency +- you *need* to version-bump the libva and libva-intel-driver in + Slackware to versions 1.7.3 for VAAPI support: as we suppose + a standard install, "--enable-libva=no" is added between the + configure options, instead diff --git a/multimedia/vlc/doinst.sh.in b/multimedia/vlc/doinst.sh.in index f62bb1cf80..2678be9797 100644 --- a/multimedia/vlc/doinst.sh.in +++ b/multimedia/vlc/doinst.sh.in @@ -12,6 +12,5 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then fi fi -if [ ! -e usr/lib%LIBDIRSUFFIX%/vlc/plugins*.dat ] ; then - usr/lib%LIBDIRSUFFIX%/vlc/vlc-cache-gen -f usr/lib%LIBDIRSUFFIX%/vlc -fi +rm -f usr/lib%LIBDIRSUFFIX%/vlc/plugins*.dat +usr/lib%LIBDIRSUFFIX%/vlc/vlc-cache-gen usr/lib%LIBDIRSUFFIX%/vlc diff --git a/multimedia/vlc/qt4-select.patch b/multimedia/vlc/qt4-select.patch deleted file mode 100644 index fb1526a30a..0000000000 --- a/multimedia/vlc/qt4-select.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54 -For use until upstream ever accepts this patch or fixes it themsleves ---- a/configure.ac -+++ b/configure.ac -@@ -3709,7 +3709,8 @@ - ]) - ]) - AS_IF([test "${enable_qt}" != "no"], [ -- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ -+ AS_IF([test "${enable_qt}" != "4"], [ -+ PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ - PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [ - VLC_ADD_LIBS([qt4],[${QTX11_LIBS}]) - VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11]) -@@ -3721,20 +3722,23 @@ - AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) - AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) - AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -+ enable_qt="5" -- ], [ -- PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ -- AS_IF([test -n "${enable_qt}"],[ -- AC_MSG_ERROR([${QT_PKG_ERRORS}.]) -- ],[ -- AC_MSG_WARN([${QT_PKG_ERRORS}.]) -- ]) -- enable_qt="no" -+ ]) -+ ]) -+ AS_IF([test "${enable_qt}" != "5"], [ -+ PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ -+ AS_IF([test -n "${enable_qt}"],[ -+ AC_MSG_ERROR([${QT_PKG_ERRORS}.]) -+ ],[ -+ AC_MSG_WARN([${QT_PKG_ERRORS}.]) - ]) -- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" -- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -- AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) -- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -+ enable_qt="no" - ]) -+ QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" -+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -+ AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) -+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -+ ]) - ]) - AS_IF([test "${enable_qt}" != "no"], [ - VLC_ADD_PLUGIN([qt4]) - diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index e5c210534f..c5b54d1ea7 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -28,8 +28,8 @@ # ----------------------------------------------------------------------------- PRGNAM=vlc -VERSION=${VERSION:-2.2.4} -BUILD=${BUILD:-3} +VERSION=${VERSION:-20170406_8268fe0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -57,7 +57,7 @@ else fi DOCS="ABOUT-NLS AUTHORS COPYING INSTALL NEWS README THANKS" -qtversion="--enable-qt=4" ; [ "${QTVERSION:-4}" != "4" ] && qtversion="--enable-qt=5" +qtversion="--enable-qt=4" ; [ "${QTVERSION:-5}" != "4" ] && qtversion="--enable-qt=5" # In an ordinary virtual machine, since a different kernal is running, # a unique dbus id is needed. @@ -81,7 +81,6 @@ cd $PRGNAM-$VERSION patch -p0 < $CWD/patch-projectM-fontpath.diff patch -p0 < $CWD/patch_vlc_cache_gen.diff -patch -p1 < $CWD/qt4-select.patch autoreconf -fiv @@ -105,6 +104,7 @@ LDFLAGS="$SLKLDFLAGS" \ --build=$ARCH-slackware-linux \ $qtversion \ --enable-merge-ffmpeg \ + --enable-libva=no \ --with-kde-solid=no \ make diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info index 35ead9c467..9d982b73be 100644 --- a/multimedia/vlc/vlc.info +++ b/multimedia/vlc/vlc.info @@ -1,10 +1,10 @@ PRGNAM="vlc" -VERSION="2.2.4" +VERSION="20170406_8268fe0" HOMEPAGE="http://www.videolan.org/vlc/" -DOWNLOAD="http://download.videolan.org/vlc/2.2.4/vlc-2.2.4.tar.xz" -MD5SUM="55666c9898f658c7fcca12725bf7dd1b" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/vlc-20170406_8268fe0.tar.xz" +MD5SUM="755967c94fe6e644301bbdf09b5d078a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus ffmpeg libwebp gsm opencv libtar libkate faac libdca libmatroska libshout speex avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac gnome-vfs live555 rtmpdump libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray" +REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus ffmpeg libwebp gsm opencv libtar libkate faac libdca libmatroska libshout speex avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac gnome-vfs live555 qt5 rtmpdump libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" |