libplacebo: Build with glslang support

Signed-off-by: Reilly Brogan <[email protected]>

packages/l/libplacebo/abi_used_symbols

@@ -3,8 +3,10 @@ libc.so.6:__ctype_b_loc
 libc.so.6:__errno_location
 libc.so.6:__fprintf_chk
 libc.so.6:__isoc23_sscanf
+libc.so.6:__isoc23_strtol
 libc.so.6:__isoc23_vsscanf
 libc.so.6:__memcpy_chk
+libc.so.6:__printf_chk
 libc.so.6:__snprintf_chk
 libc.so.6:__stack_chk_fail
 libc.so.6:__vsnprintf_chk
@@ -62,6 +64,7 @@ libdovi.so.3:dovi_rpu_free_header
 libdovi.so.3:dovi_rpu_free_vdr_dm_data
 libdovi.so.3:dovi_rpu_get_header
 libdovi.so.3:dovi_rpu_get_vdr_dm_data
+libgcc_s.so.1:_Unwind_Resume
 libgcc_s.so.1:__popcountdi2
 liblcms2.so.2:cmsBuildParametricToneCurve
 liblcms2.so.2:cmsCloseProfile
@@ -105,6 +108,16 @@ libm.so.6:roundf
 libm.so.6:sin
 libm.so.6:sincos
 libm.so.6:sincosf
+libshaderc_shared.so.1:_ZN7glslang12GlslangToSpvERKNS_13TIntermediateERSt6vectorIjSaIjEEPNS_10SpvOptionsE
+libshaderc_shared.so.1:_ZN7glslang15FinalizeProcessEv
+libshaderc_shared.so.1:_ZN7glslang17InitializeProcessEv
+libshaderc_shared.so.1:_ZN7glslang7TShader10getInfoLogEv
+libshaderc_shared.so.1:_ZN7glslang7TShader10setStringsEPKPKci
+libshaderc_shared.so.1:_ZN7glslang7TShader5parseEPK16TBuiltInResourcei8EProfilebb11EShMessagesRNS0_8IncluderE
+libshaderc_shared.so.1:_ZN7glslang7TShaderC1E11EShLanguage
+libshaderc_shared.so.1:_ZN7glslang8TProgram10getInfoLogEv
+libshaderc_shared.so.1:_ZN7glslang8TProgram4linkE11EShMessages
+libshaderc_shared.so.1:_ZN7glslang8TProgramC1Ev
 libshaderc_shared.so.1:shaderc_compile_into_spv
 libshaderc_shared.so.1:shaderc_compile_into_spv_assembly
 libshaderc_shared.so.1:shaderc_compile_options_initialize
@@ -123,10 +136,36 @@ libshaderc_shared.so.1:shaderc_result_get_length
 libshaderc_shared.so.1:shaderc_result_get_num_errors
 libshaderc_shared.so.1:shaderc_result_get_num_warnings
 libshaderc_shared.so.1:shaderc_result_release
+libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13find_first_ofEPKcmm
+libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE17find_first_not_ofEPKcmm
+libstdc++.so.6:_ZNSo9_M_insertIbEERSoT_
+libstdc++.so.6:_ZNSolsEi
+libstdc++.so.6:_ZNSt6localeC1Ev
+libstdc++.so.6:_ZNSt6localeD1Ev
+libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
+libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_assignERKS4_
+libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_createERmm
+libstdc++.so.6:_ZNSt8__detail15_List_node_base7_M_hookEPS0_
+libstdc++.so.6:_ZNSt8ios_baseC2Ev
+libstdc++.so.6:_ZNSt8ios_baseD2Ev
+libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE4initEPSt15basic_streambufIcS1_E
 libstdc++.so.6:_ZSt10from_charsPKcS0_RdSt12chars_format
 libstdc++.so.6:_ZSt10from_charsPKcS0_RfSt12chars_format
+libstdc++.so.6:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+libstdc++.so.6:_ZSt19__throw_logic_errorPKc
+libstdc++.so.6:_ZSt24__throw_out_of_range_fmtPKcz
 libstdc++.so.6:_ZSt8to_charsPcS_d
 libstdc++.so.6:_ZSt8to_charsPcS_f
+libstdc++.so.6:_ZTTNSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEE
+libstdc++.so.6:_ZTVN10__cxxabiv117__class_type_infoE
+libstdc++.so.6:_ZTVN10__cxxabiv120__si_class_type_infoE
+libstdc++.so.6:_ZTVNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEEE
+libstdc++.so.6:_ZTVNSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEE
+libstdc++.so.6:_ZTVSt15basic_streambufIcSt11char_traitsIcEE
+libstdc++.so.6:_ZTVSt9basic_iosIcSt11char_traitsIcEE
+libstdc++.so.6:_ZdlPvm
+libstdc++.so.6:_Znwm
+libstdc++.so.6:__gxx_personality_v0
 libunwind.so.8:_ULx86_64_get_proc_name
 libunwind.so.8:_ULx86_64_get_reg
 libunwind.so.8:_ULx86_64_init_local

packages/l/libplacebo/files/fix-glsl.patch

@@ -0,0 +1,35 @@
+From 3ba18d5d84738c663e16d7699342102e30e2fbc5 Mon Sep 17 00:00:00 2001
+From: Niklas Haas <[email protected]>
+Date: Thu, 8 Feb 2024 19:25:55 +0100
+Subject: [PATCH] meson: don't hard-require glslang internal dependencies
+
+They apparently like to randomly remove them. Just mark them as not
+required.
+
+Fixes: https://code.videolan.org/videolan/libplacebo/-/issues/321
+---
+ src/glsl/meson.build | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/glsl/meson.build b/src/glsl/meson.build
+index 5cebfb891..5a8819605 100644
+--- a/src/glsl/meson.build
++++ b/src/glsl/meson.build
+@@ -42,10 +42,10 @@ elif not glslang_req.disabled()
+     if static
+       glslang_deps += [
+         # Always required for static linking
+-        cxx.find_library('MachineIndependent', required: true, static: true),
+-        cxx.find_library('OSDependent',        required: true, static: true),
+-        cxx.find_library('OGLCompiler',        required: true, static: true),
+-        cxx.find_library('GenericCodeGen',     required: true, static: true),
++        cxx.find_library('MachineIndependent', required: false, static: true),
++        cxx.find_library('OSDependent',        required: false, static: true),
++        cxx.find_library('OGLCompiler',        required: false, static: true),
++        cxx.find_library('GenericCodeGen',     required: false, static: true),
+         # SPIRV-Tools are required only if optimizer is enabled in glslang build
+         cxx.find_library('SPIRV-Tools',        required: false, static: true),
+         cxx.find_library('SPIRV-Tools-opt',    required: false, static: true),
+-- 
+GitLab
+

packages/l/libplacebo/monitoring.yml

@@ -0,0 +1,6 @@
+releases:
+  id: 20101
+  rss: https://code.videolan.org/videolan/libplacebo/-/tags?format=atom
+security:
+  # No known CPE, last checked 2024-04-17
+  cpe: ~

packages/l/libplacebo/package.yml

@@ -1,6 +1,6 @@
 name       : libplacebo
 version    : 6.338.2
-release    : 24
+release    : 25
 source     :
     - https://code.videolan.org/videolan/libplacebo/-/archive/v6.338.2/libplacebo-v6.338.2.tar.bz2 : 1c02d21720f972cae02111a1286337e9d0e70d623b311a1e4245bac5ce987f28
 license    : LGPL-2.1-or-later
@@ -12,15 +12,19 @@ description: |
 builddeps  :
     - pkgconfig(dovi)
     - pkgconfig(lcms2)
+    - pkgconfig(libglvnd)
     - pkgconfig(libunwind)
     - pkgconfig(libxxhash)
     - pkgconfig(shaderc)
     - pkgconfig(spirv-cross-c-shared)
     - pkgconfig(vulkan)
+    - glslang-devel
     - python-glad2
     - python-jinja
 setup      : |
-    %meson_configure -Ddemos=false
+    %patch -p1 -i $pkgfiles/fix-glsl.patch
+    %meson_configure -Ddemos=false \
+                     -Dglslang=enabled
 build      : |
     %ninja_build
 install    : |

packages/l/libplacebo/pspec_x86_64.xml

@@ -3,8 +3,8 @@
         <Name>libplacebo</Name>
         <Homepage>https://libplacebo.org/</Homepage>
         <Packager>
-            <Name>Alexander Vorobyev</Name>
-            <Email>avorobyev@protonmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Packager>
         <License>LGPL-2.1-or-later</License>
         <PartOf>multimedia.library</PartOf>
@@ -30,7 +30,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="24">libplacebo</Dependency>
+            <Dependency release="25">libplacebo</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/libplacebo/cache.h</Path>
@@ -72,12 +72,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="24">
+        <Update release="25">
             <Date>2024-04-17</Date>
             <Version>6.338.2</Version>
             <Comment>Packaging update</Comment>
-            <Name>Alexander Vorobyev</Name>
-            <Email>avorobyev@protonmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Update>
     </History>
 </PISI>