diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-12-06 09:35:40 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-12-06 09:35:40 +0000 |
| commit | 71b645d6d468556b98ea362591e317289e823dac (patch) | |
| tree | 5af6a0614bda2555467251004dfb1c4990bf0403 /packages/mplayer/files/Makefile.patch | |
| parent | c484a94ef3b9bc3e42f06b5157086c4309591e69 (diff) | |
mplayer_0.0+1.0rc1.bb : add latest version of mplayer, fixing versioning
to meet OE policy.
A couple of patches have been rediffed and two Makefile patches dropped as
what they did is now in the Makefiles in question.
Diffstat (limited to 'packages/mplayer/files/Makefile.patch')
| -rw-r--r-- | packages/mplayer/files/Makefile.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/packages/mplayer/files/Makefile.patch b/packages/mplayer/files/Makefile.patch index b9b68491c5..f0464b9176 100644 --- a/packages/mplayer/files/Makefile.patch +++ b/packages/mplayer/files/Makefile.patch @@ -1,15 +1,13 @@ -Index: MPlayer-1.0pre8/Makefile +Index: MPlayer-1.0rc1/Makefile =================================================================== ---- MPlayer-1.0pre8.orig/Makefile -+++ MPlayer-1.0pre8/Makefile -@@ -438,8 +438,8 @@ codecs2html: mp_msg.o - $(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@ +--- MPlayer-1.0rc1.orig/Makefile ++++ MPlayer-1.0rc1/Makefile +@@ -399,7 +399,7 @@ osdep/mplayer-rc.o: osdep/mplayer.rc + windres -o $@ osdep/mplayer.rc - $(PRG_CFG): codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \ -- -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) -+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. codec-cfg.c -o $(PRG_CFG) \ -+ -DCODECS2HTML + codec-cfg: 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 $@ - install: $(ALL_PRG) - ifeq ($(VIDIX),yes) + codecs.conf.h: codec-cfg etc/codecs.conf + ./codec-cfg ./etc/codecs.conf > $@ |