cerbero: packages: Update for gst-plugins-bad libraries

[Andoni Morales]

2014-06-23 9:37 GMT+02:00 Edward Hervey <bilboed at kemper.freedesktop.org>:

> Module: cerbero
> Branch: master
> Commit: ce92730c24af514dd6b4845db17eee91bd736064
> URL:
> http://cgit.freedesktop.org/gstreamer/cerbero/commit/?id=ce92730c24af514dd6b4845db17eee91bd736064
>
> Author: Edward Hervey <bilboed at bilboed.com>
> Date:   Mon Jun 16 15:41:22 2014 +0200
>
> packages: Update for gst-plugins-bad libraries
>
> https://bugzilla.gnome.org/show_bug.cgi?id=728154
>
> ---
>
>  packages/gstreamer-1.0-capture.package           |    2 +-
>  packages/gstreamer-1.0-codecs-restricted.package |    2 +-
>  packages/gstreamer-1.0-codecs.package            |    2 +-
>  packages/gstreamer-1.0-system.package            |    2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/packages/gstreamer-1.0-capture.package
> b/packages/gstreamer-1.0-capture.package
> index 1aba654..0d2aaf3 100644
> --- a/packages/gstreamer-1.0-capture.package
> +++ b/packages/gstreamer-1.0-capture.package
> @@ -19,7 +19,7 @@ class Package(package.Package):
>      files = ['gst-plugins-base-1.0:plugins_capture',
>               'gst-plugins-good-1.0:plugins_capture',
>               'gst-plugins-ugly-1.0:plugins_capture',
> -             'gst-plugins-bad-1.0:plugins_capture']
> +             'gst-plugins-bad-1.0:plugins_capture:libs']
>      files_devel = ['gst-plugins-base-1.0-static:plugins_capture_devel'
>                     'gst-plugins-good-1.0-static:plugins_capture_devel',
>                     'gst-plugins-ugly-1.0-static:plugins_capture_devel',
> diff --git a/packages/gstreamer-1.0-codecs-restricted.package
> b/packages/gstreamer-1.0-codecs-restricted.package
> index 2b103e3..361fae1 100644
> --- a/packages/gstreamer-1.0-codecs-restricted.package
> +++ b/packages/gstreamer-1.0-codecs-restricted.package
> @@ -19,7 +19,7 @@ class Package(package.Package):
>      files = ['a52dec:libs', 'opencore-amr:libs', 'libmad:libs',
> 'libmpeg2:libs',
>               'faad2:libs', 'libdca:libs', 'vo-aacenc:libs', 'x264:libs',
>               'gst-plugins-ugly-1.0:plugins_codecs_restricted',
> -             'gst-plugins-bad-1.0:plugins_codecs_restricted']
> +             'gst-plugins-bad-1.0:plugins_codecs_restricted:libs']
>      files_devel =
> ['gst-plugins-ugly-1.0-static:plugins_codecs_restricted_devel',
>
> 'gst-plugins-bad-1.0-static:plugins_codecs_restricted_devel']
>
> diff --git a/packages/gstreamer-1.0-codecs.package
> b/packages/gstreamer-1.0-codecs.package
> index 085a5b5..801e1b3 100644
> --- a/packages/gstreamer-1.0-codecs.package
> +++ b/packages/gstreamer-1.0-codecs.package
> @@ -21,7 +21,7 @@ class Package(package.Package):
>              'libtheora:libs', 'wavpack:libs', 'libvpx:libs',
>              'taglib:libs', 'opus:libs', 'libvorbis:libs',
>              'gst-plugins-base-1.0:plugins_codecs',
> 'gst-plugins-good-1.0:plugins_codecs',
> -            'gst-plugins-bad-1.0:plugins_codecs',
> 'gst-plugins-ugly-1.0:plugins_codecs',
> +            'gst-plugins-bad-1.0:plugins_codecs:libs',
> 'gst-plugins-ugly-1.0:plugins_codecs',
>              ]
>      files_devel = ['gst-plugins-base-1.0-static:plugins_codecs_devel',
>              'gst-plugins-good-1.0-static:plugins_codecs_devel',
> diff --git a/packages/gstreamer-1.0-system.package
> b/packages/gstreamer-1.0-system.package
> index 7a78548..92f0df7 100644
> --- a/packages/gstreamer-1.0-system.package
> +++ b/packages/gstreamer-1.0-system.package
> @@ -17,7 +17,7 @@ class Package(package.Package):
>      deps = ['gstreamer-1.0-core']
>
>      files = ['gst-plugins-base-1.0:plugins_sys',
> 'gst-plugins-good-1.0:plugins_sys',
> -            'gst-plugins-ugly-1.0:plugins_sys',
> 'gst-plugins-bad-1.0:plugins_sys']
> +            'gst-plugins-ugly-1.0:plugins_sys',
> 'gst-plugins-bad-1.0:plugins_sys:libs']
>      files_devel = ['gst-plugins-base-1.0-static:plugins_sys_devel',
>              'gst-plugins-good-1.0-static:plugins_sys_devel',
>              'gst-plugins-ugly-1.0-static:plugins_sys_devel',
>

Hi,

I don't think this set of patches is correct from the point of view of the
packages. This would include the -bad libraries in several packages, ending
up with duplicated files, which is a problem for .deb and .rpm packages as
it will complain about the same file being installed by several packages.
I think the correct way of handling this is adding the gst-plugins-bad:libs
to the gstreamer-core package, which includes the libraries from gstreamer
and gstreamer-base.

Cheers,
Andoni

>
> _______________________________________________
> gstreamer-commits mailing list
> gstreamer-commits at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/gstreamer-commits
>



-- 
Andoni Morales Alastruey

LongoMatch:The Digital Coach
http://www.longomatch.ylatuya.es
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/gstreamer-devel/attachments/20140623/7e729789/attachment-0001.html>