diff --git a/lmms-1.2.2_carla_2.4.3.patch b/lmms-1.2.2_carla_2.4.3.patch new file mode 100644 index 0000000..9827028 --- /dev/null +++ b/lmms-1.2.2_carla_2.4.3.patch @@ -0,0 +1,12 @@ +diff --git a/plugins/carlabase/carla.h b/plugins/carlabase/carla.h +index fb54e2271..6f1971ea0 100644 +--- a/plugins/carlabase/carla.h ++++ b/plugins/carlabase/carla.h +@@ -28,6 +28,7 @@ + #include + + #define REAL_BUILD // FIXME this shouldn't be needed ++#include "CarlaDefines.h" + #if CARLA_VERSION_HEX >= 0x010911 + #include "CarlaNativePlugin.h" + #else diff --git a/lmms-1.2.2_winelib.patch b/lmms-1.2.2_winelib.patch index 6fc4df0..356e4d3 100644 --- a/lmms-1.2.2_winelib.patch +++ b/lmms-1.2.2_winelib.patch @@ -6,7 +6,7 @@ diff -up lmms/cmake/modules/FindWine.cmake.orig lmms/cmake/modules/FindWine.cmak FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine wine/wine) -FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine i386-linux-gnu/wine) -+FIND_LIBRARY(WINE_LIBRARY NAMES wine libwine.so.1 PATH_SUFFIXES wine i386-linux-gnu/wine wine/i386-unix) ++FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine i386-linux-gnu/wine wine/i386-unix) FIND_PROGRAM(WINE_CXX NAMES wineg++ winegcc winegcc64 winegcc32) set(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} ) diff --git a/lmms.spec b/lmms.spec index 9936f93..b17b3e5 100644 --- a/lmms.spec +++ b/lmms.spec @@ -1,6 +1,13 @@ + +%ifarch %ix86 +%bcond_with wine +%else +%bcond_with wine +%endif + Name: lmms Version: 1.2.2 -Release: 4%{?dist} +Release: 18%{?dist} Summary: Linux MultiMedia Studio URL: https://lmms.io/ @@ -40,6 +47,9 @@ Patch0: lmms-1.2.2_winelib.patch # Pass LIB_SUFFIX Patch1: lmms-1.2.2_lib_suffix.patch +# Fix building against Carla 2.4.3, see #6395 +Patch2: lmms-1.2.2_carla_2.4.3.patch + # according to upstream we should at least support oss, alsa, and # jack. output via pulseaudio has high latency, but we enable it # nevertheless as it is standard on fedora now. portaudio support is @@ -76,7 +86,7 @@ BuildRequires: libappstream-glib Requires: shared-mime-info Requires: hicolor-icon-theme -%ifarch %ix86 +%if %{with wine} BuildRequires: wine-devel %endif @@ -91,7 +101,8 @@ Requires: ladspa-calf-plugins # the -vst subpackage can only be built on ix86, but is also usable # (and thus should be installed) on x86_64. -%ifarch %ix86 x86_64 +#ifarch #ix86 x86_64 +%if %{with wine} Requires: %{name}-vst = %{version}-%{release} %endif @@ -203,7 +214,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_includedir}/%{name} -%ifarch %ix86 +%if %{with wine} %package vst Summary: VST hosting plugin for %{name} @@ -215,10 +226,55 @@ This package contains the necessary files to host VST plugins. %dir %{_libdir}/%{name} %{_libdir}/%{name}/RemoteVstPlugin* -%endif # ifarch %%ix86 +%endif %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.2.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 1.2.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 1.2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.2.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +- Disable wine vst due to libwine.so.1 being removed in wine version 8.3 + see https://bugs.winehq.org/show_bug.cgi?id=54635 and https://github.com/LMMS/lmms/issues/6672 + (copied from https://build.opensuse.org/package/view_file/openSUSE:Backports:SLE-15-SP6/lmms/) + +* Thu Jul 20 2023 Fedora Release Engineering - 1.2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 14 2022 Jan Grulich - 1.2.2-11 +- Rebuild (qt5) + +* Tue May 24 2022 Thomas Moschny - 1.2.2-10 +- Add patch to fix building with Carla 2.4.3. + +* Tue May 17 2022 Jan Grulich - 1.2.2-9 +- Rebuild (qt5) + +* Tue Mar 08 2022 Jan Grulich - 1.2.2-8 +- Rebuild (qt5) + +* Thu Jan 20 2022 Fedora Release Engineering - 1.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 16 2021 Thomas Moschny - 1.2.2-5 +- Rebuild against newer fluidsynth. + * Sun May 23 2021 Thomas Moschny - 1.2.2-4 - Switch to Qt5. - Fix search path for RemoteZynAddSubFx plugin.