From edcfee9fcd603eeea0d99e63872899839469ef11 Mon Sep 17 00:00:00 2001 From: Klaus Burton Date: Thu, 15 Mar 2012 14:47:39 +1300 Subject: [PATCH] Updated MPlayer build script to SB28 --- contrib/binaries-deps-versions | 12 +++++----- contrib/build-pms-binaries.sh | 4 ++-- ...7-SB27.patch => mplayer-r34814-SB28.patch} | 22 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) rename contrib/{mplayer-r34807-SB27.patch => mplayer-r34814-SB28.patch} (98%) diff --git a/contrib/binaries-deps-versions b/contrib/binaries-deps-versions index e75156fe4..1bea602eb 100644 --- a/contrib/binaries-deps-versions +++ b/contrib/binaries-deps-versions @@ -10,7 +10,7 @@ VERSION_FREETYPE=2.4.9 VERSION_FRIBIDI=0.19.2 VERSION_GIFLIB=4.1.6 VERSION_ICONV=1.13.1 -VERSION_JPEG=8c +VERSION_JPEG=8d VERSION_LAME=3.99.5 VERSION_LIBBLURAY=0.2.1 VERSION_LIBDCA=0.0.5 @@ -18,16 +18,16 @@ VERSION_LIBDV=1.0.0 VERSION_LIBMAD=0.15.1b VERSION_LIBMEDIAINFO=0.7.50 VERSION_LIBPNG=1.5.6 -VERSION_LIBOGG=1.2.2 +VERSION_LIBOGG=1.3.0 VERSION_LIBVORBIS=1.3.2 VERSION_LIBTHEORA=1.1.1 VERSION_LIBZEN=0.4.23 -VERSION_LZO=2.04 -VERSION_MPLAYER=34807 +VERSION_LZO=2.06 +VERSION_MPLAYER=34814 VERSION_NCURSES=5.9 VERSION_PS3MEDIASERVER=release-1.50.0 VERSION_TSMUXER=1.10.6 -VERSION_X264=r2183 -VERSION_XVID=1.3.1 +VERSION_X264=r2184 +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 index 0a86ff1ca..957a2b733 100755 --- a/contrib/build-pms-binaries.sh +++ b/contrib/build-pms-binaries.sh @@ -1220,7 +1220,7 @@ build_mplayer() { # See https://svn.macports.org/ticket/30279 # Apply SB patch that was used for the Windows version - patch -p0 < ./../../../../contrib/mplayer-r34807-SB27.patch + patch -p0 < ./../../../../contrib/mplayer-r34814-SB28.patch exit_on_error # Theora and vorbis support seems broken in this revision, disable it for now @@ -1239,7 +1239,7 @@ build_mplayer() { export LDFLAGS="$LDFLAGS -O4 -fomit-frame-pointer -pipe" # Apply SB patch that was used for the Windows version - patch -p0 < ./../../../../contrib/mplayer-r34807-SB27.patch + patch -p0 < ./../../../../contrib/mplayer-r34814-SB28.patch exit_on_error # mplayer configure patch for r34587-SB22 diff --git a/contrib/mplayer-r34807-SB27.patch b/contrib/mplayer-r34814-SB28.patch similarity index 98% rename from contrib/mplayer-r34807-SB27.patch rename to contrib/mplayer-r34814-SB28.patch index 9850b344a..ff7780ef1 100644 --- a/contrib/mplayer-r34807-SB27.patch +++ b/contrib/mplayer-r34814-SB28.patch @@ -1,6 +1,6 @@ Index: configure =================================================================== ---- configure (revision 34807) +--- configure (revision 34814) +++ configure (working copy) @@ -565,6 +565,7 @@ --with-install=PATH path to a custom install program @@ -119,7 +119,7 @@ Index: configure echores "$_memalign" -@@ -7699,6 +7777,10 @@ +@@ -7701,6 +7779,10 @@ done libs_mplayer=$ld_tmp @@ -132,7 +132,7 @@ Index: configure Index: libao2/ao_sdl.c =================================================================== ---- libao2/ao_sdl.c (revision 34807) +--- libao2/ao_sdl.c (revision 34814) +++ libao2/ao_sdl.c (working copy) @@ -143,7 +143,7 @@ mp_msg(MSGT_AO,MSGL_INFO,MSGTR_AO_SDL_INFO, rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str_short(format)); @@ -145,7 +145,7 @@ Index: libao2/ao_sdl.c Index: libvo/sdl_common.c =================================================================== ---- libvo/sdl_common.c (revision 34807) +--- libvo/sdl_common.c (revision 34814) +++ libvo/sdl_common.c (working copy) @@ -64,7 +64,7 @@ if (WinID > 0) { @@ -167,7 +167,7 @@ Index: libvo/sdl_common.c if (!s) { Index: libvo/vo_sdl.c =================================================================== ---- libvo/vo_sdl.c (revision 34807) +--- libvo/vo_sdl.c (revision 34814) +++ libvo/vo_sdl.c (working copy) @@ -1334,17 +1334,17 @@ mp_msg(MSGT_VO,MSGL_DBG3, "SDL: Opening Plugin\n"); @@ -194,7 +194,7 @@ Index: libvo/vo_sdl.c priv->fullmode = -2; Index: mencoder.c =================================================================== ---- mencoder.c (revision 34807) +--- mencoder.c (revision 34814) +++ mencoder.c (working copy) @@ -139,6 +139,7 @@ int benchmark=0; @@ -227,7 +227,7 @@ Index: mencoder.c // av = compensated (with out buffering delay) A-V diff Index: mp_msg.c =================================================================== ---- mp_msg.c (revision 34807) +--- mp_msg.c (revision 34814) +++ mp_msg.c (working copy) @@ -34,6 +34,26 @@ /* maximum message length of mp_msg */ @@ -317,7 +317,7 @@ Index: mp_msg.c } Index: mpcommon.c =================================================================== ---- mpcommon.c (revision 34807) +--- mpcommon.c (revision 34814) +++ mpcommon.c (working copy) @@ -538,40 +538,46 @@ /// Returns a_pts @@ -402,7 +402,7 @@ Index: mpcommon.c } Index: mplayer.c =================================================================== ---- mplayer.c (revision 34807) +--- mplayer.c (revision 34814) +++ mplayer.c (working copy) @@ -145,6 +145,12 @@ float start_volume = -1; @@ -637,14 +637,14 @@ Index: osdep/alloc-win.c \ No newline at end of file Index: version.sh =================================================================== ---- version.sh (revision 34807) +--- version.sh (revision 34814) +++ version.sh (working copy) @@ -17,9 +17,9 @@ version=$svn_revision fi -NEW_REVISION="#define VERSION \"${version}${extra}\"" -+NEW_REVISION="#define VERSION \"SB27\"" ++NEW_REVISION="#define VERSION \"SB28\"" OLD_REVISION=$(head -n 1 version.h 2> /dev/null) -TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2012 MPlayer Team\n"' +TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2012 MPlayer Team\nCustom build by SubJunk, http://www.spirton.com\n\n"'