CVS commit: pkgsrc/audio/mbrola

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/mbrola
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Fri, 26 Jan 2024 12:58:06 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 26 12:58:05 UTC 2024

Modified Files:
        pkgsrc/audio/mbrola: DESCR Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/mbrola: mbrolavox.mk
        pkgsrc/audio/mbrola/patches: patch-Makefile patch-Misc_common.h

Log Message:
mbrola: update to 3.3.

Packaged in wip by adr

MBROLA is now an open source project, this port replaces the old x86
binary one

First open source release


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/mbrola/DESCR
cvs rdiff -u -r1.21 -r1.22 pkgsrc/audio/mbrola/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/mbrola/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/mbrola/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/mbrola/mbrolavox.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/mbrola/patches/patch-Makefile \
    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/DESCR
diff -u pkgsrc/audio/mbrola/DESCR:1.1 pkgsrc/audio/mbrola/DESCR:1.2
--- pkgsrc/audio/mbrola/DESCR:1.1       Thu Nov  1 00:17:17 2001
+++ pkgsrc/audio/mbrola/DESCR   Fri Jan 26 12:58:05 2024
@@ -9,9 +9,9 @@ not accept raw text as input.  In order 
 you need to use this synthesizer in combination with a text processing
 system that produces phonetic and prosodic commands.
 
-This software is the heart of the MBROLA project, the aim of which is
-to obtain a set a speech synthesizers for as many languages as
-possible, free of use for non-commercial applications.
+This software is the heart of the MBROLA project, the aim of which
+is to obtain a set of speech synthesizers for as many languages as
+possible, free of use.
 
 As such, it requires an MBROLA language/voice database to run
 properly.  American English, Brazilian Portuguese, Breton, British

Index: pkgsrc/audio/mbrola/Makefile
diff -u pkgsrc/audio/mbrola/Makefile:1.21 pkgsrc/audio/mbrola/Makefile:1.22
--- pkgsrc/audio/mbrola/Makefile:1.21   Tue Dec 19 11:10:32 2023
+++ pkgsrc/audio/mbrola/Makefile        Fri Jan 26 12:58:05 2024
@@ -1,32 +1,25 @@
-# $NetBSD: Makefile,v 1.21 2023/12/19 11:10:32 zafer Exp $
+# $NetBSD: Makefile,v 1.22 2024/01/26 12:58:05 wiz Exp $
 
-DISTNAME=              mbr301h
-PKGNAME=               mbrola-301h
-PKGREVISION=           3
-CATEGORIES=            audio
-MASTER_SITES=          #
-EXTRACT_SUFX=          .zip
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://github.com/numediart/MBROLA
-COMMENT=               MBROLA diphone synthesizer executable
-LICENSE=               no-commercial-use
-
-WRKSRC=                        ${WRKDIR}
-DIST_SUBDIR=           mbrola-20010717
-BUILD_DIRS=            # empty
-
-EMUL_PLATFORMS=                netbsd-i386
-EMUL_REQD=             netbsd>=1.4
-EMUL_MODULES.netbsd=   base
+DISTNAME=      mbrola-3.3
+CATEGORIES=    audio
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=numediart/}
+GITHUB_PROJECT=        MBROLA
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
-INSTALLATION_DIRS=     bin
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/numediart/MBROLA/
+COMMENT=       Speech synthesizer
+LICENSE=       gnu-agpl-v3
+
+WRKSRC=                ${WRKDIR}/MBROLA-3.3
+
+USE_TOOLS+=    gmake pax
+BUILD_TARGET=
+
+INSTALLATION_DIRS=     bin share/doc/mbrola
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/mbrola-netbsd-i386 \
-               ${DESTDIR}${PREFIX}/bin/mbrola
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mbrola
-       ${INSTALL_DATA} ${WRKSRC}/readme.txt \
-               ${DESTDIR}${PREFIX}/share/doc/mbrola
+       ${INSTALL_PROGRAM} ${WRKSRC}/Bin/mbrola ${DESTDIR}${PREFIX}/bin
+       cd ${WRKSRC}/Documentation && pax -pp -rw * ${DESTDIR}${PREFIX}/share/doc/mbrola
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/mbrola/PLIST
diff -u pkgsrc/audio/mbrola/PLIST:1.4 pkgsrc/audio/mbrola/PLIST:1.5
--- pkgsrc/audio/mbrola/PLIST:1.4       Sun Jun 14 18:10:29 2009
+++ pkgsrc/audio/mbrola/PLIST   Fri Jan 26 12:58:05 2024
@@ -1,3 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:10:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/01/26 12:58:05 wiz Exp $
 bin/mbrola
-share/doc/mbrola/readme.txt
+share/doc/mbrola/HISTORY.txt
+share/doc/mbrola/Image1.gif
+share/doc/mbrola/LATEX/doc2.lyx
+share/doc/mbrola/LATEX/doc2.tex
+share/doc/mbrola/LATEX/doc2.toc
+share/doc/mbrola/LATEX/fpms.gif
+share/doc/mbrola/LATEX/fpms.ps.bb
+share/doc/mbrola/LATEX/fpms.ps.gz
+share/doc/mbrola/LATEX/heritage.gif
+share/doc/mbrola/LATEX/heritage.ps.bb
+share/doc/mbrola/LATEX/heritage.ps.gz
+share/doc/mbrola/documentation301.html
+share/doc/mbrola/documentation301g.odt
+share/doc/mbrola/heritage.gif
+share/doc/mbrola/rom_documentation.txt

Index: pkgsrc/audio/mbrola/distinfo
diff -u pkgsrc/audio/mbrola/distinfo:1.7 pkgsrc/audio/mbrola/distinfo:1.8
--- pkgsrc/audio/mbrola/distinfo:1.7    Tue Oct 26 09:59:12 2021
+++ pkgsrc/audio/mbrola/distinfo        Fri Jan 26 12:58:05 2024
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 09:59:12 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/01/26 12:58:05 wiz Exp $
 
-BLAKE2s (mbrola-20010717/mbr301h.zip) = 1ec58f663fb38404a5b37c1f17ed1d7a453097d02e1cec213b49f81769c7260e
-SHA512 (mbrola-20010717/mbr301h.zip) = 907358fba513fdcbf5fc428d51e662738488fa17ea96f4d33b6e8954f1abe0fdd6df704bdca4519fdeb58ea6a9bc9313b38dfb0d26be1aad2e83411bb6756062
-Size (mbrola-20010717/mbr301h.zip) = 72067 bytes
+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) = dafcf1e949e4e7fd623958a828b98763c37cad72
+SHA1 (patch-Misc_common.h) = 82aabe5bfdb4e95128039bfc1547ddbdb0efda95

Added files:

Index: pkgsrc/audio/mbrola/mbrolavox.mk
diff -u /dev/null pkgsrc/audio/mbrola/mbrolavox.mk:1.1
--- /dev/null   Fri Jan 26 12:58:06 2024
+++ pkgsrc/audio/mbrola/mbrolavox.mk    Fri Jan 26 12:58:05 2024
@@ -0,0 +1,33 @@
+# $NetBSD: mbrolavox.mk,v 1.1 2024/01/26 12:58:05 wiz Exp $
+#
+# shared Makefile fragment for mbrola voices
+# set VOX before including this (e.g. to 'en1')
+
+COMMITS=       16
+DISTNAME=      MBROLA-voices-0.0.0.${COMMITS}
+PKGNAME=       mbrolavox-${VOX}-0.0.0.${COMMITS}
+CATEGORIES=    audio
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=numediart/}
+GITHUB_PROJECT=        MBROLA-voices
+GITHUB_TAG=    fe05a0ccef6a941207fd6aaad0b31294a1f93a51
+
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              https://github.com/numediart/MBROLA-voices
+# the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
+LICENSE=               mbrola-voices-license
+
+RESTRICTED=            Commercial distribution not allowed without permission from the authors
+NO_BIN_ON_CDROM=       ${RESTRICTED}
+NO_SRC_ON_CDROM=       ${RESTRICTED}
+
+DEPENDS=       mbrola-[0-9]*:../../audio/mbrola
+
+USE_TOOLS+=    pax
+
+NO_BUILD=      yes
+
+MHOME= ${PREFIX}/share/mbrola/voices
+
+do-install:
+       ${INSTALL_DATA_DIR} ${DESTDIR}${MHOME}
+       cd ${WRKSRC}/data && pax -pp -rw ${VOX} ${DESTDIR}${MHOME}

Index: pkgsrc/audio/mbrola/patches/patch-Makefile
diff -u /dev/null pkgsrc/audio/mbrola/patches/patch-Makefile:1.1
--- /dev/null   Fri Jan 26 12:58:06 2024
+++ pkgsrc/audio/mbrola/patches/patch-Makefile  Fri Jan 26 12:58:05 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile,v 1.1 2024/01/26 12:58:05 wiz Exp $
+
+Let pkgsrc define CC and don't force endianess.
+
+--- Makefile.orig      2019-12-17 16:05:14.000000000 +0000
++++ Makefile
+@@ -4,7 +4,7 @@
+ VERSION=3.3
+ 
+ # To test strict C ANSI compliance
+-CC = gcc -ansi -pedantic
++CC ?= gcc -ansi -pedantic
+ LIB= -lm
+ 
+ # This allow you to write commands like "make PURE=purify demo1"
+@@ -26,7 +26,7 @@ CCPURE = $(PURE) $(CC)
+ 
+ # If endianess of your machine is not automatically detected in Misc/common.h
+ # you should manually specify here
+-CFLAGS += -DLITTLE_ENDIAN
++#CFLAGS += -DLITTLE_ENDIAN
+ #CFLAGS += -DBIG_ENDIAN
+ 
+ #######################
Index: pkgsrc/audio/mbrola/patches/patch-Misc_common.h
diff -u /dev/null pkgsrc/audio/mbrola/patches/patch-Misc_common.h:1.1
--- /dev/null   Fri Jan 26 12:58:06 2024
+++ pkgsrc/audio/mbrola/patches/patch-Misc_common.h     Fri Jan 26 12:58:05 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-Misc_common.h,v 1.1 2024/01/26 12:58:05 wiz Exp $
+
+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 @@
+ void swab( const char *from, char *to, int nbytes);
+ #endif
+ 
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__NetBSD__)
+ #include <endian.h>
+ #undef BIG_ENDIAN
+ #undef LITTLE_ENDIAN
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
++#if __BYTE_ORDER == __LITTLE_ENDIAN || _BYTE_ORDER == _LITTLE_ENDIAN
+ #  define LITTLE_ENDIAN
+ #else
+ #  define BIG_ENDIAN

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/audio/mbrolavox-en1
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/audio/mbrolavox-en1
Indexes:

Home | Main Index | Thread Index | Old Index