Updated MPlayer build script to SB29

smmmo · Apr 5, 2012 · ad1dc1c · ad1dc1c
1 parent 2a1804e
commit ad1dc1c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/contrib/binaries-deps-versions b/contrib/binaries-deps-versions
@@ -1,11 +1,11 @@
 VERSION_BZIP2=1.0.6
 VERSION_DCRAW=9.07
 VERSION_ENCA=1.13
-VERSION_EXPAT=2.0.1
+VERSION_EXPAT=2.1.0
 VERSION_FAAD2=2.7
 VERSION_FLAC=1.2.1
 VERSION_FONTCONFIG=2.8.0
-VERSION_FFMPEG=d3f81a67008b6418b9f22d865294898915fb3ad8
+VERSION_FFMPEG=49891784ce70456305f19847d4188f07bbc1b6e1
 VERSION_FREETYPE=2.4.9
 VERSION_FRIBIDI=0.19.2
 VERSION_GIFLIB=4.1.6
@@ -23,7 +23,7 @@ VERSION_LIBVORBIS=1.3.2
 VERSION_LIBTHEORA=1.1.1
 VERSION_LIBZEN=0.4.23
 VERSION_LZO=2.06
-VERSION_MPLAYER=34814
+VERSION_MPLAYER=34836
 VERSION_NCURSES=5.9
 VERSION_PS3MEDIASERVER=release-1.50.0
 VERSION_TSMUXER=1.10.6

diff --git 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-r34814-SB28.patch
+        patch -p0 < ./../../../../contrib/mplayer-r34836-SB29.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-r34814-SB28.patch
+        patch -p0 < ./../../../../contrib/mplayer-r34836-SB29.patch
         exit_on_error
 
         # mplayer configure patch for r34587-SB22

diff --git a/contrib/mplayer-r34836-SB29-ffmpeg-49891784.patch b/contrib/mplayer-r34836-SB29-ffmpeg-49891784.patch
@@ -0,0 +1,16 @@
+ libavcodec/aac_ac3_parser.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
+index 7545c85..6f6ed89 100644
+--- a/libavcodec/aac_ac3_parser.c
++++ b/libavcodec/aac_ac3_parser.c
+@@ -93,7 +93,7 @@ get_next:
+             avctx->channels = s->channels;
+             avctx->channel_layout = s->channel_layout;
+         }
+-        s1->duration = s->samples;
++        avctx->frame_size = s->samples;
+         avctx->audio_service_type = s->service_type;
+     }
+
diff --git a/contrib/mplayer-r34814-SB28.patch → contrib/mplayer-r34836-SB29.patch b/contrib/mplayer-r34814-SB28.patch → contrib/mplayer-r34836-SB29.patch
@@ -1,6 +1,6 @@
 Index: configure
 ===================================================================
---- configure	(revision 34814)
+--- configure	(revision 34836)
 +++ configure	(working copy)
 @@ -565,6 +565,7 @@
    --with-install=PATH    path to a custom install program
@@ -132,7 +132,7 @@ Index: configure
 
 Index: libao2/ao_sdl.c
 ===================================================================
---- libao2/ao_sdl.c	(revision 34814)
+--- libao2/ao_sdl.c	(revision 34836)
 +++ 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 34814)
+--- libvo/sdl_common.c	(revision 34836)
 +++ 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 34814)
+--- libvo/vo_sdl.c	(revision 34836)
 +++ 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 34814)
+--- mencoder.c	(revision 34836)
 +++ 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 34814)
+--- mp_msg.c	(revision 34836)
 +++ 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 34814)
+--- mpcommon.c	(revision 34836)
 +++ mpcommon.c	(working copy)
 @@ -538,40 +538,46 @@
  /// Returns a_pts
@@ -402,7 +402,7 @@ Index: mpcommon.c
  }
 Index: mplayer.c
 ===================================================================
---- mplayer.c	(revision 34814)
+--- mplayer.c	(revision 34836)
 +++ 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 34814)
+--- version.sh	(revision 34836)
 +++ version.sh	(working copy)
 @@ -17,9 +17,9 @@
  version=$svn_revision
  fi
 
 -NEW_REVISION="#define VERSION \"${version}${extra}\""
-+NEW_REVISION="#define VERSION \"SB28\""
++NEW_REVISION="#define VERSION \"SB29\""
  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"'