diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /package/mplayer/patches/patch-Makefile | |
parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'package/mplayer/patches/patch-Makefile')
-rw-r--r-- | package/mplayer/patches/patch-Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mplayer/patches/patch-Makefile b/package/mplayer/patches/patch-Makefile index 3f57255db..9c8e32783 100644 --- a/package/mplayer/patches/patch-Makefile +++ b/package/mplayer/patches/patch-Makefile @@ -1,11 +1,11 @@ ---- mplayer-1.0-32749.orig/Makefile 2011-01-03 11:27:11.000000000 +0100 -+++ mplayer-1.0-32749/Makefile 2011-02-05 18:20:49.000000000 +0100 -@@ -816,7 +816,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): +--- MPlayer-1.0rc4.orig/Makefile 2010-07-29 19:08:19.000000000 +0200 ++++ MPlayer-1.0rc4/Makefile 2011-04-01 16:14:58.571818417 +0200 +@@ -851,7 +851,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< +- $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< ++ $(CC_FOR_BUILD) -O -DCODECS2HTML -I. -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./$^ > $@ |