diff --git a/srcpkgs/lmms/patches/cross.patch b/srcpkgs/lmms/patches/cross.patch new file mode 100644 index 0000000000..96625e27e3 --- /dev/null +++ b/srcpkgs/lmms/patches/cross.patch @@ -0,0 +1,28 @@ +--- CMakeLists.txt 2017-12-19 18:24:15.000000000 +0100 ++++ - 2018-03-26 13:34:55.333893020 +0200 +@@ -498,12 +498,12 @@ + LIST(SORT LMMS_INCLUDES) + + # embedded resources stuff +-IF(WIN32 OR WIN64) ++IF(WIN32 OR WIN64 OR CMAKE_CROSSCOMPILING) + # compile buildtools native + SET(BIN2RES_CPP "${CMAKE_SOURCE_DIR}/buildtools/bin2res.cpp") + SET(BIN2RES "${CMAKE_BINARY_DIR}/bin2res") + ADD_CUSTOM_TARGET(bin2res COMMAND g++ "\"${BIN2RES_CPP}\"" -o "\"${BIN2RES}\"" DEPENDS "${BIN2RES_CPP}") +-ELSE(WIN32 OR WIN64) ++ELSE(WIN32 OR WIN64 OR CMAKE_CROSSCOMPILING) + ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp) + GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION) + ENDIF(WIN32 OR WIN64) +--- CMakeLists.txt 2018-03-26 13:35:11.477353707 +0200 ++++ - 2018-03-26 13:36:43.608724836 +0200 +@@ -506,7 +506,7 @@ + ELSE(WIN32 OR WIN64 OR CMAKE_CROSSCOMPILING) + ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp) + GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION) +-ENDIF(WIN32 OR WIN64) ++ENDIF(WIN32 OR WIN64 OR CMAKE_CROSSCOMPILING) + + # we somehow have to make LMMS-binary depend on MOC-files + ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h") diff --git a/srcpkgs/lmms/patches/ecm.patch b/srcpkgs/lmms/patches/ecm.patch new file mode 100644 index 0000000000..c4d0ea7916 --- /dev/null +++ b/srcpkgs/lmms/patches/ecm.patch @@ -0,0 +1,11 @@ +--- src/3rdparty/qt5-x11embed/CMakeLists.txt 2017-11-06 19:24:12.000000000 +0100 ++++ - 2018-03-24 12:39:30.109268924 +0100 +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) + project(qt5-x11embed) + +-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ECM/find-modules") ++list(APPEND CMAKE_MODULE_PATH "/usr/share/ECM/find-modules") + + find_package(Qt5Core COMPONENTS Private REQUIRED) + find_package(Qt5Widgets COMPONENTS Private REQUIRED) diff --git a/srcpkgs/lmms/patches/musl.patch b/srcpkgs/lmms/patches/musl.patch new file mode 100644 index 0000000000..91dd3c1cb9 --- /dev/null +++ b/srcpkgs/lmms/patches/musl.patch @@ -0,0 +1,11 @@ +--- include/lmms_math.h 2017-12-19 18:24:15.000000000 +0100 ++++ - 2018-03-24 13:02:25.850664825 +0100 +@@ -34,7 +34,7 @@ + #include + using namespace std; + +-#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__) ++#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__) || !defined(__GLIBC__) + #ifndef isnanf + #define isnanf(x) isnan(x) + #endif diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index f2883e5843..e9397e04a7 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -1,22 +1,34 @@ # Template file for 'lmms' pkgname=lmms -version=1.2.0rc4 +version=1.2.0rc5 revision=1 wrksrc="lmms-${version/r/-r}" +_x11embed_commit=022b39a1d496d72eb3e5b5188e5559f66afca957 +_rpmalloc_commit=2e0479192b8dfb15e0084969fdf06208cffbfd09 build_style=cmake configure_args="-DWANT_QT5=ON" -only_for_archs="x86_64 i686" -nocross=yes -hostmakedepends="pkg-config qt5-tools" +hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules" #missing optional depend libstk for STK instruments plugins -makedepends="qt5-devel libsndfile-devel fftw-devel libsamplerate-devel - fltk-devel jack-devel SDL_sound-devel portaudio-devel fluidsynth-devel - freetype-devel ladspa-sdk lame-devel libXft-devel libXinerama-devel - redland-devel" +makedepends="SDL_sound-devel fltk-devel fluidsynth-devel jack-devel ladspa-sdk + lame-devel libsamplerate-devel portaudio-devel qt5-tools-devel + qt5-x11extras-devel redland-devel xcb-util-devel xcb-util-keysyms-devel" depends="desktop-file-utils" short_desc="Cross-platform music production software" maintainer="Logen K. " -license="GPL-2" +license="GPL-2-or-later" homepage="https://lmms.io/" -distfiles="https://github.com/LMMS/lmms/archive/v${version/r/-r}.tar.gz" -checksum=ce6938b95e0c2af63b68c40180036b08c54127fba21737f2cd904aa67a36a00d +distfiles="https://github.com/LMMS/lmms/archive/v${version/r/-r}.tar.gz + https://github.com/Lukas-W/qt5-x11embed/archive/${_x11embed_commit}.tar.gz + https://github.com/rampantpixels/rpmalloc/archive/${_rpmalloc_commit}.tar.gz" +checksum="2cdf8c50f1e3a6d1c2158e52dac831ceef2984d8f997876fd448b66d4689f9cc + 06159c71a5eeba5662bfb309d215e733f310c2699c8c1de83297d32d13a510bc + d7291aedec6abfc7bcac6106b3b9e24f8b3b225c0bf986fb0d8e8517af611625" + +case $XBPS_TARGET_MACHINE in + armv6*) broken="https://travis-ci.org/voidlinux/void-packages/jobs/358366106";; +esac + +post_extract() { + mv ${wrksrc}/../qt5-x11embed-${_x11embed_commit}/* src/3rdparty/qt5-x11embed + mv ${wrksrc}/../rpmalloc-${_rpmalloc_commit}/* src/3rdparty/rpmalloc/rpmalloc +}