diff --git a/media-libs/libopenmpt/libopenmpt-0.4.6.recipe b/media-libs/libopenmpt/libopenmpt-0.4.10.recipe similarity index 95% rename from media-libs/libopenmpt/libopenmpt-0.4.6.recipe rename to media-libs/libopenmpt/libopenmpt-0.4.10.recipe index 65b6c9c18..7980a0f05 100644 --- a/media-libs/libopenmpt/libopenmpt-0.4.6.recipe +++ b/media-libs/libopenmpt/libopenmpt-0.4.10.recipe @@ -8,9 +8,8 @@ COPYRIGHT="2004-2019 OpenMPT contributors LICENSE="BSD (3-clause)" REVISION="1" 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" -PATCHES="libopenmpt-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 x86" diff --git a/media-libs/libopenmpt/patches/libopenmpt-0.4.6.patchset b/media-libs/libopenmpt/patches/libopenmpt-0.4.6.patchset deleted file mode 100644 index 03fd70a27..000000000 --- a/media-libs/libopenmpt/patches/libopenmpt-0.4.6.patchset +++ /dev/null @@ -1,41 +0,0 @@ -From d5d848d10ba580ec47879915780a1fb8d17068c3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -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 -