Including ffmpeg patch in build script.

smmmo · Apr 6, 2012 · 4c74101 · 4c74101
1 parent ad1dc1c
commit 4c74101
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/contrib/build-pms-binaries.sh b/contrib/build-pms-binaries.sh
@@ -664,6 +664,9 @@ build_ffmpeg() {
               --disable-shared --enable-static --prefix=$TARGET
     fi
 
+    # Apply SB patch that was used for the Windows version
+    patch -p1 < ./../../../../contrib/mplayer-r34836-SB29-ffmpeg-49891784.patch
+    exit_on_error
 
     $MAKE -j$THREADS
     exit_on_error
@@ -1367,12 +1370,12 @@ build_tsmuxer() {
     cd $SRC
 
     if is_osx; then
-        if [ ! -d tsMuxeR_$VERSION_TSMUXER ]; then
-            createdir tsMuxeR_$VERSION_TSMUXER
+        if [ ! -d tsMuxeR_${VERSION_TSMUXER} ]; then
+            createdir tsMuxeR_${VERSION_TSMUXER}
             # Nothing to build. Just open the disk image, copy the binary and detach the disk image
-            $HDID ./../src/tsMuxeR_$VERSION_TSMUXER.dmg
+            $HDID ./../src/tsMuxeR__${VERSION_TSMUXER}.dmg
             exit_on_error
-            cp -f /Volumes/tsMuxeR/tsMuxerGUI.app/Contents/MacOS/tsMuxeR tsMuxeR_$VERSION_TSMUXER/tsMuxeR
+            cp -f /Volumes/tsMuxeR/tsMuxerGUI.app/Contents/MacOS/tsMuxeR tsMuxeR_${VERSION_TSMUXER}/tsMuxeR
             $HDIUTIL detach /Volumes/tsMuxeR
         fi
     else