From 67a56c6f4895f2ae21d865b0f986f4f21e11669c Mon Sep 17 00:00:00 2001 From: Vesa Date: Wed, 2 Jul 2014 21:38:19 +0300 Subject: [PATCH 1/5] Bump version to 1.0.3 --- CMakeLists.txt | 2 +- README | 2 +- lmms.rc.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4aeab0433..b860805a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig) SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") #SET(VERSION_SUFFIX "") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") IF(VERSION_SUFFIX) diff --git a/README b/README index 80e38a000..174f1d392 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -LMMS 1.0.2 +LMMS 1.0.3 =========== Copyright (c) 2004-2014 by LMMS developers diff --git a/lmms.rc.in b/lmms.rc.in index 620a7dfd5..a3ea7e6b6 100644 --- a/lmms.rc.in +++ b/lmms.rc.in @@ -2,7 +2,7 @@ lmmsicon ICON data/lmms.ico #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,2,0 + FILEVERSION 1,0,3,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP From 71a9f94a4be993b17b4141f9e0621190d2dad064 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Thu, 3 Jul 2014 14:21:14 -0400 Subject: [PATCH 2/5] Fix Zyn GUI hard crash on Win32 I can't explain why @tobydox doesn't have to do this in his builds but committing to push ahead with 1.0.3 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4aeab0433..eafdde68a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -463,6 +463,7 @@ IF(LMMS_BUILD_WIN32) "${MINGW_PREFIX}/bin/libvorbisenc-2.dll" "${MINGW_PREFIX}/bin/libvorbisfile-3.dll" "${MINGW_PREFIX}/bin/libogg-0.dll" + "${MINGW_PREFIX}/lib/libfltk.dll" "${MINGW_PREFIX}/bin/libfluidsynth.dll" "${MINGW_PREFIX}/bin/libfftw3f-3.dll" "${MINGW_PREFIX}/bin/libFLAC-8.dll" From ab55b26e4b1521e5401f60a2f618f31579e9cc5c Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sat, 5 Jul 2014 17:46:10 +0200 Subject: [PATCH 3/5] SWH/BodeShifterCV: fix out-of-bounds array access The xcoeffs array only has 100 elements and thus accessing xcoeffs[100] leads to undefined behaviour. --- plugins/LadspaEffect/swh/bode_shifter_cv_1432.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c index 41fb4f043..967edf646 100644 --- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c +++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c @@ -247,7 +247,7 @@ static void runBodeShifterCV(LADSPA_Handle instance, unsigned long sample_count) /* Perform the Hilbert FIR convolution * (probably FFT would be faster) */ hilb = 0.0f; - for (i = 0; i <= NZEROS/2; i++) { + for (i = 0; i < NZEROS/2; i++) { hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); } From 6711f5d2914294fc7b9ed39804da0fd96a5f1ab2 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 6 Jul 2014 13:50:49 +0200 Subject: [PATCH 4/5] Added support for winpthreads library Recent builds of MinGW64 runtime include the winpthreads library which is not linked statically anymore and thus doesn't required non-portable (de-)initialization function calls. --- plugins/vst_base/RemoteVstPlugin.cpp | 4 ++++ plugins/zynaddsubfx/LocalZynAddSubFx.cpp | 3 +++ plugins/zynaddsubfx/RemoteZynAddSubFx.cpp | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/plugins/vst_base/RemoteVstPlugin.cpp b/plugins/vst_base/RemoteVstPlugin.cpp index ef85fbd48..cc441ce77 100644 --- a/plugins/vst_base/RemoteVstPlugin.cpp +++ b/plugins/vst_base/RemoteVstPlugin.cpp @@ -1860,10 +1860,12 @@ int main( int _argc, char * * _argv ) } #ifdef LMMS_BUILD_WIN32 +#ifndef __WINPTHREADS_VERSION // (non-portable) initialization of statically linked pthread library pthread_win32_process_attach_np(); pthread_win32_thread_attach_np(); #endif +#endif #ifdef LMMS_BUILD_LINUX #ifdef LMMS_HAVE_SCHED_H @@ -1897,8 +1899,10 @@ int main( int _argc, char * * _argv ) #ifdef LMMS_BUILD_WIN32 +#ifndef __WINPTHREADS_VERSION pthread_win32_thread_detach_np(); pthread_win32_process_detach_np(); +#endif #endif return 0; diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp index 05b6a725e..586481b82 100644 --- a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp @@ -25,6 +25,7 @@ #include #include +#include #include "LocalZynAddSubFx.h" @@ -46,9 +47,11 @@ LocalZynAddSubFx::LocalZynAddSubFx() if( s_instanceCount == 0 ) { #ifdef LMMS_BUILD_WIN32 +#ifndef __WINPTHREADS_VERSION // (non-portable) initialization of statically linked pthread library pthread_win32_process_attach_np(); pthread_win32_thread_attach_np(); +#endif #endif initConfig(); diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp index e769594fa..2e4535d73 100644 --- a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp @@ -263,10 +263,12 @@ int main( int _argc, char * * _argv ) } #ifdef LMMS_BUILD_WIN32 +#ifndef __WINPTHREADS_VERSION // (non-portable) initialization of statically linked pthread library pthread_win32_process_attach_np(); pthread_win32_thread_attach_np(); #endif +#endif RemoteZynAddSubFx * remoteZASF = @@ -278,8 +280,10 @@ int main( int _argc, char * * _argv ) #ifdef LMMS_BUILD_WIN32 +#ifndef __WINPTHREADS_VERSION pthread_win32_thread_detach_np(); pthread_win32_process_detach_np(); +#endif #endif return 0; From 8122041d65fc71d29639b348ba76045ed016dc63 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 6 Jul 2014 13:52:51 +0200 Subject: [PATCH 5/5] Install winpthreads DLL Install winpthreads DLL for inclusion in Win32/Win64 installer. Requires latest version of mingw-x-runtime packages (>=3.1.0). --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dd634387..b16348557 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -473,6 +473,7 @@ IF(LMMS_BUILD_WIN32) "${MINGW_PREFIX}/bin/libglib-2.0-0.dll" "${MINGW_PREFIX}/bin/libgthread-2.0-0.dll" "${MINGW_PREFIX}/bin/zlib1.dll" + "${MINGW_PREFIX}/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32/bin/libwinpthread-1.dll" DESTINATION .) ELSE(LMMS_BUILD_WIN32)