diff --git a/audio/carla/Makefile b/audio/carla/Makefile index 9f3a5d7fc887..06c78788c20d 100644 --- a/audio/carla/Makefile +++ b/audio/carla/Makefile @@ -1,67 +1,68 @@ PORTNAME= Carla DISTVERSIONPREFIX= v -DISTVERSION= 2.2.0 -PORTREVISION= 6 +DISTVERSION= 2.3.0 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org COMMENT= Audio LV2 plugin host for Jack and PulseAudio LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/GPL.txt LIB_DEPENDS= liblo.so:audio/liblo \ libsndfile.so:audio/libsndfile RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR} 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 BINARY_ALIAS= pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} INSTALLS_ICONS= yes OPTIONS_DEFINE= FFMPEG FLUIDSYNTH LINUXSAMPLER OPTIONS_DEFAULT= FFMPEG FLUIDSYNTH JACK LINUXSAMPLER OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= JACK PULSEAUDIO BACKEND_DESC= Audio backend LINUXSAMPLER_DESC= Use LinuxSampler: a software audio sampler FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg FFMPEG_MAKE_ARGS_OFF= HAVE_FFMPEG=false FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUIDSYNTH_MAKE_ARGS_OFF= HAVE_FLUIDSYNTH=false LINUXSAMPLER_LIB_DEPENDS= liblinuxsampler.so:audio/linuxsampler LINUXSAMPLER_MAKE_ARGS_OFF= HAVE_LINUXSAMPLER=false JACK_RUN_DEPENDS= ${LOCALBASE}/lib/libjack.so:audio/jack PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_MAKE_ARGS_OFF= HAVE_PULSEAUDIO=false post-install: @${REINPLACE_CMD} -i '' -e ' \ 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" cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} features .include 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 @@ -1,221 +1,225 @@ bin/carla bin/carla-control bin/carla-database bin/carla-jack-multi bin/carla-jack-patchbayplugin bin/carla-jack-single bin/carla-osc-gui bin/carla-patchbay bin/carla-rack bin/carla-settings bin/carla-single include/carla/CarlaBackend.h include/carla/CarlaEngine.hpp include/carla/CarlaHost.h include/carla/CarlaNative.h include/carla/CarlaPlugin.hpp include/carla/CarlaUtils.h include/carla/includes/CarlaDefines.h include/carla/includes/CarlaMIDI.h include/carla/includes/CarlaNative.h include/carla/includes/CarlaNativePlugin.h lib/carla/carla-bridge-lv2-gtk2 lib/carla/carla-bridge-lv2-gtk3 lib/carla/carla-bridge-lv2-modgui lib/carla/carla-bridge-lv2-qt5 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 lib/carla/styles/carlastyle.json lib/carla/styles/carlastyle.so lib/lv2/carla.lv2/audiofile.ttl lib/lv2/carla.lv2/audiogain.ttl lib/lv2/carla.lv2/audiogain_s.ttl lib/lv2/carla.lv2/bigmeter.ttl lib/lv2/carla.lv2/carla-bridge-lv2-gtk2 lib/lv2/carla.lv2/carla-bridge-lv2-gtk3 lib/lv2/carla.lv2/carla-bridge-lv2-modgui lib/lv2/carla.lv2/carla-bridge-lv2-qt5 lib/lv2/carla.lv2/carla-bridge-lv2-x11 lib/lv2/carla.lv2/carla-bridge-lv2.so lib/lv2/carla.lv2/carla-bridge-native lib/lv2/carla.lv2/carla-discovery-native lib/lv2/carla.lv2/carla.so lib/lv2/carla.lv2/carlapatchbay.ttl lib/lv2/carla.lv2/carlapatchbay16.ttl lib/lv2/carla.lv2/carlapatchbay32.ttl lib/lv2/carla.lv2/carlapatchbay3s.ttl 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 lib/lv2/carla.lv2/midichanab.ttl lib/lv2/carla.lv2/midichanfilter.ttl lib/lv2/carla.lv2/midichannelize.ttl lib/lv2/carla.lv2/midifile.ttl lib/lv2/carla.lv2/midigain.ttl lib/lv2/carla.lv2/midijoin.ttl lib/lv2/carla.lv2/midipattern.ttl lib/lv2/carla.lv2/midisplit.ttl lib/lv2/carla.lv2/miditranspose.ttl lib/lv2/carla.lv2/resources lib/lv2/carla.lv2/styles lib/vst/carla.vst/CarlaPatchbay.so lib/vst/carla.vst/CarlaPatchbay16.so lib/vst/carla.vst/CarlaPatchbay32.so lib/vst/carla.vst/CarlaPatchbay64.so lib/vst/carla.vst/CarlaPatchbayFX.so lib/vst/carla.vst/CarlaRack.so lib/vst/carla.vst/CarlaRackFX.so lib/vst/carla.vst/carla-bridge-lv2-gtk2 lib/vst/carla.vst/carla-bridge-lv2-gtk3 lib/vst/carla.vst/carla-bridge-lv2-modgui lib/vst/carla.vst/carla-bridge-lv2-qt5 lib/vst/carla.vst/carla-bridge-lv2-x11 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 share/applications/carla-control.desktop share/applications/carla-jack-multi.desktop share/applications/carla-jack-single.desktop share/applications/carla-patchbay.desktop share/applications/carla-rack.desktop share/applications/carla.desktop share/carla/carla share/carla/carla-control share/carla/carla-jack-multi share/carla/carla-jack-single share/carla/carla-patchbay share/carla/carla-rack 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 share/carla/carla_skin.py share/carla/carla_utils.py share/carla/carla_widgets.py share/carla/externalui.py share/carla/ladspa_rdf.py share/carla/modgui/__init__.py share/carla/modgui/host.py share/carla/modgui/webserver.py share/carla/patchcanvas/__init__.py share/carla/patchcanvas/canvasbezierline.py share/carla/patchcanvas/canvasbezierlinemov.py share/carla/patchcanvas/canvasbox.py share/carla/patchcanvas/canvasboxshadow.py share/carla/patchcanvas/canvasfadeanimation.py share/carla/patchcanvas/canvasicon.py share/carla/patchcanvas/canvasline.py share/carla/patchcanvas/canvaslinemov.py share/carla/patchcanvas/canvasport.py share/carla/patchcanvas/canvasportglow.py share/carla/patchcanvas/patchcanvas.py share/carla/patchcanvas/scene.py share/carla/patchcanvas/theme.py share/carla/patchcanvas/utils.py share/carla/resources/bigmeter-ui share/carla/resources/carla-plugin 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 share/carla/resources/carla_utils.py share/carla/resources/carla_widgets.py share/carla/resources/externalui.py share/carla/resources/midipattern-ui share/carla/resources/modgui share/carla/resources/notes-ui share/carla/resources/patchcanvas share/carla/resources/resources_rc.py share/carla/resources/ui_carla_about.py share/carla/resources/ui_carla_about_juce.py share/carla/resources/ui_carla_add_jack.py share/carla/resources/ui_carla_database.py share/carla/resources/ui_carla_edit.py share/carla/resources/ui_carla_host.py share/carla/resources/ui_carla_parameter.py share/carla/resources/ui_carla_plugin_calf.py share/carla/resources/ui_carla_plugin_classic.py share/carla/resources/ui_carla_plugin_compact.py share/carla/resources/ui_carla_plugin_default.py share/carla/resources/ui_carla_plugin_presets.py share/carla/resources/ui_carla_refresh.py share/carla/resources/ui_carla_settings.py share/carla/resources/ui_carla_settings_driver.py share/carla/resources/ui_inputdialog_value.py share/carla/resources/ui_midipattern.py share/carla/resources/widgets share/carla/resources/xycontroller-ui share/carla/resources_rc.py share/carla/ui_carla_about.py share/carla/ui_carla_about_juce.py share/carla/ui_carla_add_jack.py share/carla/ui_carla_database.py share/carla/ui_carla_edit.py share/carla/ui_carla_host.py share/carla/ui_carla_osc_connect.py share/carla/ui_carla_parameter.py share/carla/ui_carla_plugin_calf.py share/carla/ui_carla_plugin_classic.py share/carla/ui_carla_plugin_compact.py share/carla/ui_carla_plugin_default.py share/carla/ui_carla_plugin_presets.py share/carla/ui_carla_refresh.py share/carla/ui_carla_settings.py share/carla/ui_carla_settings_driver.py share/carla/ui_inputdialog_value.py share/carla/ui_midipattern.py share/carla/ui_xycontroller.py share/carla/widgets/__init__.py share/carla/widgets/canvaspreviewframe.py share/carla/widgets/collapsablewidget.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 share/carla/widgets/scalablebutton.py share/carla/widgets/scalabledial.py share/icons/hicolor/128x128/apps/carla-control.png share/icons/hicolor/128x128/apps/carla.png share/icons/hicolor/16x16/apps/carla-control.png share/icons/hicolor/16x16/apps/carla.png share/icons/hicolor/256x256/apps/carla-control.png share/icons/hicolor/256x256/apps/carla.png share/icons/hicolor/48x48/apps/carla-control.png share/icons/hicolor/48x48/apps/carla.png share/icons/hicolor/scalable/apps/carla-control.svg share/icons/hicolor/scalable/apps/carla.svg share/mime/packages/carla.xml