git: b4a400a8160a - main - audio/carla: Update 2.4.1 -> 2.4.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 20 Feb 2022 20:50:42 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b4a400a8160a6eae5dd00183aca443240aae8c2c

commit b4a400a8160a6eae5dd00183aca443240aae8c2c
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-02-20 20:49:40 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-02-20 20:50:39 +0000

    audio/carla: Update 2.4.1 -> 2.4.2
    
    Reported by:    portscout
---
 audio/carla/Makefile                               |  3 +-
 audio/carla/distinfo                               |  6 +--
 audio/carla/files/patch-source_modules_AppConfig.h | 46 ----------------------
 .../files/patch-source_utils_CarlaPluginUI.cpp     | 10 -----
 audio/carla/pkg-plist                              |  1 +
 5 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index 7a2653b3bde7..aea38e1ae2d2 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.1
-PORTREVISION=	1
+DISTVERSION=	2.4.2
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/audio/carla/distinfo b/audio/carla/distinfo
index 8b97dbb38141..95854547b7b6 100644
--- a/audio/carla/distinfo
+++ b/audio/carla/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634574684
-SHA256 (falkTX-Carla-v2.4.1_GH0.tar.gz) = bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
-SIZE (falkTX-Carla-v2.4.1_GH0.tar.gz) = 10049637
+TIMESTAMP = 1645375539
+SHA256 (falkTX-Carla-v2.4.2_GH0.tar.gz) = 376884965e685242953cab757818dde262209c651bd563a04eade0678c6b9f39
+SIZE (falkTX-Carla-v2.4.2_GH0.tar.gz) = 10057302
diff --git a/audio/carla/files/patch-source_modules_AppConfig.h b/audio/carla/files/patch-source_modules_AppConfig.h
deleted file mode 100644
index 92b425882177..000000000000
--- a/audio/carla/files/patch-source_modules_AppConfig.h
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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/files/patch-source_utils_CarlaPluginUI.cpp b/audio/carla/files/patch-source_utils_CarlaPluginUI.cpp
deleted file mode 100644
index 10415d82633f..000000000000
--- a/audio/carla/files/patch-source_utils_CarlaPluginUI.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/utils/CarlaPluginUI.cpp.orig	2021-11-03 18:15:18 UTC
-+++ source/utils/CarlaPluginUI.cpp
-@@ -19,6 +19,7 @@
- #include "CarlaPluginUI.hpp"
- 
- #ifdef HAVE_X11
-+# include <pthread.h>
- # include <sys/types.h>
- # include <X11/Xatom.h>
- # include <X11/Xlib.h>
diff --git a/audio/carla/pkg-plist b/audio/carla/pkg-plist
index 16076340a439..0c8833b0c04f 100644
--- a/audio/carla/pkg-plist
+++ b/audio/carla/pkg-plist
@@ -96,6 +96,7 @@ 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