Removing the need to rename patches on version changes.

smmmo · May 4, 2012 · 3b81109 · 3b81109
1 parent 6298150
commit 3b81109
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/contrib/binaries-deps-versions b/contrib/binaries-deps-versions
@@ -1,3 +1,15 @@
+#
+# This file defines the versions used by these scripts:
+# 
+#    download-pms-binaries-source.sh
+#    build-pms-binaries.sh
+#
+# Revisions for the source code patches:
+#
+#    mplayer-configure.patch             MPlayer r34587
+#    mplayer-ffmpeg.patch                MPlayer r34866-SB31, FFmpeg-58c25724
+#    mplayer.patch                       MPlayer r34883-SB32
+#
 VERSION_BZIP2=1.0.6
 VERSION_DCRAW=9.07
 VERSION_ENCA=1.13
@@ -31,3 +43,4 @@ VERSION_X264=r2197
 VERSION_XVID=1.3.2
 VERSION_ZLIB=1.2.5
 VERSION_YASM=1.2.0
+
diff --git a/contrib/build-pms-binaries.sh b/contrib/build-pms-binaries.sh
@@ -775,7 +775,7 @@ build_ffmpeg() {
     fi
 
     # Apply SB patch that was used for the Windows version
-    $PATCH -p1 < $WORKDIR/mplayer-r34866-SB31-ffmpeg-58c25724.patch
+    $PATCH -p1 < $WORKDIR/mplayer-ffmpeg.patch
     exit_on_error
 
     $MAKE -j$THREADS
@@ -1333,7 +1333,7 @@ build_mplayer() {
         # See https://svn.macports.org/ticket/30279
 
         # Apply SB patch that was used for the Windows version
-        $PATCH -p0 < $WORKDIR/mplayer-r34883-SB32.patch
+        $PATCH -p0 < $WORKDIR/mplayer.patch
         exit_on_error
 
         # Theora and vorbis support seems broken in this revision, disable it for now
@@ -1352,11 +1352,11 @@ build_mplayer() {
         export LDFLAGS="$LDFLAGS -O4 -fomit-frame-pointer -pipe"
 
         # Apply SB patch that was used for the Windows version
-        $PATCH -p0 < $WORKDIR/mplayer-r34883-SB32.patch
+        $PATCH -p0 < $WORKDIR/mplayer.patch
         exit_on_error
 
-        # mplayer configure patch for r34587-SB22
-        $PATCH -p0 < $WORKDIR/mplayer-r34587-configure.patch
+        # mplayer configure patch
+        $PATCH -p0 < $WORKDIR/mplayer-configure.patch
         exit_on_error
 
         # libvorbis support seems broken in this revision, disable it for now

diff --git a/contrib/mplayer-r34587-configure.patch → contrib/mplayer-configure.patch b/contrib/mplayer-r34587-configure.patch → contrib/mplayer-configure.patch
diff --git a/...mplayer-r34866-SB31-ffmpeg-58c25724.patch → contrib/mplayer-ffmpeg.patch b/...mplayer-r34866-SB31-ffmpeg-58c25724.patch → contrib/mplayer-ffmpeg.patch
diff --git a/contrib/mplayer-r34883-SB32.patch → contrib/mplayer.patch b/contrib/mplayer-r34883-SB32.patch → contrib/mplayer.patch