[packages/lmms] Version: 1.1.3

jajcus jajcus at pld-linux.org
Sat Dec 12 19:59:38 CET 2015


commit cfe29be1254928c70f135079e410d8c5d91b3df7
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sat Dec 12 19:59:27 2015 +0100

    Version: 1.1.3

 cmake_buildef.patch           | 24 ++++++++++++-----------
 lmms-gcc47.patch              | 12 ------------
 lmms.spec                     | 14 ++++++++------
 logical-not-parentheses.patch | 13 +++++++++++++
 static_inline.patch           | 45 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 79 insertions(+), 29 deletions(-)
---
diff --git a/lmms.spec b/lmms.spec
index 9b2fe0a..d56e0dd 100644
--- a/lmms.spec
+++ b/lmms.spec
@@ -1,15 +1,16 @@
 Summary:	Linux MultiMedia Studio
 Summary(pl.UTF-8):	MultiMedialne Studio Linuksa
 Name:		lmms
-Version:	0.4.14
+Version:	1.1.3
 Release:	1
 License:	GPL V2
 Group:		X11/Applications/Sound
-Source0:	http://downloads.sourceforge.net/lmms/%{name}-%{version}.tar.bz2
-# Source0-md5:	a30e4fcc24c117a1fb4fd7bef891f7e8
+Source0:	https://github.com/LMMS/lmms/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	88d9e66d240b711c37315e3c9da644a1
 Patch0:		cmake_buildef.patch
-Patch1:		%{name}-gcc47.patch
-URL:		http://lmms.sourceforge.net/
+Patch1:		static_inline.patch
+Patch2:		logical-not-parentheses.patch
+URL:		https://lmms.io/
 BuildRequires:	QtCore-devel >= 4.5
 BuildRequires:	QtGui-devel >= 4.5
 BuildRequires:	QtXml-devel >= 4.5
@@ -65,8 +66,9 @@ Biblioteka LMMS.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
diff --git a/cmake_buildef.patch b/cmake_buildef.patch
index da2192b..e59f7c1 100644
--- a/cmake_buildef.patch
+++ b/cmake_buildef.patch
@@ -1,11 +1,13 @@
---- CMakeLists.txt.old	2011-06-09 10:34:59.000000000 +0200
-+++ CMakeLists.txt	2011-07-02 17:09:58.000000000 +0200
-@@ -421,7 +421,7 @@
- 	SET(EXTRA_LIBRARIES "-lwinmm")
- ENDIF()
- 
--ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
-+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
- 
- INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
- LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
+diff -dur lmms-1.1.3.orig/CMakeLists.txt lmms-1.1.3/CMakeLists.txt
+--- lmms-1.1.3.orig/CMakeLists.txt	2015-03-08 03:47:14.000000000 +0100
++++ lmms-1.1.3/CMakeLists.txt	2015-12-12 19:03:31.196480144 +0100
+@@ -436,8 +436,8 @@
+ # Paths relative to lmms executable
+-FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
+-FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/${BIN_DIR}" "/${PLUGIN_DIR}")
++FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/usr/bin" "${LIB_DIR}")
++FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/usr/bin" "${PLUGIN_DIR}")
+ ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR_RELATIVE}/"' -D'PLUGIN_DIR="${PLUGIN_DIR_RELATIVE}/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}"
+                     "${CMAKE_BINARY_DIR}/include"
+                     "${CMAKE_SOURCE_DIR}"
diff --git a/lmms-gcc47.patch b/lmms-gcc47.patch
deleted file mode 100644
index 8a92a92..0000000
--- a/lmms-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr lmms-0.4.13.old/plugins/zynaddsubfx/LocalZynAddSubFx.cpp lmms-0.4.13/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
---- lmms-0.4.13.old/plugins/zynaddsubfx/LocalZynAddSubFx.cpp	2012-02-02 23:27:02.000000000 +0100
-+++ lmms-0.4.13/plugins/zynaddsubfx/LocalZynAddSubFx.cpp	2012-09-15 22:59:23.599016916 +0200
-@@ -22,6 +22,8 @@
-  *
-  */
- 
-+#include <unistd.h>
-+
- #include <lmmsconfig.h>
- 
- #include "LocalZynAddSubFx.h"
diff --git a/logical-not-parentheses.patch b/logical-not-parentheses.patch
new file mode 100644
index 0000000..9fdf509
--- /dev/null
+++ b/logical-not-parentheses.patch
@@ -0,0 +1,13 @@
+diff -dur lmms-1.1.3.orig/src/core/AutomatableModel.cpp lmms-1.1.3.fixed/src/core/AutomatableModel.cpp
+--- lmms-1.1.3.orig/src/core/AutomatableModel.cpp	2015-03-08 03:47:14.000000000 +0100
++++ lmms-1.1.3.fixed/src/core/AutomatableModel.cpp	2015-12-12 18:27:26.937607923 +0100
+@@ -312,7 +312,7 @@
+ 									it != m_linkedModels.end(); ++it )
+ 		{
+ 			if( (*it)->m_setValueDepth < 1 &&
+-				!(*it)->fittedValue( m_value ) !=
++				(!(*it)->fittedValue( m_value )) !=
+ 							 (*it)->m_value )
+ 			{
+ 				(*it)->setAutomatedValue( value );
+Only in lmms-1.1.3.fixed/src/core: AutomatableModel.cpp~
diff --git a/static_inline.patch b/static_inline.patch
new file mode 100644
index 0000000..931bba2
--- /dev/null
+++ b/static_inline.patch
@@ -0,0 +1,45 @@
+diff -dur lmms-1.1.3.orig/plugins/LadspaEffect/swh/hermes_filter_1200.c lmms-1.1.3/plugins/LadspaEffect/swh/hermes_filter_1200.c
+--- lmms-1.1.3.orig/plugins/LadspaEffect/swh/hermes_filter_1200.c	2015-03-08 03:47:14.000000000 +0100
++++ lmms-1.1.3/plugins/LadspaEffect/swh/hermes_filter_1200.c	2015-12-12 18:42:29.272811379 +0100
+@@ -117,7 +117,7 @@
+ 
+ /* Run one sample through the SV filter. Filter is by andy at vellocet */
+ 
+-inline float run_svf(sv_filter *sv, float in) {
++static inline float run_svf(sv_filter *sv, float in) {
+         float out;
+         int i;
+ 
+@@ -144,7 +144,7 @@
+         return out;
+ }
+ 
+-inline int wave_tbl(const float wave) {
++static inline int wave_tbl(const float wave) {
+         switch (f_round(wave)) {
+                 case 0:
+                 return BLO_SINE;
+diff -dur lmms-1.1.3.orig/plugins/LadspaEffect/swh/imp_1199.c lmms-1.1.3/plugins/LadspaEffect/swh/imp_1199.c
+--- lmms-1.1.3.orig/plugins/LadspaEffect/swh/imp_1199.c	2015-03-08 03:47:14.000000000 +0100
++++ lmms-1.1.3/plugins/LadspaEffect/swh/imp_1199.c	2015-12-12 18:42:29.272811379 +0100
+@@ -77,7 +77,7 @@
+ #ifdef __clang__
+ void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
+ #else
+-inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
++void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
+ #endif
+ {
+   fftw_real impulse_time[MAX_FFT_LENGTH];
+diff -dur lmms-1.1.3.orig/plugins/LadspaEffect/swh/retro_flange_1208.c lmms-1.1.3/plugins/LadspaEffect/swh/retro_flange_1208.c
+--- lmms-1.1.3.orig/plugins/LadspaEffect/swh/retro_flange_1208.c	2015-03-08 03:47:14.000000000 +0100
++++ lmms-1.1.3/plugins/LadspaEffect/swh/retro_flange_1208.c	2015-12-12 18:42:29.276144738 +0100
+@@ -31,7 +31,7 @@
+ 
+ #define BASE_BUFFER 0.001 // Base buffer length (s)
+ 
+-inline LADSPA_Data sat(LADSPA_Data x, float q,  float dist) {
++static inline LADSPA_Data sat(LADSPA_Data x, float q,  float dist) {
+         if (x == q) {
+                 return 1.0f / dist + q / (1.0f - f_exp(dist * q));
+         }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lmms.git/commitdiff/cfe29be1254928c70f135079e410d8c5d91b3df7



More information about the pld-cvs-commit mailing list