Try to get rid of the 'libavcodec_plugin.so: undefined symbol: drmMap' error

1 files changed, 15 insertions, 13 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index 6f2a7ec8..33cc8de7 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -269,8 +269,10 @@
 #             * Update to 1.1.3.
 # 1.1.X-1:    XX/XXX/2010 by Eric Hameleers <alien@slackware.com>
 #             * 
-#               Enable ncurses support.
-# 
+#               Enabled ncurses support.
+#               Updated ffmpeg/libva/live555/schroedinger/x264 libraries.
+#               Updated the xulrunner SDK used to compile the browser plugin.
+#
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
@@ -316,7 +318,7 @@ PKGTYPE=${PKGTYPE:-"txz"}
 #VERSION=${VERSION:-"@1.1.0-bugfix#20100414"}
 #VERSION=${VERSION:-"master@git://git.videolan.org/vlc/vlc-1.1.git#20100523"}
 
-VERSION=${VERSION:-"1.1.3"}
+VERSION=${VERSION:-"master@git://git.videolan.org/vlc/vlc-1.1.git#20101029"}
 
 # At some point, the 1.1 development branched off the master tree:
 DEFGITURI=${GITURI:-"git://git.videolan.org/vlc.git"}
@@ -413,25 +415,25 @@ DVDCSS=1.2.10
 EBML=1.0.0
 FAAC=1.28
 FAAD2=2.7
-#FFMPEG=r23555   # 20100609
-FFMPEG=0.6
+#FFMPEG=0.6
+FFMPEG=r25603   # 20101029
 FLUID=1.1.1
 GGI=2.2.2
 GII=1.0.2
 GOOM=2k4-0
 KATE=0.3.7
 LAME=3.98.4
-LIBVA="0.31.0-1+sds13"
+LIBVA="0.31.1-1+sds4"
 LIVE=latest
 LUA=5.1.4
 MATROSKA=1.0.0
 MPCDEC=1.2.6
 MPEG2DEC=0.5.1
-ORC=0.4.5
+ORC=0.4.11
 PROJECTM=2.0.1
 QT4=4.6.0
 RAW1394=2.0.5
-SCHROEDINGER=1.0.9
+SCHROEDINGER=1.0.10
 SHOUT=2.2.2
 SPEEX=1.2rc1
 SWSCALE=""       # Set SWSCALE="" to checkout a version of ffmpeg's swscale
@@ -445,8 +447,8 @@ VCD=0.7.23
 VPX=20100617
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         # about 'function hidden'
-X264=20100713-2245      # Needs yasm installed
-XUL=1.9.2
+X264=20101029-2245      # Needs yasm installed
+XUL=1.9.2.10
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -2670,7 +2672,7 @@ cd $TMP/tmp-$PRGNAM/mozilla-$(echo $XUL | cut -d. -f1-3)
 # Compiling xulrunner takes a long, long time. We will look for a pre-compiled
 # version of the xulrunner SDK in the $SRCDIR and use that instead if available.
 # You can find a tarball of this SDK after the xulrunner compilation has ended;
-# check the ./dist subdirectory in the source tree and copy the file
+# check the ./dist/sdk subdirectory in the source tree and copy the file
 # xulrunner-*.sdk.tar.bz2 to the directory containing vlc.SlackBuild.
 MOZSDK=$(ls --indicator-style=none $SRCDIR/xulrunner-${XUL}.*.linux-$(uname -m).sdk.tar.bz2 | tail -1)
 
@@ -2696,7 +2698,7 @@ if [ -z "$MOZSDK" ]; then
   # Create an SDK package that we pass to vlc's configure:
   echo -e "\n**\n**\n"
   make sdk 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_xul.log
-  tar -C $VLCDEPSDIR/usr -xvf dist/xulrunner-${XUL}*.sdk.tar.bz2
+  tar -C $VLCDEPSDIR/usr -xvf dist/sdk/xulrunner-${XUL}*.sdk.tar.bz2
 else
   # Use our precompiled SDK - compiling it takes ages:
   echo "Using a precompiled mozilla SDK: $(basename $MOZSDK)"
@@ -2872,7 +2874,7 @@ CPPFLAGS="-I$VLCDEPSDIR/usr/include -I$VLCDEPSDIR/usr/include/xulrunner" \
 CFLAGS="-I$VLCDEPSDIR/usr/include -I$VLCDEPSDIR/usr/include/xulrunner $SLKCFLAGS" \
 CXXFLAGS="-I$VLCDEPSDIR/usr/include -I$VLCDEPSDIR/usr/include/xulrunner $SLKCFLAGS" \
 LDFLAGS="-Wl,-Bsymbolic -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
-LIBS="-lva -lva-x11 -lX11 -lXext -lXfixes" \
+LIBS="-lva -lva-x11 -lX11 -lXext -lXfixes -ldrm" \
 PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PROJECTM_LIBS="-lprojectM $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libMilkdropPresetFactory.a $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libRenderer.a -lGLU -lGLEW -lGL" \
 PROJECTM2_LIBS="-lprojectM $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libMilkdropPresetFactory.a $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libRenderer.a -lGLU -lGLEW -lGL" \