[93025] trunk/dports/multimedia/lmms

jmr at macports.org jmr at macports.org
Sun May 13 23:03:09 PDT 2012 

Revision: 93025
          https://trac.macports.org/changeset/93025
Author:   jmr at macports.org
Date:     2012-05-13 23:03:08 -0700 (Sun, 13 May 2012)
Log Message:
-----------
lmms: update to 0.4.12 (#30630)

Modified Paths:
--------------
    trunk/dports/multimedia/lmms/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff

Removed Paths:
-------------
    trunk/dports/multimedia/lmms/files/patch-disable-zynaddsubfx.diff

Modified: trunk/dports/multimedia/lmms/Portfile
===================================================================
--- trunk/dports/multimedia/lmms/Portfile	2012-05-14 05:12:41 UTC (rev 93024)
+++ trunk/dports/multimedia/lmms/Portfile	2012-05-14 06:03:08 UTC (rev 93025)
@@ -6,13 +6,16 @@
 PortGroup           qt4 1.0
 
 name                lmms
-version             0.4.8
-revision            1
+version             0.4.12
 categories          multimedia
 maintainers         nomaintainer
 
 description         Linux Multimedia Studio
-long_description    Free alternative to popular programs such as FruityLoops, Cubase and Logic
+long_description    LMMS is a free cross-platform alternative to commercial programs like FL Studio®, \
+                    which allow you to produce music with your computer. This includes the creation of \
+                    melodies and beats, the synthesis and mixing of sounds, and arranging of samples. \
+                    You can have fun with your MIDI-keyboard and much more, all in a user-friendly and \
+                    modern interface.
 
 homepage            http://lmms.sourceforge.net
 platforms           darwin
@@ -20,24 +23,21 @@
 #parallel build seems broken :(
 use_parallel_build  no
 use_bzip2           yes
-checksums           md5     8573b8376808c77c058cca3a57a36d8d \
-                    sha1    851021270157d3eda15c6b6dae8a71ab47db24cd \
-                    rmd160  8319667b7c65dc4b14022ebe2d76b39e11703f1f
+checksums           md5     0642aba9b6b71d2ed41b44cfde4004f6 \
+                    sha1    680495a87517f90a63b58ea052c369c8ab31bb9a \
+                    rmd160  534784eca23d653f3cd1ad780c7a4d2c14d223a8
 
 depends_build-append port:pkgconfig
 depends_lib-append  port:libsndfile \
                     path:lib/pkgconfig/sdl.pc:libsdl \
                     port:fftw-3-single \
                     port:fluidsynth \
-                    port:jack
+                    port:jack \
+                    port:fltk-devel
 
-patchfiles          patch-qt-include.diff
+patchfiles          patch-qt-include.diff \
+                    patch-zynaddsubfx-CMakeLists.txt.diff
 
-# Disable zynaddsubfx plugin on x86_64 as the included fltk does not build
-if {${configure.build_arch} == "x86_64"} {
-    patchfiles-append patch-disable-zynaddsubfx.diff
-}
-
 # Use bundled libsamplerate due to link problems with the external library
 configure.args-append -DWANT_SYSTEM_SR=OFF
 # Disable VST because it is not supported on OS X

Deleted: trunk/dports/multimedia/lmms/files/patch-disable-zynaddsubfx.diff
===================================================================
--- trunk/dports/multimedia/lmms/files/patch-disable-zynaddsubfx.diff	2012-05-14 05:12:41 UTC (rev 93024)
+++ trunk/dports/multimedia/lmms/files/patch-disable-zynaddsubfx.diff	2012-05-14 06:03:08 UTC (rev 93025)
@@ -1,14 +0,0 @@
---- plugins/zynaddsubfx/CMakeLists.txt
-+++ plugins/zynaddsubfx/CMakeLists.txt
-@@ -1,3 +1,5 @@
-+IF(NOT LMMS_BUILD_APPLE)
-+
- IF(LMMS_HAVE_FFTW3F)
- 
- INCLUDE(BuildPlugin)
-@@ -137,3 +139,5 @@ ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && c
- ADD_DEPENDENCIES(remote_zynaddsubfx libfltk)
- ENDIF(LMMS_HAVE_FFTW3F)
- 
-+ENDIF(NOT LMMS_BUILD_APPLE)
-+

Added: trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff
===================================================================
--- trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/multimedia/lmms/files/patch-zynaddsubfx-CMakeLists.txt.diff	2012-05-14 06:03:08 UTC (rev 93025)
@@ -0,0 +1,53 @@
+--- plugins/zynaddsubfx/CMakeLists.txt.orig	2011-08-07 07:11:44.000000000 +0100
++++ plugins/zynaddsubfx/CMakeLists.txt	2011-08-07 07:18:03.000000000 +0100
+@@ -24,6 +24,9 @@
+ )
+ 
+ 
++SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
++
++
+ # definitions for ZynAddSubFX
+ IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
+     ADD_DEFINITIONS(-DOS_LINUX)
+@@ -47,7 +47,8 @@
+ 	ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
+ ENDIF(LMMS_BUILD_WIN32)
+ 
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
++# INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
+ 
+ set(ZASF_CORE_LIBS
+     zynaddsubfx_input
+@@ -100,7 +101,8 @@
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC})
+ INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR})
+-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a)
++#TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a)
++TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore -lfltk)
+ ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
+ 
+ # link system libraries when on win32
+@@ -122,13 +124,13 @@
+ ENDIF(LMMS_BUILD_WIN32)
+ 
+ # build FLTK
+-IF(LMMS_BUILD_WIN64)
+-	SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win64Toolchain.cmake")
+-ELSEIF(LMMS_BUILD_WIN32)
+-	SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake")
+-ENDIF(LMMS_BUILD_WIN64)
+-ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL})
++#IF(LMMS_BUILD_WIN64)
++#	SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win64Toolchain.cmake")
++#ELSEIF(LMMS_BUILD_WIN32)
++#	SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake")
++#ENDIF(LMMS_BUILD_WIN64)
++#ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL})
+ 
+-ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk)
++#ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk)
+ ENDIF(LMMS_HAVE_FFTW3F)
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120513/f275be87/attachment-0001.html>

More information about the macports-changes mailing list