[libcamera-devel,v2,2/2] gst: Fix GLib detection

Message ID 20200307191634.9320-3-laurent.pinchart@ideasonboard.com
State Accepted
Commit 34396936f7a46f21422ef64769fd807876716304
Headers show
Series
  • Fix GStreamer element compilation
Related show

Commit Message

Laurent Pinchart March 7, 2020, 7:16 p.m. UTC
Commit 17cccc68a88f ("Add GStreamer plugin and element skeleton") has
gained a last minute fix for a clang compilation error with GLib prior
to v2.63.0. The fix wasn't properly tested, and failed to check the GLib
dependency correctly. This resulted in compilation of the GStreamer
element to always be disabled.

Fix this by changing the GLib package name from 'glib' to 'glib-2.0'.

Fixes: 17cccc68a88f ("Add GStreamer plugin and element skeleton")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/gstreamer/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nicolas Dufresne March 7, 2020, 7:34 p.m. UTC | #1
Le samedi 07 mars 2020 à 21:16 +0200, Laurent Pinchart a écrit :
> Commit 17cccc68a88f ("Add GStreamer plugin and element skeleton") has
> gained a last minute fix for a clang compilation error with GLib prior
> to v2.63.0. The fix wasn't properly tested, and failed to check the GLib
> dependency correctly. This resulted in compilation of the GStreamer
> element to always be disabled.
> 
> Fix this by changing the GLib package name from 'glib' to 'glib-2.0'.
> 
> Fixes: 17cccc68a88f ("Add GStreamer plugin and element skeleton")
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

> ---
>  src/gstreamer/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build
> index 8759a12205fa..e119e472cb58 100644
> --- a/src/gstreamer/meson.build
> +++ b/src/gstreamer/meson.build
> @@ -13,7 +13,7 @@ libcamera_gst_cpp_args = [
>      '-DPACKAGE="@0@"'.format(meson.project_name()),
>  ]
>  
> -glib_dep = dependency('glib', required : get_option('gstreamer'))
> +glib_dep = dependency('glib-2.0', required : get_option('gstreamer'))
>  
>  gst_dep_version = '>=1.14.0'
>  gstvideo_dep = dependency('gstreamer-video-1.0', version : gst_dep_version,

Patch

diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build
index 8759a12205fa..e119e472cb58 100644
--- a/src/gstreamer/meson.build
+++ b/src/gstreamer/meson.build
@@ -13,7 +13,7 @@  libcamera_gst_cpp_args = [
     '-DPACKAGE="@0@"'.format(meson.project_name()),
 ]
 
-glib_dep = dependency('glib', required : get_option('gstreamer'))
+glib_dep = dependency('glib-2.0', required : get_option('gstreamer'))
 
 gst_dep_version = '>=1.14.0'
 gstvideo_dep = dependency('gstreamer-video-1.0', version : gst_dep_version,