From 8547251d0980c43a06e1d801864c630f941a7c6d Mon Sep 17 00:00:00 2001
From: Hanspeter Portner <dev@open-music-kontrollers.ch>
Date: Sun, 13 Oct 2024 20:09:34 +0200
Subject: [PATCH] Squashed 'subprojects/pugl/' changes from 8df91ca1..57801836

57801836 Fixes for static embedding
REVERT: 8df91ca1 Convert meson recipe to static linking

git-subtree-dir: subprojects/pugl
git-subtree-split: 57801836466e2432b146998320992696bc1a81ad
---
 include/pugl/attributes.h |  2 +-
 meson.build               | 35 +++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/include/pugl/attributes.h b/include/pugl/attributes.h
index 75322ee..f247626 100644
--- a/include/pugl/attributes.h
+++ b/include/pugl/attributes.h
@@ -20,7 +20,7 @@
 #  elif defined(_WIN32) && !defined(PUGL_STATIC)
 #    define PUGL_API __declspec(dllimport)
 #  elif defined(__GNUC__)
-#    define PUGL_API __attribute__((visibility("default")))
+#    define PUGL_API __attribute__((visibility("hidden")))
 #  else
 #    define PUGL_API
 #  endif
diff --git a/meson.build b/meson.build
index 855cf7c..aa49d8f 100644
--- a/meson.build
+++ b/meson.build
@@ -234,13 +234,16 @@ common_sources = files(
   'src/internal.c',
 )
 
-libpugl = static_library(
+libpugl = library(
   core_name,
   common_sources + platform_sources,
   c_args: library_args + core_args,
   dependencies: core_deps,
   gnu_symbol_visibility: 'hidden',
-  include_directories: includes
+  include_directories: includes,
+  install: false,
+  soversion: soversion,
+  version: meson.project_version(),
 )
 
 pugl_dep = declare_dependency(
@@ -261,13 +264,16 @@ if get_option('stub')
   name = 'pugl_' + platform + '_stub' + version_suffix
   sources = files('src/' + platform + '_stub' + extension)
 
-  stub_backend = static_library(
+  stub_backend = library(
     name,
     sources,
     c_args: library_args,
     dependencies: [pugl_dep],
     gnu_symbol_visibility: 'hidden',
-    include_directories: includes
+    include_directories: includes,
+    install: false,
+    soversion: soversion,
+    version: meson.project_version(),
   )
 
   pugl_stub_dep = declare_dependency(
@@ -291,13 +297,16 @@ if opengl_dep.found()
   name = 'pugl_' + platform + '_gl' + version_suffix
   sources = files('src/' + platform + '_gl' + extension)
 
-  gl_backend = static_library(
+  gl_backend = library(
     name,
     sources,
     c_args: library_args,
     dependencies: [pugl_dep, opengl_dep],
     gnu_symbol_visibility: 'hidden',
-    include_directories: includes
+    include_directories: includes,
+    install: false,
+    soversion: soversion,
+    version: meson.project_version(),
   )
 
   pugl_gl_dep = declare_dependency(
@@ -332,14 +341,17 @@ if cairo_dep.found()
 
   cairo_args = cc.get_supported_arguments(cairo_args)
 
-  cairo_backend = static_library(
+  cairo_backend = library(
     name,
     sources,
     c_args: library_args + cairo_args,
     dependencies: [pugl_dep, cairo_dep],
     gnu_symbol_visibility: 'hidden',
     include_directories: includes,
-    objc_args: library_args + cairo_args
+    install: false,
+    objc_args: library_args + cairo_args,
+    soversion: soversion,
+    version: meson.project_version(),
   )
 
   pugl_cairo_dep = declare_dependency(
@@ -375,13 +387,16 @@ if vulkan_dep.found()
     ]
   endif
 
-  vulkan_backend = static_library(
+  vulkan_backend = library(
     name,
     sources,
     c_args: library_args,
     dependencies: vulkan_deps,
     gnu_symbol_visibility: 'hidden',
-    include_directories: includes
+    include_directories: includes,
+    install: false,
+    soversion: soversion,
+    version: meson.project_version(),
   )
 
   pugl_vulkan_dep = declare_dependency(
-- 
2.45.2