summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-03-15 15:18:06 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-03-15 15:18:06 +0000
commit10c51fbb2fe9394445c658541db485fd5a83e7c1 (patch)
treed5f83b9ea87451237ec20f9def98973105f42663
parente10fa259f424bdcbd5e26c262bb3521d8ec43e47 (diff)
parentcc9e12b871b19bb1ed014e5fbba722aae9b84230 (diff)
merge of 'a1f690feff27a3cf8c220262f43412c6cefd8638'
and 'e7fbe6e21edb50535d695aa0668f424883d1c7a3'
-rw-r--r--packages/mplayer/files/Makefile-codec-cfg.patch6
-rw-r--r--packages/mplayer/files/makefile-nostrip-svn.patch43
-rw-r--r--packages/mplayer/mplayer_0.0+1.0rc1.bb5
-rw-r--r--packages/mplayer/mplayer_svn.bb21
4 files changed, 49 insertions, 26 deletions
diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch
index f1fe636df2..e6cb7247f8 100644
--- a/packages/mplayer/files/Makefile-codec-cfg.patch
+++ b/packages/mplayer/files/Makefile-codec-cfg.patch
@@ -2,12 +2,12 @@ Index: trunk/Makefile
===================================================================
--- trunk.orig/Makefile
+++ trunk/Makefile
-@@ -239,7 +239,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+@@ -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 codec-cfg.c -o $@
-+ $(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
+- $(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/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch
index 0c3180c728..44087e7dca 100644
--- a/packages/mplayer/files/makefile-nostrip-svn.patch
+++ b/packages/mplayer/files/makefile-nostrip-svn.patch
@@ -2,25 +2,30 @@ Index: trunk/Makefile
===================================================================
--- trunk.orig/Makefile
+++ trunk/Makefile
-@@ -253,10 +253,10 @@ install: $(ALL_PRG)
- ifeq ($(VIDIX),yes)
- $(MAKE) -C libdha install
- mkdir -p $(LIBDIR)/mplayer/vidix
-- -install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
-+ -install -m 755 -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
- endif
- $(INSTALL) -d $(BINDIR)
-- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
-+ $(INSTALL) -m 755 mplayer$(EXESUF) \
- $(BINDIR)/mplayer$(EXESUF)
- ifeq ($(GUI),yes)
- -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
-@@ -271,7 +271,7 @@ endif
- fi ; \
+@@ -264,7 +264,7 @@ install-dirs:
+ 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-mplayer-man:
+ for i in $(MAN_LANG); do \
+@@ -277,7 +277,7 @@ install-mplayer-man:
done
- ifeq ($(MENCODER),yes)
-- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) \
-+ $(INSTALL) -m 755 mencoder$(EXESUF) \
- $(BINDIR)/mencoder$(EXESUF)
+
+ 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 \
+ cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
+@@ -299,7 +299,7 @@ install-gui:
+ install-vidix:
+ $(MAKE) -C libdha install
+ mkdir -p $(LIBDIR)/mplayer/vidix
+- $(INSTALL) -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
++ $(INSTALL) -m 755 -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
+
+ uninstall:
+ -rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index b030be5b69..ff3fab3d7b 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -33,7 +33,7 @@ PACKAGE_ARCH_mencoder_collie = "collie"
RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
-PR = "r9"
+PR = "r10"
PARALLEL_MAKE = ""
@@ -178,6 +178,9 @@ EXTRA_OECONF_append_hx4700 = " --enable-imageon "
EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
EXTRA_OECONF_append_spitz = " --enable-pxa "
+TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt"
+PACKAGE_ARCH_spitz = "iwmmxt"
+
do_configure() {
cp ${WORKDIR}/vo_w100.c ${S}/libvo
cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 5dca7401c9..a9d8d0f1ff 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -9,12 +9,18 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
file://vo_w100.c \
file://vo_w100_api.h \
file://vo_w100_fb.h \
+ file://vo_pxa.c \
+ file://vo_pxa.h \
file://Makefile-codec-cfg.patch;patch=1 \
file://w100-configure-svn.patch;patch=1 \
file://w100-video_out.patch;patch=1 \
file://w100-mplayer.patch;patch= \
file://pld-onlyarm5.patch;patch=1 \
- file://makefile-nostrip-svn.patch;patch=1"
+ file://makefile-nostrip-svn.patch;patch=1 \
+ file://mplayer-imageon-svn.patch;patch=1 \
+ file://imageon-video_out.patch;patch=1 \
+ file://pxa_configure.patch;patch=1 \
+ file://pxa-video_out.patch;patch=1 "
RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
@@ -79,7 +85,7 @@ EXTRA_OECONF = " \
--enable-png \
--enable-jpeg \
--disable-libcdio \
- --enable-liblzo \
+ --disable-liblzo \
--disable-win32 \
--disable-qtx \
--disable-xanim \
@@ -162,12 +168,21 @@ EXTRA_OECONF = " \
"
EXTRA_OECONF_append_c7x0 = " --enable-w100 "
+EXTRA_OECONF_append_hx4700 = " --enable-imageon "
+EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
+EXTRA_OECONF_append_spitz = " --enable-pxa "
+
+TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt"
+PACKAGE_ARCH_spitz = "iwmmxt"
do_configure() {
cp ${WORKDIR}/vo_w100.c ${S}/libvo
cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
- ./configure ${EXTRA_OECONF}
+ cp ${WORKDIR}/vo_pxa.c ${S}/libvo
+ cp ${WORKDIR}/vo_pxa.h ${S}/libvo
+
+ ./configure ${EXTRA_OECONF}
}
do_compile () {