<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e9b7b59cd84a90a7a259c639b532d392768ed620">https://github.com/macports/macports-ports/commit/e9b7b59cd84a90a7a259c639b532d392768ed620</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e9b7b59cd84 lmms: update to 1.2.2, fix broken port
</span>e9b7b59cd84 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e9b7b59cd84a90a7a259c639b532d392768ed620
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Aug 3 03:03:07 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> lmms: update to 1.2.2, fix broken port
</span>---
multimedia/lmms/Portfile | 68 +++++++-----
...eLists-use-flags-for-Apple-correctly-6784.patch | 36 +++++++
...002-Detect-PowerPC-and-ARM-correctly-6790.patch | 81 ++++++++++++++
...pp-fix-getName-to-allow-build-with-GCC-67.patch | 24 +++++
....h-fix-recognizing-archs-and-compiler-679.patch | 53 ++++++++++
.../lmms/files/0005-Pick-Macports-patches.patch | 117 +++++++++++++++++++++
multimedia/lmms/files/patch-CMakeLists.txt.diff | 11 --
.../patch-cmake-modules-DetectMachine.cmake.diff | 11 --
.../lmms/files/patch-data-lmms.plist.in.diff | 11 --
...tch-data-scripts-create_apple_bundle.sh.in.diff | 51 ---------
.../patch-plugins-zynaddsubfx-CMakeLists.txt.diff | 10 --
11 files changed, 350 insertions(+), 123 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/Portfile b/multimedia/lmms/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9234d10c189..655f0817a0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/lmms/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/lmms/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,18 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span> PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup LMMS lmms 1.1.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories multimedia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MAP_ANONYMOUS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup LMMS lmms 1.2.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories multimedia audio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span> license GPL-2+
description Linux Multimedia Studio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,20 +23,18 @@ long_description LMMS is a free cross-platform alternative to commercial prog
</span> modern interface.
homepage https://lmms.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://sourceforge.net/p/lmms/bugs/571/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This issue tracker has disappeared but this issue still occurs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# A new issue tracker has been set up at github.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6af06a2bb277d41c4ee8a3bdc85fc30c171cd6c3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c8611be5c259f49cdcaac583bdf9bdd2ffc1f843cd8233ab5bb63c5a720f4910
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}_${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cb4a07dc27dfa31a70b5154a5386b2a8873774c8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b185507fb64ecfd8e31145135b58ab244b637f9efc09c4176caf70aa3cbaae1e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22733960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.rename yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
depends_lib-append port:fftw-3-single \
path:lib/libfltk.dylib:fltk \
port:fluidsynth \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jack \
</span> port:libogg \
port:libsamplerate \
port:libsdl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,22 +43,23 @@ depends_lib-append port:fftw-3-single \
</span> port:portaudio \
port:stk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-modules-DetectMachine.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-data-lmms.plist.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-data-scripts-create_apple_bundle.sh.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# These are merged to the upstream:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-CMakeLists-use-flags-for-Apple-correctly-6784.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Detect-PowerPC-and-ARM-correctly-6790.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-MidiApple.cpp-fix-getName-to-allow-build-with-GCC-67.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-versioninfo.h-fix-recognizing-archs-and-compiler-679.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# These are fixes, specific to Macports:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0005-Pick-Macports-patches.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/data/scripts/create_apple_bundle.sh.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@DESTROOT@|${destroot}|g" ${worksrcpath}/data/scripts/create_apple_bundle.sh.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/data/scripts/create_apple_bundle.sh.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/cmake/apple/install_apple.sh.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@DESTROOT@|${destroot}|g" ${worksrcpath}/cmake/apple/install_apple.sh.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/apple/install_apple.sh.in
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Apple clang version 1.7 (tags/Apple/clang-77) (based on LLVM 2.9svn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Undefined symbols: "_waveguide_nl_process", referenced from: _runGong in gong_1424.o, _runAddingGong in gong_1424.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -std=gnu89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
# The build system uses CMAKE_INSTALL_PREFIX in a nonstandard way, both by
# writing the Info.plist into it during configure and by attempting to copy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +82,13 @@ configure.args-append -DFLTK_FLUID_EXECUTABLE=${prefix}/bin/fluid \
</span> -DWANT_STK=ON \
-DWANT_VST=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/jackaudio/jack2/issues/950
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} ne "darwin" || ${configure.build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWANT_JACK=OFF -DWANT_JACK=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib -DCMAKE_INSTALL_NAME_DIR=${applications_dir}/LMMS.app/Contents/Frameworks
# The build system only partly honors DESTDIR, such that the destroot fails
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,8 +103,8 @@ post-destroot {
</span> ln -s ${applications_dir}/LMMS.app/Contents/share/man/man1/lmms.1.gz ${destroot}${prefix}/share/man/man1/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cmake/modules/DetectMachine.cmake tries to detect bitness but because the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# build system does not destroot entirely within the destdir, using the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# muniversal portgroup will be complicated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cmake/modules/DetectMachine.cmake tries to detect bitness but because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the build system does not destroot entirely within the destdir, using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the muniversal portgroup will be complicated.
</span> #PortGroup muniversal 1.0
universal_variant no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/0001-CMakeLists-use-flags-for-Apple-correctly-6784.patch b/multimedia/lmms/files/0001-CMakeLists-use-flags-for-Apple-correctly-6784.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7316f36395c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/lmms/files/0001-CMakeLists-use-flags-for-Apple-correctly-6784.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From afaceadce6ebfa2ab1dcc0b1b37bba5523a0c532 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 29 Jul 2023 12:22:32 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/5] CMakeLists: use flags for Apple correctly (#6784)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugins/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git plugins/CMakeLists.txt plugins/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a1196886..64d5c72e2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-std=c++0x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(LMMS_BUILD_APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF(LMMS_BUILD_APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/CMakeLists.txt src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b18fa897e..eda133291 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(LMMS_BUILD_APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF(LMMS_BUILD_APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/0002-Detect-PowerPC-and-ARM-correctly-6790.patch b/multimedia/lmms/files/0002-Detect-PowerPC-and-ARM-correctly-6790.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8c4dcd557a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/lmms/files/0002-Detect-PowerPC-and-ARM-correctly-6790.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,81 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dd70bab7e51dfdf7a93225ae3f3c8292621cb35c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Jul 2023 11:30:38 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/5] Detect PowerPC and ARM correctly (#6790)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/modules/DetectMachine.cmake | 34 +++++++++++++++++++++++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/lmmsconfig.h.in | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 34 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/modules/DetectMachine.cmake cmake/modules/DetectMachine.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c764b5507..a7acba89f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/DetectMachine.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/DetectMachine.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,21 +26,47 @@ IF(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(IS_X86 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(WIN64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Detect target architecture based on compiler target triple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXEC_PROGRAM( ${CMAKE_C_COMPILER} ARGS "-dumpmachine ${CMAKE_C_FLAGS}" OUTPUT_VARIABLE Machine )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE("Machine: ${Machine}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REGEX MATCH "i.86" IS_X86 "${Machine}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REGEX MATCH "86_64|amd64" IS_X86_64 "${Machine}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(Machine MATCHES "arm|aarch64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(Machine MATCHES "arm64|aarch64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(IS_ARM64 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(IS_ARM32 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSEIF(Machine MATCHES "ppc|powerpc")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(Machine MATCHES "ppc64|powerpc64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(IS_PPC64 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(IS_PPC32 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(IS_X86)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE("-- Target host is 32 bit")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE("-- Target host is 32 bit, Intel")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(LMMS_HOST_X86 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSEIF(IS_X86_64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE("-- Target host is 64 bit")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE("-- Target host is 64 bit, Intel")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(LMMS_HOST_X86_64 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSE(IS_X86)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSEIF(IS_ARM32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE("-- Target host is 32 bit, ARM")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(LMMS_HOST_ARM32 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSEIF(IS_ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE("-- Target host is 64 bit, ARM")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(LMMS_HOST_ARM64 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSEIF(IS_PPC32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE("-- Target host is 32 bit, PPC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(LMMS_HOST_PPC32 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSEIF(IS_PPC64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE("-- Target host is 64 bit, PPC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(LMMS_HOST_PPC64 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE("Can't identify target host. Assuming 32 bit platform.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF(IS_X86)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(CMAKE_INSTALL_LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/lmmsconfig.h.in src/lmmsconfig.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7e37be8bd..8cd7320e5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lmmsconfig.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lmmsconfig.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +8,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine LMMS_HOST_X86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine LMMS_HOST_X86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine LMMS_HOST_ARM32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine LMMS_HOST_ARM64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine LMMS_HOST_PPC32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine LMMS_HOST_PPC64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine LMMS_HAVE_ALSA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine LMMS_HAVE_FLUIDSYNTH
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/0003-MidiApple.cpp-fix-getName-to-allow-build-with-GCC-67.patch b/multimedia/lmms/files/0003-MidiApple.cpp-fix-getName-to-allow-build-with-GCC-67.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e0f4e7397b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/lmms/files/0003-MidiApple.cpp-fix-getName-to-allow-build-with-GCC-67.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d87917cdc9d4777784a643163cbd5f264079c9b6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Jul 2023 12:38:35 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/5] MidiApple.cpp: fix getName to allow build with GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (#6791)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: https://github.com/LMMS/lmms/issues/6785
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/core/midi/MidiApple.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/core/midi/MidiApple.cpp src/core/midi/MidiApple.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f4bc0d4dd..3d34de2fe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/midi/MidiApple.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/midi/MidiApple.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -398,7 +398,7 @@ void MidiApple::midiInClose( MIDIEndpointRef reference )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *getName( MIDIObjectRef &object )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char *getName( const MIDIObjectRef &object )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Returns the name of a given MIDIObjectRef as char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFStringRef name = nil;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/0004-versioninfo.h-fix-recognizing-archs-and-compiler-679.patch b/multimedia/lmms/files/0004-versioninfo.h-fix-recognizing-archs-and-compiler-679.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..df122d61e22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/lmms/files/0004-versioninfo.h-fix-recognizing-archs-and-compiler-679.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7700916eaeb1624dd7b639e2f85c7de62dca1571 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 2 Aug 2023 21:02:39 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4/5] versioninfo.h: fix recognizing archs and compiler (#6794)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/versioninfo.h | 24 +++++++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 23 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git include/versioninfo.h include/versioninfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 664fc80e6..61a9dc356 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/versioninfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/versioninfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GCC_VERSION "GCC " __VERSION__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GCC_VERSION "Clang " __clang_version__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GCC_VERSION "unknown compiler"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +14,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MACHINE "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef LMMS_HOST_ARM32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MACHINE "arm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef LMMS_HOST_ARM64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MACHINE "arm64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef LMMS_HOST_PPC32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MACHINE "ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef LMMS_HOST_PPC64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MACHINE "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef MACHINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MACHINE "unknown processor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,3 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LMMS_BUILD_HAIKU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PLATFORM "Haiku"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef PLATFORM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define PLATFORM "unknown platform"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/0005-Pick-Macports-patches.patch b/multimedia/lmms/files/0005-Pick-Macports-patches.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c9955a81d2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/lmms/files/0005-Pick-Macports-patches.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,117 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1ddbb29b9e6c5fefd3029c4b4637c031e10d2176 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Jul 2023 09:55:00 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 5/5] Pick Macports patches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 2 --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/apple/install_apple.sh.in | 28 ++++++----------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/apple/lmms.plist.in | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugins/zynaddsubfx/CMakeLists.txt | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 8 insertions(+), 25 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b56a8c07b..a52125b8d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,8 +72,6 @@ OPTION(BUNDLE_QT_TRANSLATIONS "Install Qt translation files for LMMS" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(LMMS_BUILD_APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Fix linking on 10.14+. See issue #4762 on github
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LINK_DIRECTORIES(/usr/local/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(WANT_SOUNDIO OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(WANT_ALSA OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(WANT_PULSEAUDIO OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/apple/install_apple.sh.in cmake/apple/install_apple.sh.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 259734208..83b26f142 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/apple/install_apple.sh.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/apple/install_apple.sh.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,28 +5,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Debug the loading of dynamic libraries using `export DYLD_PRINT_LIBRARIES=1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # STK rawwaves directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-STK_RAWWAVE=$HOME/stk-*/rawwaves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ ! -d "$STK_RAWWAVE" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STK_RAWWAVE=$(brew --prefix stk)/share/stk/rawwaves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++STK_RAWWAVE=@PREFIX@/share/stk/rawwaves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Place to create ".app" bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-APP="@CMAKE_BINARY_DIR@/@PROJECT_NAME_UCASE@.app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++APP="@DESTROOT@@APPLICATIONS_DIR@/@PROJECT_NAME_UCASE@.app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MSG_COLOR='\x1B[1;36m'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COLOR_RESET='\x1B[0m'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Locate macdeployqt, assume homebrew & Qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-which macdeployqt > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ $? -ne 0 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export PATH=$PATH:$(brew --prefix qt)/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Remove any old .app bundles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rm -Rf "$APP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy/overwrite Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \cp "@CMAKE_BINARY_DIR@/Info.plist" "@CMAKE_INSTALL_PREFIX@/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,11 +21,12 @@ rm -Rf "$APP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p "$APP/Contents/MacOS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p "$APP/Contents/Frameworks"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p "$APP/Contents/Resources"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-mkdir -p "$APP/Contents/share/stk/rawwaves"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mkdir -p "$APP/Contents/share/stk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "@CMAKE_INSTALL_PREFIX@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -R * "$APP/Contents"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp "@CMAKE_SOURCE_DIR@/cmake/apple/"*.icns "$APP/Contents/Resources/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cp $STK_RAWWAVE/*.raw "$APP/Contents/share/stk/rawwaves" > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Symlink STK rawwaves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ln -s ${STK_RAWWAVE} ${APP}/Contents/share/stk/rawwaves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make all libraries writable for macdeployqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "$APP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,9 +79,6 @@ for file in "$APP/Contents/lib/lmms/ladspa/"*.so; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _executables="${_executables} -executable=$_thisfile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Finalize .app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-macdeployqt "$APP" $_executables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Carla is a standalone plugin. Remove library, look for it side-by-side LMMS.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This MUST be done AFTER calling macdeployqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,6 +100,5 @@ for file in "$APP/Contents/lib/lmms/"libcarla*; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Cleanup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rm -rf "$APP/Contents/bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++exit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo -e "\nFinished.\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/apple/lmms.plist.in cmake/apple/lmms.plist.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 88fe0b0bf..63fd0e0d1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/apple/lmms.plist.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/apple/lmms.plist.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,7 +13,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>APPL</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleGetInfoString</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@ @MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>@MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <!--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #############################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git plugins/zynaddsubfx/CMakeLists.txt plugins/zynaddsubfx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4c170a987..cc1e63345 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/zynaddsubfx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/zynaddsubfx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE(BuildPlugin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # definitions for ZynAddSubFX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/patch-CMakeLists.txt.diff b/multimedia/lmms/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a2e3d63c9c8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/lmms/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2015-03-07 20:47:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2015-05-07 00:33:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,8 +52,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(WANT_VST OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(STATUS_ALSA "<not supported on this platform>")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(STATUS_PULSEAUDIO "<not supported on this platform>")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # MacPorts: /opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LINK_DIRECTORIES(${LINK_DIRECTORIES} /opt/local/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(LMMS_BUILD_APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/patch-cmake-modules-DetectMachine.cmake.diff b/multimedia/lmms/files/patch-cmake-modules-DetectMachine.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ef3e1c5c9e2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/lmms/files/patch-cmake-modules-DetectMachine.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/modules/DetectMachine.cmake.orig 2015-03-07 20:47:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/modules/DetectMachine.cmake 2015-05-11 10:32:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(IS_X86 TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(WIN64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXEC_PROGRAM( ${CMAKE_C_COMPILER} ARGS "-dumpmachine" OUTPUT_VARIABLE Machine )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXEC_PROGRAM( ${CMAKE_C_COMPILER} ARGS "-dumpmachine ${CMAKE_C_FLAGS}" OUTPUT_VARIABLE Machine )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE("Machine: ${Machine}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRING(REGEX MATCH "i.86" IS_X86 "${Machine}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRING(REGEX MATCH "86_64" IS_X86_64 "${Machine}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/patch-data-lmms.plist.in.diff b/multimedia/lmms/files/patch-data-lmms.plist.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3b68ec9f621..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/lmms/files/patch-data-lmms.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- data/lmms.plist.in.orig 2015-03-07 20:47:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ data/lmms.plist.in 2015-05-08 05:17:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,7 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>APPL</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleGetInfoString</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@ @MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #############################################################
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/patch-data-scripts-create_apple_bundle.sh.in.diff b/multimedia/lmms/files/patch-data-scripts-create_apple_bundle.sh.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 649c71d7586..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/lmms/files/patch-data-scripts-create_apple_bundle.sh.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- data/scripts/create_apple_bundle.sh.in.orig 2015-03-07 20:47:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ data/scripts/create_apple_bundle.sh.in 2015-05-08 04:49:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #=========================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts Location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MACPORTS=/opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MACPORTS=@PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LMMS project root directory (extracted source)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_SRC=@CMAKE_SOURCE_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,10 +23,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_BUILD=$(cd @CMAKE_CURRENT_BINARY_DIR@/../..; pwd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # STK rawwaves directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STK_RAWWAVE=${HOME}/stk-*/rawwaves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STK_RAWWAVE=@PREFIX@/share/stk/rawwaves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Place to create ".app" bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--APP=${HOME}/Desktop/LMMS.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+APP=@DESTROOT@@APPLICATIONS_DIR@/LMMS.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts installs libreadline with wrong permissions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBREADLINE=${MACPORTS}/lib/libreadline.6.2.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,9 +63,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir ${APP}/Contents
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -R * ${APP}/Contents
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Manually copy STK rawwaves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--mkdir -p ${APP}/Contents/share/stk/rawwaves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cp ${STK_RAWWAVE}/*.raw ${APP}/Contents/share/stk/rawwaves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Symlink STK rawwaves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+mkdir -p ${APP}/Contents/share/stk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ln -s ${STK_RAWWAVE} ${APP}/Contents/share/stk/rawwaves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make all libraries writable for macdeployqt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd ${APP}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,11 +107,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _executables="${_executables} -executable=${APP}/Contents/MacOS/RemoteZynAddSubFx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _executables="${_executables} -executable=${APP}/Contents/Frameworks/libZynAddSubFxCore.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Build our App Package using "macdeployqt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--macdeployqt ${APP} $_executables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OS X Specific Artwork
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+mkdir -p ${APP}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp ${CMAKE_SRC}/data/*.icns ${APP}/Contents/Resources/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+exit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Done. Ready to build DMG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -e "\nFinished.\n\nYou may run LMMS from the Desktop."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff b/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6b342b3791f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/lmms/files/patch-plugins-zynaddsubfx-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/zynaddsubfx/CMakeLists.txt.orig 2014-03-23 18:00:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/zynaddsubfx/CMakeLists.txt 2014-03-25 15:46:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/BankUI.cc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # definitions for ZynAddSubFX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
</span></pre><pre style='margin:0'>
</pre>