diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-10-29 11:11:41 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-10-29 11:11:41 +0000 |
| commit | d6e496ece73d18e9abb933ca7cff27d0a0815686 (patch) | |
| tree | 71e09d5ec6eac9480c515c345cdd1ab3eb6e27fc /vlc | |
| parent | 6f0295d0958e4491b4b055f285d54b5a98a96f60 (diff) | |
| download | asb-d6e496ece73d18e9abb933ca7cff27d0a0815686.tar.gz asb-d6e496ece73d18e9abb933ca7cff27d0a0815686.tar.xz | |
Downgrading libupnp was the only working fix (thanks to a videolan forum post). Fixed the compilation of the new ffmpeg libraries
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc.SlackBuild | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild index 41f4c448..4f982220 100755 --- a/vlc/build/vlc.SlackBuild +++ b/vlc/build/vlc.SlackBuild @@ -338,7 +338,7 @@ # Stop using internal xulrunner SDK to build the browser plugin, # Slackware's own seamonkey can do this now. # 2.0.4-2 29/oct/2012 by Eric Hameleers <alien@slackware.com> -# * Fix uPnP support (thanks to Pii Ajah). Added opus encoder +# * Fix uPnP support by downgrading libupnp. Added opus encoder # support. Updated bluray, ffmpeg, vpx, x264 libraries. # # Run 'sh vlc.SlackBuild' to build a Slackware package. @@ -534,7 +534,7 @@ SWSCALE="" # Set SWSCALE="" to checkout a version of ffmpeg's swscale THEORA=1.1.1 TIGER=0.3.4 TWOLAME=0.3.13 -UPNP=1.6.17 +UPNP=1.6.16 V4L=0.8.8 VCD=0.7.23 VPX=v1.1.0 @@ -1486,7 +1486,7 @@ fi [ -f version.sh ] && sed -i -e "s/UNKNOWN/$FFMPEG/" version.sh TMPDIR="$TMP" \ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS --std=gnu99" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ @@ -1504,15 +1504,16 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ --enable-libtheora \ --enable-libvo-amrwbenc \ --enable-libvpx \ - --enable-avfilter \ --enable-postproc \ --enable-pthreads \ --enable-hardcoded-tables \ - --disable-ffserver \ - --disable-ffplay \ - --disable-ffmpeg \ - --disable-ffprobe \ - --enable-fastdiv \ + --disable-avdevice \ + --disable-avfilter \ + --disable-devices \ + --disable-filters \ + --disable-network \ + --disable-protocols \ + --disable-doc \ --disable-debug \ --disable-shared \ --enable-static \ |