mplayer svn: update patches, srcrev and EXTRA_OECONF

8 files changed, 49 insertions, 20 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d13dc0ffee..7cd82349e9 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -67,7 +67,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-mplayer ?= "26455"
 SRCREV_pn-multitap-pad ?= "337"
 SRCREV_pn-neod ?= "4219"
 SRCREV_pn-netsurf ?= "3859"
diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch
index e6cb7247f8..78fb6e98ce 100644
--- a/packages/mplayer/files/Makefile-codec-cfg.patch
+++ b/packages/mplayer/files/Makefile-codec-cfg.patch
@@ -1,13 +1,11 @@
-Index: trunk/Makefile
-===================================================================
---- trunk.orig/Makefile
-+++ trunk/Makefile
-@@ -235,7 +235,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+--- /tmp/Makefile	2008-04-17 21:41:29.623907292 +0200
++++ trunk/Makefile	2008-04-17 21:42:04.164926258 +0200
+@@ -311,7 +311,7 @@
  	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
  
  codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
--	$(HOST_CC) -I. -DCODECS2HTML $< -o $@
-+	$(BUILD_CC) -I. -DCODECS2HTML $< -o $@
+-	$(HOST_CC) -O -I. -DCODECS2HTML $< -o $@
++	$(BUILD_CC) -O -I. -DCODECS2HTML $< -o $@
  
  codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
  	./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch
index a1b6a0b43f..96346a470c 100644
--- a/packages/mplayer/files/makefile-nostrip-svn.patch
+++ b/packages/mplayer/files/makefile-nostrip-svn.patch
@@ -1,22 +1,20 @@
-Index: trunk/Makefile
-===================================================================
---- trunk.orig/Makefile	2007-06-29 14:48:19.000000000 +0100
-+++ trunk/Makefile	2007-06-29 14:48:43.000000000 +0100
-@@ -252,7 +252,7 @@
+--- /tmp/Makefile	2008-04-17 21:48:32.987984542 +0200
++++ trunk/Makefile	2008-04-17 21:48:52.042750779 +0200
+@@ -337,7 +337,7 @@
  	if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
  
  install-mplayer: mplayer$(EXESUF)
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR)
-+	$(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR)
++	$(INSTALL) -m 755  mplayer$(EXESUF) $(BINDIR)
  
  install-mplayer-man:
- 	for i in $(MAN_LANG); do \
-@@ -265,7 +265,7 @@
+ 	for lang in $(MAN_LANG); do \
+@@ -350,7 +350,7 @@
  	done
  
  install-mencoder: mencoder$(EXESUF)
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
 +	$(INSTALL) -m 755 mencoder$(EXESUF) $(BINDIR)
- 	for i in $(MAN_LANG); do \
- 		if test "$$i" = en ; then \
+ 	for lang in $(MAN_LANG); do \
+ 		if test "$$lang" = en ; then \
  			cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
diff --git a/packages/mplayer/mplayer-0.0+1.0rc1/.mtn2git_empty b/packages/mplayer/mplayer-0.0+1.0rc1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mplayer/mplayer-0.0+1.0rc1/.mtn2git_empty
diff --git a/packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch b/packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch
new file mode 100644
index 0000000000..e6cb7247f8
--- /dev/null
+++ b/packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch
@@ -0,0 +1,13 @@
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -235,7 +235,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+ 	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
+ 
+ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
+-	$(HOST_CC) -I. -DCODECS2HTML $< -o $@
++	$(BUILD_CC) -I. -DCODECS2HTML $< -o $@
+ 
+ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
+ 	./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
diff --git a/packages/mplayer/mplayer-0.0+1.0rc2/.mtn2git_empty b/packages/mplayer/mplayer-0.0+1.0rc2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mplayer/mplayer-0.0+1.0rc2/.mtn2git_empty
diff --git a/packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch b/packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch
new file mode 100644
index 0000000000..e6cb7247f8
--- /dev/null
+++ b/packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch
@@ -0,0 +1,13 @@
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -235,7 +235,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+ 	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
+ 
+ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
+-	$(HOST_CC) -I. -DCODECS2HTML $< -o $@
++	$(BUILD_CC) -I. -DCODECS2HTML $< -o $@
+ 
+ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
+ 	./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 04035098fa..741f9e27d9 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -82,7 +82,6 @@ EXTRA_OECONF = " \
 	--disable-dvdread-internal \
         --disable-cdparanoia \
         --enable-freetype \
-        --disable-unrarlib \
         --disable-menu \
         --enable-sortsub \
         --disable-fribidi \
@@ -161,7 +160,7 @@ EXTRA_OECONF = " \
         --enable-ossaudio \
         --disable-arts \
         --disable-esd \
-        --disable-polyp \
+        --disable-pulse \
         --disable-jack \
         --disable-openal \
         --disable-nas \
@@ -177,6 +176,10 @@ EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \
 EXTRA_OECONF_append_c7x0 = " --enable-imageon "
 EXTRA_OECONF_append_hx4700 = " --enable-imageon "
 
+EXTRA_OECONF_append_armv6 = " --enable-armv6 "
+EXTRA_OECONF_append_armv7a = "--enable-armv6 "
+
+
 #build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
 #not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt 
 MY_ARCH := "${PACKAGE_ARCH}"
@@ -188,6 +191,10 @@ TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt
 EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "
 EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '--enable-runtime-cpudetection', '',d)} "
 
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
+
 do_configure() {
 	cp ${WORKDIR}/vo_w100.c ${S}/libvo
 	cp ${WORKDIR}/vo_w100_api.h ${S}/libvo