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

into cimmeria.(none):/home/dp/zaurus/openembedded

2005/06/24 17:16:55+01:00 (none)!XorA
mplayer-atty: added needed patch I missed when upping rev

BKrev: 42bc3356yodaigktU9S9lLv97b4VXA

2 files changed, 97 insertions, 0 deletions

diff --git a/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch
diff --git a/packages/mplayer/mplayer-atty_1.1.4.bb b/packages/mplayer/mplayer-atty_1.1.4.bb
index e69de29bb2..cb43938d22 100644
--- a/packages/mplayer/mplayer-atty_1.1.4.bb
+++ b/packages/mplayer/mplayer-atty_1.1.4.bb
@@ -0,0 +1,97 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.mplayerhq.hu/"
+DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg"
+LICENSE = "GPL"
+RCONFLICTS = "mplayer"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+PR = "r1"
+
+SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
+	   file://Makefile.patch;patch=1;pnum=0 \
+	   file://sdl.patch;patch=1 \
+           file://Makefile-libs.patch;patch=1 \
+           file://libmpdemux-ogg-include.patch;patch=1 \
+           file://libmpcodecs-ogg-include.patch;patch=1 "
+
+PARALLEL_MAKE = ""
+
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
+PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_akita = "${MACHINE_ARCH}"
+PACKAGE_ARCH_spitz = "${MACHINE_ARCH}"
+
+S = "${WORKDIR}/mplayer-${PV}"
+
+PACKAGES =+ "postproc postproc-dev"
+
+FILES_${PN} = "${bindir}/mplayer"
+
+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 \
+	--disable-smb \
+        \
+        --enable-dynamic-plugins \
+        --enable-fbdev \
+        --enable-sdl \
+        --with-sdl-config=${STAGING_BINDIR}/sdl-config \
+        \
+        --enable-mad \
+        --enable-vorbis \
+        \
+        --enable-ossaudio \
+        \
+        --enable-rtc \
+	--disable-ipp \
+	--disable-iwmmxt \
+        \
+        --with-extralibdir=${STAGING_LIBDIR} "
+
+EXTRA_OECONF_append_c7x0 = " --enable-w100"
+EXTRA_OECONF_append_akita = " --enable-bvdd"
+EXTRA_OECONF_append_spitz = " --enable-bvdd"
+
+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
+}
+