commit 6bea298f814d88bedebf09d9f20563a94b1d72b9
Author: Jan Rękorajski <[email protected]>
Date: Mon Jan 24 09:13:30 2022 +0100
- up to 2.4.1
Carla.spec | 38 +++++++++++++++++++++++++-------------
pypkgdir.patch | 21 ---------------------
soundfonts_path.patch | 8 ++------
3 files changed, 27 insertions(+), 40 deletions(-)
---
diff --git a/Carla.spec b/Carla.spec
index d34b55b..1ce0e1e 100644
--- a/Carla.spec
+++ b/Carla.spec
@@ -4,19 +4,18 @@
%bcond_without qt4 # Qt4 plugin wrapper
# current revision of source/native-plugins/external git submodule
-%define plugins_rev 859bc98
+%define plugins_rev 385f1fd
Summary: Audio plugin host
Name: Carla
-Version: 2.0.0
-Release: 2
+Version: 2.4.1
+Release: 1
License: GPL v2+
Group: Applications
Source0:
https://github.com/falkTX/Carla/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 48fb7b0b8ee2e451798767ae779e8483
-Source1:
https://github.com/falkTX/Carla-Plugins/archive/%{plugins_rev}/Carla-Plugins-%{plugins_rev}.tar.gz
-# Source1-md5: d1f05c048b8c813d7768ef40fc9badaa
-Patch0: pypkgdir.patch
+# Source0-md5: c7d9daae2ca3d7d2b58aaeb63dc385fe
+Source1:
https://github.com/falkTX/Carla-Plugins/archive/%{plugins_rev}/%{name}-Plugins-%{plugins_rev}.tar.gz
+# Source1-md5: 776e4052a6cc33d85b4cb082665b5e2c
Patch1: soundfonts_path.patch
URL: http://kxstudio.linuxaudio.org/Applications:Carla
BuildRequires: Mesa-libGL-devel
@@ -36,11 +35,11 @@ BuildRequires: liblo-devel
BuildRequires: libprojectM-devel
BuildRequires: mxml-devel
BuildRequires: pulseaudio-devel
+BuildRequires: python-PyQt5-devel-tools >= 5.8.2-2
+BuildRequires: python-PyQt5-uic
BuildRequires: python3
BuildRequires: python3-PyQt5
BuildRequires: python3-PyQt5-uic
-BuildRequires: python-PyQt5-devel-tools >= 5.8.2-2
-BuildRequires: python-PyQt5-uic
BuildRequires: rpm-pythonprov
BuildRequires: zlib-devel
Requires: python3-PyQt5
@@ -67,12 +66,11 @@ Header files for %{name} library.
Pliki nagłówkowe biblioteki %{name}.
%prep
-%setup -q -n %{name}-%{version} -a 1
+%setup -q -a 1
rmdir source/native-plugins/external
mv Carla-Plugins-%{plugins_rev}* source/native-plugins/external
-#%patch0 -p1
%patch1 -p1
%build
@@ -128,8 +126,8 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
%{__sed} -i -e '1s,^#!.*python3\?,#!%{__python3},' \
- $RPM_BUILD_ROOT/%{_datadir}/carla/resources/*-* \
- $RPM_BUILD_ROOT/%{_bindir}/*
+ $RPM_BUILD_ROOT%{_datadir}/carla/resources/*-* \
+ $RPM_BUILD_ROOT%{_bindir}/*
%py3_comp $RPM_BUILD_ROOT%{_datadir}/carla
@@ -173,8 +171,20 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/vst/carla.vst/styles
%{_desktopdir}/carla.desktop
%{_desktopdir}/carla-control.desktop
+%{_desktopdir}/carla-jack-multi.desktop
+%{_desktopdir}/carla-jack-single.desktop
+%{_desktopdir}/carla-patchbay.desktop
+%{_desktopdir}/carla-rack.desktop
%dir %{_datadir}/carla
+%dir %{_datadir}/carla/modgui
+%{_datadir}/carla/modgui/*.py
+%{_datadir}/carla/modgui/__pycache__
+%dir %{_datadir}/carla/patchcanvas
+%{_datadir}/carla/patchcanvas/*.py
+%{_datadir}/carla/patchcanvas/__pycache__
%dir %{_datadir}/carla/resources
+%{_datadir}/carla/resources/modgui
+%{_datadir}/carla/resources/patchcanvas
%{_datadir}/carla/resources/widgets
%{?with_zynaddsubfx:%{_datadir}/carla/resources/zynaddsubfx}
%{_datadir}/carla/resources/*.py
@@ -187,6 +197,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_datadir}/carla/resources/carla-plugin-patchbay
%attr(755,root,root) %{_datadir}/carla/resources/midipattern-ui
%attr(755,root,root) %{_datadir}/carla/resources/notes-ui
+%attr(755,root,root) %{_datadir}/carla/resources/xycontroller-ui
%{?with_zynaddsubfx:%attr(755,root,root)
%{_datadir}/carla/resources/zynaddsubfx-ui}
%{_datadir}/carla/widgets
%{_datadir}/carla/*.py
@@ -200,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%{_includedir}/carla
+%{_pkgconfigdir}/carla-host-plugin.pc
%{_pkgconfigdir}/carla-native-plugin.pc
%{_pkgconfigdir}/carla-standalone.pc
%{_pkgconfigdir}/carla-utils.pc
diff --git a/pypkgdir.patch b/pypkgdir.patch
deleted file mode 100644
index 0a4a733..0000000
--- a/pypkgdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -dur -x '*~' Carla-1.9.8.orig/Makefile Carla-1.9.8/Makefile
---- Carla-1.9.8.orig/Makefile 2018-01-22 22:05:35.000000000 +0100
-+++ Carla-1.9.8/Makefile 2018-02-03 21:14:30.198488505 +0100
-@@ -375,7 +375,7 @@
- install -d $(DESTDIR)$(BINDIR)
- ifeq ($(LINUX),true)
- install -d $(DESTDIR)$(LIBDIR)/carla/jack
-- install -d $(DESTDIR)$(LIBDIR)/python3/dist-packages
-+ install -d $(DESTDIR)$(PYPKGDIR)
- else
- install -d $(DESTDIR)$(LIBDIR)/carla
- endif
-@@ -447,7 +447,7 @@
- install -m 644 \
- source/carla_backend.py \
- source/carla_utils.py \
-- $(DESTDIR)$(LIBDIR)/python3/dist-packages
-+ $(DESTDIR)$(PYPKGDIR)
- endif
-
- # Install headers
diff --git a/soundfonts_path.patch b/soundfonts_path.patch
index d3a248e..2c80d73 100644
--- a/soundfonts_path.patch
+++ b/soundfonts_path.patch
@@ -1,12 +1,8 @@
diff -dur Carla-1.9.12.orig/source/frontend/carla_shared.py
Carla-1.9.12/source/frontend/carla_shared.py
--- Carla-1.9.12.orig/source/frontend/carla_shared.py 2018-10-25
11:06:35.000000000 +0200
+++ Carla-1.9.12/source/frontend/carla_shared.py 2018-11-19
12:44:20.000000000 +0100
-@@ -418,9 +418,11 @@
- DEFAULT_VST2_PATH += ":/usr/local/lib/vst"
-
- DEFAULT_SF2_PATH = HOME + "/.sounds/sf2"
-+ DEFAULT_SF2_PATH += ":/usr/share/soundfonts"
- DEFAULT_SF2_PATH += ":/usr/share/sounds/sf2"
+@@ -418,6 +418,7 @@
+ DEFAULT_SF2_PATH += ":/usr/share/soundfonts"
DEFAULT_SFZ_PATH = HOME + "/.sounds/sfz"
+ DEFAULT_SFZ_PATH += ":/usr/share/soundfonts"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Carla.git/commitdiff/6bea298f814d88bedebf09d9f20563a94b1d72b9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
