diff options
| author | Tim Ansell <mithro@mithis.com> | 2004-09-24 12:56:39 +0000 |
|---|---|---|
| committer | Tim Ansell <mithro@mithis.com> | 2004-09-24 12:56:39 +0000 |
| commit | c9763529cff3cf381608b22250de282220887eed (patch) | |
| tree | ea151d99f0c1523cf7af676f4cde5c5833b8a625 /mplayer/mplayer-1.0pre3try2 | |
| parent | 94af4cbac737ce5e035f03924bbf5f1ca4931c95 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into mithis.com:/cc/packages
2004/09/24 22:25:17+09:30 mithis.com!mithro
Moved it back into working because it compiles and works.
BKrev: 415419876Cz_qiJqEaL8I0sgCy6CTA
Diffstat (limited to 'mplayer/mplayer-1.0pre3try2')
| -rw-r--r-- | mplayer/mplayer-1.0pre3try2/Makefile.patch | 22 | ||||
| -rw-r--r-- | mplayer/mplayer-1.0pre3try2/zlib.patch | 17 |
2 files changed, 39 insertions, 0 deletions
diff --git a/mplayer/mplayer-1.0pre3try2/Makefile.patch b/mplayer/mplayer-1.0pre3try2/Makefile.patch new file mode 100644 index 0000000000..eb9a07d4f8 --- /dev/null +++ b/mplayer/mplayer-1.0pre3try2/Makefile.patch @@ -0,0 +1,22 @@ +--- ./Makefile~Makefile.patch 2003-12-09 08:03:31.000000000 +1030 ++++ ./Makefile 2004-09-24 02:08:50.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) +@@ -246,7 +242,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) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS) + + install: $(ALL_PRG) + ifeq ($(VIDIX),yes) diff --git a/mplayer/mplayer-1.0pre3try2/zlib.patch b/mplayer/mplayer-1.0pre3try2/zlib.patch new file mode 100644 index 0000000000..6e0918d8ed --- /dev/null +++ b/mplayer/mplayer-1.0pre3try2/zlib.patch @@ -0,0 +1,17 @@ +--- ./configure.old 2004-09-24 01:03:55.000000000 +0930 ++++ ./configure 2004-09-24 01:04:18.000000000 +0930 +@@ -4313,13 +4313,7 @@ + echores "$_fribidi" + + +-echocheck "zlib" +-cat > $TMPC << EOF +-#include <zlib.h> +-int main(void) { (void) inflate(0, Z_NO_FLUSH); return 0; } +-EOF +-_zlib=no +-cc_check -lz && _zlib=yes ++_zlib=yes + if test "$_zlib" = yes ; then + _def_zlib='#define HAVE_ZLIB 1' + _ld_zlib='-lz' |