ffmpeg: but presets in their own package

* people, adding subpackages is easy, doing rm in do_install* is pretty much always wrong

diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index 7d7d957..cdb3f7e 100644 (file)
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -80,13 +80,16 @@ FILES_${PN}-vhook = "${libdir}/vhook"
 FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
 
 
-PACKAGES += "libavcodec  libavcodec-dev  libavcodec-dbg \
+PACKAGES += "ffmpeg-x264-presets \
+             libavcodec  libavcodec-dev  libavcodec-dbg \
              libavdevice libavdevice-dev libavdevice-dbg \
              libavformat libavformat-dev libavformat-dbg \
              libavutil   libavutil-dev   libavutil-dbg \
              libpostproc libpostproc-dev libpostproc-dbg \
              libswscale  libswscale-dev  libswscale-dbg"
 
+FILES_ffmpeg-x264-presets = "${datadir}/*.ffpreset"
+
 FILES_${PN}-dev = "${includedir}"
 FILES_libavcodec = "${libdir}/libavcodec*.so.*"
 FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a"

diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index 3545316..b80fa88 100644 (file)
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
 DEPENDS += "schroedinger libgsm"
 
 PE = "1"
-PR = "r4"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "1"
 
@@ -60,6 +60,3 @@ do_configure() {
                sed -i -e s:Os:O4:g ${B}/config.h
 }
 
-do_install_append() {
-       rm ${D}${datadir}/*.ffpreset
-}