From 8d9254d0233851ff629c9959b33d9fe591a9fe62 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 13 Dec 2013 21:40:14 +0000 Subject: Removed external libvdpau dependency, and fixed the broken rtmp support. --- vlc/build/vlc.SlackBuild | 83 +++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 51 deletions(-) (limited to 'vlc') diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild index fe66a229..ef96bbcc 100755 --- a/vlc/build/vlc.SlackBuild +++ b/vlc/build/vlc.SlackBuild @@ -376,6 +376,11 @@ # opus, speex, x264. # 2.1.2.-2 11/dec/2013 by Eric Hameleers # * Add VDPAU driver. +# 2.1.2.-2 13/dec/2013 by Eric Hameleers +# * Fixed the unexpectedly introduced external dependency on +# shared libvdpau libraries - vlc will now work again +# even if you do not have libvdpau installed. +# Also, fixed the (long) broken rtmp support. # # Run 'sh vlc.SlackBuild' to build a Slackware package. # The package (.txz) plus descriptive .txt file are created in /tmp . @@ -399,7 +404,7 @@ PRGNAM=vlc PRGNAM2=npapi-vlc -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NPBUILD=${NPBUILD:-1} TAG=${TAG:-"alien"} @@ -562,7 +567,6 @@ ORC=0.4.17 PROJECTM=2.0.1 QT4=4.8.5 RAW1394=2.0.5 -RTMP=2.3 SCHROEDINGER=1.0.11 SHOUT=2.3.1 SPEEX=a6d05eb # git snapshot 8-Jul-2009 04:29:03; @@ -946,9 +950,9 @@ SRCURL[49]="http://fribidi.org/download/fribidi-${FRIBIDI}.tar.bz2" SRCPAT[49]="NO" USE[49]="YES" -# librtmp library, supporting RTMP (flash) streams -SOURCE[50]="$SRCDIR/rtmpdump-${RTMP}.tar.gz" -SRCURL[50]="http://rtmpdump.mplayerhq.hu/download/rtmpdump-${RTMP}.tgz" +# VDPAU for video hardware acceleration: +SOURCE[50]="$SRCDIR/libvdpau-${VDPAU}.tar.gz" +SRCURL[50]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${VDPAU}.tar.gz" SRCPAT[50]="NO" USE[50]="YES" @@ -957,17 +961,11 @@ SRCURL[51]="http://taglib.github.io/releases/taglib-${TAGLIB}.tar.gz" SRCPAT[51]="NO" USE[51]="YES" -# VDPAU for video hardware acceleration: -SOURCE[52]="$SRCDIR/libvdpau-${VDPAU}.tar.gz" -SRCURL[52]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${VDPAU}.tar.gz" -SRCPAT[52]="NO" -USE[52]="YES" - # CSS decoding- VLC can do without if you install an external libdvdcss package. -SOURCE[53]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2" -SRCURL[53]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2" -SRCPAT[53]="YES" -USE[53]="YES" +SOURCE[52]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2" +SRCURL[52]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2" +SRCPAT[52]="YES" +USE[52]="YES" # Use the src_checkout() function if no downloadable tarball exists. # This function checks out sources from SVN/CVS and creates a tarball of them. @@ -1178,7 +1176,6 @@ if [ "$STATIC_FFMPEG" != "YES" ]; then USE[44]="NO" # vpx USE[45]="NO" # aacenc USE[46]="NO" # vo-amrwb - USE[50]="NO" # rtmp fi # Source file availability: @@ -1441,28 +1438,6 @@ cd - } -# ----------------------------------------------------------------------------- -# Compile rtmpdump -# ----------------------------------------------------------------------------- -make_rtmp() -{ -echo -e "**\n** rtmp ...\n**" -cd $TMP/tmp-$PRGNAM/rtmpdump-$RTMP -make -C librtmp prefix=/usr OPT="$SLKCFLAGS" all librtmp.pc \ - 2>&1 | tee $OUTPUT/make-${PRGNAM}_rtmp.log -# Install librtmp into a temp location so ffmpeg can pickup the library -echo -e "\n**\n**\n" -mkdir -p $VLCDEPSDIR/usr/{include/librtmp,lib${LIBDIRSUFFIX}/pkgconfig} -cp -a librtmp/librtmp.a $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} -cp -a librtmp/{amf.h,http.h,log.h,rtmp.h} $VLCDEPSDIR/usr/include/librtmp -cp -a librtmp/librtmp.pc $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig -# Add DOCS to the vlcdeps to have it added to vlc package later: -mkdir -p $VLCDEPSDIR/doc/rtmp -cp -a AUTHORS COPYING ChangeLog README $VLCDEPSDIR/doc/rtmp/ || true -cd - -} - - # ----------------------------------------------------------------------------- # Compile gsm # ----------------------------------------------------------------------------- @@ -1549,27 +1524,24 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \ --shlibdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \ ${USE_PATENTED} \ + --disable-avdevice \ + --disable-avfilter \ + --disable-devices \ + --disable-filters \ + --disable-doc \ + --disable-debug \ + --disable-shared \ --enable-gpl \ --enable-version3 \ --enable-libgsm \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ - --enable-librtmp \ --enable-libtheora \ --enable-libvorbis \ --enable-libvo-amrwbenc \ --enable-libvpx \ --enable-pthreads \ --enable-hardcoded-tables \ - --disable-avdevice \ - --disable-avfilter \ - --disable-devices \ - --disable-filters \ - --disable-network \ - --disable-protocols \ - --disable-doc \ - --disable-debug \ - --disable-shared \ --enable-static \ --enable-memalign-hack \ --enable-bzlib \ @@ -1588,12 +1560,16 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ # native xvid encoder implementation instead #--enable-libvorbis \ # Use ffmpeg's native support #--disable-vhook \ - #--disable-devices \ - #--disable-protocols \ #--logfile=$OUTPUT/ffmpeg.conf.log \ # Remove this in 0.6.1 to avoid "error: libavcodec/cbrt_tables.h: No such file or directory" # (compile issue has been fixed in ffmpeg-git but I'll stick to 0.6.1 for now): # --enable-hardcoded-tables \ + # Since vlc-1.1 this is no longer needed... neither is rtmpdump, becausee + # ffmpeg has an internal implementation: + #--disable-protocols \ + #--disable-devices \ + #--disable-network \ + #--enable-librtmp \ make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ffmpeg.log [ $? -ne 0 ] && return 1 @@ -3203,6 +3179,12 @@ find . -name "*.a" | xargs strip --strip-unneeded # Install vdpau into a temp location so vlc can pickup the library echo -e "\n**\n**\n" make install DESTDIR=$VLCDEPSDIR 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vdpau.log +# Remove the .so and .la files; we want static linking (but still use +# the drivers in $(libdir)/va/drivers): +rm -f $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libvdpau*.so* +rm -f $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libvdpau*.la +rm -f $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/vdpau/libvdpau*.so* +rm -f $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/vdpau/libvdpau*.la # Add DOCS to the vlcdeps to have it added to vlc package later: mkdir -p $VLCDEPSDIR/doc/vdpau/ cp AUTHORS COPYING ChangeLog NEWS README $VLCDEPSDIR/doc/vdpau/ || true @@ -3861,7 +3843,6 @@ else make_theora make_amr make_amrwbenc - make_rtmp make_gsm # Only use patented code if we are allowing it: if [ "${USE_PATENTS}" == "YES" ]; then -- cgit v1.2.3