diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-06-15 18:22:46 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-06-15 18:22:46 +0000 |
| commit | 5bfa07914e91a6df6936bcc41796f00bfe999fa1 (patch) | |
| tree | 3568aa94ff589f4a9baef13ce82274a5d99bde62 /packages/mplayer | |
| parent | ed57e0e23afc7fbfbedfd1ca2f54a5e29ca4d7bd (diff) | |
| download | openembedded-5bfa07914e91a6df6936bcc41796f00bfe999fa1.tar.gz | |
sane-srcrevs: bump opkg*, mplayer and packagekit
* update recipes to match
Diffstat (limited to 'packages/mplayer')
| -rw-r--r-- | packages/mplayer/files/Makefile-codec-cfg.patch | 10 | ||||
| -rw-r--r-- | packages/mplayer/files/makefile-nostrip-svn.patch | 29 |
2 files changed, 14 insertions, 25 deletions
diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch index 78fb6e98ce..84c17a9017 100644 --- a/packages/mplayer/files/Makefile-codec-cfg.patch +++ b/packages/mplayer/files/Makefile-codec-cfg.patch @@ -1,11 +1,11 @@ ---- /tmp/Makefile 2008-04-17 21:41:29.623907292 +0200 -+++ trunk/Makefile 2008-04-17 21:42:04.164926258 +0200 -@@ -311,7 +311,7 @@ +--- /tmp/Makefile 2008-06-10 20:55:43.100403024 +0200 ++++ trunk/Makefile 2008-06-10 20:56:10.881647093 +0200 +@@ -731,7 +731,7 @@ $(CC) -o $@ $^ $(LDFLAGS_MENCODER) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) -O -I. -DCODECS2HTML $< -o $@ -+ $(BUILD_CC) -O -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 b1a60af312..c684001792 100644 --- a/packages/mplayer/files/makefile-nostrip-svn.patch +++ b/packages/mplayer/files/makefile-nostrip-svn.patch @@ -1,22 +1,11 @@ -upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping) - ---- /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 +--- /tmp/Makefile 2008-06-10 21:05:55.613676241 +0200 ++++ trunk/Makefile 2008-06-10 21:06:30.701172833 +0200 +@@ -797,7 +797,7 @@ + $(INSTALL) -d $(BINDIR) $(CONFDIR) - install-mplayer: mplayer$(EXESUF) -- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR) -+ $(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR) + install-%: %$(EXESUF) install-dirs +- $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) ++ $(INSTALL) -m 755 $< $(BINDIR) - install-mplayer-man: - 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 lang in $(MAN_LANG); do \ - if test "$$lang" = en ; then \ - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ + install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang)) + install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang)) |