haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibOpenMPT: bump, remove unneeded cruft, patches upstreamed (#4434)

Browse Source 
* readd necessary stuff
This commit is contained in:
miqlas
2019-12-08 17:38:42 +01:00
committed by Jérôme Duval
parent 87124b5bdb
commit 7ace008c10
2 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media-libs/libopenmpt/libopenmpt-0.4.6.recipe → media-libs/libopenmpt/libopenmpt-0.4.10.recipe
View File

@@ -8,9 +8,8 @@ COPYRIGHT="2004-2019 OpenMPT contributors
LICENSE="BSD (3-clause)" LICENSE="BSD (3-clause)"
REVISION="1" REVISION="1"
SOURCE_URI="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$portVersion+release.autotools.tar.gz" SOURCE_URI="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$portVersion+release.autotools.tar.gz"
CHECKSUM_SHA256="fa8f2ff5d9b74c00b3fed5edad2aefdfb79a6cd370bf5ec9894b2121f49fb67e" CHECKSUM_SHA256="6a2804d5491eaa90e4b2d7fb5d68e436113e8c8fd164fc705547bcb23a8f258a"
SOURCE_DIR="libopenmpt-$portVersion+release.autotools" SOURCE_DIR="libopenmpt-$portVersion+release.autotools"
PATCHES="libopenmpt-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 x86 x86_64" ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 x86" SECONDARY_ARCHITECTURES="?x86_gcc2 x86"

41
media-libs/libopenmpt/patches/libopenmpt-0.4.6.patchset
View File

@@ -1,41 +0,0 @@
From d5d848d10ba580ec47879915780a1fb8d17068c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 24 Aug 2019 10:26:19 +0200
Subject: Haiku support
diff --git a/common/CompilerDetect.h b/common/CompilerDetect.h
index 3b3dbec..0259347 100644
--- a/common/CompilerDetect.h
+++ b/common/CompilerDetect.h
@@ -246,6 +246,8 @@
#define MPT_OS_NETBSD 1
#elif defined(__unix__)
#define MPT_OS_GENERIC_UNIX 1
+#elif defined(__HAIKU__)
+ #define MPT_OS_HAIKU 1
#else
#define MPT_OS_UNKNOWN 1
#endif
@@ -286,6 +288,9 @@
#ifndef MPT_OS_GENERIC_UNIX
#define MPT_OS_GENERIC_UNIX 0
#endif
+#ifndef MPT_OS_HAIKU
+#define MPT_OS_HAIKU 0
+#endif
#ifndef MPT_OS_UNKNOWN
#define MPT_OS_UNKNOWN 0
#endif
@@ -312,7 +317,7 @@
#endif
#if MPT_CXX_AT_LEAST(17)
-#if MPT_COMPILER_MSVC || MPT_GCC_BEFORE(8,1,0) || MPT_CLANG_BEFORE(5,0,0) || (MPT_COMPILER_GCC && defined(__GLIBCXX__) && (defined(__MINGW32__) || defined(__MINGW64__))) || (MPT_COMPILER_CLANG && defined(__GLIBCXX__)) || (MPT_COMPILER_CLANG && MPT_OS_MACOSX_OR_IOS) || MPT_OS_OPENBSD || MPT_OS_EMSCRIPTEN || (defined(__clang__) && defined(_MSC_VER))
+#if MPT_COMPILER_MSVC || MPT_GCC_BEFORE(8,1,0) || MPT_CLANG_BEFORE(5,0,0) || (MPT_COMPILER_GCC && defined(__GLIBCXX__) && (defined(__MINGW32__) || defined(__MINGW64__))) || (MPT_COMPILER_CLANG && defined(__GLIBCXX__)) || (MPT_COMPILER_CLANG && MPT_OS_MACOSX_OR_IOS) || MPT_OS_OPENBSD || MPT_OS_EMSCRIPTEN || MPT_OS_HAIKU || (defined(__clang__) && defined(_MSC_VER))
#define MPT_COMPILER_QUIRK_NO_ALIGNEDALLOC
#endif
#endif
--
2.23.0