merged mplayer and mplayer-w100 into one

BKrev: 4166e42aCwMQKx1NsKLjVXfLQMwXfg

7 files changed, 26 insertions, 140 deletions

diff --git a/mplayer/mplayer-w100-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff b/mplayer/mplayer-1.0pre3try2/Makefile-vidix.patch
index e69de29bb2..e69de29bb2 100644
--- a/mplayer/mplayer-w100-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff
+++ b/mplayer/mplayer-1.0pre3try2/Makefile-vidix.patch
diff --git a/mplayer/mplayer-w100-1.0pre3try2/sdl.patch b/mplayer/mplayer-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff
index e69de29bb2..e69de29bb2 100644
--- a/mplayer/mplayer-w100-1.0pre3try2/sdl.patch
+++ b/mplayer/mplayer-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff
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/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
diff --git a/mplayer/mplayer-w100_1.0pre3try2.oe b/mplayer/mplayer-w100_1.0pre3try2.oe
deleted file mode 100644
index 0161b6821e..0000000000
--- a/mplayer/mplayer-w100_1.0pre3try2.oe
+++ /dev/null
@@ -1,84 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/games"
-PRIORITY = "optional"
-DEPENDS = "libsdl-qpe libmad tremor-20030325 libogg libvorbis zlib libpng jpeg sharp-aticore"
-
-SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
-			file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
-			file://Makefile.patch;patch=0 \
-			file://Makefile-vidix.patch;patch=0 \
-			file://sdl.patch;patch=0 \
-			file://zlib.patch;patch=0 "
-S = "${WORKDIR}/MPlayer-${PV}"
-
-PACKAGES="${PN} postproc postproc-dev"
-
-FILES_${PN} = "/usr/bin/mplayer /usr/lib/mplayer/vidix/w100_vid.so"
-
-FILES_postproc = " /usr/lib/libpostproc.so.0.0.0 /usr/lib/libpostproc.so.0"
-FILES_postproc-dev = " /usr/include/postproc/postprocess.h /usr/lib/libpostproc.so /usr/lib/libpostproc.a"
-
-inherit autotools 
-
-EXTRA_OECONF = " \
-	--prefix=/usr \
-	--target=${PACKAGE_ARCH} \
-	--enable-shared-pp \
-	\
-	--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-vidix \
-	--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}
-}
-
-do_install_append () {
-	mkdir ${D}/usr/lib
-	cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}/usr/lib/libpostproc.so.0.0.0
-	mkdir ${D}/usr/include
-	mkdir ${D}/usr/include/postproc
-	cp ${S}/libavcodec/libpostproc/postprocess.h ${D}/usr/include/postproc/postprocess.h
-	cd ${D}/usr/lib
-	ln -s libpostproc.so.0.0.0 libpostproc.so.0
-	ln -s libpostproc.so.0 libpostproc.so
-}
-
-do_stage () {
-	oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR}
-	cd ${STAGING_LIBDIR}
-	ln -s libpostproc.so libpostproc.so.0.0.0
-	ln -s libpostproc.so libpostproc.so.0
-
-	install -d ${STAGING_INCDIR}/postproc
-	install -m 0644 ${S}/libavcodec/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h
-}					
-
diff --git a/mplayer/mplayer_1.0pre3try2.oe b/mplayer/mplayer_1.0pre3try2.oe
index 5809042d84..5f783cba2e 100644
--- a/mplayer/mplayer_1.0pre3try2.oe
+++ b/mplayer/mplayer_1.0pre3try2.oe
@@ -1,15 +1,37 @@
 DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/games"
+SECTION = "opie/multimedia"
 PRIORITY = "optional"
-DEPENDS = "libsdl-qpe libmad tremor-20030325 libogg libvorbis zlib libpng jpeg sharp-aticore"
+HOMEPAGE = "http://www.mplayerhq.hu/"
+DEPENDS = "libsdl-qpe libmad tremor-20030325 libogg libvorbis zlib libpng jpeg"
+PR = "r1"
 
 SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
 			file://Makefile.patch;patch=0 \
 			file://sdl.patch;patch=0 \
 			file://zlib.patch;patch=0 "
+
+DEPENDS_corgi += "sharp-aticore"
+DEPENDS_shepherd += "sharp-aticore"
+DEPENDS_husky += "sharp-aticore"
+DEPENDS_tosa += "sharp-aticore"
+
+PACKAGE_ARCH_corgi = "${MACHINE}"
+PACKAGE_ARCH_shepherd = "${MACHINE}"
+PACKAGE_ARCH_husky = "${MACHINE}"
+PACKAGE_ARCH_tosa = "${MACHINE}"
+
+SRC_URI_append_corgi = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
+			file://Makefile-vidix.patch;patch=0 "
+SRC_URI_shepherd += "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
+			file://Makefile-vidix.patch;patch=0 "
+SRC_URI_husky += "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
+			file://Makefile-vidix.patch;patch=0 "
+SRC_URI_tosa += "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
+			file://Makefile-vidix.patch;patch=0 "
+			
 S = "${WORKDIR}/MPlayer-${PV}"
 
-PACKAGES="${PN} postproc postproc-dev"
+PACKAGES =+ "postproc postproc-dev"
 
 FILES_${PN} = "/usr/bin/mplayer"
 
@@ -20,7 +42,7 @@ inherit autotools
 
 EXTRA_OECONF = " \
 	--prefix=/usr \
-	--target=${PACKAGE_ARCH} \
+	--target=${TARGET_ARCH} \
 	--enable-shared-pp \
 	\
 	--disable-win32 \