CVS commit: [pkgsrc-2024Q3] pkgsrc/multimedia/vlc

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Oct  1 17:47:48 UTC 2024

Modified Files:
        pkgsrc/multimedia/vlc [pkgsrc-2024Q3]: distinfo
        pkgsrc/multimedia/vlc/patches [pkgsrc-2024Q3]:
            patch-modules_meta__engine_taglib.cpp

Log Message:
Pullup ticket #6896 - requested by nia
Build fix for 32-bit

Revisions pulled up:
- multimedia/vlc/distinfo                                       1.93
- multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp  1.2

---
   Module Name:    pkgsrc
   Committed By:   nia
   Date:           Tue Oct  1 11:27:39 UTC 2024

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

   Log Message:
   vlc: Update patch for taglib API changes. Should help the 32-bit build.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.92.4.1 pkgsrc/multimedia/vlc/distinfo
cvs rdiff -u -r1.1 -r1.1.6.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/distinfo
diff -u pkgsrc/multimedia/vlc/distinfo:1.92 pkgsrc/multimedia/vlc/distinfo:1.92.4.1
--- pkgsrc/multimedia/vlc/distinfo:1.92 Tue Jun 18 03:21:12 2024
+++ pkgsrc/multimedia/vlc/distinfo      Tue Oct  1 17:47:48 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2024/06/18 03:21:12 ryoon Exp $
+$NetBSD: distinfo,v 1.92.4.1 2024/10/01 17:47:48 maya Exp $
 
 BLAKE2s (vlc-3.0.21.tar.xz) = 1e82df56f34b84b388ac77137d326ca36b0afa9597fd52b861630b09f5bf7fb2
 SHA512 (vlc-3.0.21.tar.xz) = cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee
@@ -10,6 +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_meta__engine_taglib.cpp) = 0d5230627b53e02cf6120fc6457bcfce524b5e8e
 SHA1 (patch-modules_services__discovery_mtp.c) = 5b5b9b341c71a3273178493ae55fccb583f5bd59
 SHA1 (patch-share_Makefile.am) = 4f126948c73159d06aef323b47a702442b5981e8

Index: pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp
diff -u pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp:1.1 pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp:1.1.6.1
--- pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp:1.1     Sun Jan 28 22:40:44 2024
+++ pkgsrc/multimedia/vlc/patches/patch-modules_meta__engine_taglib.cpp Tue Oct  1 17:47:48 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-modules_meta__engine_taglib.cpp,v 1.1 2024/01/28 22:40:44 wiz Exp $
+$NetBSD: patch-modules_meta__engine_taglib.cpp,v 1.1.6.1 2024/10/01 17:47:48 maya 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.orig        2024-06-05 15:56:07.000000000 +0000
 +++ modules/meta_engine/taglib.cpp
 @@ -185,7 +185,7 @@ public:
          ByteVector res(length, 0);
@@ -14,6 +14,39 @@ https://gitlab.archlinux.org/archlinux/p
          else if ((size_t)i_read != length)
              res.resize(i_read);
          return res;
+@@ -214,7 +214,7 @@ public:
+         return true;
+     }
+ 
+-    void seek(long offset, Position p)
++    void seek(offset_t offset, Position p)
+     {
+         uint64_t pos = 0;
+         switch (p)
+@@ -237,12 +237,12 @@ public:
+         return;
+     }
+ 
+-    long tell() const
++    offset_t tell() const
+     {
+         return m_previousPos;
+     }
+ 
+-    long length()
++    offset_t length()
+     {
+         uint64_t i_size;
+         if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -250,7 +250,7 @@ public:
+         return i_size;
+     }
+ 
+-    void truncate(long)
++    void truncate(offset_t)
+     {
+     }
+ 
 @@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* t
  static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
  {