Browse Source

mplayer: update to 1.5

Waldemar Brodkorb 2 years ago
parent
commit
b86248dece
2 changed files with 3 additions and 31 deletions
  1. 3 4
      package/mplayer/Makefile
  2. 0 27
      package/mplayer/patches/patch-stream_asf_streaming_c

+ 3 - 4
package/mplayer/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
-PKG_VERSION:=		1.3.0
+PKG_VERSION:=		1.5
 PKG_RELEASE:=		1
-PKG_HASH:=		3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843
+PKG_HASH:=		650cd55bb3cb44c9b39ce36dac488428559799c5f18d16d98edb2b7256cbbf85
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		alsa-lib libjpeg-turbo libfaad2 libmad libncurses
@@ -23,7 +23,7 @@ PKG_SITES:=		http://www.mplayerhq.hu/MPlayer/releases/
 DISTFILES:=		MPlayer-$(PKG_VERSION).tar.xz
 WRKDIST=		${WRKDIR}/MPlayer-${PKG_VERSION}
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm aarch64
 
 PKG_FLAVOURS_MPLAYER:=	WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
@@ -161,7 +161,6 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-live \
 			--disable-pvr \
 			--disable-ftp \
-			--disable-ivtv \
 			--disable-freetype \
 			--disable-mpg123 \
 			--disable-arts \

+ 0 - 27
package/mplayer/patches/patch-stream_asf_streaming_c

@@ -1,27 +0,0 @@
---- mplayer-1.0-32749.orig/stream/asf_streaming.c	2011-01-03 11:26:52.000000000 +0100
-+++ mplayer-1.0-32749/stream/asf_streaming.c	2011-07-29 17:54:35.013424616 +0200
-@@ -38,7 +38,6 @@
- 
- #include "stream.h"
- #include "libmpdemux/demuxer.h"
--#include "asf_mmst_streaming.h"
- #include "network.h"
- #include "tcp.h"
- 
-@@ -87,16 +86,6 @@ static int asf_streaming_start( stream_t
- 		if( fd==-2 ) return -1;
- 	}
- 
--    //Is protocol mms or mmst?
--    if (!strcasecmp(proto, "mmst") || !strcasecmp(proto, "mms"))
--    {
--		mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
--		fd = asf_mmst_streaming_start( stream );
--		stream->streaming_ctrl->url->port = port;
--		if( fd>-1 ) return fd;
--		mp_msg(MSGT_NETWORK,MSGL_V,"  ===> ASF/TCP failed\n");
--		if( fd==-2 ) return -1;
--	}
- 
-     //Is protocol http, http_proxy, or mms?
-     if (!strcasecmp(proto, "http_proxy") || !strcasecmp(proto, "http") ||