mplayer: bump SRCREV, remove hacks that aren't needed anymore

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 956e1fb..f6f3605 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -126,7 +126,7 @@ SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "29653"
+SRCREV_pn-mplayer ?= "29699"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-multitap-pad ?= "373"

diff --git a/recipes/mplayer/files/armv5te/configh b/recipes/mplayer/files/armv5te/configh
deleted file mode 100644 (file)
index 46c647e..0000000
--- a/recipes/mplayer/files/armv5te/configh
+++ /dev/null
@@ -1,6 +0,0 @@
-#define HAVE_LLRINT 1
-#define HAVE_ROUNDF 1
-#define ARCH_ARMV4L 1
-#define ENABLE_ARMV4L 1
-#define HAVE_ARMV5TE 1
-#define ENABLE_ARMV5TE 1

diff --git a/recipes/mplayer/files/armv5te/configmak b/recipes/mplayer/files/armv5te/configmak
deleted file mode 100644 (file)
index aa99785..0000000
--- a/recipes/mplayer/files/armv5te/configmak
+++ /dev/null
@@ -1,3 +0,0 @@
-ARCH_ARMV4L=yes
-HAVE_ARMV5TE=yes
-

diff --git a/recipes/mplayer/files/armv6/configh b/recipes/mplayer/files/armv6/configh
deleted file mode 100644 (file)
index 2301e72..0000000
--- a/recipes/mplayer/files/armv6/configh
+++ /dev/null
@@ -1,8 +0,0 @@
-#define HAVE_LLRINT 1
-#define HAVE_ROUNDF 1
-#define ARCH_ARMV4L 1
-#define ENABLE_ARMV4L 1
-#define HAVE_ARMV5TE 1
-#define ENABLE_ARMV5TE 1
-#define HAVE_ARMV6 1
-#define ENABLE_ARMV6 1

diff --git a/recipes/mplayer/files/armv6/configmak b/recipes/mplayer/files/armv6/configmak
deleted file mode 100644 (file)
index 4db5dc0..0000000
--- a/recipes/mplayer/files/armv6/configmak
+++ /dev/null
@@ -1,3 +0,0 @@
-ARCH_ARMV4L=yes
-HAVE_ARMV5TE=yes
-HAVE_ARMV6=yes

diff --git a/recipes/mplayer/files/armv7a/configh b/recipes/mplayer/files/armv7a/configh
deleted file mode 100644 (file)
index 245e40f..0000000
--- a/recipes/mplayer/files/armv7a/configh
+++ /dev/null
@@ -1,14 +0,0 @@
-#define HAVE_LLRINT 1
-#define HAVE_ROUNDF 1
-#define ARCH_ARMV4L 1
-#define ENABLE_ARMV4L 1
-#define HAVE_ARMV5TE 1
-#define ENABLE_ARMV5TE 1
-#define HAVE_ARMV6 1
-#define ENABLE_ARMV6 1
-#define HAVE_ARMV6T2 1
-#define ENABLE_ARMV6T2 1
-#define HAVE_ARMVFP 1
-#define ENABLE_ARMVFP 1
-#define HAVE_NEON 1
-#define ENABLE_NEON 1

diff --git a/recipes/mplayer/files/armv7a/configmak b/recipes/mplayer/files/armv7a/configmak
deleted file mode 100644 (file)
index 50d549f..0000000
--- a/recipes/mplayer/files/armv7a/configmak
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH_ARMV4L=yes
-HAVE_ARMV5TE=yes
-HAVE_ARMV6=yes
-HAVE_ARMV6T2=yes
-HAVE_ARMVFP=yes
-HAVE_NEON=yes

diff --git a/recipes/mplayer/files/configh b/recipes/mplayer/files/configh
deleted file mode 100644 (file)
index 2fe7658..0000000
--- a/recipes/mplayer/files/configh
+++ /dev/null
@@ -1,2 +0,0 @@
-#define HAVE_LLRINT 1
-#define HAVE_ROUNDF 1

diff --git a/recipes/mplayer/files/configmak b/recipes/mplayer/files/configmak
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index d065837..49b2705 100644 (file)
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -8,11 +8,8 @@ DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jp
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
-#         file://Makefile-codec-cfg.patch;patch=1 \
           file://pld-onlyarm5-svn.patch;patch=1 \
           file://makefile-nostrip-svn.patch;patch=1 \
-          file://configh \
-          file://configmak \
           "
 
 SRC_URI_append_armv7a = " \
@@ -174,7 +171,7 @@ EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \
                                --disable-encoder=vorbis_encoder"
 
 EXTRA_OECONF_append_armv6 = " --enable-armv6"
-EXTRA_OECONF_append_armv7a = " --enable-armv6"
+EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
 
 
 #build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
@@ -213,8 +210,6 @@ do_configure() {
        export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
        ./configure ${EXTRA_OECONF}
        
-       cat ${WORKDIR}/configh >> ${S}/config.h
-       cat ${WORKDIR}/configmak  ${OPTSMAK} >> ${S}/config.mak
 }
 
 do_compile () {