Merge bk://openembedded@openembedded.bkbits.net/packages

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

2004/08/18 01:48:09+02:00 uni-frankfurt.de!mickey
minor cleanups to libxine and opie-mediaplayer2

BKrev: 4123231b8jQcalRadbpq0ex4xFkqNA

diff --git a/libxine/libxine_1.0.0-beta12.oe b/libxine/libxine_1.0.0-beta12.oe
index 1bdba68..23b8120 100644 (file)
--- a/libxine/libxine_1.0.0-beta12.oe
+++ b/libxine/libxine_1.0.0-beta12.oe
@@ -1,14 +1,17 @@
-DESCRIPTION = "libxine"
+DESCRIPTION = "libxine is a library for multimedia players. \
+It plays back CDs, DVDs, and VCDs. It also decodes multimedia \
+files like AVI, MOV, WMV, and MP3 from local disk drives, \
+and displays multimedia streamed over the Internet. It interprets \
+many of the most common multimedia formats available - \
+and some of the most uncommon formats, too."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "zlib libogg tremor libmad"
+PR = "r1"
 
 inherit autotools
 
-S = "${WORKDIR}/xine-lib"
-
-SRC_URI = "cvs://anonymous@cvs.xine.sf.net/cvsroot/xine;module=xine-lib;tag=xine-1-beta12-release \
+SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-1-beta12.tar.gz \
           file://full.patch;patch=1 \
           file://libvorbis.patch;patch=0 \
           file://demux_ogg.patch;patch=0 \
@@ -17,6 +20,7 @@ SRC_URI = "cvs://anonymous@cvs.xine.sf.net/cvsroot/xine;module=xine-lib;tag=xine
           file://mpegvideo-static-inlining.patch;patch=1 \
           file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \
           file://fftscope-static-inlining.patch;patch=1"
+S = "${WORKDIR}/xine-lib-1-beta12"
 
 SOV = "1.0.6"
 
@@ -33,39 +37,52 @@ do_compile() {
        oe_runmake LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool OGG_LIBS=$(STAGING_LIBDIR)/libogg.so
 }
 
-# ug - we don't do elegant/purdy today
-do_install() {
-       oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
-         -C src install-data \
-         'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
-         'includedir=${D}/${includedir}'
-       oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
-         -C include install-data \
-         'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
-         'includedir=${D}/${includedir}'
-       for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
-         dir=`dirname $plugin`
-         libname=`basename $plugin|sed -e's,\.la,,'` 
-         oe_libinstall -so -C $dir $libname ${D}/${libdir}/xine/plugins/1.0.0
-       done
-       oe_libinstall -so -C src/xine-engine libxine ${D}/${libdir}
-}
-
 do_stage() {
        oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
          -C src install-data \
          'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
          'libdir=${STAGING_LIBDIR}' \
          'includedir=${STAGING_INCDIR}'
+
        oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
          -C include install-data \
          'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
          'libdir=${STAGING_LIBDIR}' \
          'includedir=${STAGING_INCDIR}'
+
        for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
          dir=`dirname $plugin`
          libname=`basename $plugin|sed -e's,\.la,,'` 
          oe_libinstall -so -C $dir $libname ${STAGING_LIBDIR}/xine/plugins/1.0.0
        done
+
        oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
 }
+
+do_install() {
+        oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+          -C src install-data \
+          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+          'includedir=${D}/${includedir}' 
+
+        oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+          -C include install-data \
+          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+          'includedir=${D}/${includedir}'
+
+        for plugin in `find ${S}/src -type f -name xineplug*.la`; do
+          dir=`dirname $plugin`
+          libname=`basename $plugin|sed -e's,\.la,,'`
+          oe_libinstall -so -C $dir $libname ${D}/${libdir}/xine/plugins/1.0.0
+        done
+
+        oe_libinstall -so -C src/xine-engine libxine ${D}/${libdir}
+}
+
+#
+# FIXME: Split plugins into codex, demux, and visualization plugins
+#        or even better, each plugin into one package, since some are HUGE.
+#
+
+PACKAGES += "libxine-plugins"
+FILES_libxine-plugins = "${libdir}/xine/plugins/1.0.0/xineplug*.so"

diff --git a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
index e69de29..e15f9b4 100644 (file)
--- a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and more. Also it is streaming capable."
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Team Opie <opie@handhelds.org>
+PV = "1.1.5-cvs-${CVSDATE}"
+DEPENDS = "libxine"
+RDEPENDS = "opie-mediaplayer2-skin"
+APPNAME = "opieplayer2"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/opieplayer2 \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
+          file://fix-switch-yuv2rgb_arm2.patch;patch=1"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+QMAKE_PROFILES = "opieplayer2.pro"
+
+do_install() {
+       install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+