pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

audio/espeak-ng: Fixes, almost ready for inclusion in pkgsrc.



Module Name:	pkgsrc-wip
Committed By:	adr <adr%sdf.org@localhost>
Pushed By:	adr
Date:		Fri Jan 26 05:07:37 2024 +0000
Changeset:	1d9820bb9c118629515110009ec359cf8d5213e0

Modified Files:
	espeak-ng/Makefile
	espeak-ng/distinfo
	espeak-ng/options.mk

Log Message:
audio/espeak-ng: Fixes, almost ready for inclusion in pkgsrc.

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

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

diffstat:
 espeak-ng/Makefile   | 9 +++++++--
 espeak-ng/distinfo   | 6 +++---
 espeak-ng/options.mk | 9 +++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diffs:
diff --git a/espeak-ng/Makefile b/espeak-ng/Makefile
index 915f02f6de..acbf3479e4 100644
--- a/espeak-ng/Makefile
+++ b/espeak-ng/Makefile
@@ -5,7 +5,6 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=espeak-ng/}
 GITHUB_PROJECT=	espeak-ng
 GITHUB_TAG=	refs/tags/1.51
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/espeak-ng/espeak-ng/
@@ -13,7 +12,7 @@ COMMENT=	Open source speech synthesizer
 LICENSE=	gnu-gpl-v3 AND apache-2.0 AND 2-clause-bsd AND unicode
 
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_TOOLS+=	autoconf automake autoreconf gmake
 GNU_CONFIGURE=	yes
@@ -33,6 +32,12 @@ PKGCONFIG_OVERRIDE+=	espeak-ng.pc.in
 
 DEPENDS+=	mbrola-[0-9]*:../../audio/mbrola
 
+SUBST_CLASSES+=		mbrola
+SUBST_STAGE.mbrola=	pre-configure
+SUBST_FILES.mbrola=	src/libespeak-ng/synth_mbrola.c
+SUBST_SED.mbrola=	-e s,/usr/share/mbrola/%s/%s,${PREFIX}/share/mbrola/voices/%s/%s,g
+SUBST_MESSAGE.mbrola=	Fixing hardcoded mbrola path.
+
 # Makefile.am: error: required file './AUTHORS' not found
 pre-configure:
 	set -e; cd ${WRKSRC} && touch AUTHORS NEWS && autoreconf -fi
diff --git a/espeak-ng/distinfo b/espeak-ng/distinfo
index e6744ac192..0361832fc5 100644
--- a/espeak-ng/distinfo
+++ b/espeak-ng/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (1.51.zip) = 57d83a79de51b7452d2616f027e59785429bf17bbfa0767344df245d12abe70c
-SHA512 (1.51.zip) = fc7ba1b02723c7699a7f3faff5bb28889e107129d3fab243ff1021ec64cdde959f1b20f3f462ce2bda752eb501d253970d884dfbe9dea80961c8521de3202ad4
-Size (1.51.zip) = 15742676 bytes
+BLAKE2s (1.51.tar.gz) = 7e95a1f9619984f4b349c48146a4a7a3f50f359d7043366edb1c447089b1e383
+SHA512 (1.51.tar.gz) = 6c29275706d21de2d5fa393702d2f173fc05d2ce4e2f46f3bf9a2742b0a8f294177663df0d079188e31cc2541f2c21a64e09e8afffe95befab667a4d00429fd2
+Size (1.51.tar.gz) = 14260788 bytes
 SHA1 (patch-src_libespeak-ng_spect.c) = 73d2fa907eca74ae241094e7c8504f542e20229c
diff --git a/espeak-ng/options.mk b/espeak-ng/options.mk
index cf085b565a..0917f0b685 100644
--- a/espeak-ng/options.mk
+++ b/espeak-ng/options.mk
@@ -1,14 +1,11 @@
 # $NetBSD: $
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.espeak-ng
-
-PKG_SUPPORTED_OPTIONS+=		sonic
-
+PKG_OPTIONS_VAR=	PKG_OPTIONS.espeak-ng
+PKG_SUPPORTED_OPTIONS+=	sonic
+PKG_SUGGESTED_OPTIONS+=	sonic
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	${PKG_SUPPORTED_OPTIONS}
-
 .if !empty(PKG_OPTIONS:Msonic)
 .  include "../../audio/sonic/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-sonic


Home | Main Index | Thread Index | Old Index