pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mbrola, mbrolavox-*: Preparing to import to pkgsrc

Module Name:	pkgsrc-wip
Committed By:	adr <adr%sdf.org@localhost>
Pushed By:	adr
Date:		Wed Jan 24 20:06:07 2024 +0000
Changeset:	391095dcbc9466adcff1624a6a58c4bdf591666d

Modified Files:
	mbrola/Makefile
	mbrola/distinfo
	mbrola/patches/patch-Makefile
	mbrola/patches/patch-Misc_common.h
	mbrolavox-en1/Makefile
	mbrolavox-en1/distinfo
	mbrolavox-us1/Makefile
	mbrolavox-us1/distinfo
	mbrolavox-us2/Makefile
	mbrolavox-us2/distinfo
	mbrolavox-us3/Makefile
	mbrolavox-us3/distinfo
Added Files:
	mbrola/COMMIT_MSG
	mbrolavox-en1/COMMIT_MSG
	mbrolavox-us1/COMMIT_MSG
	mbrolavox-us2/COMMIT_MSG
	mbrolavox-us3/COMMIT_MSG

Log Message:
mbrola, mbrolavox-*: Preparing to import to pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=391095dcbc9466adcff1624a6a58c4bdf591666d

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

diffstat:
 mbrola/COMMIT_MSG                  |  8 ++++++++
 mbrola/Makefile                    |  1 -
 mbrola/distinfo                    | 10 +++++-----
 mbrola/patches/patch-Makefile      |  5 ++---
 mbrola/patches/patch-Misc_common.h | 13 ++-----------
 mbrolavox-en1/COMMIT_MSG           |  6 ++++++
 mbrolavox-en1/Makefile             | 17 +++++++----------
 mbrolavox-en1/distinfo             |  6 +++---
 mbrolavox-us1/COMMIT_MSG           |  6 ++++++
 mbrolavox-us1/Makefile             | 19 ++++++++-----------
 mbrolavox-us1/distinfo             |  6 +++---
 mbrolavox-us2/COMMIT_MSG           |  6 ++++++
 mbrolavox-us2/Makefile             | 19 ++++++++-----------
 mbrolavox-us2/distinfo             |  6 +++---
 mbrolavox-us3/COMMIT_MSG           |  6 ++++++
 mbrolavox-us3/Makefile             | 19 ++++++++-----------
 mbrolavox-us3/distinfo             |  6 +++---
 17 files changed, 84 insertions(+), 75 deletions(-)

diffs:
diff --git a/mbrola/COMMIT_MSG b/mbrola/COMMIT_MSG
new file mode 100644
index 0000000000..c99e86a093
--- /dev/null
+++ b/mbrola/COMMIT_MSG
@@ -0,0 +1,8 @@
+audio/mbrola: Update mbrola to 3.3
+
+Packaged in wip by adr
+
+MBROLA is now an open source project, this port replace the old x86
+binary one
+
+First open source release
diff --git a/mbrola/Makefile b/mbrola/Makefile
index ba2169b3f5..e8c5f7b8b8 100644
--- a/mbrola/Makefile
+++ b/mbrola/Makefile
@@ -7,7 +7,6 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=numediart/}
 GITHUB_PROJECT=	MBROLA
 GITHUB_TAG=	refs/tags/3.3
 DIST_SUBDIR=	${GITHUB_PROJECT}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA/
diff --git a/mbrola/distinfo b/mbrola/distinfo
index 27eb1cbe52..4d84e1d3d7 100644
--- a/mbrola/distinfo
+++ b/mbrola/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-BLAKE2s (MBROLA/3.3.zip) = 17e4caee3b818ac38d38a70a020ebbab69e0c056b7c056b9625bea73fdeebfd1
-SHA512 (MBROLA/3.3.zip) = f64eed78985bc88641fa93f759af6f698786240d82bb05e7bd2a99bed033310233c6b20ed271d16c6105afa31faaac11971ec9db86d92e41f2f28ed345283180
-Size (MBROLA/3.3.zip) = 399480 bytes
-SHA1 (patch-Makefile) = ec85f82be935b5158f2f73f66b2754ab4b276e05
-SHA1 (patch-Misc_common.h) = f7b3d1d9a26560110e32870744ff12dc21929bb6
+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) = cdd783c89d35b547b587a57555be722bf495f81b
diff --git a/mbrola/patches/patch-Makefile b/mbrola/patches/patch-Makefile
index 7a1925481a..806fa596a6 100644
--- a/mbrola/patches/patch-Makefile
+++ b/mbrola/patches/patch-Makefile
@@ -1,7 +1,6 @@
 $NetBSD$
 
-Avoid function definition conflicts when using ansi and don't force
-endianess.
+Let pkgsrc define CC and don't force endianess.
 
 --- Makefile.orig	2019-12-17 16:05:14.000000000 +0000
 +++ Makefile
@@ -10,7 +9,7 @@ endianess.
  
  # To test strict C ANSI compliance
 -CC = gcc -ansi -pedantic
-+#CC = gcc -ansi -pedantic
++CC ?= gcc -ansi -pedantic
  LIB= -lm
  
  # This allow you to write commands like "make PURE=purify demo1"
diff --git a/mbrola/patches/patch-Misc_common.h b/mbrola/patches/patch-Misc_common.h
index 03ad1f3637..f34e85ad3e 100644
--- a/mbrola/patches/patch-Misc_common.h
+++ b/mbrola/patches/patch-Misc_common.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Add NetBSD target and check for _LITTLE_ENDIAN
+
 --- Misc/common.h.orig	2019-12-17 16:05:14.000000000 +0000
 +++ Misc/common.h
 @@ -70,11 +70,11 @@
@@ -16,14 +18,3 @@ $NetBSD$
  #  define LITTLE_ENDIAN
  #else
  #  define BIG_ENDIAN
-@@ -100,6 +100,10 @@ void swab( const char *from, char *to, i
- #endif
- #endif
- 
-+#if defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN)
-+#error "Both LITTLE_ENDIAN and BIG_ENDIAN are defined and this should not happen."
-+#endif
-+
- /* memmove is not defined on SUN4, but memcpy will do */
- #ifdef TARGET_OS_SUN4
- #define memmove memcpy
diff --git a/mbrolavox-en1/COMMIT_MSG b/mbrolavox-en1/COMMIT_MSG
new file mode 100644
index 0000000000..1dd2807960
--- /dev/null
+++ b/mbrolavox-en1/COMMIT_MSG
@@ -0,0 +1,6 @@
+audio/mbrolavox-en1: adapt to mbrola-3.3
+
+Packaged in wip by adr
+
+Adapt the package to the updated mbrola and follow the pkgsrc
+guide respect to repositories without tags or releases (21.2.3.2)
diff --git a/mbrolavox-en1/Makefile b/mbrolavox-en1/Makefile
index 1129b8f119..2b4f83a37d 100644
--- a/mbrolavox-en1/Makefile
+++ b/mbrolavox-en1/Makefile
@@ -1,21 +1,18 @@
 # $NetBSD$
 
-VOX=	en1
-VER=	980910
-PKGNAME=	mbrolavox-${VOX}-${VER}
-GITHUB_PROJECT=	MBROLA-voices
-GITHUB_TAG=	refs/heads/master
-DISTNAME=	master
+VOX=		en1
+COMMITS=	16
+PKGNAME=	mbrolavox-${VOX}-0.0.0.${COMMITS}
+DISTNAME=	MBROLA-voices-0.0.0.${COMMITS}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=numediart/}
-EXTRACT_SUFX=	.zip
-DIST_SUBDIR=	${GITHUB_PROJECT}
-
-WRKSRC=	${WRKDIR}/MBROLA-voices-master/
+GITHUB_PROJECT=	MBROLA-voices
+GITHUB_TAG=	fe05a0ccef6a941207fd6aaad0b31294a1f93a51
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA-voices
 COMMENT=	British English male voice for MBROLA
+# the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
 LICENSE=	no-commercial-use
 
 DEPENDS=	mbrola-[0-9]*:../../audio/mbrola
diff --git a/mbrolavox-en1/distinfo b/mbrolavox-en1/distinfo
index c2bf1e096a..b030466ce7 100644
--- a/mbrolavox-en1/distinfo
+++ b/mbrolavox-en1/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (MBROLA-voices/master.zip) = bcc03144a289035afe1f5e177b37b9af9e466c2f6f14725e510b7bea222f3705
-SHA512 (MBROLA-voices/master.zip) = 00eb9a585b3fb5157b8f8d63ed751db1e026a29fbc91dc2aed82a478114c4ea4badf4ea567fdc3293a4355b25107143ad4b1f8fe6c5cc3e9db4acae88e9c19b7
-Size (MBROLA-voices/master.zip) = 583115117 bytes
+BLAKE2s (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 45a43a766aeab730da24129fff468a35038c671ebef3d10ef8d2a46500ace5b0
+SHA512 (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 8476e80984279fddab1bda07e9352bee9f11499dc5b59652cd4bc0385b08a83259c080748e7040fa10cc03c9b0f1e1d1a39f80ddd782073c92f49fadc9af9585
+Size (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 583211254 bytes
diff --git a/mbrolavox-us1/COMMIT_MSG b/mbrolavox-us1/COMMIT_MSG
new file mode 100644
index 0000000000..5dcbaff64c
--- /dev/null
+++ b/mbrolavox-us1/COMMIT_MSG
@@ -0,0 +1,6 @@
+audio/mbrolavox-us1: adapt to mbrola-3.3
+
+Packaged in wip by adr
+
+Adapt the package to the updated mbrola and follow the pkgsrc
+guide respect to repositories without tags or releases (21.2.3.2)
diff --git a/mbrolavox-us1/Makefile b/mbrolavox-us1/Makefile
index ed490aab19..19fb7935eb 100644
--- a/mbrolavox-us1/Makefile
+++ b/mbrolavox-us1/Makefile
@@ -1,21 +1,18 @@
 # $NetBSD$
 
-VOX=	us1
-VER=	0.3
-PKGNAME=	mbrolavox-${VOX}-${VER}
-GITHUB_PROJECT=	MBROLA-voices
-GITHUB_TAG=	refs/heads/master
-DISTNAME=	master
+VOX=		us1
+COMMITS=	16
+PKGNAME=	mbrolavox-${VOX}-0.0.0.${COMMITS}
+DISTNAME=	MBROLA-voices-0.0.0.${COMMITS}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=numediart/}
-EXTRACT_SUFX=	.zip
-DIST_SUBDIR=	${GITHUB_PROJECT}
-
-WRKSRC=	${WRKDIR}/MBROLA-voices-master/
+GITHUB_PROJECT=	MBROLA-voices
+GITHUB_TAG=	fe05a0ccef6a941207fd6aaad0b31294a1f93a51
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA-voices
-COMMENT=	American English female voice for MBROLA
+COMMENT=	British English male voice for MBROLA
+# the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
 LICENSE=	no-commercial-use
 
 DEPENDS=	mbrola-[0-9]*:../../audio/mbrola
diff --git a/mbrolavox-us1/distinfo b/mbrolavox-us1/distinfo
index c2bf1e096a..b030466ce7 100644
--- a/mbrolavox-us1/distinfo
+++ b/mbrolavox-us1/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (MBROLA-voices/master.zip) = bcc03144a289035afe1f5e177b37b9af9e466c2f6f14725e510b7bea222f3705
-SHA512 (MBROLA-voices/master.zip) = 00eb9a585b3fb5157b8f8d63ed751db1e026a29fbc91dc2aed82a478114c4ea4badf4ea567fdc3293a4355b25107143ad4b1f8fe6c5cc3e9db4acae88e9c19b7
-Size (MBROLA-voices/master.zip) = 583115117 bytes
+BLAKE2s (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 45a43a766aeab730da24129fff468a35038c671ebef3d10ef8d2a46500ace5b0
+SHA512 (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 8476e80984279fddab1bda07e9352bee9f11499dc5b59652cd4bc0385b08a83259c080748e7040fa10cc03c9b0f1e1d1a39f80ddd782073c92f49fadc9af9585
+Size (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 583211254 bytes
diff --git a/mbrolavox-us2/COMMIT_MSG b/mbrolavox-us2/COMMIT_MSG
new file mode 100644
index 0000000000..ff15a16bdc
--- /dev/null
+++ b/mbrolavox-us2/COMMIT_MSG
@@ -0,0 +1,6 @@
+audio/mbrolavox-us2: adapt to mbrola-3.3
+
+Packaged in wip by adr
+
+Adapt the package to the updated mbrola and follow the pkgsrc
+guide respect to repositories without tags or releases (21.2.3.2)
diff --git a/mbrolavox-us2/Makefile b/mbrolavox-us2/Makefile
index d341af0847..75d1969a37 100644
--- a/mbrolavox-us2/Makefile
+++ b/mbrolavox-us2/Makefile
@@ -1,21 +1,18 @@
 # $NetBSD$
 
-VOX=	us2
-VER=	0.1
-PKGNAME=	mbrolavox-${VOX}-${VER}
-GITHUB_PROJECT=	MBROLA-voices
-GITHUB_TAG=	refs/heads/master
-DISTNAME=	master
+VOX=		us2
+COMMITS=	16
+PKGNAME=	mbrolavox-${VOX}-0.0.0.${COMMITS}
+DISTNAME=	MBROLA-voices-0.0.0.${COMMITS}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=numediart/}
-EXTRACT_SUFX=	.zip
-DIST_SUBDIR=	${GITHUB_PROJECT}
-
-WRKSRC=	${WRKDIR}/MBROLA-voices-master/
+GITHUB_PROJECT=	MBROLA-voices
+GITHUB_TAG=	fe05a0ccef6a941207fd6aaad0b31294a1f93a51
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA-voices
-COMMENT=	American English female voice for MBROLA
+COMMENT=	British English male voice for MBROLA
+# the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
 LICENSE=	no-commercial-use
 
 DEPENDS=	mbrola-[0-9]*:../../audio/mbrola
diff --git a/mbrolavox-us2/distinfo b/mbrolavox-us2/distinfo
index c2bf1e096a..b030466ce7 100644
--- a/mbrolavox-us2/distinfo
+++ b/mbrolavox-us2/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (MBROLA-voices/master.zip) = bcc03144a289035afe1f5e177b37b9af9e466c2f6f14725e510b7bea222f3705
-SHA512 (MBROLA-voices/master.zip) = 00eb9a585b3fb5157b8f8d63ed751db1e026a29fbc91dc2aed82a478114c4ea4badf4ea567fdc3293a4355b25107143ad4b1f8fe6c5cc3e9db4acae88e9c19b7
-Size (MBROLA-voices/master.zip) = 583115117 bytes
+BLAKE2s (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 45a43a766aeab730da24129fff468a35038c671ebef3d10ef8d2a46500ace5b0
+SHA512 (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 8476e80984279fddab1bda07e9352bee9f11499dc5b59652cd4bc0385b08a83259c080748e7040fa10cc03c9b0f1e1d1a39f80ddd782073c92f49fadc9af9585
+Size (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 583211254 bytes
diff --git a/mbrolavox-us3/COMMIT_MSG b/mbrolavox-us3/COMMIT_MSG
new file mode 100644
index 0000000000..e54fe4ade9
--- /dev/null
+++ b/mbrolavox-us3/COMMIT_MSG
@@ -0,0 +1,6 @@
+audio/mbrolavox-us3: adapt to mbrola-3.3
+
+Packaged in wip by adr
+
+Adapt the package to the updated mbrola and follow the pkgsrc
+guide respect to repositories without tags or releases (21.2.3.2)
diff --git a/mbrolavox-us3/Makefile b/mbrolavox-us3/Makefile
index 51a93917f8..d005d715bf 100644
--- a/mbrolavox-us3/Makefile
+++ b/mbrolavox-us3/Makefile
@@ -1,21 +1,18 @@
 # $NetBSD$
 
-VOX=	us3
-VER=	0.1
-PKGNAME=	mbrolavox-${VOX}-${VER}
-GITHUB_PROJECT=	MBROLA-voices
-GITHUB_TAG=	refs/heads/master
-DISTNAME=	master
+VOX=		us3
+COMMITS=	16
+PKGNAME=	mbrolavox-${VOX}-0.0.0.${COMMITS}
+DISTNAME=	MBROLA-voices-0.0.0.${COMMITS}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=numediart/}
-EXTRACT_SUFX=	.zip
-DIST_SUBDIR=	${GITHUB_PROJECT}
-
-WRKSRC=	${WRKDIR}/MBROLA-voices-master/
+GITHUB_PROJECT=	MBROLA-voices
+GITHUB_TAG=	fe05a0ccef6a941207fd6aaad0b31294a1f93a51
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA-voices
-COMMENT=	American English female voice for MBROLA
+COMMENT=	British English male voice for MBROLA
+# the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
 LICENSE=	no-commercial-use
 
 DEPENDS=	mbrola-[0-9]*:../../audio/mbrola
diff --git a/mbrolavox-us3/distinfo b/mbrolavox-us3/distinfo
index c2bf1e096a..b030466ce7 100644
--- a/mbrolavox-us3/distinfo
+++ b/mbrolavox-us3/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (MBROLA-voices/master.zip) = bcc03144a289035afe1f5e177b37b9af9e466c2f6f14725e510b7bea222f3705
-SHA512 (MBROLA-voices/master.zip) = 00eb9a585b3fb5157b8f8d63ed751db1e026a29fbc91dc2aed82a478114c4ea4badf4ea567fdc3293a4355b25107143ad4b1f8fe6c5cc3e9db4acae88e9c19b7
-Size (MBROLA-voices/master.zip) = 583115117 bytes
+BLAKE2s (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 45a43a766aeab730da24129fff468a35038c671ebef3d10ef8d2a46500ace5b0
+SHA512 (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 8476e80984279fddab1bda07e9352bee9f11499dc5b59652cd4bc0385b08a83259c080748e7040fa10cc03c9b0f1e1d1a39f80ddd782073c92f49fadc9af9585
+Size (MBROLA-voices-0.0.0.16-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz) = 583211254 bytes
Home | Main Index | Thread Index | Old Index