diff --git a/.gitignore b/.gitignore index e388825..b7e2a7e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /synthv1-0.8.6.tar.gz /synthv1-0.9.2.tar.gz /synthv1-0.9.10.tar.gz +/synthv1-0.9.13.tar.gz diff --git a/qmake-qt5.sh b/qmake-qt5.sh deleted file mode 100755 index 09d9fe6..0000000 --- a/qmake-qt5.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -/usr/bin/qmake-qt5 \ - "$@" \ - QMAKE_CFLAGS_RELEASE="${CFLAGS}" \ - QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \ - QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \ - QMAKE_STRIP= diff --git a/sources b/sources index 167b1c2..9d7c710 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synthv1-0.9.10.tar.gz) = 83cb2c2bddfe009fe51735f2564d2502ab701fbb1ec6dbe5fc082c1550102b8aed2bbb9ae7abd4df22cb7614a3f6f7dcb06fd13f47ea00961f5d8ad243e5b849 +SHA512 (synthv1-0.9.13.tar.gz) = 5a6c2ad66ce8dccc58ede795822b489319bb44f0b9afaa9ed57f21e55552eff5b838af29e66b2c71d8d23829de94c02975d64039ae0c92cee7efadc26f6363d9 diff --git a/synthv1-0.7.1-lib64.patch b/synthv1-0.7.1-lib64.patch deleted file mode 100644 index 41abd70..0000000 --- a/synthv1-0.7.1-lib64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- synthv1-0.7.1/configure.ac.orig 2015-11-20 06:27:01.366916885 +0100 -+++ synthv1-0.7.1/configure.ac 2015-11-20 07:02:02.997034459 +0100 -@@ -187,7 +187,7 @@ ac_arch=`uname -m` - # Check for install paths and alternatives... - ac_libdirs="lib" - --if test "x$ac_arch" = "xx86_64"; then -+if test -d $X/lib64; then - ac_libdirs="$ac_libdirs lib64" - fi - diff --git a/synthv1-nostrip.patch b/synthv1-nostrip.patch new file mode 100644 index 0000000..0baa08f --- /dev/null +++ b/synthv1-nostrip.patch @@ -0,0 +1,42 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 46d1b61..48e12f2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -165,13 +165,6 @@ if (CONFIG_LIBLO) + endif () + + +-if (UNIX AND NOT APPLE AND NOT CONFIG_DEBUG) +- add_custom_command(TARGET ${NAME}_lv2 POST_BUILD +- COMMAND strip lib${NAME}_lv2.so) +- add_custom_command(TARGET ${NAME}_jack POST_BUILD +- COMMAND strip ${NAME}_jack) +-endif () +- + + if (UNIX AND NOT APPLE) + if (CONFIG_PREFIX MATCHES $ENV{HOME}) +diff --git a/src/src_jack.pro b/src/src_jack.pro +index bbfe01d..6c6f298 100644 +--- a/src/src_jack.pro ++++ b/src/src_jack.pro +@@ -79,7 +79,6 @@ unix { + mimetypes_scalable.path = $${DATADIR}/icons/hicolor/scalable/mimetypes + mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svg + +- CONFIG(release, debug|release):QMAKE_POST_LINK += strip $(TARGET) + } + + QT += widgets xml +diff --git a/src/src_lv2.pro b/src/src_lv2.pro +index 72c798d..83e7c7b 100644 +--- a/src/src_lv2.pro ++++ b/src/src_lv2.pro +@@ -66,7 +66,6 @@ unix { + $${TARGET_LV2UI}.ttl \ + $${NAME}.lv2/manifest.ttl + +- CONFIG(release, debug|release)::QMAKE_POST_LINK += strip $(TARGET); + QMAKE_POST_LINK += $${QMAKE_COPY} -vp $(TARGET) $${TARGET_LV2}.so + + QMAKE_CLEAN += $${TARGET_LV2}.so diff --git a/synthv1.spec b/synthv1.spec index 2330921..d176267 100644 --- a/synthv1.spec +++ b/synthv1.spec @@ -1,11 +1,11 @@ Summary: A 4-oscillator subtractive polyphonic synthesizer Name: synthv1 -Version: 0.9.10 -Release: 2%{?dist} -URL: http://sourceforge.net/projects/%{name} -Source0: http://downloads.sourceforge.net/project/%{name}/0.1.0/%{name}-%{version}.tar.gz -Source1: qmake-qt5.sh -Patch0: synthv1-0.7.1-lib64.patch +Version: 0.9.13 +Release: 1%{?dist} +URL: https://%{name}.sourceforge.io/ +Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# Do not strip executables +Patch0: synthv1-nostrip.patch License: GPLv2+ Requires: hicolor-icon-theme @@ -14,10 +14,9 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-linguist BuildRequires: lv2-devel >= 1.2.0 -BuildRequires: autoconf -BuildRequires: automake BuildRequires: desktop-file-utils BuildRequires: libsndfile-devel +BuildRequires: liblo-devel %description %{name} is a 4-oscillator subtractive polyphonic synthesizer with stereo fx. @@ -25,37 +24,19 @@ BuildRequires: libsndfile-devel %package -n lv2-%{name} Summary: An LV2 port of synthv1 Requires: lv2 -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n lv2-%{name} An LV2 plugin of the synthv1 subtractive synthesizer %prep -%setup -q -%patch0 -p1 - -# configure hard-codes prepending searches of /usr (already implicit, causes problems), -# and /usr/local (not needed here), so force it's non-use -sed -i.ac_with_paths -e "s|^ac_with_paths=.*|ac_with_paths=|g" configure configure.ac - -autoconf -f -sed -i -e 's|-msse -mfpmath=sse -ffast-math|%{optflags} -fPIC|' synthv1_lv2.pro -sed -i -e 's|-msse -mfpmath=sse -ffast-math|%{optflags} -fPIC|' synthv1_jack.pro +%autosetup -p1 %build - -autoreconf - -# force use of custom/local qmake, to inject proper build flags (above) -install -m755 -D %{SOURCE1} bin/qmake-qt5 -PATH=`pwd`/bin:%{_qt5_bindir}:$PATH; export PATH - -export QTDIR=%{_qt5_prefix} -%configure --enable-qt5 -make +%configure +%make_build %install -make DESTDIR=%{buildroot} install +%make_install chmod +x %{buildroot}%{_libdir}/lv2/%{name}.lv2/%{name}.so install -m 0644 src/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -70,12 +51,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/mime/packages/%{name}.xml %{_datadir}/man/man1/%{name}* %{_datadir}/metainfo/%{name}.appdata.xml -%{_libdir}/lib%{name}*.so* %files -n lv2-%{name} %{_libdir}/lv2/%{name}.lv2/ %changelog +* Sat Apr 18 2020 Guido Aulisi - 0.9.13-1 +- Update to 0.9.13 +- Some spec cleanup + * Fri Jan 31 2020 Fedora Release Engineering - 0.9.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild