From 933f1c4258a3d49dc10d7ae9d3df8440b4868ccf Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 11 Dec 2018 09:50:44 +0000 Subject: [PATCH] adplug: update to 2.3.1. Changes for version 2.3.1: -------------------------- - Fixed unconditional inclusion of "sys/io.h" on Linux - Autotools improvement - Non-recursive Automake, improved parallelizability - Compatibility fixes for FreeBSD's pmake and OpenBSD's make - Out-of-source building Changes for version 2.3: ------------------------- - Bug fixes: - CMF: Fix uninitialised variable use (thanks binarymaster) - CMF: Handle invalid offsets without crashing - ROL: Prevent access beyond end of vector - MSC: Fix use of uninitialised variable - HSC: Handle out of range patterns more gracefully - MID: Fix for issue #2 - out of range array read - LDS: Use the tempo stored inside the Loudness-File instead of simply returning 70Hz - RIX: Fix several replay bugs (thanks to Palxex) - RIX: Big-endian fix by Wei Mingzhi - XAD: Tempo fix - Various other out of bounds array fixes, timing fixes, etc. - New formats: - BMF: Easy AdLib 1.0 - CMF: SoundFX Macs Opera - GOT: God of Thunder - HSQ/SQX/SDB/AGD/HA2: Herbulot AdLib System (HERAD) - MUS/IMS/MDI: AdLib Visual Composer ROL derivatives - SOP: sopepos' Note Player - VGM: Video Game Music - Allow compilation on platforms that don't support real OPL hardware access - Add support for compiling on Appveyor and publishing a NuGet package - Add Visual Studio 2015 projects - Add support for Travis CI builds - Add new CRC16 and CRC32 tests - Addition of WoodyOPL from DOSBox SVN (thanks to NY00123) - Addition of NukedOPL (thanks to loki666 and nukeykt) - Move from SourceForge to GitHub - DRO player refactored (thanks to Laurence Myers and William Yates) - Add (mono) OPL3 support to the surround/harmonic-effect OPL - Fix occasional random noise in right channel when using surround OPL and Satoh synth - Add display for ROL comment and instrument names - Improve support for different Westwood ADL format versions - Improve CMF transpose support (per-channel now) - Autotools build environment updated Changes for version 2.2.1: -------------------------- - Bug fixes: - CMF: Fix crash on v1.0 files - DRO: Correct playback of early v0.1 files Changes for version 2.2: ------------------------ - New format support: - JBM: JBM Adlib Music Format - CMF: New player (more accurate) for Creative Music Format - DRO: DOSBox Raw OPL v2.0 support - Fixed current subsong rewind in D00 player. - Added test case for ADL file format. - Fixed replay bug in DRO player (thanks to Adam Nielsen). - New surround/harmonic synth effect (sounds really nice!) --- audio/adplug/Makefile | 11 ++-- audio/adplug/PLIST | 19 ++++++- audio/adplug/distinfo | 13 ++--- .../patches/patch-adplugdb_adplugdb_cpp | 51 ------------------- audio/adplug/patches/patch-src_fmopl_c | 15 ------ audio/adplug/patches/patch-src_player.h | 12 ----- 6 files changed, 28 insertions(+), 93 deletions(-) delete mode 100644 audio/adplug/patches/patch-adplugdb_adplugdb_cpp delete mode 100644 audio/adplug/patches/patch-src_fmopl_c delete mode 100644 audio/adplug/patches/patch-src_player.h diff --git a/audio/adplug/Makefile b/audio/adplug/Makefile index 6cc83da89332..4b43ef47456d 100644 --- a/audio/adplug/Makefile +++ b/audio/adplug/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.7 2016/04/20 12:10:24 nros Exp $ -# +# $NetBSD: Makefile,v 1.8 2018/12/11 09:50:44 wiz Exp $ -DISTNAME= adplug-2.1 -PKGREVISION= 1 +DISTNAME= adplug-2.3.1 CATEGORIES= audio devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=adplug/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=adplug/} +GITHUB_RELEASE= ${PKGNAME_NOREV} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jfranz@bsdprojects.net -HOMEPAGE= http://adplug.sourceforge.net/ +HOMEPAGE= https://github.com/adplug/adplug/ COMMENT= AdLib emulator library supporting many formats LICENSE= gnu-lgpl-v2.1 diff --git a/audio/adplug/PLIST b/audio/adplug/PLIST index f8ec7f96b818..ea10b6b746d5 100644 --- a/audio/adplug/PLIST +++ b/audio/adplug/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:01 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2018/12/11 09:50:44 wiz Exp $ bin/adplugdb include/adplug/a2m.h include/adplug/adl.h +include/adplug/adlib.h include/adplug/adlibemu.h include/adplug/adplug.h include/adplug/adtrack.h @@ -10,31 +11,41 @@ include/adplug/analopl.h include/adplug/bam.h include/adplug/bmf.h include/adplug/cff.h +include/adplug/cmf.h +include/adplug/cmfmcsop.h include/adplug/d00.h include/adplug/database.h include/adplug/dfm.h include/adplug/diskopl.h include/adplug/dmo.h include/adplug/dro.h +include/adplug/dro2.h include/adplug/dtm.h include/adplug/emuopl.h include/adplug/flash.h include/adplug/fmc.h include/adplug/fmopl.h include/adplug/fprovide.h +include/adplug/got.h +include/adplug/herad.h include/adplug/hsc.h include/adplug/hsp.h include/adplug/hybrid.h include/adplug/hyp.h include/adplug/imf.h +include/adplug/jbm.h include/adplug/kemuopl.h include/adplug/ksm.h include/adplug/lds.h include/adplug/mad.h +include/adplug/mdi.h include/adplug/mid.h include/adplug/mkj.h include/adplug/msc.h include/adplug/mtk.h +include/adplug/mus.h +include/adplug/nemuopl.h +include/adplug/nukedopl.h include/adplug/opl.h include/adplug/player.h include/adplug/players.h @@ -50,8 +61,14 @@ include/adplug/s3m.h include/adplug/sa2.h include/adplug/silentopl.h include/adplug/sng.h +include/adplug/sop.h +include/adplug/surroundopl.h include/adplug/temuopl.h include/adplug/u6m.h +include/adplug/version.h +include/adplug/vgm.h +include/adplug/wemuopl.h +include/adplug/woodyopl.h include/adplug/xad.h include/adplug/xsm.h info/libadplug.info diff --git a/audio/adplug/distinfo b/audio/adplug/distinfo index a9fda3095c2a..b51f18d51831 100644 --- a/audio/adplug/distinfo +++ b/audio/adplug/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 01:12:24 agc Exp $ +$NetBSD: distinfo,v 1.7 2018/12/11 09:50:44 wiz Exp $ -SHA1 (adplug-2.1.tar.bz2) = 49dd798467f194ece1863f18019912f8089cb9df -RMD160 (adplug-2.1.tar.bz2) = 8788c174507fe39d3415f36e1ac60df6b84c889f -SHA512 (adplug-2.1.tar.bz2) = 498e18df60660f40cb6504922abbe736867d6a36a42f12f1003d85c522b660575e5cfc70a5f7ab94aeec1bf78d1ab3ba649c156ba5521f38018ea19953fee5ff -Size (adplug-2.1.tar.bz2) = 730686 bytes -SHA1 (patch-adplugdb_adplugdb_cpp) = 06471351d5b263e515b115960ec0e3d3564dbd16 -SHA1 (patch-src_fmopl_c) = e5a081da04b9935a6c146c487bf578a5a78e5436 -SHA1 (patch-src_player.h) = a1bf12c872a244d56fa0cd776ecd22cc5af3bca4 +SHA1 (adplug-2.3.1.tar.bz2) = c6efe2e3ec744b45b607a18fb0ef04c87374b4ba +RMD160 (adplug-2.3.1.tar.bz2) = 928c26a97248fb4e5c63813ff52369e812d1dd2c +SHA512 (adplug-2.3.1.tar.bz2) = 324ce084ecf5b0d180b335ebcacd5ab80806a5c9fbdeed6ef7cbd6c2f2cb476d9d9f38f596b7d6100e3d6cab42294300559200297b4b3f34190c1f516454c8c3 +Size (adplug-2.3.1.tar.bz2) = 1478424 bytes diff --git a/audio/adplug/patches/patch-adplugdb_adplugdb_cpp b/audio/adplug/patches/patch-adplugdb_adplugdb_cpp deleted file mode 100644 index 49cb16ad3414..000000000000 --- a/audio/adplug/patches/patch-adplugdb_adplugdb_cpp +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-adplugdb_adplugdb_cpp,v 1.1 2011/09/03 23:40:47 dholland Exp $ - -const correctness, required by clang - ---- adplugdb/adplugdb.cpp.orig 2006-05-17 12:47:21.000000000 +0000 -+++ adplugdb/adplugdb.cpp -@@ -99,13 +99,15 @@ static const struct { - }; - - static struct { -- char *db_file; -+ const char *db_file; -+ char *freeable_db_file; - CAdPlugDatabase::CRecord::RecordType rtype; - int message_level; - bool usedefaultdb, usercomment, cmdkeys; - const char *homedir; - } cfg = { - ADPLUGDB_PATH, -+ NULL, - CAdPlugDatabase::CRecord::Plain, - MSG_NOTE, - false, false, false, -@@ -297,7 +299,7 @@ static void db_save(void) - static void shutdown(void) - { - // Free userdb variable, if applicable -- if(cfg.homedir && !cfg.usedefaultdb) free(cfg.db_file); -+ if(cfg.homedir && !cfg.usedefaultdb) free(cfg.freeable_db_file); - } - - /***** Main program *****/ -@@ -355,11 +357,14 @@ int main(int argc, char *argv[]) - // Try user's home directory first, before trying the default location. - cfg.homedir = getenv("HOME"); - if(cfg.homedir && !cfg.usedefaultdb) { -- cfg.db_file = (char *)malloc(strlen(cfg.homedir) + strlen(ADPLUG_CONFDIR) + -+ char *s; -+ s = (char *)malloc(strlen(cfg.homedir) + strlen(ADPLUG_CONFDIR) + - strlen(ADPLUGDB_FILE) + 3); -- strcpy(cfg.db_file, cfg.homedir); -- strcat(cfg.db_file, "/" ADPLUG_CONFDIR "/"); -- strcat(cfg.db_file, ADPLUGDB_FILE); -+ strcpy(s, cfg.homedir); -+ strcat(s, "/" ADPLUG_CONFDIR "/"); -+ strcat(s, ADPLUGDB_FILE); -+ cfg.freeable_db_file = s; -+ cfg.db_file = s; - } - - // Load database file diff --git a/audio/adplug/patches/patch-src_fmopl_c b/audio/adplug/patches/patch-src_fmopl_c deleted file mode 100644 index a4fec66e56b0..000000000000 --- a/audio/adplug/patches/patch-src_fmopl_c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_fmopl_c,v 1.2 2012/05/04 16:00:01 joerg Exp $ - -Redefine INLINE to cover all inline functions for compilers with C99 semantic. - ---- src/fmopl.c~ 2006-05-13 05:36:42.000000000 +0000 -+++ src/fmopl.c -@@ -31,7 +31,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#define INLINE __inline -+#define INLINE static __inline - #define HAS_YM3812 1 - - #include diff --git a/audio/adplug/patches/patch-src_player.h b/audio/adplug/patches/patch-src_player.h deleted file mode 100644 index 7ce9028ee1b1..000000000000 --- a/audio/adplug/patches/patch-src_player.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_player.h,v 1.1 2011/11/25 21:29:32 joerg Exp $ - ---- src/player.h.orig 2011-11-25 16:52:54.000000000 +0000 -+++ src/player.h -@@ -22,6 +22,7 @@ - #ifndef H_ADPLUG_PLAYER - #define H_ADPLUG_PLAYER - -+#include - #include - - #include "fprovide.h"