CVS commit: pkgsrc/audio/mad123

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Thu Jun  5 10:46:26 UTC 2025

Modified Files:
        pkgsrc/audio/mad123: distinfo
        pkgsrc/audio/mad123/patches: patch-mp3__stream.c

Log Message:
Fix build after curl update


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/mad123/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/mad123/patches/patch-mp3__stream.c

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

Modified files:

Index: pkgsrc/audio/mad123/distinfo
diff -u pkgsrc/audio/mad123/distinfo:1.14 pkgsrc/audio/mad123/distinfo:1.15
--- pkgsrc/audio/mad123/distinfo:1.14   Tue Oct 26 09:59:11 2021
+++ pkgsrc/audio/mad123/distinfo        Thu Jun  5 10:46:26 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 09:59:11 nia Exp $
+$NetBSD: distinfo,v 1.15 2025/06/05 10:46:26 martin Exp $
 
 BLAKE2s (mad123-0.8.5.tar.gz) = e2a0aca653ff93ae8067da7e3e1be7bf713c99a38a0fba3d844af2c0f9619f71
 SHA512 (mad123-0.8.5.tar.gz) = b0feda09ff34cc713bbcd393ceaa11b88f931b4883ea1ce7d255181740d336fa81c0c1e9d6d46f08fe565fa7d689ce91185145d0e5282db1fa86a600bef54859
@@ -7,4 +7,4 @@ SHA1 (patch-aa) = c2b6eb6eb4b23151c31ae7
 SHA1 (patch-ab) = 55d046e95e740520b9a74cdc764eb37a59cbf049
 SHA1 (patch-ac) = 23bdaecce33684a32e7e0ada01df2ac23bc58722
 SHA1 (patch-audio__dev.h) = 699760f797aa4b90a5672b42b24e08443fe0ae69
-SHA1 (patch-mp3__stream.c) = bfd36ec13ab8f78e65007692195ed12275ffc0d8
+SHA1 (patch-mp3__stream.c) = 7a431e9b7bc791aae22c262efb1fb214e12bf914

Index: pkgsrc/audio/mad123/patches/patch-mp3__stream.c
diff -u pkgsrc/audio/mad123/patches/patch-mp3__stream.c:1.1 pkgsrc/audio/mad123/patches/patch-mp3__stream.c:1.2
--- pkgsrc/audio/mad123/patches/patch-mp3__stream.c:1.1 Wed Feb 15 22:09:31 2012
+++ pkgsrc/audio/mad123/patches/patch-mp3__stream.c     Thu Jun  5 10:46:26 2025
@@ -1,4 +1,7 @@
-$NetBSD: patch-mp3__stream.c,v 1.1 2012/02/15 22:09:31 hans Exp $
+$NetBSD: patch-mp3__stream.c,v 1.2 2025/06/05 10:46:26 martin Exp $
+
+fix build on Solaris derivates
+fix build with newer curl versions
 
 --- mp3_stream.c.orig  2004-10-21 11:11:42.000000000 +0200
 +++ mp3_stream.c       2012-01-11 19:53:46.065401047 +0100
@@ -14,3 +17,17 @@ $NetBSD: patch-mp3__stream.c,v 1.1 2012/
  #include "mp3_stream.h"
  
  static void   *mps_file_open(const char *, int);
+@@ -645,9 +645,9 @@ mps_url_spawn_reader(const char *path, i
+       curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, mps_url_writer);
+       curl_easy_setopt(ch, CURLOPT_FILE, fp);
+       curl_easy_setopt(ch, CURLOPT_URL, path);
+-      curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1);
+-      curl_easy_setopt(ch, CURLOPT_FAILONERROR, 1);
+-      curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 1);
++      curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1L);
++      curl_easy_setopt(ch, CURLOPT_FAILONERROR, 1L);
++      curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 1L);
+ 
+       curl_easy_perform(ch);
+       exit(1);
+