From nobody Fri Nov 04 21:33:00 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 4N3v4F0yrHz4gnly; Fri, 4 Nov 2022 21:33:01 +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 4N3v4F0Rfkz3pkQ; Fri, 4 Nov 2022 21:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667597581; 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=wGkysyN6Ist5pSTF0LdYoX71HJsf4IFbWSclAosGU2o=; b=pHbaKjfazXxA66PGcbxEFnTSi85aTnzlQGBRTswEayLvaf6WnY+9Kf96WIMK2Wzj+IlC1m Xz0BuWczfNg1mr5FbrVsWwMf57mR+cZFVqK5IN7JsqHgYdcIV9w1JrisK8RQkkGDVqw6Jb NfAt+lyV3wiOhQiUXovrF/ho+ISziN910iT+Jg0WB6yo0+OacXyvrox0i2e4VvRzYduRqN RJ6roevcYJveTWPZIdlmtdZ5JdI2cZCcAnuFSsRQ/EG/eZyts78GptC6dnrLn+hPBX42TM Dt3+hm4aAg9jyJT5BhRai5qqstESnwj5sy9v+HE/NHVzrcelmw/irHD73bUXSA== 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 4N3v4D6blkzH6Y; Fri, 4 Nov 2022 21:33:00 +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 2A4LX0mZ017925; Fri, 4 Nov 2022 21:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A4LX0Q2017924; Fri, 4 Nov 2022 21:33:00 GMT (envelope-from git) Date: Fri, 4 Nov 2022 21:33:00 GMT Message-Id: <202211042133.2A4LX0Q2017924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: bcd61b6a5e15 - main - audio/jack-capture: Add dependencies; Fix format handling code 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd61b6a5e155e44c104892bad8bcb2f3e15977e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667597581; 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=wGkysyN6Ist5pSTF0LdYoX71HJsf4IFbWSclAosGU2o=; b=WMDH42F6rloJiqYTu5prfxsXdkUu5ICY7PWFwP7NoEpV3N/u2TcYtBORja3NeObupp73T7 lqVzs5M4Pygy1/nxqe1q05Q1YP1kqqmgem9511LNjteas5QO1BJQT99I6+lpm4Piq2o5ua qGl8QMH5e/o59GQIovWz3RfxbFYkCGHOAEYLCmOs/t9ze9BE5y7Ia5wVnYvCxFR50TipoB VHg13k41h85intjqyRdsfr14Xbq6/qOO8W6EvKJ/oO2ZG6xsHCBnBiz/ktWhX3AgqCiimu 3E3BGXD8XX/M47CYO6+F5gQ7WNPrhof0CHJY2RT1/2YMDwxPLIPLZrbMIbUk5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667597581; a=rsa-sha256; cv=none; b=urMGiYV+qNA0RNkdWSoV7o+AZ+djvUZrKnysbqxfxree8S5IL09vLm6X4PlxVJ8bCm5MNe PbJsIOizxPoyB657/F9j84Yuf+uLQ8yGX85FtaVMWZbCBI8HkI6DOHQItnXhSHJhdI5/VK OyZZRDnGTbT4/vwWTm/jVA3SE+GtWSfp3DQ+4Hb1SJE+mvYW1rcEnnueUAMJHAUORkQNxg frOLmJadZ0wFH2veCEDXlhs3xvmFA1InpNVYx0n2EHSGbWOc+xquJm3PWJrmaFsnLm5bVd nIp30bINkDWXYb8jgDYimwQoDKm7eFRhEm5vm3wBj9fj6yYnN6s2dTUfvloGfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcd61b6a5e155e44c104892bad8bcb2f3e15977e commit bcd61b6a5e155e44c104892bad8bcb2f3e15977e Author: Yuri Victorovich AuthorDate: 2022-11-04 15:29:00 +0000 Commit: Yuri Victorovich CommitDate: 2022-11-04 21:32:58 +0000 audio/jack-capture: Add dependencies; Fix format handling code --- audio/jack-capture/Makefile | 6 ++++ .../files/patch-gen__das__config__h.sh | 38 ++++++++++++++++++++++ .../jack-capture/files/patch-gen__setformat__c.sh | 11 +++++++ 3 files changed, 55 insertions(+) diff --git a/audio/jack-capture/Makefile b/audio/jack-capture/Makefile index e36e617be35b..e727c1c65879 100644 --- a/audio/jack-capture/Makefile +++ b/audio/jack-capture/Makefile @@ -1,6 +1,7 @@ PORTNAME= jack-capture DISTVERSION= 0.9.73-38 DISTVERSIONSUFFIX= -g10cec47 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org @@ -12,6 +13,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libjack.so:audio/jack \ + liblo.so:audio/liblo \ + libmp3lame.so:audio/lame \ + libogg.so:audio/libogg \ libsndfile.so:audio/libsndfile USES= gmake localbase:ldflags pkgconfig @@ -20,6 +24,8 @@ USE_GITHUB= yes GH_ACCOUNT= kmatheussen GH_PROJECT= jack_capture +MAKE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + BINARY_ALIAS= gcc=${CC} g++=${CXX} PLIST_FILES= bin/jack_capture diff --git a/audio/jack-capture/files/patch-gen__das__config__h.sh b/audio/jack-capture/files/patch-gen__das__config__h.sh new file mode 100644 index 000000000000..dae63edce55d --- /dev/null +++ b/audio/jack-capture/files/patch-gen__das__config__h.sh @@ -0,0 +1,38 @@ +--- gen_das_config_h.sh.orig 2022-11-04 16:32:42 UTC ++++ gen_das_config_h.sh +@@ -16,7 +16,7 @@ + echo "#include " >temp$$.c + echo "main(){return SF_FORMAT_OGG;}" >>temp$$.c + echo >>temp$$.c +-if gcc temp$$.c 2>/dev/null; then ++if gcc $CFLAGS $LDFLAGS temp$$.c 2>/dev/null; then + echo "#define HAVE_OGG 1" + else + echo "#define HAVE_OGG 0" +@@ -26,7 +26,7 @@ fi + echo "#include " >temp$$.c + echo "main(){return 0;}" >>temp$$.c + echo >>temp$$.c +-if gcc temp$$.c -lmp3lame 2>/dev/null; then ++if gcc $CFLAGS $LDFLAGS temp$$.c -lmp3lame 2>/dev/null; then + echo "#define HAVE_LAME 1" + echo "//COMPILEFLAGS -lmp3lame" + else +@@ -37,7 +37,7 @@ fi + echo "#include " >temp$$.c + echo "main(){return 0;}" >>temp$$.c + echo >>temp$$.c +-if pkg-config --cflags --libs liblo >/dev/null 2>/dev/null && gcc temp$$.c `pkg-config --cflags --libs liblo` 2>/dev/null ; then ++if pkg-config --cflags --libs liblo >/dev/null 2>/dev/null && gcc $CFLAGS $LDFLAGS temp$$.c `pkg-config --cflags --libs liblo` 2>/dev/null ; then + echo "#define HAVE_LIBLO 1" + echo "//COMPILEFLAGS " `pkg-config --cflags --libs liblo` + else +@@ -48,7 +48,7 @@ fi + echo "#include " >temp$$.c + echo "main(){return (int)jack_port_get_latency_range;}" >>temp$$.c + echo >>temp$$.c +-if gcc temp$$.c -ljack 2>/dev/null ; then ++if gcc $CFLAGS $LDFLAGS temp$$.c -ljack 2>/dev/null ; then + echo "#define NEW_JACK_LATENCY_API 1" + else + echo "#define NEW_JACK_LATENCY_API 0" diff --git a/audio/jack-capture/files/patch-gen__setformat__c.sh b/audio/jack-capture/files/patch-gen__setformat__c.sh new file mode 100644 index 000000000000..1ed7f8381ab4 --- /dev/null +++ b/audio/jack-capture/files/patch-gen__setformat__c.sh @@ -0,0 +1,11 @@ +--- gen_setformat_c.sh.orig 2022-11-04 20:56:46 UTC ++++ gen_setformat_c.sh +@@ -63,7 +63,7 @@ for a in $ai;do + esac + echo "main(){return $format;}" >>temp.c + echo >>temp.c +- if gcc temp.c 2>/dev/null; then ++ if gcc $CFLAGS $LDFLAGS temp.c 2>/dev/null; then + echo " (!strcasecmp(\""$a"\",soundfile_format)) ? $format :" + fi + done