lmms: use Qt5

This commit is contained in:
Sergei Reznikov
2017-11-14 10:57:25 +03:00
parent 9d6b017fd7
commit 94b1441c98
2 changed files with 13 additions and 79 deletions

View File

@@ -6,16 +6,16 @@ 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.io/"
COPYRIGHT="2004-2014 Tobias Doerffel et al."
COPYRIGHT="2004-2017 Tobias Doerffel et al."
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/LMMS/lmms/archive/v${portVersion/\~/-}.tar.gz"
CHECKSUM_SHA256="031c7d599101ac26f39f1cc3b0dfa856713c99731117eb5d72431726f51b10bb"
CHECKSUM_SHA256="ce6938b95e0c2af63b68c40180036b08c54127fba21737f2cd904aa67a36a00d"
SOURCE_DIR="lmms-${portVersion/\~/-}"
PATCHES="lmms-$portVersion.patchset"
#PATCHES="lmms-$portVersion.patchset"
ADDITIONAL_FILES="LMMS.rdef"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -24,9 +24,10 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libQtCore$secondaryArchSuffix
lib:libQtGui$secondaryArchSuffix
lib:libQtXml$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libsndfile$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisenc$secondaryArchSuffix
@@ -40,7 +41,9 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
libqt4${secondaryArchSuffix}_devel >= 4.8
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libsndfile$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
@@ -59,7 +62,7 @@ BUILD_PREREQUIRES="
BUILD()
{
mkdir -p build && cd build
cmake -DCMAKE_INSTALL_PREFIX=$appsDir/LMMS/ -Wno-dev -GNinja ..
cmake -DCMAKE_INSTALL_PREFIX=$appsDir/LMMS/ -DWANT_QT5=ON -Wno-dev -GNinja ..
ninja $jobArgs
}

View File

@@ -1,69 +0,0 @@
From 5be8656af750936fb4ce045f5288a3540e4e5f02 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 16 Mar 2015 17:50:12 -0400
Subject: Allow running as root on Haiku.
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 1d2c657..ae6ea74 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -251,7 +251,7 @@ int main( int argc, char * * argv )
}
}
-#ifndef LMMS_BUILD_WIN32
+#if !defined(LMMS_BUILD_WIN32) && !defined(__HAIKU__)
if ( ( getuid() == 0 || geteuid() == 0 ) && !allowRoot )
{
printf( "LMMS cannot be run as root.\nUse \"--allowroot\" to override.\n\n" );
--
2.10.2
From 710199648563fb32b1ba3fc142ca65c2654bf816 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 4 Mar 2017 12:10:55 +0100
Subject: include unistd.h for ::read and ::write.
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index e3beef8..eace532 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -94,6 +94,7 @@ typedef int32_t key_t;
#ifndef SYNC_WITH_SHM_FIFO
#include <poll.h>
+#include <unistd.h>
#endif
#endif
--
2.10.2
From fb0a85393a728970880fbc22c19c629ab0197b36 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 4 Mar 2017 13:06:59 +0100
Subject: Link libnetwork on Haiku
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 563d240..b44e321 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,6 +118,10 @@ if(LMMS_HAVE_OSS AND LMMS_BUILD_OPENBSD)
SET(EXTRA_LIBRARIES "-lossaudio")
endif()
+IF(LMMS_BUILD_HAIKU)
+ SET(EXTRA_LIBRARIES "-lnetwork")
+ENDIF()
+
SET(LMMS_REQUIRED_LIBS
${CMAKE_THREAD_LIBS_INIT}
${QT_LIBRARIES}
--
2.10.2