CVS commit: pkgsrc/multimedia/qt6-qtmultimedia

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Mar 18 13:14:16 UTC 2023

Modified Files:
        pkgsrc/multimedia/qt6-qtmultimedia: distinfo
Added Files:
        pkgsrc/multimedia/qt6-qtmultimedia/patches:
            patch-cmake_FindFFmpeg.cmake

Log Message:
qt6-multimedia: fix breakage due to that --exclude-libs is unavailable on some linkers


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/qt6-qtmultimedia/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/qt6-qtmultimedia/patches/patch-cmake_FindFFmpeg.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/qt6-qtmultimedia/distinfo
diff -u pkgsrc/multimedia/qt6-qtmultimedia/distinfo:1.1 pkgsrc/multimedia/qt6-qtmultimedia/distinfo:1.2
--- pkgsrc/multimedia/qt6-qtmultimedia/distinfo:1.1     Mon Nov 28 13:04:40 2022
+++ pkgsrc/multimedia/qt6-qtmultimedia/distinfo Sat Mar 18 13:14:15 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/11/28 13:04:40 nros Exp $
+$NetBSD: distinfo,v 1.2 2023/03/18 13:14:15 nros Exp $
 
 BLAKE2s (qtmultimedia-everywhere-src-6.4.1.tar.xz) = e1c7972009d4a6da2b95913c8774afe49936f5e76cd0309dd1a0d71af34795f6
 SHA512 (qtmultimedia-everywhere-src-6.4.1.tar.xz) = f221bedaf997b413e1fa8a984503b03839ac731c99e9ab4233871acde57b0fd66b64ec401448505b25e6c1a5313b594a01b65ba9af0047ed008a2fea8e40d6c9
 Size (qtmultimedia-everywhere-src-6.4.1.tar.xz) = 5934284 bytes
+SHA1 (patch-cmake_FindFFmpeg.cmake) = 34cc0a4cb416a008392e6392366e3e14a5da8106

Added files:

Index: pkgsrc/multimedia/qt6-qtmultimedia/patches/patch-cmake_FindFFmpeg.cmake
diff -u /dev/null pkgsrc/multimedia/qt6-qtmultimedia/patches/patch-cmake_FindFFmpeg.cmake:1.1
--- /dev/null   Sat Mar 18 13:14:16 2023
+++ pkgsrc/multimedia/qt6-qtmultimedia/patches/patch-cmake_FindFFmpeg.cmake     Sat Mar 18 13:14:16 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-cmake_FindFFmpeg.cmake,v 1.1 2023/03/18 13:14:16 nros Exp $
+
+* --exclude-libs is not available on Solaris/Illumos, according to
+  the git commit messages for this file about exlude-libs it was
+  added relocation problems on Linux so only use it on Linux
+
+--- cmake/FindFFmpeg.cmake.orig        2023-03-18 11:53:01.741033419 +0000
++++ cmake/FindFFmpeg.cmake
+@@ -247,7 +247,7 @@ endfunction()
+             __ffmpeg_internal_set_dependencies(${_lowerComponent})
+         endif()
+         target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "${${_component}_LIBRARY}")
+-        if (UNIX AND NOT APPLE)
++        if (LINUX)
+           target_link_options(FFmpeg::${_lowerComponent} INTERFACE  "-Wl,--exclude-libs=lib${_lowerComponent}")
+         endif ()
+     endif()