From 02237f08437106a4fa44bb075adfec73b18b7c03 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 5 Jan 2013 21:46:43 +0000 Subject: [PATCH] Few more fixes to fluidsynth-1-1.6 bep, and added initial patch for 1.1.6, untested. --- media-sound/fluidsynth/fluidsynth-1.1.6.bep | 23 ++++++++++++ .../fluidsynth/patches/fluidsynth-1.1.6.patch | 35 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 media-sound/fluidsynth/fluidsynth-1.1.6.bep create mode 100644 media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.bep b/media-sound/fluidsynth/fluidsynth-1.1.6.bep new file mode 100644 index 000000000..86ea54247 --- /dev/null +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.bep @@ -0,0 +1,23 @@ +DESCRIPTION="Fluidsynth is a software real-time synthesizer based on the Soundfont 2 specifications." +HOMEPAGE="http://www.fluidsynth.org/" +SRC_URI="http://sourceforge.net/projects/fluidsynth/files/fluidsynth-1.1.6/fluidsynth-1.1.6.tar.bz2/download" +CHECKSUM_MD5="f6e696690e989098f70641364fdffad7" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/glib >= 2.26.1 + media-libs/libsndfile >= 1.0.21 + sys-libs/readline >= 6.0" + +BUILD { + cd fluidsynth-1.1.6 + cmake . + make +} + +INSTALL { + cd fluidsynth-1.1.6 + make install prefix=`finddir B_COMMON_DIRECTORY` +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson" diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch new file mode 100644 index 000000000..d37506392 --- /dev/null +++ b/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch @@ -0,0 +1,35 @@ +diff -urN fluidsynth-1.1.6/CMakeLists.txt fluidsynth-1.1.6-haiku/CMakeLists.txt +--- fluidsynth-1.1.6/CMakeLists.txt ++++ fluidsynth-1.1.6/haiku/CMakeLists.txt +@@ -168,9 +168,16 @@ + endif ( MINGW ) + else ( WIN32 ) + # Check PThreads, but not in Windows +- find_package ( Pthreads REQUIRED ) +- set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) +- set ( LIBFLUID_LIBS "m" ) ++if (UNIX AND NOT HAIKU) ++# Check PThreads, but not in Windows ++ find_package ( Pthreads REQUIRED ) ++ set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) ++ set ( LIBFLUID_LIBS "m" ) ++endif (UNIX AND NOT HAIKU) ++ ++if (HAIKU) ++set ( LIBFLUID_LIBS "network") ++endif (HAIKU) + endif ( WIN32 ) + + # IBM OS/2 +diff -Naur fluidsynth-1.1.6/src/utils/fluid_sys.h fluidsynth-1.1.3-haiku/src/utils/fluid_sys.h +--- fluidsynth-1.1.6/src/utils/fluid_sys.h ++++ fluidsynth-1.1.6-haiku/src/utils/fluid_sys.h +@@ -335,7 +335,7 @@ + sample data. + */ + +-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) ++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__) + #define fluid_mlock(_p,_n) mlock(_p, _n) + #define fluid_munlock(_p,_n) munlock(_p,_n) + #else