CVS commit: pkgsrc/audio/mixxx

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb  1 08:33:30 UTC 2024

Modified Files:
        pkgsrc/audio/mixxx: Makefile distinfo
Added Files:
        pkgsrc/audio/mixxx/patches:
            patch-src_track_taglib_trackmetadata__ape.cpp

Log Message:
mixxx: fix build with taglib 2.

Clean up some pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/audio/mixxx/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/mixxx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/mixxx/patches/patch-src_track_taglib_trackmetadata__ape.cpp

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

Modified files:

Index: pkgsrc/audio/mixxx/Makefile
diff -u pkgsrc/audio/mixxx/Makefile:1.53 pkgsrc/audio/mixxx/Makefile:1.54
--- pkgsrc/audio/mixxx/Makefile:1.53    Tue Jan 30 14:21:32 2024
+++ pkgsrc/audio/mixxx/Makefile Thu Feb  1 08:33:30 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2024/01/30 14:21:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2024/02/01 08:33:30 wiz Exp $
 
 DISTNAME=      mixxx-2.3.1
-PKGREVISION=   26
+PKGREVISION=   27
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mixxxdj/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -19,8 +19,6 @@ USE_CMAKE=    yes
 CMAKE_ARGS+=   -DUSE_SYMLINKS=OFF
 CMAKE_ARGS+=   -DPORTMIDI=OFF
 
-PLIST_SRCS+=   PLIST
-
 USE_CXX_FEATURES+=     c++11
 
 .include "../../mk/bsd.prefs.mk"
@@ -59,6 +57,7 @@ CHECK_INTERPRETER_SKIP+=      share/mixxx/con
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../multimedia/mp4v2/buildlink3.mk"

Index: pkgsrc/audio/mixxx/distinfo
diff -u pkgsrc/audio/mixxx/distinfo:1.6 pkgsrc/audio/mixxx/distinfo:1.7
--- pkgsrc/audio/mixxx/distinfo:1.6     Sat Nov 20 19:07:37 2021
+++ pkgsrc/audio/mixxx/distinfo Thu Feb  1 08:33:30 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/11/20 19:07:37 nia Exp $
+$NetBSD: distinfo,v 1.7 2024/02/01 08:33:30 wiz Exp $
 
 BLAKE2s (mixxx-2.3.1.tar.gz) = 70ee035e6399d096caec4fe8aa69d4a3ce361763c4a5fbfd7f2c985f4c7cbc71
 SHA512 (mixxx-2.3.1.tar.gz) = 17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816
@@ -6,5 +6,6 @@ Size (mixxx-2.3.1.tar.gz) = 39977210 byt
 SHA1 (patch-CMakeLists.txt) = f7c45756d9952391859b643daf12c7c74dce5b1c
 SHA1 (patch-lib_kaitai_kaitaistream.cpp) = 1d77832b7f33d4605eda857a9998a0c66654c452
 SHA1 (patch-src_controllers_controllermanager.cpp) = eb368c3ed4c0fe3bd553641fe07a385e7e78a064
+SHA1 (patch-src_track_taglib_trackmetadata__ape.cpp) = e0f7c4eadfb246a73660dc9d6444ba81cac40277
 SHA1 (patch-src_util_screensaver.cpp) = da16ba829646298af7a57567894c732ef1ecd53e
 SHA1 (patch-src_util_screensaver.h) = 8bea9c3365219fd52db60f38af4fdcab4be40b81

Added files:

Index: pkgsrc/audio/mixxx/patches/patch-src_track_taglib_trackmetadata__ape.cpp
diff -u /dev/null pkgsrc/audio/mixxx/patches/patch-src_track_taglib_trackmetadata__ape.cpp:1.1
--- /dev/null   Thu Feb  1 08:33:30 2024
+++ pkgsrc/audio/mixxx/patches/patch-src_track_taglib_trackmetadata__ape.cpp    Thu Feb  1 08:33:30 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_track_taglib_trackmetadata__ape.cpp,v 1.1 2024/02/01 08:33:30 wiz Exp $
+
+Fix build with taglib 2.
+https://gitlab.archlinux.org/archlinux/packaging/packages/mixxx/-/blob/main/taglib-2.patch?ref_type=heads
+
+--- src/track/taglib/trackmetadata_ape.cpp.orig        2024-02-01 08:27:27.916407263 +0000
++++ src/track/taglib/trackmetadata_ape.cpp
+@@ -58,7 +58,7 @@ bool importCoverImageFromTag(QImage* pCo
+     if (tag.itemListMap().contains("COVER ART (FRONT)")) {
+         const TagLib::ByteVector nullStringTerminator(1, 0);
+         TagLib::ByteVector item =
+-                tag.itemListMap()["COVER ART (FRONT)"].value();
++                tag.itemListMap()["COVER ART (FRONT)"].binaryData();
+         int pos = item.find(nullStringTerminator); // skip the filename
+         if (++pos > 0) {
+             const TagLib::ByteVector data(item.mid(pos));