main/mplayer: upgrade to 1.1

4 files changed, 8 insertions, 91 deletions

diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD
index a9a46a078..fa1227d98 100644
--- a/main/mplayer/APKBUILD
+++ b/main/mplayer/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mplayer
-pkgver=1.0_rc4
-_ver=${pkgver%_*}${pkgver#*_}
-pkgrel=9
+pkgver=1.1
+_ver=${pkgver/_/}
+pkgrel=0
 pkgdesc="A movie player for linux"
 url="http://www.mplayerhq.hu/"
 arch="all"
@@ -12,20 +12,17 @@ subpackages="$pkgname-doc"
 makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev
 	libtheora-dev xvidcore-dev zlib-dev sdl-dev freetype-dev
 	x264-dev faac-dev ttf-dejavu libxvmc-dev alsa-lib-dev live-media-dev
-	mesa-dev"
+	mesa-dev yasm"
 
-source="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$_ver.tar.bz2
-	mplayer-gcc-4.6-audio-fix.patch
-	mplayer-libpng-1.5.patch
+source="ftp://ftp1.mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver.tar.xz
 	x11-libs.patch
-	live555.patch
 	"
 _builddir="$srcdir"/MPlayer-$_ver
 prepare() {
 	cd "$_builddir"
 	for i in $source; do
 		case $i in
-		*.patch) patch -p1 -i "$srcdir"/$i || return 1 ;;
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;;
 		esac;
 	done
 }
@@ -45,7 +42,6 @@ build() {
 		--enable-gl \
 		--disable-tv-v4l1 \
 		--enable-tv-v4l2 \
-		--enable-largefiles \
 		--disable-liblzo \
 		--disable-speex \
 		--disable-openal \
@@ -77,8 +73,5 @@ package() {
 		"$pkgdir"/usr/share/mplayer/subfont.ttf || return 1
 	rm -rf "$pkgdir"/usr/share/mplayer/font
 }
-md5sums="1699c94de39da9c4c5d34e8f58e418f0  MPlayer-1.0rc4.tar.bz2
-5f261813c5dfa70ba2378c2535428e5d  mplayer-gcc-4.6-audio-fix.patch
-f3f3bae09f6cee684ced1dbc7d7ed23c  mplayer-libpng-1.5.patch
-01bcc935a6b429347e8e77e1a70bf2b2  x11-libs.patch
-d194e74e35d5bfb460e1ecba0d976cc3  live555.patch"
+md5sums="ac7bf1cfedc1c5c24bfc83107eefb1d9  MPlayer-1.1.tar.xz
+01bcc935a6b429347e8e77e1a70bf2b2  x11-libs.patch"
diff --git a/main/mplayer/live555.patch b/main/mplayer/live555.patch
deleted file mode 100644
index 504185c03..000000000
--- a/main/mplayer/live555.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur mplayer-export-2012-03-02.orig/libmpdemux/demux_rtp.cpp mplayer-export-2012-03-02/libmpdemux/demux_rtp.cpp
---- mplayer-export-2012-03-02.orig/libmpdemux/demux_rtp.cpp	2011-10-26 11:12:25.000000000 -0400
-+++ mplayer-export-2012-03-02/libmpdemux/demux_rtp.cpp	2012-03-04 11:53:30.000000000 -0500
-@@ -19,6 +19,8 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
-
-+#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
-+
- extern "C" {
- // on MinGW, we must include windows.h before the things it conflicts
- #ifdef __MINGW32__    // with.  they are each protected from
-
diff --git a/main/mplayer/mplayer-gcc-4.6-audio-fix.patch b/main/mplayer/mplayer-gcc-4.6-audio-fix.patch
deleted file mode 100644
index 148856c23..000000000
--- a/main/mplayer/mplayer-gcc-4.6-audio-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix broken audio decoding when compiling with gcc-4.6
-http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2011-May/068495.html
-
---- ./mp3lib/dct64_sse.c.orig
-+++ ./mp3lib/dct64_sse.c
-@@ -113,7 +113,6 @@
-     }
- 
-     {
--        real *costab = costab_mmx + 24;
-         int i;
- 
-         __asm__(
-@@ -122,7 +121,7 @@
-             "movaps    %1, %%xmm5\n\t"
-             "movaps    %%xmm5, %%xmm6\n\t"
-             :
--            :"m"(*costab), "m"(*nnnn)
-+            :"m"(costab_mmx[24]), "m"(*nnnn)
-            );
- 
-         for (i = 0; i < 0x20; i += 8)
diff --git a/main/mplayer/mplayer-libpng-1.5.patch b/main/mplayer/mplayer-libpng-1.5.patch
deleted file mode 100644
index 704c64c97..000000000
--- a/main/mplayer/mplayer-libpng-1.5.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c
-index 13dcfdb..c430566 100644
---- a/libmpcodecs/vd_mpng.c
-+++ b/libmpcodecs/vd_mpng.c
-@@ -74,7 +74,7 @@ static int    pngLength;
- 
- static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size )
- {
-- char * p = pngstr->io_ptr;
-+ char * p = png_get_io_ptr(pngstr);
-  if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer;
-  fast_memcpy( buffer,(char *)&p[pngPointer],size );
-  pngPointer+=size;
-@@ -90,6 +90,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
-     png_uint_32     png_width=0,png_height=0;
-     int             depth,color;
-     png_uint_32     i;
-+    png_byte        color_type;
-     mp_image_t* mpi;
- 
-     int cols;
-@@ -111,7 +112,9 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
-  png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL );
-  png_set_bgr( png );
- 
-- switch( info->color_type ) {
-+ color_type=png_get_color_type(png, info);
-+
-+ switch( color_type ) {
-    case PNG_COLOR_TYPE_GRAY_ALPHA:
-       mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" );
-       break;
-@@ -128,7 +131,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
-       out_fmt=IMGFMT_BGR24;
-       break;
-    default:
--      mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type);
-+      mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,color_type);
-  }
- 
-  // (re)init libvo if image parameters changed (width/height/colorspace)