CVS commit: pkgsrc/audio/taglib

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Mar 11 09:11:01 UTC 2024

Modified Files:
        pkgsrc/audio/taglib: distinfo
Added Files:
        pkgsrc/audio/taglib/patches: patch-taglib_toolkit_taglib.h

Log Message:
taglib: Avoid offset_t conflict on illumos.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/taglib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/taglib/patches/patch-taglib_toolkit_taglib.h

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

Modified files:

Index: pkgsrc/audio/taglib/distinfo
diff -u pkgsrc/audio/taglib/distinfo:1.28 pkgsrc/audio/taglib/distinfo:1.29
--- pkgsrc/audio/taglib/distinfo:1.28   Sun Jan 28 13:23:46 2024
+++ pkgsrc/audio/taglib/distinfo        Mon Mar 11 09:11:01 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.28 2024/01/28 13:23:46 wiz Exp $
+$NetBSD: distinfo,v 1.29 2024/03/11 09:11:01 jperkin Exp $
 
 BLAKE2s (taglib-2.0.tar.gz) = 6c3e1c191d88271214dd6fa24decf954a5e9e9308e8ac9cfa5175ab87b3ef1ea
 SHA512 (taglib-2.0.tar.gz) = 099d02b2eab033f5702a8cb03e70752d7523c6f8c2f3eebdd0bcd939eafbdca3f2a6c82452983904b5822cfa45f2707ed866c3419508df9d43bf5c0b3a476f6c
 Size (taglib-2.0.tar.gz) = 1429934 bytes
+SHA1 (patch-taglib_toolkit_taglib.h) = 1d59e929c53492e42f63b213f32d5f9b1cdff16e

Added files:

Index: pkgsrc/audio/taglib/patches/patch-taglib_toolkit_taglib.h
diff -u /dev/null pkgsrc/audio/taglib/patches/patch-taglib_toolkit_taglib.h:1.1
--- /dev/null   Mon Mar 11 09:11:01 2024
+++ pkgsrc/audio/taglib/patches/patch-taglib_toolkit_taglib.h   Mon Mar 11 09:11:01 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-taglib_toolkit_taglib.h,v 1.1 2024/03/11 09:11:01 jperkin Exp $
+
+illumos headers define offset_t.
+
+--- taglib/toolkit/taglib.h.orig       2024-03-11 09:08:42.276396541 +0000
++++ taglib/toolkit/taglib.h
+@@ -60,7 +60,7 @@ namespace TagLib {
+   // In Win32, always 64bit. Otherwise, equivalent to off_t.
+ #ifdef _WIN32
+   using offset_t = long long;
+-#else
++#elif !defined(__illumos__)
+   using offset_t = off_t;
+ #endif
+