From nobody Mon Jul 18 17:37:17 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lmq0Y728bz4WkGD; Mon, 18 Jul 2022 17:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lmq0Y6Sxbz3TJX; Mon, 18 Jul 2022 17:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658165837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ypoe+JBZSP2nvVY5yFor0omZ2jtHbJDxswAT57QKN3k=; b=OyzayXYuX2MJM03Z7hm9yDY5Q3HPe9+Wda/7j0xXCdzNgGvsV7Cfs4Ow99JdcxlJOjPTa+ kqMD7dFdxFVHD+RrqbDTf94IUkG/f8ZhGhLJrs29T89QBrsAlAXF0i9itt273dAoMdUhzM KQ5Ixxu41CKca8TQLusWz4jhYQW5U5zMR3oAwFIDE7lufQo8BBcOKeuw2WRuKlM6OpqKZ1 GJU0RsPgUjEYYc8i7HGkRTggy8O+J75J/W1Mtvl/tzPoLO/Xdt2zcgm4NAVKY8qyJL77QC UixHgR+u8PKt1EMmmgFkxwcx6J3djzQlV2kLi0vKspzF7zyrskvHa3UXJEsDrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lmq0Y5Tn5znZn; Mon, 18 Jul 2022 17:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26IHbH7T077877; Mon, 18 Jul 2022 17:37:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26IHbHpu077876; Mon, 18 Jul 2022 17:37:17 GMT (envelope-from git) Date: Mon, 18 Jul 2022 17:37:17 GMT Message-Id: <202207181737.26IHbHpu077876@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 1035e88e5d63 - main - audio/asterisk-espeak: Update to 5.0-rc1, fix. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1035e88e5d63579637ee1d5706361d5489e2f755 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658165837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ypoe+JBZSP2nvVY5yFor0omZ2jtHbJDxswAT57QKN3k=; b=gaY18xsx76kaO6P+O7BrLguw3DcWp/NKIyM9dbbGyOR9IZPtpgvIDxrav/utvXBMyQBFGd fxUVREVTcMgYsUhshWh3u1e11r4kN4BZPGkJUAcBJUHHRVuoNAvaD+T4JZeHKzhJ8sKjP5 vtG3yvjeq7wixKTA+newhnb6T5CHiM8GCFcH7E0p+iKc1Xe3GLKJ3Mfft13EnWW/23lmPB KUixG9iANsEcqwo46XxEd3TBFvF9qUIyJRi5+iaV2CgNNS7yALfaLKykkd94ocD5J6AjBS VgvZ2UeHi7QZBOClsCYXtDVgDh9Z4htKC7E2K0C0EsfWI8QJ3aU6paFMm0uILg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658165837; a=rsa-sha256; cv=none; b=LUJ8VGx6XzRSxfFB6zvcM+MP9eKLuUj2K2SVB+ygEIIqW1CkHn5kIhAyjDVeR97YD7xPZ8 7qyeTgCQWWpkrXgR0juxFw/TtRcOrZmV83S/3xVJpzEI3c9PLfgVNC0pqrdEG/BLDlDWnh r9F961YjuuIRbesC5YY4/roTwf71n7+3c2PlTYqUVMpBb+K1fAl7E3kk2J0gXz2xRjPlqh En+AEkNR8YKwOf8RZ1rYS0h7Sg0HPuJuFGv+MW7467aJESoJXHqG297IkzVMQDbqTV8RAm uMiIEIKxne/mkU4g7EqOBKI9alrpwCFXHVDUAaAQkZsZL+NqqW1C5AUtla+jmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=1035e88e5d63579637ee1d5706361d5489e2f755 commit 1035e88e5d63579637ee1d5706361d5489e2f755 Author: Guido Falsi AuthorDate: 2022-07-18 17:35:08 +0000 Commit: Guido Falsi CommitDate: 2022-07-18 17:35:08 +0000 audio/asterisk-espeak: Update to 5.0-rc1, fix. - 5.0-rc1 is required to properly work with espeak-ng - Use proper flavors helpers. Using ${FLAVOR} in the variables makes the @all special flavor fail --- audio/asterisk-espeak/Makefile | 13 ++++++++----- audio/asterisk-espeak/distinfo | 6 +++--- audio/asterisk-espeak/files/patch-Makefile | 8 ++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/audio/asterisk-espeak/Makefile b/audio/asterisk-espeak/Makefile index f1e1eaa70e2f..90f06e6aae96 100644 --- a/audio/asterisk-espeak/Makefile +++ b/audio/asterisk-espeak/Makefile @@ -1,7 +1,6 @@ PORTNAME= espeak -PORTVERSION= 4.0 DISTVERSIONPREFIX= v -PORTREVISION= 4 +DISTVERSION= 5.0-rc1 CATEGORIES= audio MAINTAINER= madpilot@FreeBSD.org @@ -15,9 +14,13 @@ LIB_DEPENDS= libespeak-ng.so:audio/espeak-ng \ FLAVORS= asterisk18 asterisk16 FLAVOR?= ${FLAVORS:[1]} -PKGNAMEPREFIX= ${FLAVOR}- -BUILD_DEPENDS= asterisk:net/${FLAVOR} -RUN_DEPENDS= asterisk:net/${FLAVOR} +asterisk16_PKGNAMEPREFIX= asterisk16- +asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 +asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 + +asterisk18_PKGNAMEPREFIX= asterisk18- +asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 +asterisk18_RUN_DEPENDS= asterisk:net/asterisk18 USES= compiler:c11 gmake localbase INSTALL_TARGET= install samples diff --git a/audio/asterisk-espeak/distinfo b/audio/asterisk-espeak/distinfo index f1769e752ced..138c8df6e03e 100644 --- a/audio/asterisk-espeak/distinfo +++ b/audio/asterisk-espeak/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503328653 -SHA256 (zaf-Asterisk-eSpeak-v4.0_GH0.tar.gz) = 29b76b8483e398bde9b3639ebb7d89e86c5ff1bac339e6c5bea7e6b9518dd369 -SIZE (zaf-Asterisk-eSpeak-v4.0_GH0.tar.gz) = 13739 +TIMESTAMP = 1658164283 +SHA256 (zaf-Asterisk-eSpeak-v5.0-rc1_GH0.tar.gz) = 2fb3d5f9f9d112383126feb5e6f2ef90d952d166f3a394e6563188b552d1ee55 +SIZE (zaf-Asterisk-eSpeak-v5.0-rc1_GH0.tar.gz) = 13405 diff --git a/audio/asterisk-espeak/files/patch-Makefile b/audio/asterisk-espeak/files/patch-Makefile index d707f3a69fc9..a0a00cb17e80 100644 --- a/audio/asterisk-espeak/files/patch-Makefile +++ b/audio/asterisk-espeak/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2017-01-08 00:20:52 UTC +--- Makefile.orig 2018-08-01 16:53:07 UTC +++ Makefile @@ -6,31 +6,18 @@ # the GNU General Public License Version 2. See the COPYING file @@ -23,8 +23,8 @@ -DEBUG:=-g +CC?=gcc --LIBS+=-lespeak -lsamplerate -+LIBS+=$(LDFLAGS) -lespeak -lsamplerate +-LIBS+=-lespeak-ng -lsamplerate ++LIBS+=$(LDFLAGS) -lespeak-ng -lsamplerate CFLAGS+=-pipe -fPIC -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE -DAST_MODULE_SELF_SYM=__internal_app_espeak_self all: app_espeak.so @@ -37,7 +37,7 @@ app_espeak.o: app_espeak.c $(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o $@ $*.c -@@ -44,20 +31,7 @@ clean: +@@ -44,20 +31,7 @@ install: all install: all $(INSTALL) -m 755 -d $(DESTDIR)$(MODULES_DIR) $(INSTALL) -m 755 app_espeak.so $(DESTDIR)$(MODULES_DIR)