Patchwork [RFC] libav: drop unused FFMPEG_LIBS and move libpostproc only to 0.8.11

login
register
mail settings
Submitter Martin Jansa
Date July 16, 2014, 12:13 p.m.
Message ID <1405512834-14423-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/75771/
State New
Headers show

Comments

Martin Jansa - July 16, 2014, 12:13 p.m.
* standalone libpostproc recipe depends on libav, but current PACKAGES_DYNAMIC indicated
  that libav-9.13 also provides libpostproc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-multimedia/libav/libav.inc       | 5 -----
 meta/recipes-multimedia/libav/libav_0.8.11.bb | 2 ++
 meta/recipes-multimedia/libav/libav_9.13.bb   | 3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)
Martin Jansa - Aug. 16, 2014, 6:20 p.m.
On Wed, Jul 16, 2014 at 02:13:54PM +0200, Martin Jansa wrote:
> * standalone libpostproc recipe depends on libav, but current PACKAGES_DYNAMIC indicated
>   that libav-9.13 also provides libpostproc

ping

> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-multimedia/libav/libav.inc       | 5 -----
>  meta/recipes-multimedia/libav/libav_0.8.11.bb | 2 ++
>  meta/recipes-multimedia/libav/libav_9.13.bb   | 3 +++
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
> index 1d617a2..ff1ab0e 100644
> --- a/meta/recipes-multimedia/libav/libav.inc
> +++ b/meta/recipes-multimedia/libav/libav.inc
> @@ -87,9 +87,6 @@ do_install_append() {
>      install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
>  }
>  
> -FFMPEG_LIBS = "libavcodec libavdevice libavformat \
> -               libavutil libpostproc libswscale libavfilter"
> -
>  PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"
>  
>  RSUGGESTS_${PN} = "mplayer"
> @@ -142,5 +139,3 @@ python populate_packages_prepend() {
>          for pkg in pkgs:
>              d.appendVar('INSANE_SKIP_%s' % pkg, ' textrel')
>  }
> -
> -PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"
> diff --git a/meta/recipes-multimedia/libav/libav_0.8.11.bb b/meta/recipes-multimedia/libav/libav_0.8.11.bb
> index 662d205..1344a2a 100644
> --- a/meta/recipes-multimedia/libav/libav_0.8.11.bb
> +++ b/meta/recipes-multimedia/libav/libav_0.8.11.bb
> @@ -16,3 +16,5 @@ PROVIDES += "libpostproc"
>  EXTRA_OECONF += " \
>      --enable-postproc \
>  "
> +
> +PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"
> diff --git a/meta/recipes-multimedia/libav/libav_9.13.bb b/meta/recipes-multimedia/libav/libav_9.13.bb
> index 7bfbc48..f9c413f 100644
> --- a/meta/recipes-multimedia/libav/libav_9.13.bb
> +++ b/meta/recipes-multimedia/libav/libav_9.13.bb
> @@ -11,3 +11,6 @@ SRC_URI[md5sum] = "23b9e34bffdaee366710fdf20157a570"
>  SRC_URI[sha256sum] = "2ff05df6cd2259b3bb277eb16c234214f8e0530700d0c774d033eba23edde6ca"
>  
>  DEFAULT_PREFERENCE = "-1"
> +
> +# unlike 0.8.11 we don't provide libpostproc
> +PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*"
> -- 
> 2.0.0
>
Martin Jansa - Oct. 30, 2014, 8:21 a.m.
On Wed, Jul 16, 2014 at 02:13:54PM +0200, Martin Jansa wrote:
> * standalone libpostproc recipe depends on libav, but current PACKAGES_DYNAMIC indicated
>   that libav-9.13 also provides libpostproc

ping

> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-multimedia/libav/libav.inc       | 5 -----
>  meta/recipes-multimedia/libav/libav_0.8.11.bb | 2 ++
>  meta/recipes-multimedia/libav/libav_9.13.bb   | 3 +++
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
> index 1d617a2..ff1ab0e 100644
> --- a/meta/recipes-multimedia/libav/libav.inc
> +++ b/meta/recipes-multimedia/libav/libav.inc
> @@ -87,9 +87,6 @@ do_install_append() {
>      install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
>  }
>  
> -FFMPEG_LIBS = "libavcodec libavdevice libavformat \
> -               libavutil libpostproc libswscale libavfilter"
> -
>  PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"
>  
>  RSUGGESTS_${PN} = "mplayer"
> @@ -142,5 +139,3 @@ python populate_packages_prepend() {
>          for pkg in pkgs:
>              d.appendVar('INSANE_SKIP_%s' % pkg, ' textrel')
>  }
> -
> -PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"
> diff --git a/meta/recipes-multimedia/libav/libav_0.8.11.bb b/meta/recipes-multimedia/libav/libav_0.8.11.bb
> index 662d205..1344a2a 100644
> --- a/meta/recipes-multimedia/libav/libav_0.8.11.bb
> +++ b/meta/recipes-multimedia/libav/libav_0.8.11.bb
> @@ -16,3 +16,5 @@ PROVIDES += "libpostproc"
>  EXTRA_OECONF += " \
>      --enable-postproc \
>  "
> +
> +PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"
> diff --git a/meta/recipes-multimedia/libav/libav_9.13.bb b/meta/recipes-multimedia/libav/libav_9.13.bb
> index 7bfbc48..f9c413f 100644
> --- a/meta/recipes-multimedia/libav/libav_9.13.bb
> +++ b/meta/recipes-multimedia/libav/libav_9.13.bb
> @@ -11,3 +11,6 @@ SRC_URI[md5sum] = "23b9e34bffdaee366710fdf20157a570"
>  SRC_URI[sha256sum] = "2ff05df6cd2259b3bb277eb16c234214f8e0530700d0c774d033eba23edde6ca"
>  
>  DEFAULT_PREFERENCE = "-1"
> +
> +# unlike 0.8.11 we don't provide libpostproc
> +PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*"
> -- 
> 2.0.0
>

Patch

diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index 1d617a2..ff1ab0e 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -87,9 +87,6 @@  do_install_append() {
     install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
 }
 
-FFMPEG_LIBS = "libavcodec libavdevice libavformat \
-               libavutil libpostproc libswscale libavfilter"
-
 PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"
 
 RSUGGESTS_${PN} = "mplayer"
@@ -142,5 +139,3 @@  python populate_packages_prepend() {
         for pkg in pkgs:
             d.appendVar('INSANE_SKIP_%s' % pkg, ' textrel')
 }
-
-PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"
diff --git a/meta/recipes-multimedia/libav/libav_0.8.11.bb b/meta/recipes-multimedia/libav/libav_0.8.11.bb
index 662d205..1344a2a 100644
--- a/meta/recipes-multimedia/libav/libav_0.8.11.bb
+++ b/meta/recipes-multimedia/libav/libav_0.8.11.bb
@@ -16,3 +16,5 @@  PROVIDES += "libpostproc"
 EXTRA_OECONF += " \
     --enable-postproc \
 "
+
+PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*"
diff --git a/meta/recipes-multimedia/libav/libav_9.13.bb b/meta/recipes-multimedia/libav/libav_9.13.bb
index 7bfbc48..f9c413f 100644
--- a/meta/recipes-multimedia/libav/libav_9.13.bb
+++ b/meta/recipes-multimedia/libav/libav_9.13.bb
@@ -11,3 +11,6 @@  SRC_URI[md5sum] = "23b9e34bffdaee366710fdf20157a570"
 SRC_URI[sha256sum] = "2ff05df6cd2259b3bb277eb16c234214f8e0530700d0c774d033eba23edde6ca"
 
 DEFAULT_PREFERENCE = "-1"
+
+# unlike 0.8.11 we don't provide libpostproc
+PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*"