- Update to 0.4.6

PR:		142976
Submitted by:	Ports Fury

3 files changed, 65 insertions, 20 deletions

diff --git a/audio/lmms/files/patch-CMakeLists.txt b/audio/lmms/files/patch-CMakeLists.txt
index 32201821e182..9e96f9421202 100644
--- a/audio/lmms/files/patch-CMakeLists.txt
+++ b/audio/lmms/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2009-08-11 20:52:15.000000000 +0400
-+++ CMakeLists.txt	2010-01-14 22:07:03.000000000 +0300
+--- CMakeLists.txt.orig	2009-12-25 08:49:19.000000000 +0900
++++ CMakeLists.txt	2010-01-20 00:15:00.000000000 +0900
 @@ -334,6 +334,7 @@
  # check for libsamplerate
  IF(WANT_SYSTEM_SR)
@@ -8,3 +8,23 @@
  	IF(SAMPLERATE_FOUND)
  		SET(LMMS_HAVE_SAMPLERATE TRUE)
  	ENDIF(SAMPLERATE_FOUND)
+@@ -364,8 +365,8 @@
+ 
+ # set compiler flags
+ #SET(CMAKE_BUILD_TYPE relwithdebug)
+-SET(CMAKE_C_FLAGS "-O2 -g -Wall -ftree-vectorize ${CMAKE_C_FLAGS}")
+-SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions -Wall -ftree-vectorize ${CMAKE_CXX_FLAGS}")
++SET(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
++SET(CMAKE_CXX_FLAGS "-fno-exceptions -Wall ${CMAKE_CXX_FLAGS}")
+ #SET(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS}")
+ #SET(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS}")
+ 
+@@ -459,7 +460,7 @@
+ 	ENDIF(NOT LMMS_BUILD_APPLE)
+ 
+ 	INSTALL(TARGETS lmms RUNTIME DESTINATION bin)
+-	INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
++	INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ 
+ ENDIF(LMMS_BUILD_WIN32)
+ 
diff --git a/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt b/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt
index 63248f91c93e..7adaef165ef5 100644
--- a/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt
+++ b/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt
@@ -1,26 +1,29 @@
---- plugins/zynaddsubfx/CMakeLists.txt.orig	2009-08-11 20:52:18.000000000 +0400
-+++ plugins/zynaddsubfx/CMakeLists.txt	2010-01-14 22:15:51.000000000 +0300
-@@ -97,12 +97,9 @@
- ADD_DEFINITIONS(-DASM_F2I_YES)
+--- plugins/zynaddsubfx/CMakeLists.txt.orig	2009-12-25 08:49:24.000000000 +0900
++++ plugins/zynaddsubfx/CMakeLists.txt	2010-01-20 00:48:44.000000000 +0900
+@@ -52,15 +52,13 @@
+ 	ADD_DEFINITIONS(-DASM_F2I_YES)
  ENDIF(LMMS_HOST_X86 OR LMMS_HOST_X86_64)
  
 -# build ZynAddSubFX with full optimizations
--SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wno-write-strings -Wno-deprecated-declarations")
+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wno-write-strings -Wno-deprecated-declarations")
 -
- # link default libraries
- LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
--LINK_LIBRARIES(${FFTW3F_LIBRARIES} -lz -lpthread ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a)
-+LINK_LIBRARIES(${FFTW3F_LIBRARIES} -lz ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a)
- 
- # FLTK needs X
- IF(LMMS_BUILD_LINUX)
-@@ -117,7 +114,8 @@
- LINK_LIBRARIES(${QT_LIBRARIES} -lole32 -luuid -lcomctl32 -lgdi32)
+ # link system-libraries when on win32
+ IF(LMMS_BUILD_WIN32)
+ 	ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
  ENDIF(LMMS_BUILD_WIN32)
  
--INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS})
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR}/mxml ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mxml ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS})
 +INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/fltk/)
  
- ADD_EXECUTABLE(remote_zynaddsubfx remote_zynaddsubfx.cpp ${ZYN_SRC} ${MXML_SRC})
- INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${PLUGIN_DIR})
+ set(ZASF_CORE_LIBS
+     zynaddsubfx_input
+@@ -90,7 +88,7 @@
+ add_subdirectory(src/Samples)
+ 
+ ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${MXML_SRC})
+-TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} -lz -lpthread)
++TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} -lz -L${FFTW3F_LIBRARY_DIRS})
+ IF(LMMS_BUILD_WIN32)
+ 	TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lwsock32)
+ 	INSTALL(TARGETS ZynAddSubFxCore DESTINATION ${PLUGIN_DIR})
diff --git a/audio/lmms/files/patch-plugins__zynaddsubfx__fltk__src__filename_list.cxx b/audio/lmms/files/patch-plugins__zynaddsubfx__fltk__src__filename_list.cxx
new file mode 100644
index 000000000000..9b9c04bc7dff
--- /dev/null
+++ b/audio/lmms/files/patch-plugins__zynaddsubfx__fltk__src__filename_list.cxx
@@ -0,0 +1,22 @@
+--- plugins/zynaddsubfx/fltk/src/filename_list.cxx.orig	2009-12-25 08:49:24.000000000 +0900
++++ plugins/zynaddsubfx/fltk/src/filename_list.cxx	2010-01-22 02:17:11.000000000 +0900
+@@ -31,6 +31,10 @@
+ #include "flstring.h"
+ #include <stdlib.h>
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ 
+ extern "C" {
+ #ifndef HAVE_SCANDIR
+@@ -77,7 +81,7 @@
+                      Fl_File_Sort_F *sort) {
+ #ifndef HAVE_SCANDIR
+   int n = scandir(d, list, 0, sort);
+-#elif defined(__hpux) || defined(__CYGWIN__) || (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 10 )
++#elif defined(__hpux) || defined(__CYGWIN__) || (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 10 ) || (defined(__FreeBSD__) && __FreeBSD_version >= 900006)
+   // HP-UX, Cygwin and POSIX (2008) define the comparison function like this:
+   int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
+ #elif defined(__osf__)