summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2006-11-30 10:35:42 +0000
committerGraeme Gregory <dp@xora.org.uk>2006-11-30 10:35:42 +0000
commit082937c58c72c0c3481c7f38eeff915ffc0fe40e (patch)
treef27afa4bf6f7999d3a6f38cc16f187412492c008
parentd44e4c85f982f09bc2dec77288d8c052f164162d (diff)
parent9bd07ee8a2b3ccbc5be100bda3eb2f2e0f7985ff (diff)
merge of '1b0bce82739ca8ced95d2176c9fcffa61ffb1eed'
and 'e5838be9f21da1bfd36d7676cbc48579b0af1b53'
-rw-r--r--packages/mplayer/files/Makefile.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/mplayer/files/Makefile.patch b/packages/mplayer/files/Makefile.patch
index da316ad129..b9b68491c5 100644
--- a/packages/mplayer/files/Makefile.patch
+++ b/packages/mplayer/files/Makefile.patch
@@ -1,11 +1,15 @@
---- mplayer_20060519/Makefile.orig 2006-05-30 09:32:23.000000000 +0100
-+++ mplayer_20060519/Makefile 2006-05-30 09:34:07.000000000 +0100
-@@ -438,7 +438,7 @@
+Index: MPlayer-1.0pre8/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 $@
$(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 $(EXTRA_LIB) $(EXTRA_INC)
++ -DCODECS2HTML
install: $(ALL_PRG)
+ ifeq ($(VIDIX),yes)