diff --git a/media-sound/lmms/lmms-1.2.0_git.recipe b/media-sound/lmms/lmms-1.2.0~rc2.recipe similarity index 87% rename from media-sound/lmms/lmms-1.2.0_git.recipe rename to media-sound/lmms/lmms-1.2.0~rc2.recipe index a8aa578e7..2dca81350 100644 --- a/media-sound/lmms/lmms-1.2.0_git.recipe +++ b/media-sound/lmms/lmms-1.2.0~rc2.recipe @@ -8,11 +8,11 @@ interface." HOMEPAGE="http://lmms.io/" COPYRIGHT="2004-2014 Tobias Doerffel et al." LICENSE="GNU GPL v2" -REVISION="3" -SOURCE_URI="https://github.com/LMMS/lmms/archive/07e422c66defdde88b3a8686ae1f0e6011fe387f.tar.gz" -CHECKSUM_SHA256="4a55299cf388c06d996e152353b1898cab457597d10cbbc77ce97777ae516d29" -SOURCE_DIR="lmms-07e422c66defdde88b3a8686ae1f0e6011fe387f" -PATCHES="lmms-1.2.0.patch" +REVISION="1" +SOURCE_URI="https://github.com/LMMS/lmms/archive/v${portVersion/\~/-}.tar.gz" +CHECKSUM_SHA256="031c7d599101ac26f39f1cc3b0dfa856713c99731117eb5d72431726f51b10bb" +SOURCE_DIR="lmms-${portVersion/\~/-}" +PATCHES="lmms-$portVersion.patchset" ADDITIONAL_FILES="LMMS.rdef" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/media-sound/lmms/patches/lmms-1.2.0.patch b/media-sound/lmms/patches/lmms-1.2.0.patch deleted file mode 100644 index 925e5f213..000000000 --- a/media-sound/lmms/patches/lmms-1.2.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 818d2a84a9ec2d73a082585578b8b46ad4d1dd47 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Mon, 16 Mar 2015 17:50:12 -0400 -Subject: [PATCH] Allow running as root on Haiku. - ---- - src/core/main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/main.cpp b/src/core/main.cpp -index 5313811..73c031b 100644 ---- a/src/core/main.cpp -+++ b/src/core/main.cpp -@@ -142,7 +142,7 @@ int main( int argc, char * * argv ) - } - } - --#ifndef LMMS_BUILD_WIN32 -+#if !defined(LMMS_BUILD_WIN32) && !defined(__HAIKU__) - if ( ( getuid() == 0 || geteuid() == 0 ) && !allow_root ) - { - printf("LMMS cannot be run as root.\nUse \"--allowroot\" to override.\n\n"); --- -2.2.2 - diff --git a/media-sound/lmms/patches/lmms-1.2.0~rc2.patchset b/media-sound/lmms/patches/lmms-1.2.0~rc2.patchset new file mode 100644 index 000000000..32cf3758f --- /dev/null +++ b/media-sound/lmms/patches/lmms-1.2.0~rc2.patchset @@ -0,0 +1,69 @@ +From 5be8656af750936fb4ce045f5288a3540e4e5f02 Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +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 +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 ++#include + #endif + + #endif +-- +2.10.2 + + +From fb0a85393a728970880fbc22c19c629ab0197b36 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 +