different make bulkallmod fixes

4 files changed, 64 insertions, 9 deletions

diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index ee2e09a44..2529c1eec 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.0-32749
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		aadc5d8cca503c8b18b3ed00b3a52cf5
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
@@ -17,7 +17,7 @@ PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips
 
 PKG_FLAVOURS_MPLAYER:=	WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
@@ -30,15 +30,12 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 # gcc 4.5 produces internal compiler error with -Os
-TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
+TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
 
 CONFIG_STYLE:=		minimal
 FAKE_FLAGS+=		INSTALLSTRIP=''
 
-ifeq (${ADK_LINUX_MIPS64EL},y)
-EXTRA_CFLAGS:=		-DARCH_MIPS64
-endif
-ifeq (${ADK_LINUX_MIPS64},y)
+ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 EXTRA_CFLAGS:=		-DARCH_MIPS64
 endif
 
diff --git a/package/mplayer/patches/patch-Makefile b/package/mplayer/patches/patch-Makefile
index 3f57255db..bb8529c8c 100644
--- a/package/mplayer/patches/patch-Makefile
+++ b/package/mplayer/patches/patch-Makefile
@@ -1,6 +1,14 @@
 --- mplayer-1.0-32749.orig/Makefile	2011-01-03 11:27:11.000000000 +0100
-+++ mplayer-1.0-32749/Makefile	2011-02-05 18:20:49.000000000 +0100
-@@ -816,7 +816,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
++++ mplayer-1.0-32749/Makefile	2011-07-29 17:44:21.073424743 +0200
+@@ -185,7 +185,6 @@ SRCS_COMMON-$(NEED_STRSEP)           += 
+ SRCS_COMMON-$(NEED_SWAB)             += osdep/swab.c
+ SRCS_COMMON-$(NEED_VSSCANF)          += osdep/vsscanf.c
+ SRCS_COMMON-$(NETWORKING)            += stream/stream_netstream.c \
+-                                        stream/asf_mmst_streaming.c \
+                                         stream/asf_streaming.c \
+                                         stream/cookies.c \
+                                         stream/http.c \
+@@ -816,7 +815,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
  	$(CC) -o $@ $^ $(EXTRALIBS)
  
  codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
diff --git a/package/mplayer/patches/patch-stream_asf_mmst_streaming_c b/package/mplayer/patches/patch-stream_asf_mmst_streaming_c
new file mode 100644
index 000000000..b16cec430
--- /dev/null
+++ b/package/mplayer/patches/patch-stream_asf_mmst_streaming_c
@@ -0,0 +1,23 @@
+--- mplayer-1.0-32749.orig/stream/asf_mmst_streaming.c	2011-01-03 11:26:52.000000000 +0100
++++ mplayer-1.0-32749/stream/asf_mmst_streaming.c	2011-07-29 17:29:01.494032168 +0200
+@@ -359,20 +359,7 @@ static int interp_header (uint8_t *heade
+       }
+ 
+     } else {
+-#if 0
+-      int b = i;
+-      printf ("unknown object (guid: %016llx, %016llx, len: %lld)\n", guid_1, guid_2, length);
+-      for (; b < length; b++)
+-      {
+-        if (isascii(header[b]) || isalpha(header[b]))
+-	    printf("%c ", header[b]);
+-	else
+-    	    printf("%x ", header[b]);
+-      }
+-      printf("\n");
+-#else
+       mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_MMST_UnknownObject);
+-#endif
+     }
+ 
+ //    mp_msg(MSGT_NETWORK,MSGL_INFO,"length    : %lld\n", length);
diff --git a/package/mplayer/patches/patch-stream_asf_streaming_c b/package/mplayer/patches/patch-stream_asf_streaming_c
new file mode 100644
index 000000000..4fa3b696b
--- /dev/null
+++ b/package/mplayer/patches/patch-stream_asf_streaming_c
@@ -0,0 +1,27 @@
+--- 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") ||