From ac03b663f33ecf508d7b310cc76db2925bb57822 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 2 Sep 2014 21:44:02 +0200 Subject: [PATCH] libmodplug: dependency fixup + strings.h fix. --- .../libmodplug/libmodplug-0.8.8.4.recipe | 10 ++++++++- .../patches/libmodplug-0.8.8.4.patchset | 21 +++++++++++++++++++ .../patches/libmodplug_x86-0.8.8.4.patchset | 21 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 media-libs/libmodplug/patches/libmodplug-0.8.8.4.patchset create mode 100644 media-libs/libmodplug/patches/libmodplug_x86-0.8.8.4.patchset diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe index 7716782ae..046ea6871 100644 --- a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe +++ b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe @@ -27,11 +27,12 @@ Plays all types of MIDI files (*.mid): HOMEPAGE="http://modplug-xmms.sourceforge.net" SRC_URI="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.4/libmodplug-0.8.8.4.tar.gz" CHECKSUM_SHA256="5c5ee13dddbed144be26276e5f102da17ff5b1c992f3100389983082da2264f7" +PATCHES="libmodplug-$portVersion.patchset" LICENSE="Public Domain" COPYRIGHT="Public Domain" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -42,6 +43,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" " @@ -79,6 +82,11 @@ INSTALL() $developDir } +TEST() +{ + make check +} + # ----- devel package ------------------------------------------------------- PROVIDES_devel=" diff --git a/media-libs/libmodplug/patches/libmodplug-0.8.8.4.patchset b/media-libs/libmodplug/patches/libmodplug-0.8.8.4.patchset new file mode 100644 index 000000000..347c282d7 --- /dev/null +++ b/media-libs/libmodplug/patches/libmodplug-0.8.8.4.patchset @@ -0,0 +1,21 @@ +From 48531f8341980cd59fc5e5e4bbe67e85c645efb4 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 2 Sep 2014 21:44:34 +0200 +Subject: strings.h fix. + + +diff --git a/src/libmodplug/stdafx.h b/src/libmodplug/stdafx.h +index 0330170..eb250dd 100644 +--- a/src/libmodplug/stdafx.h ++++ b/src/libmodplug/stdafx.h +@@ -53,6 +53,7 @@ inline void ProcessPlugins(int n) {} + #include + #include + #include ++#include + #ifdef HAVE_MALLOC_H + #include + #endif +-- +1.8.3.4 + diff --git a/media-libs/libmodplug/patches/libmodplug_x86-0.8.8.4.patchset b/media-libs/libmodplug/patches/libmodplug_x86-0.8.8.4.patchset new file mode 100644 index 000000000..347c282d7 --- /dev/null +++ b/media-libs/libmodplug/patches/libmodplug_x86-0.8.8.4.patchset @@ -0,0 +1,21 @@ +From 48531f8341980cd59fc5e5e4bbe67e85c645efb4 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 2 Sep 2014 21:44:34 +0200 +Subject: strings.h fix. + + +diff --git a/src/libmodplug/stdafx.h b/src/libmodplug/stdafx.h +index 0330170..eb250dd 100644 +--- a/src/libmodplug/stdafx.h ++++ b/src/libmodplug/stdafx.h +@@ -53,6 +53,7 @@ inline void ProcessPlugins(int n) {} + #include + #include + #include ++#include + #ifdef HAVE_MALLOC_H + #include + #endif +-- +1.8.3.4 +