From nobody Tue Jul 19 00:46:37 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 4Ln0Wx4S8Fz4WRyf; Tue, 19 Jul 2022 00:46:37 +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 4Ln0Wx41MZz3DBf; Tue, 19 Jul 2022 00:46:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658191597; 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=sPK3TPDCSWBeV2Lv7VA8aQHOcagJhza4j4l5euhZrSQ=; b=r/txuUmNvIr4euNg0pH8+Z0a7X4FddYBACXVNQg6YpHRsuZ/2i4BTDAN149lZoDJbO4HU/ M0VjDE1nFV05naqmisFbY9PuXoUbZc8vxElo1/LA4Xhj2AkuFaapYElTpYhpFLHXb1COjY wK7EOZ0YnjelSGQjhjpAqpOhr1Uy1CfV1xgp1PvyRCvdzvQQUj97mS6/4h/k+3NC+e3Vxd SC5yfk5DjrnFGt3Ko8bDD2yuuzmnEziStn0R4riGNWJp6lSsTIh0SVRkisqAwmZsUP+h+X ZuaxaSqM3bUKQw8B5zyxV3WKKSGDwqkysSVu05TMraDpVPe9BiRcU703oLg10Q== 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 4Ln0Wx34cBz10FG; Tue, 19 Jul 2022 00:46:37 +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 26J0kbgR063362; Tue, 19 Jul 2022 00:46:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J0kbaf063361; Tue, 19 Jul 2022 00:46:37 GMT (envelope-from git) Date: Tue, 19 Jul 2022 00:46:37 GMT Message-Id: <202207190046.26J0kbaf063361@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: 52fb727e6af9 - main - audio/carla: Update 2.4.3 -> 2.5.0 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: 52fb727e6af98df359be2716ac376f5f44ed9ec3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658191597; 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=sPK3TPDCSWBeV2Lv7VA8aQHOcagJhza4j4l5euhZrSQ=; b=DWQSoFUOs91FCWuQ2jaavueFD3JSlDSBxiaBX6q4dUHWSWTX4fefTcLXLq28bu/go7mkhh rUH5dZY7tzrqkRE7Ut9RYup3ApcQqftY/ko8etSHh4k/aHPjeJMh6ZPLbb4YmLRPENz2lr pqDuRgiNulPF6G1r95dkl77+2Pms83LLkfM1Y3uqD5rxndvTwVGe6Ww0+yhfoKrg7QeRyf ni861H9KTqbVqcjG7JvjKPiPGCQRKkff1buku4o28pxiTIQWdr7dzG8iy+29f0U1VHpZqH +BvxrGp1Kb+Vl2hs95FtaldXcMFfJ5+k4DvkzPXh1frBO3CVqaZcP5ud2nnm0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658191597; a=rsa-sha256; cv=none; b=Tpxe3BoPErkLJp8WO/KT0wLYrVSUQvIlJ1bIcOGJgGy/5J5DQG7/WicjiexV/5gO88Jq9o j1SmmTh0aO1GGW69YXOLKe2xDPqZlqrsM8SqI+RDF47Tx3zno8y6Ss2FVvAIVfUm9e3nTX Gv3M6xGjYCNlQhmyJCYYmv9uemIxrTPpE0Ou8PtDTwqSZXQomDCClZajBDH/PtWDPtpGtJ A+GG6sAo+MgcZhDhRJLBBtLAB4F3vXgEHsODRYZTrUm0bBsDN13oJBKnQbkrnLYvqdtR44 hkMRGl1r4vBf0wdmphtoD4XbnKmU3/RrH1hX7v9+koOD4DX0v0rLbz3t/hTwIw== 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=52fb727e6af98df359be2716ac376f5f44ed9ec3 commit 52fb727e6af98df359be2716ac376f5f44ed9ec3 Author: Yuri Victorovich AuthorDate: 2022-07-19 00:41:50 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-19 00:46:31 +0000 audio/carla: Update 2.4.3 -> 2.5.0 Reported by: portscout --- audio/carla/Makefile | 8 ++++++-- audio/carla/distinfo | 8 +++++--- audio/carla/files/patch-source_Makefile.mk | 13 ------------- .../patch-source_modules_ysfx_sources_ysfx__utils__fts.cpp | 13 +++++++++++++ audio/carla/files/patch-source_utils_CarlaPluginUI.cpp | 13 ------------- audio/carla/pkg-plist | 2 +- 6 files changed, 25 insertions(+), 32 deletions(-) diff --git a/audio/carla/Makefile b/audio/carla/Makefile index 758a8787a174..290c7c81bb33 100644 --- a/audio/carla/Makefile +++ b/audio/carla/Makefile @@ -1,8 +1,11 @@ PORTNAME= Carla DISTVERSIONPREFIX= v -DISTVERSION= 2.4.3 +DISTVERSION= 2.5.0 CATEGORIES= audio +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 5aba957f3cf0fb4dcef4d2add679603e6c048fb4.diff:-p1 + MAINTAINER= yuri@FreeBSD.org COMMENT= Audio plugin host for Jack and PulseAudio @@ -14,13 +17,14 @@ LIB_DEPENDS= liblo.so:audio/liblo \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR} USES= compiler:c++11-lib desktop-file-utils gl gmake gnome localbase \ - pkgconfig pyqt:5 python:3.4+ qt:5 shared-mime-info shebangfix \ + pkgconfig pyqt:5 python:3.4+ qt:5 sdl shared-mime-info shebangfix \ tar:bz2 xorg USE_PYQT= pyqt5 sip USE_GNOME= gtk20 gtk30 USE_QT= core gui widgets buildtools_build USE_GL= gl USE_XORG= x11 +USE_SDL= sdl2 USE_LDCONFIG= ${PREFIX}/lib/carla CONFLICTS_BUILD= rtaudio rtmidi diff --git a/audio/carla/distinfo b/audio/carla/distinfo index 66dadcecf20e..67cfdc2f7a76 100644 --- a/audio/carla/distinfo +++ b/audio/carla/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1650173689 -SHA256 (falkTX-Carla-v2.4.3_GH0.tar.gz) = 0092926e5167f3a5eb592f0055e5491803354ae42947e706db0dc548d9e786d3 -SIZE (falkTX-Carla-v2.4.3_GH0.tar.gz) = 10057018 +TIMESTAMP = 1658075318 +SHA256 (falkTX-Carla-v2.5.0_GH0.tar.gz) = f1077caa97b52fedc0d567f7f0e561b466031b5b34b760cd68efe836e19d408d +SIZE (falkTX-Carla-v2.5.0_GH0.tar.gz) = 11533773 +SHA256 (5aba957f3cf0fb4dcef4d2add679603e6c048fb4.diff) = 1709d27634fc68794b72a200905e1cb6b2dd35aa0df16a9fd3fe7926cfb7d91a +SIZE (5aba957f3cf0fb4dcef4d2add679603e6c048fb4.diff) = 432 diff --git a/audio/carla/files/patch-source_Makefile.mk b/audio/carla/files/patch-source_Makefile.mk deleted file mode 100644 index 4ffda8ab2cae..000000000000 --- a/audio/carla/files/patch-source_Makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ -- workaround for https://github.com/falkTX/Carla/issues/1608: error: unknown argument: '-fno-gnu-unique' - ---- source/Makefile.mk.orig 2022-04-17 05:37:05 UTC -+++ source/Makefile.mk -@@ -86,7 +86,7 @@ endif - - ifneq ($(MACOS),true) - ifneq ($(WIN32),true) --BASE_FLAGS += -fno-gnu-unique -+#BASE_FLAGS += -fno-gnu-unique - endif - endif - diff --git a/audio/carla/files/patch-source_modules_ysfx_sources_ysfx__utils__fts.cpp b/audio/carla/files/patch-source_modules_ysfx_sources_ysfx__utils__fts.cpp new file mode 100644 index 000000000000..ece3249b2fa1 --- /dev/null +++ b/audio/carla/files/patch-source_modules_ysfx_sources_ysfx__utils__fts.cpp @@ -0,0 +1,13 @@ +- workaround for https://github.com/jpcima/ysfx/issues/61 + +--- source/modules/ysfx/sources/ysfx_utils_fts.cpp.orig 2022-07-17 16:50:07 UTC ++++ source/modules/ysfx/sources/ysfx_utils_fts.cpp +@@ -36,7 +36,7 @@ void visit_directories(const char *rootpath, bool (*vi + #ifndef __EMSCRIPTEN__ + char *argv[] = {(char *)rootpath, nullptr}; + +- auto compar = [](const FTSENT **a, const FTSENT **b) -> int { ++ auto compar = [](const FTSENT * const *a, const FTSENT * const *b) -> int { + return strcmp((*a)->fts_name, (*b)->fts_name); + }; + diff --git a/audio/carla/files/patch-source_utils_CarlaPluginUI.cpp b/audio/carla/files/patch-source_utils_CarlaPluginUI.cpp deleted file mode 100644 index ed5dcda5d2a2..000000000000 --- a/audio/carla/files/patch-source_utils_CarlaPluginUI.cpp +++ /dev/null @@ -1,13 +0,0 @@ -- fix build on 12, see https://github.com/falkTX/Carla/issues/1597 - ---- source/utils/CarlaPluginUI.cpp.orig 2022-03-06 18:03:22 UTC -+++ source/utils/CarlaPluginUI.cpp -@@ -40,6 +40,8 @@ - # error CARLA_PLUGIN_UI_CLASS_PREFIX undefined - #endif - -+#include -+ - // --------------------------------------------------------------------------------------------------------------------- - // X11 - diff --git a/audio/carla/pkg-plist b/audio/carla/pkg-plist index 0c8833b0c04f..ccec10c630a0 100644 --- a/audio/carla/pkg-plist +++ b/audio/carla/pkg-plist @@ -205,12 +205,12 @@ share/carla/ui_xycontroller.py share/carla/widgets/__init__.py share/carla/widgets/canvaspreviewframe.py share/carla/widgets/collapsablewidget.py +share/carla/widgets/commondial.py share/carla/widgets/digitalpeakmeter.py share/carla/widgets/draggablegraphicsview.py share/carla/widgets/ledbutton.py share/carla/widgets/paramspinbox.py share/carla/widgets/pianoroll.py -share/carla/widgets/pixmapbutton.py share/carla/widgets/pixmapdial.py share/carla/widgets/pixmapkeyboard.py share/carla/widgets/racklistwidget.py