diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-04-17 19:53:22 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-04-17 19:53:22 +0000 |
| commit | 3ff98d28d6f9c9c8b66467f0bc7448e7bd93a6e6 (patch) | |
| tree | 3477a0ca92445520cc052774805d5063f0cc4c7a /packages/mplayer/files | |
| parent | 90f0c269820860daf3487ce9f4bcc93f71c3af5b (diff) | |
| download | openembedded-3ff98d28d6f9c9c8b66467f0bc7448e7bd93a6e6.tar.gz | |
mplayer svn: update patches, srcrev and EXTRA_OECONF
Diffstat (limited to 'packages/mplayer/files')
| -rw-r--r-- | packages/mplayer/files/Makefile-codec-cfg.patch | 12 | ||||
| -rw-r--r-- | packages/mplayer/files/makefile-nostrip-svn.patch | 18 |
2 files changed, 13 insertions, 17 deletions
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 ; \ |