diff --git a/audio/carla/Makefile b/audio/carla/Makefile index 758a8787a174..290c7c81bb33 100644 --- a/audio/carla/Makefile +++ b/audio/carla/Makefile @@ -1,76 +1,80 @@ 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 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} 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 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 \ PREFIX=${LOCALBASE} # Give the Makefile the proper versioned binaries of PyQt BINARY_ALIAS= pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} OPTIONS_DEFINE= FFMPEG FLUIDSYNTH LINUXSAMPLER OPTIONS_DEFAULT= FFMPEG FLUIDSYNTH JACK OPTIONS_DEFAULT_amd64= LINUXSAMPLER OPTIONS_DEFAULT_i386= LINUXSAMPLER OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= JACK PULSEAUDIO BACKEND_DESC= Audio backend 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_DESC= Use LinuxSampler: a software audio sampler LINUXSAMPLER_LIB_DEPENDS= liblinuxsampler.so:audio/linuxsampler LINUXSAMPLER_MAKE_ARGS_OFF= HAVE_LINUXSAMPLER=false JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_RUN_DEPENDS= ${LOCALBASE}/lib/libjack.so:audio/jack JACK_MAKE_ARGS_OFF= HAVE_JACK=false 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 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 @@ -1,231 +1,231 @@ 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/CarlaNativePlugin.h include/carla/CarlaPlugin.hpp include/carla/CarlaPluginPtr.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/appdata/studio.kx.carla.appdata.xml 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_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_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/ui_xycontroller.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/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 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/32x32/apps/carla-control.png share/icons/hicolor/32x32/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