update carla

Makefile

@@ -36,7 +36,7 @@ SUM_EXT=sha256sum
 ZRYTHM_TARBALL_SUM=zrythm-$(ZRYTHM_VERSION).tar.gz.$(SUM_EXT)
 CALC_SUM=sha256sum --check
 ZRYTHM_TARBALL_URL=https://git.zrythm.org/cgit/zrythm/snapshot/zrythm-$(ZRYTHM_VERSION).tar.gz
-CARLA_VERSION=3c3f67054d6b3cb1f57585b50dd111197f0ced7d
+CARLA_VERSION=9f8c9369b71ece323f77f385963a32f94bf141d3
 CARLA_SOURCE_URL=https://github.com/falkTX/Carla/archive/$(CARLA_VERSION).zip
 CARLA_SOURCE_ZIP=Carla-$(CARLA_VERSION).zip
 CARLA_WINDOWS_BINARY_64_ZIP=carla-64-$(shell echo $(CARLA_VERSION) | head -c 7).zip
@@ -116,7 +116,8 @@ OSX_BREW_BOTTLE=zrythm--$(ZRYTHM_PKG_VERSION).catalina.bottle.tar.gz
 OSX_TRIAL_BREW_BOTTLE=zrythm-trial--$(ZRYTHM_PKG_VERSION).catalina.bottle.tar.gz
 OSX_BREW_ZIP_PKG_FILE=zrythm-$(ZRYTHM_PKG_VERSION)-osx-installer.zip
 OSX_BREW_ZIP_TRIAL_PKG_FILE=zrythm-trial-$(ZRYTHM_PKG_VERSION)-osx-installer.zip
-CARLA_BOTTLE=carla-git--0.1.1.catalina.bottle.tar.gz
+CARLA_BOTTLE_VER=0.1.2
+CARLA_BOTTLE=carla-git--$(CARLA_BOTTLE_VER).catalina.bottle.tar.gz
 APPIMAGE_APPDIR=/tmp/appimage/AppDir
 BREEZE_DARK_PATH=/Users/alex/.local/share/icons/breeze-dark
 MANUAL_ZIP_PATH=$(BUILD_DIR)/user-manual.zip
@@ -243,7 +244,7 @@ $(BUILD_OSX_BREW_DIR)/$(1): tools/gen_osx_installer_brew.sh tools/osx/zrythm.rb
 	mkdir -p $(BUILD_OSX_BREW_DIR)
 	rm -rf /tmp/breeze-dark
 	cp -R $(BREEZE_DARK_PATH) /tmp/breeze-dark
-	tools/gen_osx_installer_brew.sh bottle "$$@" tools/osx/zrythm.rb $(BUILD_DIR)/$(ZRYTHM_TARBALL) $(ZRYTHM_PKG_VERSION) $(CARLA_VERSION)
+	tools/gen_osx_installer_brew.sh bottle "$$@" tools/osx/zrythm.rb $(BUILD_DIR)/$(ZRYTHM_TARBALL) $(ZRYTHM_PKG_VERSION) $(CARLA_VERSION) $(CARLA_BOTTLE_VER)
 	touch $$@
 endef
 
@@ -251,10 +252,10 @@ $(eval $(call make_osx_brew_bottle_target,$(OSX_BREW_BOTTLE)))
 $(eval $(call make_osx_brew_bottle_target,$(OSX_TRIAL_BREW_BOTTLE),$(BUILD_OSX_BREW_DIR)/$(OSX_BREW_BOTTLE)))
 
 $(BUILD_OSX_BREW_DIR)/$(OSX_BREW_ZIP_PKG_FILE): $(BUILD_OSX_BREW_DIR)/$(OSX_BREW_BOTTLE)
-	tools/gen_osx_installer_brew.sh zip "$<" "$@" $(ZRYTHM_PKG_VERSION) $(BUILD_OSX_BREW_DIR)/$(CARLA_BOTTLE)
+	tools/gen_osx_installer_brew.sh zip "$<" "$@" $(ZRYTHM_PKG_VERSION) $(CARLA_BOTTLE_VER) $(BUILD_OSX_BREW_DIR)/$(CARLA_BOTTLE)
 
 $(BUILD_OSX_BREW_DIR)/$(OSX_BREW_ZIP_TRIAL_PKG_FILE): $(BUILD_OSX_BREW_DIR)/$(OSX_TRIAL_BREW_BOTTLE) $(BUILD_OSX_BREW_DIR)/$(OSX_BREW_ZIP_PKG_FILE)
-	tools/gen_osx_installer_brew.sh zip "$<" "$@" $(ZRYTHM_PKG_VERSION) $(BUILD_OSX_BREW_DIR)/$(CARLA_BOTTLE)
+	tools/gen_osx_installer_brew.sh zip "$<" "$@" $(ZRYTHM_PKG_VERSION) $(CARLA_BOTTLE_VER) $(BUILD_OSX_BREW_DIR)/$(CARLA_BOTTLE)
 
 .PHONY: osx-brew-zip
 osx-brew-zip: $(BUILD_OSX_BREW_DIR)/$(OSX_BREW_ZIP_PKG_FILE) $(BUILD_OSX_BREW_DIR)/$(OSX_BREW_ZIP_TRIAL_PKG_FILE)

tools/gen_osx_installer_brew.sh

@@ -15,6 +15,7 @@ if [ "$bottle_or_zip" = "bottle" ]; then
   tarball_filename="$(git ls-remote https://git.zrythm.org/git/zrythm | grep HEAD | awk '{print $1}').tar.gz"
   zrythm_version=$5
   carla_version=$6
+  carla_bottle_ver=$7
 
   wget https://git.zrythm.org/cgit/zrythm/snapshot/$tarball_filename
 
@@ -39,6 +40,8 @@ if [ "$bottle_or_zip" = "bottle" ]; then
     $formula_dir/$formula_filename
   sed -i -e "s/@VERSION@/$carla_version/" \
     $formula_dir/carla-git.rb
+  sed -i -e "s/@BOTTLE_VERSION@/$carla_bottle_ver/" \
+    $formula_dir/carla-git.rb
   sed -i -e "s/@SHA256@/$(openssl sha256 -r $tarball_filename | awk '{print $1;}')/" \
     $formula_dir/$formula_filename
 
@@ -54,7 +57,7 @@ if [ "$bottle_or_zip" = "bottle" ]; then
   brew bottle $pkg_name
   brew link --overwrite $pkg_name
   destdir="$(dirname $bottle_file)"
-  carla_git_bottle_filename="carla-git--0.1.1.catalina.bottle.tar.gz"
+  carla_git_bottle_filename="carla-git--$carla_bottle_ver.catalina.bottle.tar.gz"
   rm -rf $destdir/$carla_git_bottle_filename
   mv $carla_git_bottle_filename "$destdir"/
   rm -rf $bottle_file
@@ -65,14 +68,15 @@ elif [ "$bottle_or_zip" = "zip" ]; then
   zip_file=$3
   zip_filename="$(basename $zip_file)"
   zrythm_version=$4
-  carla_bottle_file=$5
+  carla_bottle_ver=$5
+  carla_bottle_file=$6
   tmp="${zip_filename%.*}"
   mkdir -p $tmp
   rm -rf $zip_file
   cp installer-osx.sh.in $tmp/installer.sh
   sed -i -e "s/@VERSION@/$zrythm_version/" \
     $tmp/installer.sh
-  sed -i -e "s/@CARLA_VERSION@/0.1.1/" \
+  sed -i -e "s/@CARLA_VERSION@/$carla_bottle_ver/" \
     $tmp/installer.sh
   if [[ "$bottle_filename" == *"rial"* ]]; then
     cp README-osx-trial.in $tmp/README

tools/osx/carla-git.rb

@@ -2,9 +2,9 @@ class CarlaGit < Formula
   desc "Audio plugin host supporting LADSPA, LV2, VST2/3, SF2 and more"
   homepage "https://kxstudio.linuxaudio.org/Applications:Carla"
   url "https://github.com/falkTX/Carla/archive/@VERSION@.zip"
-  sha256 "a96d4339d8b85b179a76d093b45eed95967a324ce044fa95ca3cb02b4042540a"
+  sha256 "4bf90e9c6b81e91e98b9ec818a426b14cb484bb298d4b1e1c64c0164a0e6be6a"
   head "https://github.com/falkTX/Carla.git"
-  version "0.1.1"
+  version "@BOTTLE_VERSION@"
 
   bottle do
     cellar :any