Merge branch 'master' into f21

Update to new maintenance upstream 1.6.3
2015-11-01 12:02:32 +01:00 · 2015-11-01 11:48:15 +01:00
7 changed files with 113 additions and 177 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,16 +3,3 @@
 /amsynth-1.6.1.tar.gz
 /amsynth-1.6.2.tar.gz
 /amsynth-1.6.3.tar.gz
-/amsynth-1.6.4.tar.bz2
-/amsynth-1.7.0.tar.bz2
-/amsynth-1.7.1.tar.bz2
-/amsynth-1.8.0.tar.bz2
-/amsynth-1.9.0.tar.bz2
-/amsynth-1.10.0.tar.gz
-/amsynth-1.11.0.tar.gz
-/amsynth-1.12.1.tar.gz
-/amsynth-1.12.2.tar.gz
-/amsynth-1.12.4.tar.gz
-/amsynth-1.13.0.tar.gz
-/amsynth-1.13.2.tar.gz
-/amsynth-1.13.4.tar.gz
--- a/amsynth.appdata.xml
+++ b/amsynth.appdata.xml
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 Alexandre Moine <nobrakal@gmail.com> -->
+<application>
+  <id type="desktop">amsynth.desktop</id>
+  <metadata_license>CC0</metadata_license>
+  <project_license>GPL-2.0</project_license>
+  <name>Amsynth</name>
+  <summary>A classic synthesizer with dual oscillators</summary>
+  <summary xml:lang="fr">Un synthétiseur classique avec deux oscillateurs</summary>
+  <description>
+    <p>
+    Amsynth is a software synthesis that provides a classic subtractive synthesizer topology, with:
+    <ul>
+      <li> Dual oscillators with classic waveforms - sine / saw / square / noise </li>
+      <li> 12/24 dB/octave low/high/band-pass resonant filter </li>
+      <li> Independent ADSR envelopes for filter and amplitude </li>
+      <li> LFO which can modulate the oscillators, filter, and amplitude </li>
+      <li> Distortion </li>
+      <li> Reverb </li>
+    </ul>
+    </p>
+    <p xml:lang="fr">
+    Amsynth est un programme de synthétisation sonore qui fournit une topologie soustractive de synthétiseur, avec:
+    <ul>
+      <li> Deux oscillateurs avec des formes d'ondes classiques - sinusoïdales / en dents de scies / carées / bruit </li>
+      <li> 12/24 dB/octave petite/grande/bande passante filtre de résonance </li>
+      <li> Enveloppes ADSR indépendantes pour les filtres et les amplitudes </li>
+      <li> LFO pouvant modifier les oscillateurs, les filtres et les amplitudes </li>
+      <li> Distortion </li>
+      <li> Reverb </li>
+    </ul>
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://wiki.amsynth.googlecode.com/git/amsynth_151_fedora.png</image>
+      <caption>The main window showing the application in action</caption>
+      <caption xml:lang="fr">La fenêtre principale montrant l'application en action</caption>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://code.google.com/p/amsynth/</url>
+  <updatecontact>nobrakal@gmail.com</updatecontact>
+</application>
+
--- a/amsynth.spec
+++ b/amsynth.spec
@ -1,26 +1,22 @@
 Name:           amsynth
-Version:        1.13.4
-Release:        4%{?dist}
+Version:        1.6.3
+Release:        1%{?dist}
 Summary:        A classic synthesizer with dual oscillators

-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            http://amsynth.github.io/
-Source0:        https://github.com/%{name}/%{name}/releases/download/release-%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/nixxcode/%{name}/releases/download/release-%{version}/%{name}-%{version}.tar.gz
+Source1:        %{name}.appdata.xml
+Source2:        lv2-%{name}-plugin.metainfo.xml
+Source3:        dssi-%{name}-plugin.metainfo.xml
+Source4:        vst-%{name}-plugin.metainfo.xml

-# https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  gtk2-devel
-BuildRequires:  jack-audio-connection-kit-devel
-BuildRequires:  lash-devel
+BuildRequires:  gtk2-devel gtkmm24-devel
+BuildRequires:  jack-audio-connection-kit-devel lash-devel libsndfile-devel libsndfile-utils
 BuildRequires:  mesa-libGL-devel mesa-libEGL-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
-BuildRequires:  intltool
-BuildRequires:  pandoc
-BuildRequires:  lv2-devel
-Requires:       hicolor-icon-theme
+Requires:       jack-audio-connection-kit libsndfile-utils lash
 Requires:       %{name}-data = %{version}-%{release}

 %description
@ -32,7 +28,7 @@ classic subtractive synthesizer topology, with:
 - Independent ADSR envelopes for filter and amplitude
 - LFO which can modulate the oscillators, filter, and amplitude
 - Distortion
- Reverb
+- Reverb 

 %package data
 BuildArch: noarch
@ -44,60 +40,65 @@ Sound banks and skins used in amsynth
 Summary: Amsynth lv2 plugin
 Requires: lv2
 Requires: %{name}-data = %{version}-%{release}
-Obsoletes: lv2-amsynth-plugins < 1.6.0
+Obsoletes: lv2-amsynth-plugins

 %description -n lv2-amsynth-plugin
-Amsynth plugin for the lv2 audio standard
+Amsynth plugin for the lv2 audio standard 


 %package -n dssi-amsynth-plugin
 Summary: Amsynth dssi plugin
 BuildRequires: dssi-devel liblo liblo-devel
-BuildRequires: make
 Requires:      dssi
 Requires: %{name}-data = %{version}-%{release}
-Obsoletes: dssi-amsynth-plugins < 1.6.0
+Obsoletes: dssi-amsynth-plugins

 %description -n dssi-amsynth-plugin
 Amsynth plugin for the dssi audio API

 %package -n vst-amsynth-plugin
-Summary: Amsynth vst plugin
+Summary: Amsynth lv2 plugin
 Requires: %{name}-data = %{version}-%{release}
-Obsoletes: vst-amsynth-plugins < 1.6.0
+Obsoletes: vst-amsynth-plugins

 %description -n vst-amsynth-plugin
-Amsynth plugin for the vst protocol
+Amsynth plugin for the vst protocl


 %prep
-%autosetup -p1
+%setup -q
+

 %build
-%configure --with-jack --with-alsa --with-sndfile --with-lash --with-dssi
-%make_build V=1
+# Build in C++11 mode as glibmm headers use C++11 features. This can be dropped
+# when GCC in Fedora switches to C++11 by default (with GCC 6, most likely).
+export CXXFLAGS="%{optflags} -std=c++11"
+
+%configure --with-jack --with-alsa --with-jack --with-sndfile --with-lash --with-dssi --prefix=/usr
+make %{?_smp_mflags}


 %install
 %make_install

+# Install appdata files
+mkdir %{buildroot}%{_datadir}/appdata/
+install -pDm644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/
+install -pDm644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/
+install -pDm644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/
+install -pDm644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
+
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*%{name}.*.xml

-%find_lang %{name}

 %files
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/appdata/%{name}.appdata.xml
-%{_mandir}/de/man1/amsynth.1*
-%{_mandir}/fr/man1/amsynth.1*
-%{_mandir}/man1/amsynth.1*

-
-%files data -f %{name}.lang
+%files data
 %doc README AUTHORS
 %license COPYING
 %{_datadir}/%{name}
@ -117,134 +118,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*%{name}.*


 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Sep 29 2024 Guido Aulisi <guido.aulisi@inps.it> - 1.13.4-1
- Update to 1.13.4
-
-* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 1.13.2-6
- convert license to SPDX
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Feb 05 2023 Guido Aulisi <guido.aulisi@gmail.com> - 1.13.2-1
- Update to 1.13.2
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Dec 27 2022 Guido Aulisi <guido.aulisi@gmail.com> - 1.13.0-1
- Update to 1.13.0
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 10 2022 Guido Aulisi <guido.aulisi@gmail.com> - 1.12.4-1
- Update to 1.12.4
- Add BR lv2-devel
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 29 08:20:42 CET 2020 Guido Aulisi <guido.aulisi@gmail.com> - 1.12.2-1
- Update to 1.12.2
- Fix #1911367
-
-* Mon Nov 16 2020 Guido Aulisi <guido.aulisi@gmail.com> - 1.12.1-1
- Update to 1.12.1
-
-* Sun Oct 04 2020 Guido Aulisi <guido.aulisi@gmail.com> - 1.11.0-1
- Update to 1.11.0
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri May 08 2020 Guido Aulisi <guido.aulisi@gmail.com> - 1.10.0-1
- Update to 1.10.0
- Some spec cleanup
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Apr 23 2019 Guido Aulisi <guido.aulisi@gmail.com> - 1.9.0-1
- Update to 1.9.0
- Patch a format string overflow
- Minor spec tuning
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 09 2018 Guido Aulisi <guido.aulisi@gmail.com> - 1.8.0-5
- Fix FTBFS with new Automake: patch Makefile.in, not Makefile.am
-
-* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.8.0-4
- Remove obsolete scriptlets
-
-* Tue Aug 01 2017 Alexandre Moine <nobrakal@cthugha.org> - 1.8.0-3
- Fix RHBGZ #1476525
- Spec cleanup
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jun 26 2017 Alexandre Moine <nobrakal@cthugha.org> - 1.8.0-1
- New upstream release
- Drop dependency on gtkmm
- Add man page
-
-* Fri Mar 17 2017 Alexandre Moine <nobrakal@gmail.com> - 1.7.1-1
- New upstream release
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sun Oct 09 2016 Alexandre Moine <nobrakal@gmail.com> 1.7.0-1
- Update to new upstream 1.7.0
- Add support for translation
- Move icon from pixmaps to hicolor
-
-* Tue Apr 19 2016 Alexandre Moine <nobrakal@gmail.com> 1.6.4-1
- Update to new maintenance upstream 1.6.4
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
 * Sun Nov 1 2015 Alexandre Moine <nobrakal@gmail.com> 1.6.3-1
 - Update to new maintenance upstream 1.6.3

@ -283,4 +156,3 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*%{name}.*

 * Sat May 30 2015 Alexandre Moine <nobrakal@gmail.com> 1.5.1-1
 - Initial spec
-
--- a/dssi-amsynth-plugin.metainfo.xml
+++ b/dssi-amsynth-plugin.metainfo.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+  <id>dssi-amsynth-plugin</id>
+  <extends>amsynth.desktop</extends>
+  <name>DSSI plugin</name>
+  <summary>Plugin for the dssi audio API</summary>
+  <summary xml:lang="fr">Plugin pour l'API audio dssi</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0</project_license>
+  <updatecontact>nobrakal@gmail.com</updatecontact>
+</component>
--- a/lv2-amsynth-plugin.metainfo.xml
+++ b/lv2-amsynth-plugin.metainfo.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+  <id>lv2-amsynth-plugin</id>
+  <extends>amsynth.desktop</extends>
+  <name>lv2 plugin</name>
+  <summary>Plugin for the lv2 audio standard</summary>
+  <summary xml:lang="fr">Plugin pour le standard lv2</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0</project_license>
+  <updatecontact>nobrakal@gmail.com</updatecontact>
+</component>
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (amsynth-1.13.4.tar.gz) = 94da080036667cc89dd22c04cadc8993fa4ff534b0f009f84d374fa20d391928a3b104287e6c6856edbdb1e5d26daf2c730a73fc08734db8c7eb62c8f35cc129
+8704d7db65c21d24e40cbe249d523e60  amsynth-1.6.3.tar.gz
--- a/vst-amsynth-plugin.metainfo.xml
+++ b/vst-amsynth-plugin.metainfo.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+  <id>vst-amsynth-plugin</id>
+  <extends>amsynth.desktop</extends>
+  <name>VST plugin</name>
+  <summary>Amsynth plugin for the vst protocl</summary>
+  <summary xml:lang="fr">Plugin amsynth pour le protocole vst</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0</project_license>
+  <updatecontact>nobrakal@gmail.com</updatecontact>
+</component>
Author	SHA1	Message	Date
Alexandre Moine	ee89d554fb	Merge branch 'master' into f21	2015-11-01 12:02:32 +01:00
Alexandre Moine	6680970472	Update to new maintenance upstream 1.6.3	2015-11-01 11:48:15 +01:00