libmikmod: bump version.

* remove upstreamed patch and old version recipe.
This commit is contained in:
Jerome Duval
2015-11-23 19:28:51 +00:00
parent 057a3b6275
commit c22fd25f1f
4 changed files with 2 additions and 4455 deletions

View File

@@ -1,65 +0,0 @@
SUMMARY="A library for playing MOD files"
DESCRIPTION="libmikmod is a library supporting many formats, including mod, \
s3m, it, and xm."
HOMEPAGE="http://mikmod.sourceforge.net"
COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, \
Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.1.14/libmikmod-3.1.14.tar.gz"
CHECKSUM_SHA256="fd78b67a74c802fee9040cd1f53d629beb985933585dd7d2f3bc69b069b321cd"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
libmikmod = $portVersion compat >= 3.1
lib:libmikmod = 2.0.5 compat >= 2
"
REQUIRES="
haiku
"
PROVIDES_devel="
libmikmod_devel = $portVersion
cmd:libmikmod_config
devel:libmikmod = 2.0.5 compat >= 0
"
REQUIRES_devel="
libmikmod == $portVersion base
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:ld
cmd:libtool
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:make
"
BUILD()
{
libtoolize --force --copy --install
aclocal --install -I m4
autoconf
automake --add-missing
runConfigure ./configure
make
}
INSTALL()
{
make install
prepareInstalledDevelLibs libmikmod
fixPkgconfig
# devel package
packageEntries devel \
$developDir $binDir/libmikmod-config \
$dataDir
}

View File

@@ -6,8 +6,8 @@ McIntyre, Peter Amstutz, and Miodrag Vallat."
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/$portVersion/libmikmod-$portVersion.tar.gz"
CHECKSUM_SHA256="4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2"
PATCHES="libmikmod-$portVersion.patchset"
CHECKSUM_SHA256="4acf6634a477d8b95f18b55a3e2e76052c149e690d202484e8b0ac7589cf37a2"
#PATCHES="libmikmod-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"

File diff suppressed because it is too large Load Diff

View File

@@ -1,41 +0,0 @@
From d5e9bbbf31af28e94806ad9ecfe8547d459abceb Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 7 Aug 2015 13:31:37 +0000
Subject: Haiku patch
diff --git a/configure.ac b/configure.ac
index 79a4fd2..f15c532 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ libmikmod_openbsd=no
libmikmod_os2=no
libmikmod_djgpp=no
libmikmod_amiga=no
+libmikmod_haiku=no
case $host_os in
mingw*) libmikmod_mingw=yes ;;
@@ -56,6 +57,7 @@ case $host_os in
*djgpp) libmikmod_djgpp=yes ;;
amigaos*|aros*|morphos*)
libmikmod_amiga=yes ;;
+ haiku*) libmikmod_haiku=yes ;;
esac
# ==============================================================
@@ -508,9 +510,9 @@ then
CFLAGS=$ac_save_CFLAGS
)
if test $libmikmod_cv_gcc_pthread = yes; then
- dnl There is no need for -pthread on darwin, and gcc
+ dnl There is no need for -pthread on darwin or haiku, and gcc
dnl complains about unrecognized option -pthread
- if test $libmikmod_darwin = no; then
+ if test $libmikmod_darwin = no && test $libmikmod_haiku = no; then
libmikmod_threads=""
CFLAGS="$CFLAGS -pthread"
fi
--
1.8.3.4