From nobody Fri Jul 15 14:37:19 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 4Lkv8J2ZD8z4WnWm; Fri, 15 Jul 2022 14:37:20 +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 4Lkv8J0kPhz428Y; Fri, 15 Jul 2022 14:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657895840; 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=FA5HFGLhyX+U+UbvDx/X0gbfR1tVT8LazWKERB33SMk=; b=WHPNJzC7TJJdDJNJe75IaSTjp0L5G/PHGr6EvXA6tYHkMvNARXLBuwrpJsKeANLAbA792v IsOWJgYm1kqaksubT0lEU4Mqx/m9oTPso03fh2lFnAB32cayZlIqKB9IcKBBuobj2Vs738 DEtMBwsW5spAdVQDXtDbyWrQmC6nmdd5AYQRwYW/0WBqGgDfPVYyQS/yzRqL/X+1V75hVA Mv7sqcyJ/pN5iq5W7xRPYeeu9XQ+vuyYwgFUkc/l0KAVB+EXGd8Y2E3fDLSvHxKgToxB8E GpnPIk3iBqlRY131iPVcYnq9dqKP35Z6Ngr1NZf4qPjUqmewZur+qrPF4Vw5uQ== 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 4Lkv8H6xgfzlrk; Fri, 15 Jul 2022 14:37:19 +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 26FEbJpr075565; Fri, 15 Jul 2022 14:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FEbJBX075564; Fri, 15 Jul 2022 14:37:19 GMT (envelope-from git) Date: Fri, 15 Jul 2022 14:37:19 GMT Message-Id: <202207151437.26FEbJBX075564@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 724d62baf8fd - main - Revert "multimedia/arcan: drop option for expired audio/espeak" 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 724d62baf8fd304ff99872f44b285075f659646d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657895840; 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=FA5HFGLhyX+U+UbvDx/X0gbfR1tVT8LazWKERB33SMk=; b=wdmfvQmdCXamQGAVXIyVVrueSZ8ANXtVawct8Rmw7rIeNivMmaZj7jJu/cvKYWYBZ5TPgA JpravrfA0Dg+Ih76LbU2VYwVDB8rVRIUx9I/czI2AuK6UrRyr1PO9bhe5pbLcUYgfOHhHL YvufaG3Xpl38VeOXZGnHEcjj8bGyoXOtOAv1EDVNyiTfHCUW2lts+bT3AJuuqrd1sG+Ept BdHYlSC/+WOgVTgxpP5Vwc9oy7kWUPVaMfxT4/hID9UDjx/xym2EdVCQOE2XwTscj5dvRb xYpGl5fPkxaB21ENOys90twVXI1MnZZ1NzcyvP1K/VFeU6HJ0gV4683n+9J9rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657895840; a=rsa-sha256; cv=none; b=YAyGSBt3KRu12BEG5nIF/Zz5bNM7SEiw9x9jvuUP3/sRlj04boycYvEc/OpSZ1Us3hex+s Wwb/Dm1vJI8lyTnboA0cYFFvA+N+tBAD4lcKYiJ2VFTEwfkNkU7U+ItjKaLTwdhHFO310L lTNf/pozXVjiUVFxzyXTF++qejdGsgs38UjDV7CchoTg0yEoy+BrDnY4t1f498j3G7zFo6 Yzzvwn7fLy1XBtfO7lirQY1ZHaxhh+rTZlh6ax/0LWqFAEuztlmpb6DxYgcWTgeWYAkRGD 80nI8th8zu+aDOhXimhcJ/GY53NJ77Iokaa2E75DN5DyYXCkkQD51pDihX1YeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=724d62baf8fd304ff99872f44b285075f659646d commit 724d62baf8fd304ff99872f44b285075f659646d Author: Stefan Eßer AuthorDate: 2022-07-15 13:44:12 +0000 Commit: Stefan Eßer CommitDate: 2022-07-15 14:36:22 +0000 Revert "multimedia/arcan: drop option for expired audio/espeak" Bump PORTREVISION and update dependency on espeak to espeak-ng. This reverts commit b57678ad2e5278b6c5eba29e7602e681528400fd. --- multimedia/arcan/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile index b06a185bf1c2..e8c11df9e8ea 100644 --- a/multimedia/arcan/Makefile +++ b/multimedia/arcan/Makefile @@ -1,6 +1,6 @@ PORTNAME= arcan DISTVERSION= 0.6.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -30,10 +30,11 @@ CMAKE_ARGS= -DDISTR_TAG:STRING="portbld" \ LDFLAGS+= -Wl,--as-needed # bzip2, ffmpeg, librt, libutil, lzma, zlib LDFLAGS_i386= -Wl,-z,notext -OPTIONS_DEFINE= FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND -OPTIONS_DEFAULT=FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND +OPTIONS_DEFINE= ESPEAK FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND +OPTIONS_DEFAULT=ESPEAK FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND OPTIONS_SUB= yes +ESPEAK_LIB_DEPENDS= libespeak-ng.so:audio/espeak-ng FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg MANPAGES_USE= RUBY=yes @@ -84,12 +85,14 @@ post-patch: ${WRKSRC}/frameserver/terminal/default/cli_builtin.c \ ${WRKSRC}/platform/posix/paths.c \ ${WRKSRC}/shmif/arcan_shmif_debugif.c - @${REINPLACE_CMD} -i.noespeak '/find.*Espeak/d' \ - ${WRKSRC}/frameserver/decode/default/CMakeLists.txt pre-configure-MANPAGES-on: @${RUBY} -C ${WRKSRC:H}/doc -Ku docgen.rb mangen 2>/dev/null +post-patch-ESPEAK-off: + @${REINPLACE_CMD} -i.noespeak '/find.*Espeak/d' \ + ${WRKSRC}/frameserver/decode/default/CMakeLists.txt + post-patch-FFMPEG-off: @${REINPLACE_CMD} -i.noffmpeg '/pkg.*FFMPEG/d' \ ${WRKSRC}/a12/CMakeLists.txt \