From 36c7631b582975ace887b17d5f1a667192373315 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 17 Nov 2014 18:26:06 +0000 Subject: [PATCH] libmodplug: bump version * add pkgconfig dependency * the soname is now 1.0.0. --- ...8.8.4.recipe => libmodplug-0.8.8.5.recipe} | 44 ++++++------------- ...4.patchset => libmodplug-0.8.8.5.patchset} | 0 .../patches/libmodplug_x86-0.8.8.4.patchset | 21 --------- 3 files changed, 14 insertions(+), 51 deletions(-) rename media-libs/libmodplug/{libmodplug-0.8.8.4.recipe => libmodplug-0.8.8.5.recipe} (52%) rename media-libs/libmodplug/patches/{libmodplug-0.8.8.4.patchset => libmodplug-0.8.8.5.patchset} (100%) delete 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.5.recipe similarity index 52% rename from media-libs/libmodplug/libmodplug-0.8.8.4.recipe rename to media-libs/libmodplug/libmodplug-0.8.8.5.recipe index 046ea6871..4f2cc88d4 100644 --- a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe +++ b/media-libs/libmodplug/libmodplug-0.8.8.5.recipe @@ -3,49 +3,32 @@ DESCRIPTION=" Olivier Lapicque, author of Modplug, which is arguably the best quality \ MOD-playing software available, has placed his sound rendering code in the \ public domain. This library and plugin is based on that code. -Plays 22 different mod formats, including: -- MOD, S3M, XM, IT, 669, AMF (both of them), AMS, DBM, DMF, DSM, FAR, MDL, \ -MED, MTM, OKT, PTM, STM, ULT, UMX, MT2, PSM -Plays zip, rar, gzip, and bzip2 compressed mods. The following extensions are \ -recognized: -- zip: MDZ, S3Z, XMZ, ITZ -- rar: MDR, S3R, XMR, ITR -- gzip: MDGZ, S3GZ, XMGZ, ITGZ -- You can also load plain old ZIP, RAR, and GZ files. If ModPlug finds a mod \ -in them, it will play it. -- Note: To play these formats, you need to have the associated decompression \ -utilities (unzip, gunzip, unrar) installed. -- Note(2): The format of the mod is NOT determined from the extension on \ -compressed mods. For example, if you zipped a UMX mod and gave it the \ -extension MDZ, it would work fine. -Plays timidity's GUS patch files (*.pat): -- a multi sample pat file with n samples can be played with a Frere Jacques \ -canon with n voices. -Plays all types of MIDI files (*.mid): -- uses the timidity .pat files for samples (when available) +Plays 22 different mod formats, zip, rar, gzip, and bzip2 compressed mods. " 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" +SRC_URI="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/$portVersion/libmodplug-$portVersion.tar.gz" +CHECKSUM_SHA256="77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad" PATCHES="libmodplug-$portVersion.patchset" - LICENSE="Public Domain" COPYRIGHT="Public Domain" - -REVISION="2" - -ARCHITECTURES="x86_gcc2 x86" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libmodplug$secondaryArchSuffix = $portVersion - lib:libmodplug$secondaryArchSuffix = 0.8.0 compat >= 0 + lib:libmodplug$secondaryArchSuffix = 1.0.0 compat >= 1 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libstdc++$secondaryArchSuffix - lib:libgcc_s$secondaryArchSuffix " +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + REQUIRES+=" + lib:libgcc_s$secondaryArchSuffix + " +fi + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" @@ -57,6 +40,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make + cmd:pkg_config$secondaryArchSuffix " BUILD() @@ -91,7 +75,7 @@ TEST() PROVIDES_devel=" libmodplug${secondaryArchSuffix}_devel = $portVersion - devel:libmodplug$secondaryArchSuffix = 0.8.0 compat >= 0 + devel:libmodplug$secondaryArchSuffix = 1.0.0 compat >= 1 " REQUIRES_devel=" libmodplug$secondaryArchSuffix == $portVersion diff --git a/media-libs/libmodplug/patches/libmodplug-0.8.8.4.patchset b/media-libs/libmodplug/patches/libmodplug-0.8.8.5.patchset similarity index 100% rename from media-libs/libmodplug/patches/libmodplug-0.8.8.4.patchset rename to media-libs/libmodplug/patches/libmodplug-0.8.8.5.patchset 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 deleted file mode 100644 index 347c282d7..000000000 --- a/media-libs/libmodplug/patches/libmodplug_x86-0.8.8.4.patchset +++ /dev/null @@ -1,21 +0,0 @@ -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 -