Reverting earlier commit "Switching to standard MPlayer"

This reverts commit 13d6048.

contrib/binaries-deps-versions

@@ -8,16 +8,17 @@
 #
 #    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
 VERSION_EXPAT=2.1.0
 VERSION_FAAD2=2.7
 VERSION_FLAC=1.2.1
-VERSION_FONTCONFIG=2.9.92
-VERSION_FFMPEG=5fd3e6965e58aee59e9bf26e38e2a3925535ab21
-VERSION_FREETYPE=2.4.10
+VERSION_FONTCONFIG=2.8.0
+VERSION_FFMPEG=58c25724b7f921fdf3657fcb011b3bb3b7b353d4
+VERSION_FREETYPE=2.4.9
 VERSION_FRIBIDI=0.19.2
 VERSION_GIFLIB=4.1.6
 VERSION_ICONV=1.13.1
@@ -28,17 +29,17 @@ VERSION_LIBDCA=0.0.5
 VERSION_LIBDV=1.0.0
 VERSION_LIBMAD=0.15.1b
 VERSION_LIBMEDIAINFO=0.7.57
-VERSION_LIBPNG=1.5.11
+VERSION_LIBPNG=1.5.6
 VERSION_LIBOGG=1.3.0
-VERSION_LIBVORBIS=1.3.3
+VERSION_LIBVORBIS=1.3.2
 VERSION_LIBTHEORA=1.1.1
 VERSION_LIBZEN=0.4.26
 VERSION_LZO=2.06
-VERSION_MPLAYER=35007
+VERSION_MPLAYER=34883
 VERSION_NCURSES=5.9
-VERSION_PS3MEDIASERVER=release-1.54.0
+VERSION_PS3MEDIASERVER=release-1.50.0
 VERSION_TSMUXER=1.10.6
-VERSION_X264=r2200
+VERSION_X264=r2197
 VERSION_XVID=1.3.2
 VERSION_ZLIB=1.2.7
 VERSION_YASM=1.2.0

contrib/build-pms-binaries.sh

@@ -1337,6 +1337,10 @@ build_mplayer() {
         # /usr/bin/gcc gives compile errors for MPlayer on OSX Lion.
         # See https://svn.macports.org/ticket/30279
 
+        # Apply SB patch that was used for the Windows version
+        $PATCH -p0 < $WORKDIR/mplayer.patch
+        exit_on_error
+
         # Theora and vorbis support seems broken in this revision, disable it for now
         ./configure --cc=$GCC2 --disable-x11 --disable-gl --disable-qtx \
               --with-freetype-config=$TARGET/bin/freetype-config --prefix=$TARGET
@@ -1352,6 +1356,10 @@ build_mplayer() {
         export CFLAGS="$CFLAGS -O4 -fomit-frame-pointer -pipe"
         export LDFLAGS="$LDFLAGS -O4 -fomit-frame-pointer -pipe"
 
+        # Apply SB patch that was used for the Windows version
+        $PATCH -p0 < $WORKDIR/mplayer.patch
+        exit_on_error
+
         # mplayer configure patch
         $PATCH -p0 < $WORKDIR/mplayer-configure.patch
         exit_on_error
@@ -1689,4 +1697,4 @@ build_ffmpeg
 build_mplayer
 
 # Build PS3 Media Server itself
-#build_ps3mediaserver
+# build_ps3mediaserver

contrib/download-pms-binaries-source.sh

@@ -498,9 +498,7 @@ download_libpng() {
     cd $SRC
 
     if [ ! -f libpng-${VERSION_LIBPNG}.tar.gz ]; then
-        # One of these two, depending on whether we use the latest release
-        #download http://downloads.sourceforge.net/project/libpng/libpng15/older-releases/${VERSION_LIBPNG}/libpng-${VERSION_LIBPNG}.tar.gz
-        download http://downloads.sourceforge.net/project/libpng/libpng15/${VERSION_LIBPNG}/libpng-${VERSION_LIBPNG}.tar.gz
+        download http://downloads.sourceforge.net/project/libpng/libpng15/older-releases/${VERSION_LIBPNG}/libpng-${VERSION_LIBPNG}.tar.gz
         exit_on_error
     fi
 }
@@ -795,4 +793,4 @@ download_enca
 download_ffmpeg
 download_mplayer
 download_tsmuxer
-#download_ps3mediaserver
+download_ps3mediaserver