CVS commit: pkgsrc/audio/mbrola

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Aug 18 10:07:29 UTC 2026

Modified Files:
        pkgsrc/audio/mbrola: distinfo
        pkgsrc/audio/mbrola/patches: patch-Makefile patch-Misc_common.h
Added Files:
        pkgsrc/audio/mbrola/patches: patch-Misc_common.c

Log Message:
mbrola: fix build on Darwin and do not add -O6


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/mbrola/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/mbrola/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/mbrola/patches/patch-Misc_common.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/mbrola/patches/patch-Misc_common.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/mbrola/distinfo
diff -u pkgsrc/audio/mbrola/distinfo:1.11 pkgsrc/audio/mbrola/distinfo:1.12
--- pkgsrc/audio/mbrola/distinfo:1.11   Tue Jul 21 13:47:57 2026
+++ pkgsrc/audio/mbrola/distinfo        Tue Aug 18 10:07:28 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2026/07/21 13:47:57 ryoon Exp $
+$NetBSD: distinfo,v 1.12 2026/08/18 10:07:28 adam Exp $
 
 BLAKE2s (mbrola-3.3.tar.gz) = 0b5fe781e2480a7ab03e84d79e9dc84cd38aeda35ba45335c580aeee59e514a6
 SHA512 (mbrola-3.3.tar.gz) = 4c15481d2afc7f459c511d2f2791ae1f0f89893ea86fcde113c73f9b5509b893bc7beac8ec5fa76ca0f4e0aca35982ff1db15e8611514d91991608aee004c3f2
 Size (mbrola-3.3.tar.gz) = 345444 bytes
-SHA1 (patch-Makefile) = d4329a39f3533504b810625f67ce53fb219f29c6
-SHA1 (patch-Misc_common.h) = 1b5806c924e23acd7f481080be43e3ce03220180
+SHA1 (patch-Makefile) = 06c7df6e31adb407e97e86559d5976aabf192d26
+SHA1 (patch-Misc_common.c) = b31eda27abadc943f70463bcb809694879ec4c71
+SHA1 (patch-Misc_common.h) = 0b1f11b44002b4ce36387224e3f42f41e0011727

Index: pkgsrc/audio/mbrola/patches/patch-Makefile
diff -u pkgsrc/audio/mbrola/patches/patch-Makefile:1.2 pkgsrc/audio/mbrola/patches/patch-Makefile:1.3
--- pkgsrc/audio/mbrola/patches/patch-Makefile:1.2      Tue Jul 21 13:47:57 2026
+++ pkgsrc/audio/mbrola/patches/patch-Makefile  Tue Aug 18 10:07:28 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile,v 1.2 2026/07/21 13:47:57 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.3 2026/08/18 10:07:28 adam Exp $
 
 * Allow CC override.
-* Let pkgsrc define CC and don't force endianess.
+* Let pkgsrc define CC, optimisation, and don't force endianess.
 * Honor LDFLAGS. If is provided by pkgsrc framework.
 
 --- Makefile.orig      2019-12-17 16:05:14.000000000 +0000
 +++ Makefile
-@@ -4,7 +4,7 @@ VERSION=3.3
+@@ -4,7 +4,7 @@
  VERSION=3.3
  
  # To test strict C ANSI compliance
@@ -15,7 +15,7 @@ $NetBSD: patch-Makefile,v 1.2 2026/07/21
  LIB= -lm
  
  # This allow you to write commands like "make PURE=purify demo1"
-@@ -26,7 +26,7 @@ CCPURE = $(PURE) $(CC)
+@@ -26,14 +26,14 @@ CCPURE = $(PURE) $(CC)
  
  # If endianess of your machine is not automatically detected in Misc/common.h
  # you should manually specify here
@@ -24,7 +24,15 @@ $NetBSD: patch-Makefile,v 1.2 2026/07/21
  #CFLAGS += -DBIG_ENDIAN
  
  #######################
-@@ -128,7 +128,7 @@ $(PROJ): install_dir  $(BINOBJS) 
+ # GENERAL FLAGS FOR GCC
+ 
+ # Optimized code
+-CFLAGS += -O6
++#CFLAGS += -O6
+ 
+ # Debug mode with gdb
+ #CFLAGS += -g 
+@@ -128,7 +128,7 @@ BINOBJS = $(BINSRCS:%.c=Bin/Standalone/%
  PROJ = mbrola
  
  $(PROJ): install_dir  $(BINOBJS) 

Index: pkgsrc/audio/mbrola/patches/patch-Misc_common.h
diff -u pkgsrc/audio/mbrola/patches/patch-Misc_common.h:1.3 pkgsrc/audio/mbrola/patches/patch-Misc_common.h:1.4
--- pkgsrc/audio/mbrola/patches/patch-Misc_common.h:1.3 Sun Sep 29 09:23:31 2024
+++ pkgsrc/audio/mbrola/patches/patch-Misc_common.h     Tue Aug 18 10:07:28 2026
@@ -1,10 +1,16 @@
-$NetBSD: patch-Misc_common.h,v 1.3 2024/09/29 09:23:31 adam Exp $
+$NetBSD: patch-Misc_common.h,v 1.4 2026/08/18 10:07:28 adam Exp $
 
+On Darwin, don't redefine swab().
 Add NetBSD support and check for _LITTLE_ENDIAN
 
 --- Misc/common.h.orig 2019-12-17 16:05:14.000000000 +0000
 +++ Misc/common.h
-@@ -70,11 +70,11 @@
+@@ -66,15 +66,15 @@
+ #endif
+ 
+ /* For beboxes and Mac use a hand-made version of swab */
+-#if defined(TARGET_OS_VMS) || defined(TARGET_OS_BEOS) || defined(TARGET_OS_MAC) || defined(__STRICT_ANSI__)
++#if defined(TARGET_OS_VMS) || defined(TARGET_OS_BEOS) || defined(__STRICT_ANSI__)
  void swab( const char *from, char *to, int nbytes);
  #endif
  

Added files:

Index: pkgsrc/audio/mbrola/patches/patch-Misc_common.c
diff -u /dev/null pkgsrc/audio/mbrola/patches/patch-Misc_common.c:1.1
--- /dev/null   Tue Aug 18 10:07:29 2026
+++ pkgsrc/audio/mbrola/patches/patch-Misc_common.c     Tue Aug 18 10:07:28 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-Misc_common.c,v 1.1 2026/08/18 10:07:28 adam Exp $
+
+On Darwin, don't redefine swab().
+
+--- Misc/common.c.orig 2026-08-18 09:54:14.054642967 +0000
++++ Misc/common.c
+@@ -28,7 +28,7 @@
+ 
+ #include "common.h"
+ 
+-#if defined(TARGET_OS_VMS) || defined(TARGET_OS_BEOS) || defined(TARGET_OS_MAC)
++#if defined(TARGET_OS_VMS) || defined(TARGET_OS_BEOS)
+ void swab( const char *from, char *to, int nbytes)
+ /* A quick definition of SWAB for VAX-VMS  */
+ {