Mon Apr 5 12:54:28 2021 UTC ()
k3b: update to 20.12.3

builds with taglib 1.12
fixes detection on ffmpeg


(markd)
diff -r1.121 -r1.122 pkgsrc/sysutils/k3b/Makefile
diff -r1.15 -r1.16 pkgsrc/sysutils/k3b/PLIST
diff -r1.27 -r1.28 pkgsrc/sysutils/k3b/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/k3b/patches/patch-cmake_modules_FindFFmpeg.cmake
cvs diff -r1.121 -r1.122 pkgsrc/sysutils/k3b/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/k3b/Makefile 2021/02/07 06:30:37 1.121
+++ pkgsrc/sysutils/k3b/Makefile 2021/04/05 12:54:28 1.122
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.121 2021/02/07 06:30:37 ryoon Exp $ 1# $NetBSD: Makefile,v 1.122 2021/04/05 12:54:28 markd Exp $
2 2
3DISTNAME= k3b-${KAPPSVER} 3DISTNAME= k3b-${KAPPSVER}
4PKGREVISION= 7 
5CATEGORIES= sysutils 4CATEGORIES= sysutils
6 5
7HOMEPAGE= https://userbase.kde.org/K3b 6HOMEPAGE= https://userbase.kde.org/K3b
8COMMENT= DVD and CD authoring program 7COMMENT= DVD and CD authoring program
9LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 8LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2
10 9
 10KAPPSVER= 20.12.3
11.include "../../meta-pkgs/kde/applications.mk" 11.include "../../meta-pkgs/kde/applications.mk"
12 12
13BUILD_DEPENDS+= kdoctools>=5.64.0:../../devel/kdoctools 13BUILD_DEPENDS+= kdoctools>=5.64.0:../../devel/kdoctools
14DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao 14DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao
15DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools 15DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
16 16
17USE_TOOLS+= msgmerge pkg-config perl 17USE_TOOLS+= msgmerge pkg-config perl
18 18
19CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF 19CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF
20CMAKE_ARGS+= -DKAUTH_DBUS_DIR=${PREFIX}/share/examples/k3b 20CMAKE_ARGS+= -DKAUTH_DBUS_DIR=${PREFIX}/share/examples/k3b
21 21
22INSTALLATION_DIRS+= share/examples/k3b 22INSTALLATION_DIRS+= share/examples/k3b
23 23
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/k3b/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/k3b/PLIST 2020/06/09 11:56:18 1.15
+++ pkgsrc/sysutils/k3b/PLIST 2021/04/05 12:54:28 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2020/06/09 11:56:18 markd Exp $ 1@comment $NetBSD: PLIST,v 1.16 2021/04/05 12:54:28 markd Exp $
2bin/k3b 2bin/k3b
3include/k3b_export.h 3include/k3b_export.h
4include/k3bactivepipe.h 4include/k3bactivepipe.h
5include/k3baudiocdtrackdrag.h 5include/k3baudiocdtrackdrag.h
6include/k3baudiocdtrackreader.h 6include/k3baudiocdtrackreader.h
7include/k3baudiocdtracksource.h 7include/k3baudiocdtracksource.h
8include/k3baudiocuefilewritingjob.h 8include/k3baudiocuefilewritingjob.h
9include/k3baudiodatasource.h 9include/k3baudiodatasource.h
10include/k3baudiodatasourceiterator.h 10include/k3baudiodatasourceiterator.h
11include/k3baudiodecoder.h 11include/k3baudiodecoder.h
12include/k3baudiodoc.h 12include/k3baudiodoc.h
13include/k3baudiodocreader.h 13include/k3baudiodocreader.h
14include/k3baudioencoder.h 14include/k3baudioencoder.h
@@ -114,30 +114,31 @@ include/k3bvideodvdptt.h @@ -114,30 +114,31 @@ include/k3bvideodvdptt.h
114include/k3bvideodvdsubpicturestream.h 114include/k3bvideodvdsubpicturestream.h
115include/k3bvideodvdtime.h 115include/k3bvideodvdtime.h
116include/k3bvideodvdtitle.h 116include/k3bvideodvdtitle.h
117include/k3bvideodvdtitledetectclippingjob.h 117include/k3bvideodvdtitledetectclippingjob.h
118include/k3bvideodvdtitletranscodingjob.h 118include/k3bvideodvdtitletranscodingjob.h
119include/k3bvideodvdvideostream.h 119include/k3bvideodvdvideostream.h
120include/k3bwavefilewriter.h 120include/k3bwavefilewriter.h
121lib/libk3bdevice.so 121lib/libk3bdevice.so
122lib/libk3bdevice.so.7 122lib/libk3bdevice.so.7
123lib/libk3bdevice.so.7.0.0 123lib/libk3bdevice.so.7.0.0
124lib/libk3blib.so 124lib/libk3blib.so
125lib/libk3blib.so.7 125lib/libk3blib.so.7
126lib/libk3blib.so.7.0.0 126lib/libk3blib.so.7.0.0
127libexec/k3bhelper 127libexec/kauth/k3bhelper
128qt5/plugins/k3baudiometainforenamerplugin.so 128qt5/plugins/k3baudiometainforenamerplugin.so
129qt5/plugins/k3baudioprojectcddbplugin.so 129qt5/plugins/k3baudioprojectcddbplugin.so
130qt5/plugins/k3bexternalencoder.so 130qt5/plugins/k3bexternalencoder.so
 131qt5/plugins/k3bffmpegdecoder.so
131qt5/plugins/k3bflacdecoder.so 132qt5/plugins/k3bflacdecoder.so
132qt5/plugins/k3blameencoder.so 133qt5/plugins/k3blameencoder.so
133qt5/plugins/k3blibsndfiledecoder.so 134qt5/plugins/k3blibsndfiledecoder.so
134qt5/plugins/k3bmaddecoder.so 135qt5/plugins/k3bmaddecoder.so
135qt5/plugins/k3boggvorbisdecoder.so 136qt5/plugins/k3boggvorbisdecoder.so
136qt5/plugins/k3boggvorbisencoder.so 137qt5/plugins/k3boggvorbisencoder.so
137qt5/plugins/k3bsoxencoder.so 138qt5/plugins/k3bsoxencoder.so
138qt5/plugins/k3bwavedecoder.so 139qt5/plugins/k3bwavedecoder.so
139qt5/plugins/kcm_k3bexternalencoder.so 140qt5/plugins/kcm_k3bexternalencoder.so
140qt5/plugins/kcm_k3blameencoder.so 141qt5/plugins/kcm_k3blameencoder.so
141qt5/plugins/kcm_k3boggvorbisencoder.so 142qt5/plugins/kcm_k3boggvorbisencoder.so
142qt5/plugins/kcm_k3bsoxencoder.so 143qt5/plugins/kcm_k3bsoxencoder.so
143qt5/plugins/kf5/kio/videodvd.so 144qt5/plugins/kf5/kio/videodvd.so
@@ -168,34 +169,42 @@ share/doc/HTML/es/k3b/cdcopy_reading.png @@ -168,34 +169,42 @@ share/doc/HTML/es/k3b/cdcopy_reading.png
168share/doc/HTML/es/k3b/cdcopy_settings.png 169share/doc/HTML/es/k3b/cdcopy_settings.png
169share/doc/HTML/es/k3b/cdcopy_writing.png 170share/doc/HTML/es/k3b/cdcopy_writing.png
170share/doc/HTML/es/k3b/index.cache.bz2 171share/doc/HTML/es/k3b/index.cache.bz2
171share/doc/HTML/es/k3b/index.docbook 172share/doc/HTML/es/k3b/index.docbook
172share/doc/HTML/es/k3b/select_audiofiles.png 173share/doc/HTML/es/k3b/select_audiofiles.png
173share/doc/HTML/es/k3b/select_project.png 174share/doc/HTML/es/k3b/select_project.png
174share/doc/HTML/fr/k3b/K3bAddButton.png 175share/doc/HTML/fr/k3b/K3bAddButton.png
175share/doc/HTML/fr/k3b/K3bAdvancedSettings.png 176share/doc/HTML/fr/k3b/K3bAdvancedSettings.png
176share/doc/HTML/fr/k3b/K3bDiskChoice.png 177share/doc/HTML/fr/k3b/K3bDiskChoice.png
177share/doc/HTML/fr/k3b/K3bMoreActions.png 178share/doc/HTML/fr/k3b/K3bMoreActions.png
178share/doc/HTML/fr/k3b/K3bsetup.png 179share/doc/HTML/fr/k3b/K3bsetup.png
179share/doc/HTML/fr/k3b/index.cache.bz2 180share/doc/HTML/fr/k3b/index.cache.bz2
180share/doc/HTML/fr/k3b/index.docbook 181share/doc/HTML/fr/k3b/index.docbook
 182share/doc/HTML/it/k3b/K3bAddButton.png
 183share/doc/HTML/it/k3b/K3bAdvancedSettings.png
 184share/doc/HTML/it/k3b/K3bDiskChoice.png
 185share/doc/HTML/it/k3b/K3bMoreActions.png
 186share/doc/HTML/it/k3b/K3bSetVerify.png
 187share/doc/HTML/it/k3b/K3bsetup.png
181share/doc/HTML/it/k3b/index.cache.bz2 188share/doc/HTML/it/k3b/index.cache.bz2
182share/doc/HTML/it/k3b/index.docbook 189share/doc/HTML/it/k3b/index.docbook
183share/doc/HTML/nl/k3b/index.cache.bz2 190share/doc/HTML/nl/k3b/index.cache.bz2
184share/doc/HTML/nl/k3b/index.docbook 191share/doc/HTML/nl/k3b/index.docbook
185share/doc/HTML/pt/k3b/index.cache.bz2 192share/doc/HTML/pt/k3b/index.cache.bz2
186share/doc/HTML/pt/k3b/index.docbook 193share/doc/HTML/pt/k3b/index.docbook
187share/doc/HTML/pt_BR/k3b/index.cache.bz2 194share/doc/HTML/pt_BR/k3b/index.cache.bz2
188share/doc/HTML/pt_BR/k3b/index.docbook 195share/doc/HTML/pt_BR/k3b/index.docbook
 196share/doc/HTML/ru/k3b/index.cache.bz2
 197share/doc/HTML/ru/k3b/index.docbook
189share/doc/HTML/sv/k3b/burndialog_audio.png 198share/doc/HTML/sv/k3b/burndialog_audio.png
190share/doc/HTML/sv/k3b/burndialog_progress.png 199share/doc/HTML/sv/k3b/burndialog_progress.png
191share/doc/HTML/sv/k3b/cdcopy_done.png 200share/doc/HTML/sv/k3b/cdcopy_done.png
192share/doc/HTML/sv/k3b/cdcopy_reading.png 201share/doc/HTML/sv/k3b/cdcopy_reading.png
193share/doc/HTML/sv/k3b/cdcopy_settings.png 202share/doc/HTML/sv/k3b/cdcopy_settings.png
194share/doc/HTML/sv/k3b/cdcopy_writing.png 203share/doc/HTML/sv/k3b/cdcopy_writing.png
195share/doc/HTML/sv/k3b/index.cache.bz2 204share/doc/HTML/sv/k3b/index.cache.bz2
196share/doc/HTML/sv/k3b/index.docbook 205share/doc/HTML/sv/k3b/index.docbook
197share/doc/HTML/sv/k3b/select_audiofiles.png 206share/doc/HTML/sv/k3b/select_audiofiles.png
198share/doc/HTML/sv/k3b/select_project.png 207share/doc/HTML/sv/k3b/select_project.png
199share/doc/HTML/uk/k3b/K3bAddButton.png 208share/doc/HTML/uk/k3b/K3bAddButton.png
200share/doc/HTML/uk/k3b/K3bAdvancedSettings.png 209share/doc/HTML/uk/k3b/K3bAdvancedSettings.png
201share/doc/HTML/uk/k3b/K3bDiskChoice.png 210share/doc/HTML/uk/k3b/K3bDiskChoice.png
@@ -361,26 +370,27 @@ share/k3b/pics/quant/project_right.png @@ -361,26 +370,27 @@ share/k3b/pics/quant/project_right.png
361share/k3b/pics/quant/splash.png 370share/k3b/pics/quant/splash.png
362share/k3b/pics/quant/welcome_bg.png 371share/k3b/pics/quant/welcome_bg.png
363share/knotifications5/k3b.notifyrc 372share/knotifications5/k3b.notifyrc
364share/knsrcfiles/k3btheme.knsrc 373share/knsrcfiles/k3btheme.knsrc
365share/konqsidebartng/virtual_folders/services/videodvd.desktop 374share/konqsidebartng/virtual_folders/services/videodvd.desktop
366share/kservices5/ServiceMenus/k3b_create_audio_cd.desktop 375share/kservices5/ServiceMenus/k3b_create_audio_cd.desktop
367share/kservices5/ServiceMenus/k3b_create_data_project.desktop 376share/kservices5/ServiceMenus/k3b_create_data_project.desktop
368share/kservices5/ServiceMenus/k3b_create_video_cd.desktop 377share/kservices5/ServiceMenus/k3b_create_video_cd.desktop
369share/kservices5/ServiceMenus/k3b_write_bin_image.desktop 378share/kservices5/ServiceMenus/k3b_write_bin_image.desktop
370share/kservices5/ServiceMenus/k3b_write_iso_image.desktop 379share/kservices5/ServiceMenus/k3b_write_iso_image.desktop
371share/kservices5/k3baudiometainforenamerplugin.desktop 380share/kservices5/k3baudiometainforenamerplugin.desktop
372share/kservices5/k3baudioprojectcddbplugin.desktop 381share/kservices5/k3baudioprojectcddbplugin.desktop
373share/kservices5/k3bexternalencoder.desktop 382share/kservices5/k3bexternalencoder.desktop
 383share/kservices5/k3bffmpegdecoder.desktop
374share/kservices5/k3bflacdecoder.desktop 384share/kservices5/k3bflacdecoder.desktop
375share/kservices5/k3blameencoder.desktop 385share/kservices5/k3blameencoder.desktop
376share/kservices5/k3blibsndfiledecoder.desktop 386share/kservices5/k3blibsndfiledecoder.desktop
377share/kservices5/k3bmaddecoder.desktop 387share/kservices5/k3bmaddecoder.desktop
378share/kservices5/k3boggvorbisdecoder.desktop 388share/kservices5/k3boggvorbisdecoder.desktop
379share/kservices5/k3boggvorbisencoder.desktop 389share/kservices5/k3boggvorbisencoder.desktop
380share/kservices5/k3bsoxencoder.desktop 390share/kservices5/k3bsoxencoder.desktop
381share/kservices5/k3bwavedecoder.desktop 391share/kservices5/k3bwavedecoder.desktop
382share/kservices5/kcm_k3bexternalencoder.desktop 392share/kservices5/kcm_k3bexternalencoder.desktop
383share/kservices5/kcm_k3blameencoder.desktop 393share/kservices5/kcm_k3blameencoder.desktop
384share/kservices5/kcm_k3boggvorbisencoder.desktop 394share/kservices5/kcm_k3boggvorbisencoder.desktop
385share/kservices5/kcm_k3bsoxencoder.desktop 395share/kservices5/kcm_k3bsoxencoder.desktop
386share/kservices5/videodvd.protocol 396share/kservices5/videodvd.protocol
@@ -466,26 +476,27 @@ share/locale/he/LC_MESSAGES/libk3bdevice @@ -466,26 +476,27 @@ share/locale/he/LC_MESSAGES/libk3bdevice
466share/locale/hi/LC_MESSAGES/k3b.mo 476share/locale/hi/LC_MESSAGES/k3b.mo
467share/locale/hi/LC_MESSAGES/kio_videodvd.mo 477share/locale/hi/LC_MESSAGES/kio_videodvd.mo
468share/locale/hi/LC_MESSAGES/libk3b.mo 478share/locale/hi/LC_MESSAGES/libk3b.mo
469share/locale/hi/LC_MESSAGES/libk3bdevice.mo 479share/locale/hi/LC_MESSAGES/libk3bdevice.mo
470share/locale/hr/LC_MESSAGES/k3b.mo 480share/locale/hr/LC_MESSAGES/k3b.mo
471share/locale/hr/LC_MESSAGES/kio_videodvd.mo 481share/locale/hr/LC_MESSAGES/kio_videodvd.mo
472share/locale/hr/LC_MESSAGES/libk3b.mo 482share/locale/hr/LC_MESSAGES/libk3b.mo
473share/locale/hr/LC_MESSAGES/libk3bdevice.mo 483share/locale/hr/LC_MESSAGES/libk3bdevice.mo
474share/locale/hu/LC_MESSAGES/k3b.mo 484share/locale/hu/LC_MESSAGES/k3b.mo
475share/locale/hu/LC_MESSAGES/kio_videodvd.mo 485share/locale/hu/LC_MESSAGES/kio_videodvd.mo
476share/locale/hu/LC_MESSAGES/libk3b.mo 486share/locale/hu/LC_MESSAGES/libk3b.mo
477share/locale/hu/LC_MESSAGES/libk3bdevice.mo 487share/locale/hu/LC_MESSAGES/libk3bdevice.mo
478share/locale/ia/LC_MESSAGES/k3b.mo 488share/locale/ia/LC_MESSAGES/k3b.mo
 489share/locale/ia/LC_MESSAGES/kio_videodvd.mo
479share/locale/ia/LC_MESSAGES/libk3b.mo 490share/locale/ia/LC_MESSAGES/libk3b.mo
480share/locale/ia/LC_MESSAGES/libk3bdevice.mo 491share/locale/ia/LC_MESSAGES/libk3bdevice.mo
481share/locale/id/LC_MESSAGES/kio_videodvd.mo 492share/locale/id/LC_MESSAGES/kio_videodvd.mo
482share/locale/is/LC_MESSAGES/k3b.mo 493share/locale/is/LC_MESSAGES/k3b.mo
483share/locale/is/LC_MESSAGES/kio_videodvd.mo 494share/locale/is/LC_MESSAGES/kio_videodvd.mo
484share/locale/is/LC_MESSAGES/libk3b.mo 495share/locale/is/LC_MESSAGES/libk3b.mo
485share/locale/is/LC_MESSAGES/libk3bdevice.mo 496share/locale/is/LC_MESSAGES/libk3bdevice.mo
486share/locale/it/LC_MESSAGES/k3b.mo 497share/locale/it/LC_MESSAGES/k3b.mo
487share/locale/it/LC_MESSAGES/kio_videodvd.mo 498share/locale/it/LC_MESSAGES/kio_videodvd.mo
488share/locale/it/LC_MESSAGES/libk3b.mo 499share/locale/it/LC_MESSAGES/libk3b.mo
489share/locale/it/LC_MESSAGES/libk3bdevice.mo 500share/locale/it/LC_MESSAGES/libk3bdevice.mo
490share/locale/ja/LC_MESSAGES/k3b.mo 501share/locale/ja/LC_MESSAGES/k3b.mo
491share/locale/ja/LC_MESSAGES/kio_videodvd.mo 502share/locale/ja/LC_MESSAGES/kio_videodvd.mo
cvs diff -r1.27 -r1.28 pkgsrc/sysutils/k3b/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/k3b/distinfo 2020/06/09 11:56:18 1.27
+++ pkgsrc/sysutils/k3b/distinfo 2021/04/05 12:54:28 1.28
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.27 2020/06/09 11:56:18 markd Exp $ 1$NetBSD: distinfo,v 1.28 2021/04/05 12:54:28 markd Exp $
2 2
3SHA1 (k3b-20.04.1.tar.xz) = 0792ec1c33c96dbd27a9bce5c65977fb7c8f83d4 3SHA1 (k3b-20.12.3.tar.xz) = 094fb553e92134384beb8a4a3b94dcb600af1870
4RMD160 (k3b-20.04.1.tar.xz) = 0c34f13c354776e7b621c7c844643852a5d6e493 4RMD160 (k3b-20.12.3.tar.xz) = cbe421ff091c1d51300e64f18c13eeaa84f84768
5SHA512 (k3b-20.04.1.tar.xz) = 6d9a8fe3860e996c6e2291933d5912b4a1bd36ebdd73e6de3486082052b21f5d00b7e7329cc5f17ccbe1f46120f5a77cfb9ab789968e7c48ae2e950a1f611bcc 5SHA512 (k3b-20.12.3.tar.xz) = e0c85d4faa6749d271d92a945e54c68876582b7d5c5719682950ca9305b75d0a46226f080e9c0bac300e63e32387ebb034d48f6ddc3b2d1a4fa2487db53f4039
6Size (k3b-20.04.1.tar.xz) = 10510332 bytes 6Size (k3b-20.12.3.tar.xz) = 10688136 bytes
 7SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 4bdd745f48e66a3851bf99e8846b0cf564fe2281
File Added: pkgsrc/sysutils/k3b/patches/Attic/patch-cmake_modules_FindFFmpeg.cmake
$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.")