org.openembedded.dev: cc8daafda388ec1e484dc2e68e1599944893bc76
oe at monotone.openmoko.org
oe at monotone.openmoko.org
Fri May 2 21:05:35 CEST 2008
revision: cc8daafda388ec1e484dc2e68e1599944893bc76
date: 2008-04-17T19:53:22
author: koen at openembedded.org
branch: org.openembedded.dev
changelog:
mplayer svn: update patches, srcrev and EXTRA_OECONF
manifest:
format_version "1"
new_manifest [5c1a1439032efcf48e938f305119351699835b5e]
old_revision [9e850960c7066be30333cf021516f96b380dbf9d]
add_dir "packages/mplayer/mplayer-0.0+1.0rc1"
add_dir "packages/mplayer/mplayer-0.0+1.0rc2"
add_file "packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch"
content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
add_file "packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch"
content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
patch "conf/distro/include/sane-srcrevs.inc"
from [10f12e29fe816db4b1e126a2ef7b16b93f06987d]
to [d0d87ab571957347c93128a5a4c12c23b6f74746]
patch "packages/mplayer/files/Makefile-codec-cfg.patch"
from [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
to [8f20ee3f42444885368ec66e356a21c2a53dfcdd]
patch "packages/mplayer/files/makefile-nostrip-svn.patch"
from [a56997c18d0d3b9bbe0a65391debcd74767affc1]
to [183a1b568605abf4a0dbf75a383fe15163e0c857]
patch "packages/mplayer/mplayer_svn.bb"
from [f0026979fe652d6ac626761aaf876e7c3bdcf065]
to [bca5c726d4d1951bc676f2e3b85e918a3ca0db54]
-------------- next part --------------
#
#
# add_dir "packages/mplayer/mplayer-0.0+1.0rc1"
#
# add_dir "packages/mplayer/mplayer-0.0+1.0rc2"
#
# add_file "packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch"
# content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
#
# add_file "packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch"
# content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [10f12e29fe816db4b1e126a2ef7b16b93f06987d]
# to [d0d87ab571957347c93128a5a4c12c23b6f74746]
#
# patch "packages/mplayer/files/Makefile-codec-cfg.patch"
# from [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
# to [8f20ee3f42444885368ec66e356a21c2a53dfcdd]
#
# patch "packages/mplayer/files/makefile-nostrip-svn.patch"
# from [a56997c18d0d3b9bbe0a65391debcd74767affc1]
# to [183a1b568605abf4a0dbf75a383fe15163e0c857]
#
# patch "packages/mplayer/mplayer_svn.bb"
# from [f0026979fe652d6ac626761aaf876e7c3bdcf065]
# to [bca5c726d4d1951bc676f2e3b85e918a3ca0db54]
#
============================================================
--- packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
+++ packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
@@ -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 > $@
============================================================
--- packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
+++ packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
@@ -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 > $@
============================================================
--- conf/distro/include/sane-srcrevs.inc 10f12e29fe816db4b1e126a2ef7b16b93f06987d
+++ conf/distro/include/sane-srcrevs.inc d0d87ab571957347c93128a5a4c12c23b6f74746
@@ -67,7 +67,7 @@ SRCREV_pn-mpd-alsa ?= "6952"
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"
============================================================
--- packages/mplayer/files/Makefile-codec-cfg.patch c5fded49be17d1fdfc9058a11f51704a9e9bbc2c
+++ packages/mplayer/files/Makefile-codec-cfg.patch 8f20ee3f42444885368ec66e356a21c2a53dfcdd
@@ -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 > $@
============================================================
--- packages/mplayer/files/makefile-nostrip-svn.patch a56997c18d0d3b9bbe0a65391debcd74767affc1
+++ packages/mplayer/files/makefile-nostrip-svn.patch 183a1b568605abf4a0dbf75a383fe15163e0c857
@@ -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 ; \
============================================================
--- packages/mplayer/mplayer_svn.bb f0026979fe652d6ac626761aaf876e7c3bdcf065
+++ packages/mplayer/mplayer_svn.bb bca5c726d4d1951bc676f2e3b85e918a3ca0db54
@@ -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_hx4700 = " --enable-
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 @@ EXTRA_OECONF_append = " ${@base_contains
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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/4a7c944b/attachment.htm
More information about the commitlog
mailing list