mplayer_1.0pre7.bb, mplayer-atty_1.1.5.bb : small changes to packaging

Remove the libpostproc package produced by mplayer-atty as this is an
unnofficial mplayer version.
Fix the RCONFLICTS so only mplayer/mplayer-atty conflict, not libpostproc
as well.

diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb
index eb8d8ad..6990cce 100644 (file)
--- a/packages/mplayer/mplayer-atty_1.1.5.bb
+++ b/packages/mplayer/mplayer-atty_1.1.5.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa
 LICENSE = "GPL"
 RCONFLICTS = "mplayer"
 MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
           file://Makefile.patch;patch=1;pnum=0 \
@@ -25,20 +25,15 @@ 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-shared-pp \
         \
         --disable-win32 \
         --disable-macosx \
@@ -78,23 +73,3 @@ 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.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb
index 961f68e..a9ace88 100644 (file)
--- a/packages/mplayer/mplayer_1.0pre7.bb
+++ b/packages/mplayer/mplayer_1.0pre7.bb
@@ -11,8 +11,8 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
            file://libmpdemux-ogg-include.patch;patch=1 \
            file://libmpcodecs-ogg-include.patch;patch=1 "
 MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
-RCONFLICTS="mplayer-atty"
-PR = "r1"
+RCONFLICTS_${PN} = "mplayer-atty"
+PR = "r2"
 
 PARALLEL_MAKE = ""