diff options
| author | Chris Lord <chris@openedhand.com> | 2004-09-24 12:50:38 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2004-09-24 12:50:38 +0000 |
| commit | 94af4cbac737ce5e035f03924bbf5f1ca4931c95 (patch) | |
| tree | 82c3e75320c9289e47f439f039fa78a790216f74 /mplayer/mplayer-w100-1.0pre3try2/Makefile.patch | |
| parent | 4b7993d765944a2c6a0ab954079e4ac98b66dbe3 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages
2004/09/24 22:12:50+09:30 mithis.com!mithro
Working mplayer which uses the w100 vidix driver.
BKrev: 4154181exwDpZri1n7fC1jg_GwfqtA
Diffstat (limited to 'mplayer/mplayer-w100-1.0pre3try2/Makefile.patch')
| -rw-r--r-- | mplayer/mplayer-w100-1.0pre3try2/Makefile.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/mplayer/mplayer-w100-1.0pre3try2/Makefile.patch b/mplayer/mplayer-w100-1.0pre3try2/Makefile.patch index e69de29bb2..6cd49bb1c8 100644 --- a/mplayer/mplayer-w100-1.0pre3try2/Makefile.patch +++ b/mplayer/mplayer-w100-1.0pre3try2/Makefile.patch @@ -0,0 +1,41 @@ +--- ./Makefile~Makefile.patch 2004-09-24 20:07:12.000000000 +0930 ++++ ./Makefile 2004-09-24 20:09:38.000000000 +0930 +@@ -10,10 +10,6 @@ + PRG_CFG = codec-cfg + PRG_MENCODER = mencoder + +-# Do not strip the binaries at installation +-ifeq ($(STRIPBINARIES),yes) +-INSTALLSTRIP = -s +-endif + + # These subdirectories require installation due to binaries within them. + ifeq ($(VIDIX),yes) +@@ -212,7 +208,8 @@ + + $(PRG): $(MPLAYER_DEP) + ./darwinfixlib.sh $(MPLAYER_DEP) +- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm ++ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm -ljpeg -lpng -lts ++ + + mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a + winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \ +@@ -246,7 +243,7 @@ + $(MENCODER_DEP): version.h + + $(PRG_CFG): version.h codec-cfg.c codec-cfg.h +- $(CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS) ++ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS) + + install: $(ALL_PRG) + ifeq ($(VIDIX),yes) +@@ -316,7 +313,7 @@ + -$(MAKE) -C libavcodec distclean LIBPREF=lib LIBSUF=.a + + strip: +- strip -s $(ALL_PRG) ++ + + dep: depend + |