CVS commit: pkgsrc/devel/extra-cmake-modules

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Sep  6 09:43:25 UTC 2026

Modified Files:
        pkgsrc/devel/extra-cmake-modules: Makefile distinfo
Added Files:
        pkgsrc/devel/extra-cmake-modules/patches:
            patch-find-modules_FindFFmpeg.cmake

Log Message:
extra-cmake-modules: fix paths in FindFFmpeg.cmake


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/extra-cmake-modules/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/extra-cmake-modules/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/extra-cmake-modules/patches/patch-find-modules_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/devel/extra-cmake-modules/Makefile
diff -u pkgsrc/devel/extra-cmake-modules/Makefile:1.35 pkgsrc/devel/extra-cmake-modules/Makefile:1.36
--- pkgsrc/devel/extra-cmake-modules/Makefile:1.35      Mon Aug 17 05:40:26 2026
+++ pkgsrc/devel/extra-cmake-modules/Makefile   Sun Sep  6 09:43:25 2026
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2026/08/17 05:40:26 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/09/06 09:43:25 markd Exp $
 #
 # changelog:
 # https://kde.org/announcements/frameworks/6/6.nn.0/
 
 DISTNAME=      extra-cmake-modules-6.29.0
+PKGREVISION=   1
 CATEGORIES=    devel kde
 MASTER_SITES=  ${MASTER_SITE_KDE:=frameworks/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/extra-cmake-modules/distinfo
diff -u pkgsrc/devel/extra-cmake-modules/distinfo:1.32 pkgsrc/devel/extra-cmake-modules/distinfo:1.33
--- pkgsrc/devel/extra-cmake-modules/distinfo:1.32      Sun Aug 16 11:43:12 2026
+++ pkgsrc/devel/extra-cmake-modules/distinfo   Sun Sep  6 09:43:25 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.32 2026/08/16 11:43:12 wiz Exp $
+$NetBSD: distinfo,v 1.33 2026/09/06 09:43:25 markd Exp $
 
 BLAKE2s (extra-cmake-modules-6.29.0.tar.xz) = 15606945727711dfef4cff56b2dd8b2692589d49f7da9ffcc9047778f6830594
 SHA512 (extra-cmake-modules-6.29.0.tar.xz) = 2d93e270d1edd417603718357c7a72f2903d12cb345604da0af4fe4e47533643e60aa47f74c3fdd16606a6386eff3c539594373e64f54c9e487aa41ece92d4a6
 Size (extra-cmake-modules-6.29.0.tar.xz) = 339516 bytes
+SHA1 (patch-find-modules_FindFFmpeg.cmake) = 9ba72e92cbc850592aa1cda03bc8f9a093e215dd
 SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = 0d0c33df8d3207841d48ad2dc51ebe1533866ca1
 SHA1 (patch-kde-modules_KDEMetaInfoPlatformCheck.cmake) = 74a714c25f7c73c2e2d38ae22144cf52574009ae

Added files:

Index: pkgsrc/devel/extra-cmake-modules/patches/patch-find-modules_FindFFmpeg.cmake
diff -u /dev/null pkgsrc/devel/extra-cmake-modules/patches/patch-find-modules_FindFFmpeg.cmake:1.1
--- /dev/null   Sun Sep  6 09:43:25 2026
+++ pkgsrc/devel/extra-cmake-modules/patches/patch-find-modules_FindFFmpeg.cmake        Sun Sep  6 09:43:25 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-find-modules_FindFFmpeg.cmake,v 1.1 2026/09/06 09:43:25 markd Exp $
+
+Fix broken prefix
+
+--- find-modules/FindFFmpeg.cmake.orig 2026-08-07 20:38:40.000000000 +0000
++++ find-modules/FindFFmpeg.cmake
+@@ -141,16 +141,16 @@ macro(find_component _component _pkgconf
+ 
+   find_path(${_component}_INCLUDE_DIRS ${_header}
+     HINTS
+-      ${PC_LIB${_component}_INCLUDEDIR}
+-      ${PC_LIB${_component}_INCLUDE_DIRS}
++      ${PC_${_component}_INCLUDEDIR}
++      ${PC_${_component}_INCLUDE_DIRS}
+     PATH_SUFFIXES
+       ffmpeg
+   )
+ 
+   find_library(${_component}_LIBRARIES NAMES ${_library}
+       HINTS
+-      ${PC_LIB${_component}_LIBDIR}
+-      ${PC_LIB${_component}_LIBRARY_DIRS}
++      ${PC_${_component}_LIBDIR}
++      ${PC_${_component}_LIBRARY_DIRS}
+   )
+ 
+   set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")