CVS commit: pkgsrc/sysutils/k3b

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Apr  5 12:54:28 UTC 2021

Modified Files:
        pkgsrc/sysutils/k3b: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/k3b/patches: patch-cmake_modules_FindFFmpeg.cmake

Log Message:
k3b: update to 20.12.3

builds with taglib 1.12
fixes detection on ffmpeg


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/sysutils/k3b/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/k3b/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/k3b/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/k3b/patches/patch-cmake_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/sysutils/k3b/Makefile
diff -u pkgsrc/sysutils/k3b/Makefile:1.121 pkgsrc/sysutils/k3b/Makefile:1.122
--- pkgsrc/sysutils/k3b/Makefile:1.121  Sun Feb  7 06:30:37 2021
+++ pkgsrc/sysutils/k3b/Makefile        Mon Apr  5 12:54:28 2021
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.121 2021/02/07 06:30:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.122 2021/04/05 12:54:28 markd Exp $
 
 DISTNAME=      k3b-${KAPPSVER}
-PKGREVISION=   7
 CATEGORIES=    sysutils
 
 HOMEPAGE=      https://userbase.kde.org/K3b
 COMMENT=       DVD and CD authoring program
 LICENSE=       gnu-gpl-v2 AND gnu-fdl-v1.2
 
+KAPPSVER=      20.12.3
 .include "../../meta-pkgs/kde/applications.mk"
 
 BUILD_DEPENDS+=        kdoctools>=5.64.0:../../devel/kdoctools

Index: pkgsrc/sysutils/k3b/PLIST
diff -u pkgsrc/sysutils/k3b/PLIST:1.15 pkgsrc/sysutils/k3b/PLIST:1.16
--- pkgsrc/sysutils/k3b/PLIST:1.15      Tue Jun  9 11:56:18 2020
+++ pkgsrc/sysutils/k3b/PLIST   Mon Apr  5 12:54:28 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2020/06/09 11:56:18 markd Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/04/05 12:54:28 markd Exp $
 bin/k3b
 include/k3b_export.h
 include/k3bactivepipe.h
@@ -124,10 +124,11 @@ lib/libk3bdevice.so.7.0.0
 lib/libk3blib.so
 lib/libk3blib.so.7
 lib/libk3blib.so.7.0.0
-libexec/k3bhelper
+libexec/kauth/k3bhelper
 qt5/plugins/k3baudiometainforenamerplugin.so
 qt5/plugins/k3baudioprojectcddbplugin.so
 qt5/plugins/k3bexternalencoder.so
+qt5/plugins/k3bffmpegdecoder.so
 qt5/plugins/k3bflacdecoder.so
 qt5/plugins/k3blameencoder.so
 qt5/plugins/k3blibsndfiledecoder.so
@@ -178,6 +179,12 @@ share/doc/HTML/fr/k3b/K3bMoreActions.png
 share/doc/HTML/fr/k3b/K3bsetup.png
 share/doc/HTML/fr/k3b/index.cache.bz2
 share/doc/HTML/fr/k3b/index.docbook
+share/doc/HTML/it/k3b/K3bAddButton.png
+share/doc/HTML/it/k3b/K3bAdvancedSettings.png
+share/doc/HTML/it/k3b/K3bDiskChoice.png
+share/doc/HTML/it/k3b/K3bMoreActions.png
+share/doc/HTML/it/k3b/K3bSetVerify.png
+share/doc/HTML/it/k3b/K3bsetup.png
 share/doc/HTML/it/k3b/index.cache.bz2
 share/doc/HTML/it/k3b/index.docbook
 share/doc/HTML/nl/k3b/index.cache.bz2
@@ -186,6 +193,8 @@ share/doc/HTML/pt/k3b/index.cache.bz2
 share/doc/HTML/pt/k3b/index.docbook
 share/doc/HTML/pt_BR/k3b/index.cache.bz2
 share/doc/HTML/pt_BR/k3b/index.docbook
+share/doc/HTML/ru/k3b/index.cache.bz2
+share/doc/HTML/ru/k3b/index.docbook
 share/doc/HTML/sv/k3b/burndialog_audio.png
 share/doc/HTML/sv/k3b/burndialog_progress.png
 share/doc/HTML/sv/k3b/cdcopy_done.png
@@ -371,6 +380,7 @@ share/kservices5/ServiceMenus/k3b_write_
 share/kservices5/k3baudiometainforenamerplugin.desktop
 share/kservices5/k3baudioprojectcddbplugin.desktop
 share/kservices5/k3bexternalencoder.desktop
+share/kservices5/k3bffmpegdecoder.desktop
 share/kservices5/k3bflacdecoder.desktop
 share/kservices5/k3blameencoder.desktop
 share/kservices5/k3blibsndfiledecoder.desktop
@@ -476,6 +486,7 @@ share/locale/hu/LC_MESSAGES/kio_videodvd
 share/locale/hu/LC_MESSAGES/libk3b.mo
 share/locale/hu/LC_MESSAGES/libk3bdevice.mo
 share/locale/ia/LC_MESSAGES/k3b.mo
+share/locale/ia/LC_MESSAGES/kio_videodvd.mo
 share/locale/ia/LC_MESSAGES/libk3b.mo
 share/locale/ia/LC_MESSAGES/libk3bdevice.mo
 share/locale/id/LC_MESSAGES/kio_videodvd.mo

Index: pkgsrc/sysutils/k3b/distinfo
diff -u pkgsrc/sysutils/k3b/distinfo:1.27 pkgsrc/sysutils/k3b/distinfo:1.28
--- pkgsrc/sysutils/k3b/distinfo:1.27   Tue Jun  9 11:56:18 2020
+++ pkgsrc/sysutils/k3b/distinfo        Mon Apr  5 12:54:28 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.27 2020/06/09 11:56:18 markd Exp $
+$NetBSD: distinfo,v 1.28 2021/04/05 12:54:28 markd Exp $
 
-SHA1 (k3b-20.04.1.tar.xz) = 0792ec1c33c96dbd27a9bce5c65977fb7c8f83d4
-RMD160 (k3b-20.04.1.tar.xz) = 0c34f13c354776e7b621c7c844643852a5d6e493
-SHA512 (k3b-20.04.1.tar.xz) = 6d9a8fe3860e996c6e2291933d5912b4a1bd36ebdd73e6de3486082052b21f5d00b7e7329cc5f17ccbe1f46120f5a77cfb9ab789968e7c48ae2e950a1f611bcc
-Size (k3b-20.04.1.tar.xz) = 10510332 bytes
+SHA1 (k3b-20.12.3.tar.xz) = 094fb553e92134384beb8a4a3b94dcb600af1870
+RMD160 (k3b-20.12.3.tar.xz) = cbe421ff091c1d51300e64f18c13eeaa84f84768
+SHA512 (k3b-20.12.3.tar.xz) = e0c85d4faa6749d271d92a945e54c68876582b7d5c5719682950ca9305b75d0a46226f080e9c0bac300e63e32387ebb034d48f6ddc3b2d1a4fa2487db53f4039
+Size (k3b-20.12.3.tar.xz) = 10688136 bytes
+SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 4bdd745f48e66a3851bf99e8846b0cf564fe2281

Added files:

Index: pkgsrc/sysutils/k3b/patches/patch-cmake_modules_FindFFmpeg.cmake
diff -u /dev/null pkgsrc/sysutils/k3b/patches/patch-cmake_modules_FindFFmpeg.cmake:1.1
--- /dev/null   Mon Apr  5 12:54:29 2021
+++ pkgsrc/sysutils/k3b/patches/patch-cmake_modules_FindFFmpeg.cmake    Mon Apr  5 12:54:28 2021
@@ -0,0 +1,27 @@
+$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.1 2021/04/05 12:54:28 markd Exp $
+
+Use correct variable to detect ffmpeg paths
+
+--- cmake/modules/FindFFmpeg.cmake.orig        2021-02-24 23:19:59.000000000 +0000
++++ cmake/modules/FindFFmpeg.cmake
+@@ -68,16 +68,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.")