[zynaddsubfx] Update to 2.4.4
Brendan Jones
bsjones at fedoraproject.org
Mon Jun 30 01:09:42 UTC 2014
commit b753e833fa99d571df3636bcc1f0b04324b99b38
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date: Mon Jun 30 03:09:23 2014 +0200
Update to 2.4.4
.gitignore | 1 +
sources | 2 +-
zynaddsubfx-buildflags.patch | 30 ++++++---------------------
zynaddsubfx-desktop.patch | 18 ++++++++++++++++
zynaddsubfx.spec | 45 ++++++++++++-----------------------------
5 files changed, 40 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00e879b..92c4174 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ZynAddSubFX-2.4.1.tar.bz2
/ZynAddSubFX-2.4.2.tar.bz2
/zynaddsubfx.pdf
/ZynAddSubFX-2.4.3.tar.bz2
+/zynaddsubfx-2.4.4.tar.xz
diff --git a/sources b/sources
index 7842d79..fcd5982 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2e8994cc54e5f1a64b77dfac3baf0d9a ZynAddSubFX-2.4.3.tar.bz2
+4f985c06da3a3e31ebccd7cf72ae434e zynaddsubfx-2.4.4.tar.xz
3a0259ee431ae8be4a586a37c9dd9c1c zynaddsubfx.pdf
diff --git a/zynaddsubfx-buildflags.patch b/zynaddsubfx-buildflags.patch
index 79a3e32..a44ed66 100644
--- a/zynaddsubfx-buildflags.patch
+++ b/zynaddsubfx-buildflags.patch
@@ -48,10 +48,10 @@ diff -rupN ZynAddSubFX-2.4.2.old/ExternalPrograms/Spliter/Makefile ZynAddSubFX-2
clean:
rm -f *.o spliter SpliterUI.cxx SpliterUI.h
-diff -rupN ZynAddSubFX-2.4.2.old/src/CMakeLists.txt ZynAddSubFX-2.4.2/src/CMakeLists.txt
---- ZynAddSubFX-2.4.2.old/src/CMakeLists.txt 2012-02-26 13:37:11.000000000 -0500
-+++ ZynAddSubFX-2.4.2/src/CMakeLists.txt 2012-03-08 21:23:26.111658165 -0500
-@@ -70,9 +70,14 @@ endif(NOT PKG_CONFIG_FOUND)
+diff -Nurp zynaddsubfx-2.4.4.old/src/CMakeLists.txt zynaddsubfx-2.4.4.p/src/CMakeLists.txt
+--- zynaddsubfx-2.4.4.old/src/CMakeLists.txt 2014-06-28 01:43:43.000000000 +0200
++++ zynaddsubfx-2.4.4.p/src/CMakeLists.txt 2014-06-29 21:13:38.608887395 +0200
+@@ -123,6 +123,7 @@ endif()
option (BuildForAMD_X86_64 "Build for AMD x86_64 system" OFF)
option (BuildForCore2_X86_64 "Build for Intel Core2 x86_64 system" OFF)
option (BuildForDebug "Include gdb debugging support" OFF)
@@ -59,33 +59,17 @@ diff -rupN ZynAddSubFX-2.4.2.old/src/CMakeLists.txt ZynAddSubFX-2.4.2/src/CMakeL
set(CMAKE_BUILD_TYPE "Release")
-+if (X86Build)
-+ set (AsmOption "-DASM_F2I_YES")
-+endif ()
-+
- set (BuildOptions_x86_64AMD
- "-O3 -march=athlon64 -m64 -Wall -ffast-math -fno-finite-math-only -fomit-frame-pointer"
- CACHE STRING "X86_64 compiler options"
-@@ -84,7 +89,7 @@ set (BuildOptions_X86_64Core2
+@@ -137,7 +138,7 @@ set (BuildOptions_X86_64Core2
)
set (BuildOptionsBasic
- "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
-+ "-ffast-math -fno-finite-math-only -fomit-frame-pointer ${AsmOption}"
++ "-O3 -ffast-math -fomit-frame-pointer"
CACHE STRING "basic X86 complier options"
)
-@@ -133,26 +138,19 @@ endif()
- # other include directories
- include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS})
+@@ -205,17 +206,17 @@ endif()
--add_definitions(
-- -DASM_F2I_YES
-- -g #TODO #todo put in a better location
-- -Wall
-- -Wextra
-- )
--
if (BuildForDebug)
set (CMAKE_BUILD_TYPE "Debug")
- set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
diff --git a/zynaddsubfx-desktop.patch b/zynaddsubfx-desktop.patch
new file mode 100644
index 0000000..de2c0cc
--- /dev/null
+++ b/zynaddsubfx-desktop.patch
@@ -0,0 +1,18 @@
+diff -Nurp zynaddsubfx-2.4.4.orig/zynaddsubfx-alsa.desktop zynaddsubfx-2.4.4.new/zynaddsubfx-alsa.desktop
+--- zynaddsubfx-2.4.4.orig/zynaddsubfx-alsa.desktop 2014-06-28 01:43:45.000000000 +0200
++++ zynaddsubfx-2.4.4.new/zynaddsubfx-alsa.desktop 2014-06-29 21:43:19.477730989 +0200
+@@ -5,4 +5,4 @@ Exec=zynaddsubfx -I alsa -O alsa
+ Icon=zynaddsubfx
+ Terminal=false
+ Type=Application
+-Categories=AudioVideo;Audio;
++Categories=AudioVideo;Audio;X-Synthesis;Midi;X-Jack;
+diff -Nurp zynaddsubfx-2.4.4.orig/zynaddsubfx-jack.desktop zynaddsubfx-2.4.4.new/zynaddsubfx-jack.desktop
+--- zynaddsubfx-2.4.4.orig/zynaddsubfx-jack.desktop 2014-06-28 01:43:45.000000000 +0200
++++ zynaddsubfx-2.4.4.new/zynaddsubfx-jack.desktop 2014-06-29 21:43:35.753889042 +0200
+@@ -5,4 +5,4 @@ Exec=zynaddsubfx -I jack -O jack
+ Icon=zynaddsubfx
+ Terminal=false
+ Type=Application
+-Categories=AudioVideo;Audio;
++Categories=AudioVideo;Audio;X-Synthesis;Midi;X-Jack;
diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec
index 9da2e42..f8bfe52 100644
--- a/zynaddsubfx.spec
+++ b/zynaddsubfx.spec
@@ -1,16 +1,17 @@
Summary: Real-time software synthesizer
Name: zynaddsubfx
-Version: 2.4.3
-Release: 5%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
# Source is a collective work, distributed by
License: GPLv2 and GPLv2+
Group: Applications/Multimedia
URL: http://zynaddsubfx.sourceforge.net
-Source0: http://download.sf.net/sourceforge/zynaddsubfx/ZynAddSubFX-%{version}.tar.bz2
+Source0: http://download.sf.net/sourceforge/zynaddsubfx/zynaddsubfx-%{version}.tar.xz
Source1: zynaddsubfx.desktop
# We cannot build this from source since Fedora's texlive is too old
Source2: zynaddsubfx.pdf
Patch1: zynaddsubfx-buildflags.patch
+Patch2: zynaddsubfx-desktop.patch
Requires: hicolor-icon-theme
Requires: %{name}-common = %{version}-%{release}
@@ -67,8 +68,9 @@ effects like Reverb, Echo, Chorus, Phaser...
This package includes the DSSI implementation of the synthesizer.
%prep
-%setup -q -n ZynAddSubFX-%{version}
+%setup -q
%patch1 -p1 -b .flags
+%patch2 -p1 -b .desktop
cp -a %SOURCE2 .
# Fix encoding
@@ -110,40 +112,16 @@ pushd ExternalPrograms
install -m 0755 Spliter/spliter %{buildroot}%{_bindir}/zynaddsubfx-spliter
popd
-# .desktop file
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install \
- --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-
-
-for dim in 16 32 48 64; do
- mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${dim}x${dim}/apps
- convert -resize ${dim}x${dim} zynaddsubfx_icon.ico zynaddsubfx-${dim}.png
- install -m 644 zynaddsubfx-${dim}.png %{buildroot}%{_datadir}/icons/hicolor/${dim}x${dim}/apps/zynaddsubfx.png
-done
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-jack.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-alsa.desktop
# We are including these in the common package below
rm -fr %{buildroot}%{_datadir}/doc/%{name}/
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%{_bindir}/*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/16x16/apps/zynaddsubfx.png
-%{_datadir}/icons/hicolor/32x32/apps/zynaddsubfx.png
-%{_datadir}/icons/hicolor/48x48/apps/zynaddsubfx.png
-%{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
+%{_datadir}/applications/%{name}*.desktop
+%{_datadir}/pixmaps/zynaddsubfx.svg
%files common
%doc AUTHORS.txt ChangeLog COPYING FAQ.txt HISTORY.txt README.txt zynaddsubfx.pdf
@@ -153,6 +131,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/dssi/*.so
%changelog
+* Sun Jun 29 2014 Brendan Jones <brendan.jones.it at gmail.com> 2.4.4-1
+- Update to 2.4.4
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list