summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz>2015-11-06 11:33:39 +0000
committerwiz <wiz>2015-11-06 11:33:39 +0000
commitcb9fcc0d0dd11462400d67e0d91ad26af29b0f13 (patch)
tree3123477a18077f081a5694677342557b68bf2ba6 /audio
parent9a977c0e9c1b1305b87f4b3f41600d07d3d6e258 (diff)
downloadpkgsrc-cb9fcc0d0dd11462400d67e0d91ad26af29b0f13.tar.gz
Update libopenmpt to 0.2.5705.
libopenmpt 0.2-beta15 (2015-10-31) [Change] openmpt123: SDL2 is now supported and preferred to SDL1 if available. [Bug] Emscripten support for older emscripten versions broke in -beta14. These are now supported again when using make CONFIG=emscripten-old. [Bug] Fixed crashes in MED loader. Playback improvements and loader fixes for MOD, MT2 and MED.
Diffstat (limited to 'audio')
-rw-r--r--audio/libopenmpt/Makefile13
-rw-r--r--audio/libopenmpt/distinfo11
-rw-r--r--audio/libopenmpt/patches/patch-common_Endianness.h16
3 files changed, 27 insertions, 13 deletions
diff --git a/audio/libopenmpt/Makefile b/audio/libopenmpt/Makefile
index 8457a7796b6..8905fed3377 100644
--- a/audio/libopenmpt/Makefile
+++ b/audio/libopenmpt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2015/09/30 20:09:51 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/11/06 11:33:39 wiz Exp $
-DISTNAME= libopenmpt-0.2.5602-beta14-autotools
-PKGNAME= ${DISTNAME:S/-beta/beta/:S/-autotools//}
+DISTNAME= libopenmpt-0.2.5705-beta15-autotools
+PKGNAME= ${DISTNAME:C/-beta.*//}
CATEGORIES= audio
MASTER_SITES= http://lib.openmpt.org/files/libopenmpt/src/
@@ -18,13 +18,10 @@ USE_TOOLS= gmake pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-#MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
-#MAKE_FLAGS+= INSTALL_LIB=${INSTALL_LIB:Q}
-PKGCONFIG_OVERRIDE= bin/libopenmpt.pc
-PKGCONFIG_OVERRIDE_STAGE= post-build
+PKGCONFIG_OVERRIDE= libmodplug/libmodplug.pc.in libopenmpt/libopenmpt.pc.in
.include "options.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libopenmpt/distinfo b/audio/libopenmpt/distinfo
index 2245b1fdc61..948ed128dbb 100644
--- a/audio/libopenmpt/distinfo
+++ b/audio/libopenmpt/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:12:38 agc Exp $
+$NetBSD: distinfo,v 1.9 2015/11/06 11:33:39 wiz Exp $
-SHA1 (libopenmpt-0.2.5602-beta14-autotools.tar.gz) = d1d8dfcec128ecdb53f7c4c2cd6551078ad49817
-RMD160 (libopenmpt-0.2.5602-beta14-autotools.tar.gz) = d8cce06d8e4dc59215ae1cd5068aeb8584b9c06c
-SHA512 (libopenmpt-0.2.5602-beta14-autotools.tar.gz) = c7359d0dd3c7a087944be4a61284390e9146a074f85ecb179c20fb43a7d290a74a1e5ea03b14c2cd985a2c57d88a8fb318e2d920cb6b84d8328c8fe238667002
-Size (libopenmpt-0.2.5602-beta14-autotools.tar.gz) = 1112195 bytes
+SHA1 (libopenmpt-0.2.5705-beta15-autotools.tar.gz) = 9b9ca0e3e722c81b4f604b7f74b9bab994574346
+RMD160 (libopenmpt-0.2.5705-beta15-autotools.tar.gz) = 6c660028103bf6da9b5aa4035a0fb23520cc611e
+SHA512 (libopenmpt-0.2.5705-beta15-autotools.tar.gz) = 0878d76b650e97381308b4865703b772e1c3320c86374b109d601bcd369105accd8d9e022977e69698cf4c269958ca7cd14f853fdb8bedacfb41bdb29aecb99a
+Size (libopenmpt-0.2.5705-beta15-autotools.tar.gz) = 1124923 bytes
+SHA1 (patch-common_Endianness.h) = abf38f4bdd65c29dd79fdd4abc209ba14747caef
diff --git a/audio/libopenmpt/patches/patch-common_Endianness.h b/audio/libopenmpt/patches/patch-common_Endianness.h
new file mode 100644
index 00000000000..b4713de5a9b
--- /dev/null
+++ b/audio/libopenmpt/patches/patch-common_Endianness.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-common_Endianness.h,v 1.3 2015/11/06 11:33:39 wiz Exp $
+
+bswap16 redefined on NetBSD.
+http://bugs.openmpt.org/view.php?id=720
+
+--- common/Endianness.h.orig 2015-06-13 11:59:24.000000000 +0000
++++ common/Endianness.h
+@@ -28,7 +28,7 @@ OPENMPT_NAMESPACE_BEGIN
+
+ #if MPT_COMPILER_GCC
+ #if MPT_GCC_AT_LEAST(4,8,0)
+-#define bswap16 __builtin_bswap16
++#define MPT_bswap16 __builtin_bswap16
+ #endif
+ #if MPT_GCC_AT_LEAST(4,3,0)
+ #define MPT_bswap32 __builtin_bswap32