diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-10-08 19:02:02 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-10-08 19:02:02 +0000 |
| commit | 1af370b104970e452f326373eaa1a2c9ddc5a9ea (patch) | |
| tree | 39de33365cb5147ed5fe0ebc4a3da62219c655c3 /mplayer/mplayer-w100-1.0pre3try2 | |
| parent | 0bfeb6589a328ab138c35ce7e398538d7c59ebc8 (diff) | |
merged mplayer and mplayer-w100 into one
BKrev: 4166e42aCwMQKx1NsKLjVXfLQMwXfg
Diffstat (limited to 'mplayer/mplayer-w100-1.0pre3try2')
5 files changed, 0 insertions, 52 deletions
diff --git a/mplayer/mplayer-w100-1.0pre3try2/Makefile-vidix.patch b/mplayer/mplayer-w100-1.0pre3try2/Makefile-vidix.patch deleted file mode 100644 index 9c84bdd05c..0000000000 --- a/mplayer/mplayer-w100-1.0pre3try2/Makefile-vidix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./vidix/drivers/Makefile 2004-09-24 19:05:49.000000000 +0930 -+++ ./vidix/drivers/Makefile~mplayer-w100_1.0pre3.1.modified.diff 2003-10-23 02:15:33.000000000 +0930 -@@ -151,7 +138,7 @@ - - install: - mkdir -p $(LIBDIR)/mplayer/vidix -- -install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix -+ -install -m 755 -p *.so $(LIBDIR)/mplayer/vidix - uninstall: - rm -f $(LIBDIR)/mplayer/vidix/*.so - rmdir -p --ignore-fail-on-non-empty $(LIBDIR)/mplayer/vidix diff --git a/mplayer/mplayer-w100-1.0pre3try2/Makefile.patch b/mplayer/mplayer-w100-1.0pre3try2/Makefile.patch deleted file mode 100644 index 6cd49bb1c8..0000000000 --- a/mplayer/mplayer-w100-1.0pre3try2/Makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./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 - diff --git a/mplayer/mplayer-w100-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff b/mplayer/mplayer-w100-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff deleted file mode 100644 index e69de29bb2..0000000000 --- a/mplayer/mplayer-w100-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff +++ /dev/null diff --git a/mplayer/mplayer-w100-1.0pre3try2/sdl.patch b/mplayer/mplayer-w100-1.0pre3try2/sdl.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/mplayer/mplayer-w100-1.0pre3try2/sdl.patch +++ /dev/null diff --git a/mplayer/mplayer-w100-1.0pre3try2/zlib.patch b/mplayer/mplayer-w100-1.0pre3try2/zlib.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/mplayer/mplayer-w100-1.0pre3try2/zlib.patch +++ /dev/null |