From c9763529cff3cf381608b22250de282220887eed Mon Sep 17 00:00:00 2001 From: Tim Ansell Date: Fri, 24 Sep 2004 12:56:39 +0000 Subject: [PATCH] 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 --- .../mplayer-1.0pre3try2/Makefile.patch | 0 mplayer/mplayer-1.0pre3try2/zlib.patch | 17 +++++++++++++++++ .../mplayer => mplayer}/mplayer_1.0pre3try2.oe | 0 .../mplayer/mplayer-1.0pre3try2/zlib.patch | 0 4 files changed, 17 insertions(+) rename {nonworking/mplayer => mplayer}/mplayer-1.0pre3try2/Makefile.patch (100%) create mode 100644 mplayer/mplayer-1.0pre3try2/zlib.patch rename {nonworking/mplayer => mplayer}/mplayer_1.0pre3try2.oe (100%) delete mode 100644 nonworking/mplayer/mplayer-1.0pre3try2/zlib.patch diff --git a/nonworking/mplayer/mplayer-1.0pre3try2/Makefile.patch b/mplayer/mplayer-1.0pre3try2/Makefile.patch similarity index 100% rename from nonworking/mplayer/mplayer-1.0pre3try2/Makefile.patch rename to mplayer/mplayer-1.0pre3try2/Makefile.patch 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 +-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' diff --git a/nonworking/mplayer/mplayer_1.0pre3try2.oe b/mplayer/mplayer_1.0pre3try2.oe similarity index 100% rename from nonworking/mplayer/mplayer_1.0pre3try2.oe rename to mplayer/mplayer_1.0pre3try2.oe diff --git a/nonworking/mplayer/mplayer-1.0pre3try2/zlib.patch b/nonworking/mplayer/mplayer-1.0pre3try2/zlib.patch deleted file mode 100644 index e69de29bb2..0000000000 -- 2.39.5