From owner-dev-commits-ports-main@freebsd.org Mon May 24 23:43:15 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5985863F4E3; Mon, 24 May 2021 23:43:15 +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 4Fpv0g0kHpz3Kjj; Mon, 24 May 2021 23:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F15F7138A2; Mon, 24 May 2021 23:43:14 +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 14ONhEnM061032; Mon, 24 May 2021 23:43:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14ONhEqQ061031; Mon, 24 May 2021 23:43:14 GMT (envelope-from git) Date: Mon, 24 May 2021 23:43:14 GMT Message-Id: <202105242343.14ONhEqQ061031@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: 9334b0c74636 - main - audio/carla: Update 2.2.0 -> 2.3.0 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: 9334b0c746364f602e17c851af22dc96ad9dc6dd Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 23:43:15 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9334b0c746364f602e17c851af22dc96ad9dc6dd commit 9334b0c746364f602e17c851af22dc96ad9dc6dd Author: Yuri Victorovich AuthorDate: 2021-05-24 23:42:32 +0000 Commit: Yuri Victorovich CommitDate: 2021-05-24 23:43:07 +0000 audio/carla: Update 2.2.0 -> 2.3.0 --- audio/carla/Makefile | 11 +++--- audio/carla/distinfo | 6 +-- audio/carla/files/patch-source_modules_AppConfig.h | 46 ++++++++++++++++++++++ audio/carla/pkg-plist | 8 +++- 4 files changed, 61 insertions(+), 10 deletions(-) diff --git a/audio/carla/Makefile b/audio/carla/Makefile index 9f3a5d7fc887..06c78788c20d 100644 --- a/audio/carla/Makefile +++ b/audio/carla/Makefile @@ -1,7 +1,6 @@ PORTNAME= Carla DISTVERSIONPREFIX= v -DISTVERSION= 2.2.0 -PORTREVISION= 6 +DISTVERSION= 2.3.0 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org @@ -19,16 +18,17 @@ CONFLICTS_BUILD= rtaudio-* rtmidi-* USES= compiler:c++11-lib desktop-file-utils gl gmake gnome localbase \ pkgconfig pyqt:5 python:3.4+ qt:5 shared-mime-info shebangfix \ tar:bz2 xorg -USE_GITHUB= yes -GH_ACCOUNT= falkTX USE_PYQT= core_run gui_run sip svg_run widgets_run xml_build # "sip" should be "sip_build", but "import PyQt5.QtCore" wants "sip". See bug#225040 USE_GNOME= gtk20 gtk30 USE_QT= core gui widgets buildtools_build USE_GL= gl USE_XORG= x11 -USE_LDCONFIG= ${PREFIX}/lib/carla + SHEBANG_FILES= data/carla-single data/carla-bridge-lv2-modgui source/native-plugins/resources/* source/frontend/* +USE_GITHUB= yes +GH_ACCOUNT= falkTX + MAKE_ARGS= HAVE_QT4=false \ EXTERNAL_PLUGINS=false \ # Give the Makefile the proper versioned binaries of PyQt @@ -59,6 +59,7 @@ post-install: s|^PYTHON=.*|PYTHON=${PYTHON_CMD}|; \ s|#!/bin/bash|#!/bin/sh|' \ ${STAGEDIR}${PREFIX}/bin/carla* + ${RMDIR} ${STAGEDIR}${PREFIX}/share/carla/resources/translations devel-features: patch @${ECHO} "Developer command: show build features" diff --git a/audio/carla/distinfo b/audio/carla/distinfo index eeb820a8d095..aa8b59772f0f 100644 --- a/audio/carla/distinfo +++ b/audio/carla/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601438699 -SHA256 (falkTX-Carla-v2.2.0_GH0.tar.gz) = 4bf08511257db88979eccc002f10c153ff2a14f5143291c2be39cadd69ce10e1 -SIZE (falkTX-Carla-v2.2.0_GH0.tar.gz) = 9844747 +TIMESTAMP = 1621894202 +SHA256 (falkTX-Carla-v2.3.0_GH0.tar.gz) = 27def29cc408d5c74926e8d0ef3a77fd76fee1e4f2797f840e999e6376a5be03 +SIZE (falkTX-Carla-v2.3.0_GH0.tar.gz) = 10014487 diff --git a/audio/carla/files/patch-source_modules_AppConfig.h b/audio/carla/files/patch-source_modules_AppConfig.h new file mode 100644 index 000000000000..92b425882177 --- /dev/null +++ b/audio/carla/files/patch-source_modules_AppConfig.h @@ -0,0 +1,46 @@ +--- source/modules/AppConfig.h.orig 2021-03-21 01:16:46 UTC ++++ source/modules/AppConfig.h +@@ -29,13 +29,15 @@ + # define APPCONFIG_OS_MAC + #elif defined(__linux__) || defined(__linux) + # define APPCONFIG_OS_LINUX ++#elif defined(__FreeBSD__) ++# define APPCONFIG_OS_FREEBSD + #else + # error Unsupported platform! + #endif + + #if defined(APPCONFIG_OS_WIN32) || defined(APPCONFIG_OS_WIN64) + # define APPCONFIG_OS_WIN +-#elif defined(APPCONFIG_OS_LINUX) || defined(APPCONFIG_OS_MAC) ++#elif defined(APPCONFIG_OS_LINUX) || defined(APPCONFIG_OS_FREEBSD) || defined(APPCONFIG_OS_MAC) + # define APPCONFIG_OS_UNIX + #endif + +@@ -81,7 +83,7 @@ + #define JUCE_STRING_UTF_TYPE 8 + #define JUCE_USE_VFORK 1 + +-#ifdef APPCONFIG_OS_LINUX ++#if defined(APPCONFIG_OS_LINUX) || defined(APPCONFIG_OS_FREEBSD) + # define JUCE_DISABLE_NATIVE_FILECHOOSERS 1 + # define JUCE_MODAL_LOOPS_PERMITTED 0 + // # define JUCE_AUDIOPROCESSOR_NO_GUI 1 +@@ -145,7 +147,7 @@ + /** Config: JUCE_JACK + Enables JACK audio devices (Linux only). + */ +-#ifdef APPCONFIG_OS_LINUX ++#if defined(APPCONFIG_OS_LINUX) || defined(APPCONFIG_OS_FREEBSD) + #define JUCE_JACK 1 + #define JUCE_JACK_CLIENT_NAME "Carla" + #else +@@ -227,7 +229,7 @@ + + @see VSTPluginFormat, VST3PluginFormat, AudioPluginFormat, AudioPluginFormatManager, JUCE_PLUGINHOST_VST, JUCE_PLUGINHOST_AU + */ +-#if defined(APPCONFIG_OS_LINUX) || defined(APPCONFIG_OS_MAC) || defined(APPCONFIG_OS_WIN) ++#if defined(APPCONFIG_OS_LINUX) || defined(APPCONFIG_OS_FREEBSD) || defined(APPCONFIG_OS_MAC) || defined(APPCONFIG_OS_WIN) + # define JUCE_PLUGINHOST_VST3 1 + #else + # define JUCE_PLUGINHOST_VST3 0 diff --git a/audio/carla/pkg-plist b/audio/carla/pkg-plist index 29ad5fb79b6a..23dd86f785d0 100644 --- a/audio/carla/pkg-plist +++ b/audio/carla/pkg-plist @@ -27,6 +27,7 @@ lib/carla/carla-bridge-lv2-x11 lib/carla/carla-bridge-lv2.so lib/carla/carla-bridge-native lib/carla/carla-discovery-native +lib/carla/libcarla_host-plugin.so lib/carla/libcarla_native-plugin.so lib/carla/libcarla_standalone2.so lib/carla/libcarla_utils.so @@ -53,6 +54,7 @@ lib/lv2/carla.lv2/carlapatchbay64.ttl lib/lv2/carla.lv2/carlapatchbaycv.ttl lib/lv2/carla.lv2/carlarack.ttl lib/lv2/carla.lv2/lfo.ttl +lib/lv2/carla.lv2/libcarla_host-plugin.so lib/lv2/carla.lv2/libcarla_native-plugin.so lib/lv2/carla.lv2/libcarla_utils.so lib/lv2/carla.lv2/manifest.ttl @@ -83,10 +85,12 @@ lib/vst/carla.vst/carla-bridge-lv2.so lib/vst/carla.vst/carla-bridge-native lib/vst/carla.vst/carla-discovery-native lib/vst/carla.vst/jack +lib/vst/carla.vst/libcarla_host-plugin.so lib/vst/carla.vst/libcarla_native-plugin.so lib/vst/carla.vst/libcarla_utils.so lib/vst/carla.vst/resources lib/vst/carla.vst/styles +libdata/pkgconfig/carla-host-plugin.pc libdata/pkgconfig/carla-native-plugin.pc libdata/pkgconfig/carla-standalone.pc libdata/pkgconfig/carla-utils.pc @@ -106,9 +110,9 @@ share/carla/carla_app.py share/carla/carla_backend.py share/carla/carla_backend_qt.py share/carla/carla_backend_qtweb.py -share/carla/carla_control.py share/carla/carla_database.py share/carla/carla_host.py +share/carla/carla_host_control.py share/carla/carla_modgui.py share/carla/carla_settings.py share/carla/carla_shared.py @@ -141,9 +145,9 @@ share/carla/resources/carla-plugin-patchbay share/carla/resources/carla_app.py share/carla/resources/carla_backend.py share/carla/resources/carla_backend_qt.py -share/carla/resources/carla_control.py share/carla/resources/carla_database.py share/carla/resources/carla_host.py +share/carla/resources/carla_host_control.py share/carla/resources/carla_settings.py share/carla/resources/carla_shared.py share/carla/resources/carla_skin.py