[oe-commits] org.oe.dev mplayer_0.0+1.0rc1.bb : use iwmmxt on spitz
xora commit
openembedded-commits at lists.openembedded.org
Thu Mar 15 15:09:43 UTC 2007
mplayer_0.0+1.0rc1.bb : use iwmmxt on spitz
mplayer_svn.bb : refresh patches and use iwmmxt on spitz
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: e7fbe6e21edb50535d695aa0668f424883d1c7a3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e7fbe6e21edb50535d695aa0668f424883d1c7a3
Files:
1
packages/mplayer/files/Makefile-codec-cfg.patch
packages/mplayer/files/makefile-nostrip-svn.patch
packages/mplayer/mplayer_0.0+1.0rc1.bb
packages/mplayer/mplayer_svn.bb
Diffs:
#
# mt diff -r25f23e9b66633946568bdcc68131460dfe886f2b -re7fbe6e21edb50535d695aa0668f424883d1c7a3
#
#
#
# patch "packages/mplayer/files/Makefile-codec-cfg.patch"
# from [677cd160c3b51042dd6f4eaae5395c76ff4d1426]
# to [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
#
# patch "packages/mplayer/files/makefile-nostrip-svn.patch"
# from [cdbc3dbb3847756d01c2efd4b30976a7a2720a02]
# to [0464c9bb63ca08855ae73e041a81742fa9dc24ad]
#
# patch "packages/mplayer/mplayer_0.0+1.0rc1.bb"
# from [f8d1864ec3f3e06021a6bf9d668fc05c35fdda48]
# to [ef5173ca37fbcbcd5c22d0857d69c0bc954e96c9]
#
# patch "packages/mplayer/mplayer_svn.bb"
# from [4076bd613702c4d9fb50544e202dd09b091e51e3]
# to [1c3891f07656f0a24d93af074fcedd40d4aee446]
#
============================================================
--- packages/mplayer/files/Makefile-codec-cfg.patch 677cd160c3b51042dd6f4eaae5395c76ff4d1426
+++ packages/mplayer/files/Makefile-codec-cfg.patch c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
@@ -1,13 +1,13 @@ Index: trunk/Makefile
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 > $@
============================================================
--- packages/mplayer/files/makefile-nostrip-svn.patch cdbc3dbb3847756d01c2efd4b30976a7a2720a02
+++ packages/mplayer/files/makefile-nostrip-svn.patch 0464c9bb63ca08855ae73e041a81742fa9dc24ad
@@ -1,26 +1,31 @@ Index: trunk/Makefile
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)
============================================================
--- packages/mplayer/mplayer_0.0+1.0rc1.bb f8d1864ec3f3e06021a6bf9d668fc05c35fdda48
+++ packages/mplayer/mplayer_0.0+1.0rc1.bb ef5173ca37fbcbcd5c22d0857d69c0bc954e96c9
@@ -33,7 +33,7 @@ RREPLACES_${PN} = "mplayer-atty"
RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
-PR = "r9"
+PR = "r10"
PARALLEL_MAKE = ""
@@ -178,6 +178,9 @@ EXTRA_OECONF_append_spitz = " --enable-p
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
============================================================
--- packages/mplayer/mplayer_svn.bb 4076bd613702c4d9fb50544e202dd09b091e51e3
+++ packages/mplayer/mplayer_svn.bb 1c3891f07656f0a24d93af074fcedd40d4aee446
@@ -9,12 +9,18 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplaye
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_append_c7x0 = " --enable-w1
"
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 () {
More information about the Openembedded-commits
mailing list