CVS commit: pkgsrc/multimedia/vlc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 28 22:40:44 UTC 2024

Modified Files:
        pkgsrc/multimedia/vlc: Makefile distinfo
Added Files:
        pkgsrc/multimedia/vlc/patches: patch-modules_meta__engine_taglib.cpp

Log Message:
vlc: add patch from arch to fix compilation with taglib 2


To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 pkgsrc/multimedia/vlc/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/multimedia/vlc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp

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

Modified files:

Index: pkgsrc/multimedia/vlc/Makefile
diff -u pkgsrc/multimedia/vlc/Makefile:1.289 pkgsrc/multimedia/vlc/Makefile:1.290
--- pkgsrc/multimedia/vlc/Makefile:1.289        Sun Jan 28 13:24:36 2024
+++ pkgsrc/multimedia/vlc/Makefile      Sun Jan 28 22:40:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.289 2024/01/28 13:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.290 2024/01/28 22:40:44 wiz Exp $
 
 DISTNAME=              vlc-3.0.20
 PKGREVISION=           2
@@ -22,7 +22,8 @@ USE_PKGLOCALEDIR=     yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-kde-solid=${PREFIX}/share/kde/apps/solid/actions
 PTHREAD_OPTS+=         require
-USE_LANGUAGES=         c99 c++
+USE_LANGUAGES=         c c++
+USE_CC_FEATURES+=      c99
 PLIST_VARS+=           altivec cdrom egl oss v4l2 x86simd
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/multimedia/vlc/distinfo
diff -u pkgsrc/multimedia/vlc/distinfo:1.90 pkgsrc/multimedia/vlc/distinfo:1.91
--- pkgsrc/multimedia/vlc/distinfo:1.90 Thu Nov 23 16:37:35 2023
+++ pkgsrc/multimedia/vlc/distinfo      Sun Jan 28 22:40:44 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2023/11/23 16:37:35 ryoon Exp $
+$NetBSD: distinfo,v 1.91 2024/01/28 22:40:44 wiz Exp $
 
 BLAKE2s (vlc-3.0.20.tar.xz) = c6dffc78f93f3e8e8d7fccca88950651a4a77b9d923dc631d60201aab8f65bc2
 SHA512 (vlc-3.0.20.tar.xz) = 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406
@@ -10,5 +10,6 @@ SHA1 (patch-lib_video.c) = 362aaf7977c26
 SHA1 (patch-m4_dolt.m4) = 6cf8ef04cc09510132a12df16b95a13e90019878
 SHA1 (patch-modules_access_http_Makefile.am) = d91904c6cba1a75a6872d042e4fe87ed9ce65a22
 SHA1 (patch-modules_gui_qt_dialogs_plugins.cpp) = b5cffc0bd54fd07e77f891f6bca58132d333afdd
+SHA1 (patch-modules_meta__engine_taglib.cpp) = af85dd89aba5f9617be873be113d53c442e1a181
 SHA1 (patch-modules_services__discovery_mtp.c) = 5b5b9b341c71a3273178493ae55fccb583f5bd59
 SHA1 (patch-share_Makefile.am) = 4f126948c73159d06aef323b47a702442b5981e8

Added files:

Index: pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp:1.1
--- /dev/null   Sun Jan 28 22:40:44 2024
+++ pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp Sun Jan 28 22:40:44 2024
@@ -0,0 +1,66 @@
+$NetBSD: patch-modules_meta__engine_taglib.cpp,v 1.1 2024/01/28 22:40:44 wiz Exp $
+
+Fix build with taglib 2. From arch.
+https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/blob/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+
+--- modules/meta_engine/taglib.cpp.orig        2023-04-22 23:27:28.000000000 +0000
++++ modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+         ByteVector res(length, 0);
+         ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+         if (i_read < 0)
+-            return ByteVector::null;
++            return ByteVector();
+         else if ((size_t)i_read != length)
+             res.resize(i_read);
+         return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* t
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta )                                                  \
+-    if( !tag->accessor().isNull() && !tag->accessor().isEmpty() )              \
++    if( !tag->accessor().isEmpty() )              \
+         vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta )                                               \
+     if( tag->accessor() )                                                      \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* t
+ {
+     MP4::Item list;
+ #define SET( keyName, metaName )                                                             \
+-    if( tag->itemListMap().contains(keyName) )                                               \
++    if( tag->itemMap().contains(keyName) )                                               \
+     {                                                                                        \
+-        list = tag->itemListMap()[keyName];                                                  \
++        list = tag->itemMap()[keyName];                                                  \
+         vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) );     \
+     }
+ #define SET_EXTRA( keyName, metaName )                                                   \
+-    if( tag->itemListMap().contains(keyName) )                                  \
++    if( tag->itemMap().contains(keyName) )                                  \
+     {                                                                                \
+-        list = tag->itemListMap()[keyName];                                     \
++        list = tag->itemMap()[keyName];                                     \
+         vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+     }
+ 
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* t
+ #undef SET
+ #undef SET_EXTRA
+ 
+-    if( tag->itemListMap().contains("covr") )
++    if( tag->itemMap().contains("covr") )
+     {
+-        MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++        MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+         const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+ 
+         msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_th
+         if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+             WriteMetaToId3v2( riff_aiff->tag(), p_item );
+         else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+-            WriteMetaToId3v2( riff_wav->tag(), p_item );
++            WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+     }
+     else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+     {