diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-03-15 14:35:17 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-03-15 14:35:17 +0000 |
| commit | cc9e12b871b19bb1ed014e5fbba722aae9b84230 (patch) | |
| tree | afc35958e9dd4c3520f155a94effb4ab12f4dd45 /packages/mplayer/files | |
| parent | 4fe50b3a223bfa386736527fb7c8fa61e5b40d4e (diff) | |
mplayer_0.0+1.0rc1.bb : use iwmmxt on spitz
mplayer_svn.bb : refresh patches and use iwmmxt on spitz
Diffstat (limited to 'packages/mplayer/files')
| -rw-r--r-- | packages/mplayer/files/Makefile-codec-cfg.patch | 6 | ||||
| -rw-r--r-- | packages/mplayer/files/makefile-nostrip-svn.patch | 43 |
2 files changed, 27 insertions, 22 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) |