vlc: add patch from arch to fix compilation with taglib 2diff -r1.289 -r1.290 pkgsrc/multimedia/vlc/Makefile
(wiz)
@@ -1,38 +1,39 @@ | @@ -1,38 +1,39 @@ | |||
1 | # $NetBSD: Makefile,v 1.289 2024/01/28 13:24:36 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.290 2024/01/28 22:40:44 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= vlc-3.0.20 | 3 | DISTNAME= vlc-3.0.20 | |
4 | PKGREVISION= 2 | 4 | PKGREVISION= 2 | |
5 | CATEGORIES= multimedia | 5 | CATEGORIES= multimedia | |
6 | MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${PKGVERSION_NOREV}/ | 6 | MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${PKGVERSION_NOREV}/ | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://www.videolan.org/ | 10 | HOMEPAGE= https://www.videolan.org/ | |
11 | COMMENT= VideoLAN media player and streaming server | 11 | COMMENT= VideoLAN media player and streaming server | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* | 14 | CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* | |
15 | 15 | |||
16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
17 | USE_TOOLS+= bash gmake perl pkg-config | 17 | USE_TOOLS+= bash gmake perl pkg-config | |
18 | USE_TOOLS+= autoreconf autoconf automake bison | 18 | USE_TOOLS+= autoreconf autoconf automake bison | |
19 | USE_TOOLS+= autopoint realpath msgfmt msgmerge xgettext | 19 | USE_TOOLS+= autopoint realpath msgfmt msgmerge xgettext | |
20 | 20 | |||
21 | USE_PKGLOCALEDIR= yes | 21 | USE_PKGLOCALEDIR= yes | |
22 | GNU_CONFIGURE= yes | 22 | GNU_CONFIGURE= yes | |
23 | CONFIGURE_ARGS+= --with-kde-solid=${PREFIX}/share/kde/apps/solid/actions | 23 | CONFIGURE_ARGS+= --with-kde-solid=${PREFIX}/share/kde/apps/solid/actions | |
24 | PTHREAD_OPTS+= require | 24 | PTHREAD_OPTS+= require | |
25 | USE_LANGUAGES= c99 c++ | 25 | USE_LANGUAGES= c c++ | |
26 | USE_CC_FEATURES+= c99 | |||
26 | PLIST_VARS+= altivec cdrom egl oss v4l2 x86simd | 27 | PLIST_VARS+= altivec cdrom egl oss v4l2 x86simd | |
27 | 28 | |||
28 | .include "../../mk/bsd.prefs.mk" | 29 | .include "../../mk/bsd.prefs.mk" | |
29 | .include "options.mk" | 30 | .include "options.mk" | |
30 | 31 | |||
31 | CONFIGURE_ENV+= BUILDCC=${CC:Q} | 32 | CONFIGURE_ENV+= BUILDCC=${CC:Q} | |
32 | CONFIGURE_ENV+= LUAC=${PREFIX}/bin/luac5.2 | 33 | CONFIGURE_ENV+= LUAC=${PREFIX}/bin/luac5.2 | |
33 | 34 | |||
34 | # Avoid codec duplication with ffmpeg, etc | 35 | # Avoid codec duplication with ffmpeg, etc | |
35 | 36 | |||
36 | CONFIGURE_ARGS+= --disable-aom | 37 | CONFIGURE_ARGS+= --disable-aom | |
37 | CONFIGURE_ARGS+= --disable-archive | 38 | CONFIGURE_ARGS+= --disable-archive | |
38 | CONFIGURE_ARGS+= --disable-aribsub | 39 | CONFIGURE_ARGS+= --disable-aribsub |
@@ -1,14 +1,15 @@ | @@ -1,14 +1,15 @@ | |||
1 | $NetBSD: distinfo,v 1.90 2023/11/23 16:37:35 ryoon Exp $ | 1 | $NetBSD: distinfo,v 1.91 2024/01/28 22:40:44 wiz Exp $ | |
2 | 2 | |||
3 | BLAKE2s (vlc-3.0.20.tar.xz) = c6dffc78f93f3e8e8d7fccca88950651a4a77b9d923dc631d60201aab8f65bc2 | 3 | BLAKE2s (vlc-3.0.20.tar.xz) = c6dffc78f93f3e8e8d7fccca88950651a4a77b9d923dc631d60201aab8f65bc2 | |
4 | SHA512 (vlc-3.0.20.tar.xz) = 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406 | 4 | SHA512 (vlc-3.0.20.tar.xz) = 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406 | |
5 | Size (vlc-3.0.20.tar.xz) = 25596392 bytes | 5 | Size (vlc-3.0.20.tar.xz) = 25596392 bytes | |
6 | SHA1 (patch-compat_Makefile.am) = 1c3e0a7c4610c55c3ec9ba80d66b9959661139b3 | 6 | SHA1 (patch-compat_Makefile.am) = 1c3e0a7c4610c55c3ec9ba80d66b9959661139b3 | |
7 | SHA1 (patch-configure.ac) = d30a00fe67c95f42f9838a7d5c1a5b694b44a91c | 7 | SHA1 (patch-configure.ac) = d30a00fe67c95f42f9838a7d5c1a5b694b44a91c | |
8 | SHA1 (patch-lib_core.c) = 8ec5557424e6ddc05cc365aacd1ec847d9a94605 | 8 | SHA1 (patch-lib_core.c) = 8ec5557424e6ddc05cc365aacd1ec847d9a94605 | |
9 | SHA1 (patch-lib_video.c) = 362aaf7977c264bb70a79e98cf18da923ae62e39 | 9 | SHA1 (patch-lib_video.c) = 362aaf7977c264bb70a79e98cf18da923ae62e39 | |
10 | SHA1 (patch-m4_dolt.m4) = 6cf8ef04cc09510132a12df16b95a13e90019878 | 10 | SHA1 (patch-m4_dolt.m4) = 6cf8ef04cc09510132a12df16b95a13e90019878 | |
11 | SHA1 (patch-modules_access_http_Makefile.am) = d91904c6cba1a75a6872d042e4fe87ed9ce65a22 | 11 | SHA1 (patch-modules_access_http_Makefile.am) = d91904c6cba1a75a6872d042e4fe87ed9ce65a22 | |
12 | SHA1 (patch-modules_gui_qt_dialogs_plugins.cpp) = b5cffc0bd54fd07e77f891f6bca58132d333afdd | 12 | SHA1 (patch-modules_gui_qt_dialogs_plugins.cpp) = b5cffc0bd54fd07e77f891f6bca58132d333afdd | |
13 | SHA1 (patch-modules_meta__engine_taglib.cpp) = af85dd89aba5f9617be873be113d53c442e1a181 | |||
13 | SHA1 (patch-modules_services__discovery_mtp.c) = 5b5b9b341c71a3273178493ae55fccb583f5bd59 | 14 | SHA1 (patch-modules_services__discovery_mtp.c) = 5b5b9b341c71a3273178493ae55fccb583f5bd59 | |
14 | SHA1 (patch-share_Makefile.am) = 4f126948c73159d06aef323b47a702442b5981e8 | 15 | SHA1 (patch-share_Makefile.am) = 4f126948c73159d06aef323b47a702442b5981e8 |
$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()) )
{