diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-08-15 19:25:57 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-08-15 19:25:57 +0200 |
| commit | 2a1fada6251bafedb8d3e1eb5bf5a083ff447210 (patch) | |
| tree | fd2e7b45550a23a71101cc7b5e0f8ff854fe5ec1 | |
| parent | 03170c937407de99eae7d79220d75b6867dd2037 (diff) | |
ffmpeg: but presets in their own package
* people, adding subpackages is easy, doing rm in do_install* is pretty much always wrong
| -rw-r--r-- | recipes/ffmpeg/ffmpeg.inc | 5 | ||||
| -rw-r--r-- | recipes/ffmpeg/ffmpeg_0.5.bb | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index 7d7d957014..cdb3f7ee16 100644 --- 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 354531606c..b80fa8893b 100644 --- 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 -} |