Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/04/18 16:50:34+02:00 uni-frankfurt.de!mickeyl
remove ancient tremor and old mplayer trials

BKrev: 4263c944GNWXIYovhNV9J7--YWh0Tw

14 files changed, 0 insertions, 283 deletions

diff --git a/packages/mplayer/mplayer-1.0pre3try2/Makefile-vidix.patch b/packages/mplayer/mplayer-1.0pre3try2/Makefile-vidix.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre3try2/Makefile-vidix.patch
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre3try2/Makefile.patch b/packages/mplayer/mplayer-1.0pre3try2/Makefile.patch
deleted file mode 100644
index b6029a8f6c..0000000000
--- a/packages/mplayer/mplayer-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 $(LDFLAGS)
-+	
- 
- 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/packages/mplayer/mplayer-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff b/packages/mplayer/mplayer-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre3try2/mplayer-w100_1.0pre3.1.modified.diff
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre3try2/sdl.patch b/packages/mplayer/mplayer-1.0pre3try2/sdl.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre3try2/sdl.patch
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre3try2/zlib.patch b/packages/mplayer/mplayer-1.0pre3try2/zlib.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre3try2/zlib.patch
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre6a/Makefile-vidix.patch b/packages/mplayer/mplayer-1.0pre6a/Makefile-vidix.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre6a/Makefile-vidix.patch
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre6a/Makefile.patch b/packages/mplayer/mplayer-1.0pre6a/Makefile.patch
deleted file mode 100644
index 63f697393a..0000000000
--- a/packages/mplayer/mplayer-1.0pre6a/Makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- MPlayer-1.0pre6/Makefile.orig	2004-12-25 23:48:23.000000000 +0100
-+++ MPlayer-1.0pre6/Makefile	2004-12-25 23:49:18.000000000 +0100
-@@ -8,11 +8,6 @@
- 
- PRG_CFG = codec-cfg
- 
--# 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)
- SUBDIRS += libdha vidix
-@@ -234,7 +229,7 @@
-     ifeq ($(TARGET_WIN32),yes)
- 	windres -o osdep/mplayer-rc.o osdep/mplayer.rc
-     endif
--	$(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) $(MATH_LIB)
-+	$(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) $(MATH_LIB) -ljpeg -lpng -lts $(LDFLAGS)
- 
- mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
- 	winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
-@@ -267,7 +262,7 @@
- $(MENCODER_DEP): version.h help_mp.h
- 
- $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
--	$(HOST_CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS)
-+	$(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS)
- 
- install: $(ALL_PRG)
- ifeq ($(VIDIX),yes)
-@@ -352,7 +347,7 @@
- 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
- 
- strip:
--	strip -s $(ALL_PRG)
-+
- 
- dep:	depend
- 
diff --git a/packages/mplayer/mplayer-1.0pre6a/mplayer-w100_1.0pre3.1.modified.diff b/packages/mplayer/mplayer-1.0pre6a/mplayer-w100_1.0pre3.1.modified.diff
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre6a/mplayer-w100_1.0pre3.1.modified.diff
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre6a/sdl.patch b/packages/mplayer/mplayer-1.0pre6a/sdl.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre6a/sdl.patch
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre6a/vidix-drivers-w100.patch b/packages/mplayer/mplayer-1.0pre6a/vidix-drivers-w100.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre6a/vidix-drivers-w100.patch
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre6a/zlib.patch b/packages/mplayer/mplayer-1.0pre6a/zlib.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre6a/zlib.patch
+++ /dev/null
diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb
deleted file mode 100644
index a9decc8a44..0000000000
--- a/packages/mplayer/mplayer_1.0pre3try2.bb
+++ /dev/null
@@ -1,84 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl tslib libmad tremor-20021126 libogg libvorbis zlib libpng jpeg"
-PR = "r7"
-LICENSE = "GPL"
-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_append_c7x0 = " sharp-aticore-oss"
-PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
-SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
-                       file://Makefile-vidix.patch;patch=0 "
-
-S = "${WORKDIR}/MPlayer-${PV}"
-
-PACKAGES =+ "postproc postproc-dev"
-
-FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so"
-
-FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0"
-FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a"
-
-inherit autotools 
-
-EXTRA_OECONF = " \
-        --prefix=/usr \
-		--mandir=${mandir} \
-        --target=${TARGET_SYS} \
-        --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-sdl \
-        --with-sdl-config=${STAGING_BINDIR}/sdl-config \
-        \
-        --enable-mad \
-        --enable-tremor \
-        --enable-vorbis \
-        \
-        --enable-ossaudio \
-        \
-	--enable-rtc \
-        --with-extralibdir=${STAGING_LIBDIR} "
-
-EXTRA_OECONF_append_c7x0 = " --enable-vidix "
-
-do_configure() {
-        ./configure ${EXTRA_OECONF}
-}
-
-do_install_append () {
-        install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc
-        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
-        oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir}
-        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
-        cd ${D}${libdir}
-        ln -sf libpostproc.so.0.0.0 libpostproc.so.0
-        ln -sf libpostproc.so.0 libpostproc.so
-}
-
-do_stage () {
-        oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR}
-        cd ${STAGING_LIBDIR}
-        ln -sf libpostproc.so libpostproc.so.0.0.0
-        ln -sf 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/packages/mplayer/mplayer_1.0pre6a.bb b/packages/mplayer/mplayer_1.0pre6a.bb
deleted file mode 100644
index a9248ec343..0000000000
--- a/packages/mplayer/mplayer_1.0pre6a.bb
+++ /dev/null
@@ -1,90 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad tremor-20021126 libogg libvorbis zlib libpng jpeg"
-LICENSE = "GPL"
-SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1 \
-           file://sdl.patch;patch=0 \
-           file://zlib.patch;patch=0 "
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
-PARALLEL_MAKE = ""
-
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
-PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
-SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
-                       file://Makefile-vidix.patch;patch=0 \
-                       file://vidix-drivers-w100.patch;patch=1 "
-
-S = "${WORKDIR}/MPlayer-${PV}"
-
-PACKAGES =+ "postproc postproc-dev"
-
-FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so"
-
-FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0"
-FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a"
-
-inherit autotools 
-
-EXTRA_OECONF = " \
-        --prefix=/usr \
-		--mandir=${mandir} \
-        --target=${TARGET_SYS} \
-        --enable-shared-pp \
-        \
-        --disable-win32 \
-        --disable-macosx \
-        --disable-dvdread \
-        --disable-mpdvdkit \
-        --disable-tv \
-        --disable-tv-v4l \
-        --disable-tv-v4l2 \
-        --disable-tv-bsdbt848 \
-        --disable-mencoder \
-	--disable-live \
-        \
-        --enable-dynamic-plugins \
-        --enable-fbdev \
-        --enable-sdl \
-        --with-sdl-config=${STAGING_BINDIR}/sdl-config \
-        \
-        --enable-mad \
-        --enable-tremor \
-        --enable-vorbis \
-        \
-        --enable-ossaudio \
-        \
-	--enable-rtc \
-	\
-        --with-extralibdir=${STAGING_LIBDIR} "
-
-EXTRA_OECONF_append_c7x0 = " --enable-vidix "
-
-do_configure() {
-        ./configure ${EXTRA_OECONF}
-}
-
-do_install_append () {
-        install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc
-        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
-        oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir}
-        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
-        cd ${D}${libdir}
-        ln -sf libpostproc.so.0.0.0 libpostproc.so.0
-        ln -sf libpostproc.so.0 libpostproc.so
-}
-
-do_stage () {
-        oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR}
-        cd ${STAGING_LIBDIR}
-        ln -sf libpostproc.so libpostproc.so.0.0.0
-        ln -sf 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/packages/tremor/tremor_20021126.bb b/packages/tremor/tremor_20021126.bb
deleted file mode 100644
index 614387bb31..0000000000
--- a/packages/tremor/tremor_20021126.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "libogg"
-DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
-LICENSE = "BSD"
-CVSDATE = "${PV}"
-
-SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4120;proto=http"
-
-S = "${WORKDIR}/Tremor"
-
-inherit autotools
-
-EXTRA_OECONF=" --enable-shared --disable-rpath  "
-
-#do_configure_prepend() {
-#    ./autogen.sh
-#}
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR}/tremor \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}