[mutter/bilelmoussaoui/wayland-server-subproject: 1/2] build: Drop requires from pkgconfig.generate




commit 88596c2cc9510552d8be354f190fee3353c15704
Author: Bilal Elmoussaoui <belmouss redhat com>
Date:   Wed Jul 27 14:43:14 2022 +0200

    build: Drop requires from pkgconfig.generate
    
    Quoting ebassi from #hackers
    
    "requires is mainly used for two reasons:
    - legacy (the project was ported a long time ago and nobody kept up with
    changes in idiomatic Meson)
    - Or because the old pkg-config file had a Requires clause that included
    libraries, and people don't want to break older code that relies on the
    transitive dependency"
    
    The change was needed for making wayland-server/wayland-client a
    subproject
    See next commit

 clutter/clutter/meson.build | 2 +-
 cogl/cogl-pango/meson.build | 2 +-
 cogl/cogl/meson.build       | 1 -
 src/meson.build             | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index b4ee4b7827..f0feca5f9a 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -403,7 +403,7 @@ pkg.generate(libmutter_clutter,
   description: 'Mutters Clutter Private Library',
   libraries: [m_dep],
   subdirs: join_paths(pkgname, 'clutter'),
-  requires: [clutter_pkg_deps, libmutter_cogl_name],
+  requires: [libmutter_cogl_name],
   version: meson.project_version(),
   variables: [
     'apiversion=' + libmutter_api_version,
diff --git a/cogl/cogl-pango/meson.build b/cogl/cogl-pango/meson.build
index ba8fe70bad..851a04d2b0 100644
--- a/cogl/cogl-pango/meson.build
+++ b/cogl/cogl-pango/meson.build
@@ -72,7 +72,7 @@ pkg.generate(libmutter_cogl_pango,
   filebase: 'mutter-cogl-pango-' + libmutter_api_version,
   description: 'A text rendering for Cogl in mutter',
   subdirs: join_paths(pkgname, 'cogl'),
-  requires: [cogl_pkg_deps, libmutter_cogl_name],
+  requires: [libmutter_cogl_name],
   version: meson.project_version(),
   variables: [
     'apiversion=' + libmutter_api_version,
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 0bbf58bb97..10e414aa43 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -492,7 +492,6 @@ pkg.generate(libmutter_cogl,
   description: 'An object oriented GL/GLES Abstraction/Utility Layer in mutter',
   libraries: [m_dep],
   subdirs: join_paths(pkgname, 'cogl'),
-  requires: [cogl_pkg_deps],
   version: meson.project_version(),
   variables: [
     'apiversion=' + libmutter_api_version,
diff --git a/src/meson.build b/src/meson.build
index 6dda94b696..4fb06d16c6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1128,7 +1128,7 @@ pkg.generate(libmutter,
   filebase: 'libmutter-' + libmutter_api_version,
   description: 'Mutter compositor and window manager library',
   subdirs: pkgname,
-  requires: [mutter_pkg_deps, libmutter_clutter_name],
+  requires: [libmutter_clutter_name],
   version: meson.project_version(),
   variables: [
     'apiversion=' + libmutter_api_version,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]