From c9763529cff3cf381608b22250de282220887eed Mon Sep 17 00:00:00 2001
From: Tim Ansell <mithro@mithis.com>
Date: Fri, 24 Sep 2004 12:56:39 +0000
Subject: 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/mplayer-1.0pre3try2/Makefile.patch     | 22 ---------
 nonworking/mplayer/mplayer-1.0pre3try2/zlib.patch  |  0
 nonworking/mplayer/mplayer_1.0pre3try2.oe          | 54 ----------------------
 3 files changed, 76 deletions(-)
 delete mode 100644 nonworking/mplayer/mplayer-1.0pre3try2/Makefile.patch
 delete mode 100644 nonworking/mplayer/mplayer-1.0pre3try2/zlib.patch
 delete mode 100644 nonworking/mplayer/mplayer_1.0pre3try2.oe

(limited to 'nonworking')

diff --git a/nonworking/mplayer/mplayer-1.0pre3try2/Makefile.patch b/nonworking/mplayer/mplayer-1.0pre3try2/Makefile.patch
deleted file mode 100644
index eb9a07d4f8..0000000000
--- a/nonworking/mplayer/mplayer-1.0pre3try2/Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./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/nonworking/mplayer/mplayer-1.0pre3try2/zlib.patch b/nonworking/mplayer/mplayer-1.0pre3try2/zlib.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/nonworking/mplayer/mplayer_1.0pre3try2.oe b/nonworking/mplayer/mplayer_1.0pre3try2.oe
deleted file mode 100644
index ac3f6029e2..0000000000
--- a/nonworking/mplayer/mplayer_1.0pre3try2.oe
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/games"
-PRIORITY = "optional"
-DEPENDS = "libsdl-qpe libmad tremor-20030325 libogg libvorbis zlib"
-
-SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
-			file://Makefile.patch;patch=0 \
-			file://zlib.patch;patch=0 "
-S = "${WORKDIR}/MPlayer-${PV}"
-
-FILES_${PN} = " \
-	/usr/local/bin/mplayer \
-	/usr/local/man/man1/mplayer.1 "
-
-inherit autotools 
-
-EXTRA_OECONF = " \
-	--target=arm \
-	\
-	--disable-win32 \
-	--disable-macosx \
-	--disable-dvdread \
-	--disable-mpdvdkit \
-	--disable-tv \
-	--disable-tv-v4l \
-	--disable-tv-v4l2 \
-	--disable-tv-bsdbt848 \
-	--disable-mencoder \
-	\
-	--enable-dynamic-plugins \
-	--enable-fbdev \
-	--enable-sdl \
-	--with-sdl-config=${STAGING_BINDIR}/sdl-config \
-	\
-	--enable-mad \
-	--enable-tremor \
-	--enable-vorbis \
-	\
-	--enable-ossaudio \
-	\
-	--with-extralibdir=${STAGING_LIBDIR} "
-
-#	--enable-static \
-#	--enable-live \
-#	--with-livelibdir=/Projects/armbuild/live \
-#	--host=${HOST} \
-#	--cc=arm-linux-gcc \
-#	--disable-dvdnav \
-
-
-do_configure() {
-	./configure ${EXTRA_OECONF}
-}
-
-- 
cgit v1.2.3