From 7eabd3c63e44491a326cdbcc93731fb040e47a41 Mon Sep 17 00:00:00 2001 From: bcallah Date: Wed, 1 Jul 2015 00:07:08 +0000 Subject: [PATCH] Create our own "release" of Schism Tracker, using the code from the tip of the development. Unlike the last release, this version works well and has the benefit of further work. Because versioning is YYYYMMDD, when upstream cuts a new release we will be able to move to it without issue. ok jung@ --- audio/schismtracker/Makefile | 9 ++++---- audio/schismtracker/distinfo | 4 ++-- .../patches/patch-modplug_snd_gm_c | 22 ------------------- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 audio/schismtracker/patches/patch-modplug_snd_gm_c diff --git a/audio/schismtracker/Makefile b/audio/schismtracker/Makefile index 7997733ad74..0a51afde426 100644 --- a/audio/schismtracker/Makefile +++ b/audio/schismtracker/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2013/11/13 01:09:51 bcallah Exp $ +# $OpenBSD: Makefile,v 1.2 2015/07/01 00:07:08 bcallah Exp $ COMMENT = free module tracker editor and player -# Newer versions are broken. -DISTNAME = schismtracker-20100101 +DISTNAME = schismtracker-20150425 EXTRACT_SUFX = .tar.bz2 CATEGORIES = audio x11 @@ -12,9 +11,9 @@ MAINTAINER = Brian Callahan # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += SDL X11 Xext Xv Xxf86misc c m pthread stdc++ +WANTLIB += SDL X11 Xext Xv c m pthread -MASTER_SITES = http://schismtracker.org/dl/ +MASTER_SITES = http://mirrors.nycbug.org/pub/distfiles/ LIB_DEPENDS = devel/sdl diff --git a/audio/schismtracker/distinfo b/audio/schismtracker/distinfo index c94dc94f0a6..744514a1215 100644 --- a/audio/schismtracker/distinfo +++ b/audio/schismtracker/distinfo @@ -1,2 +1,2 @@ -SHA256 (schismtracker-20100101.tar.bz2) = u82C8K6dlzYbohx1KW3jSBuEz+ou2eaKW6+1Nk8qOJQ= -SIZE (schismtracker-20100101.tar.bz2) = 1047576 +SHA256 (schismtracker-20150425.tar.bz2) = vBBkpG67SATMuPHsVTvXAwkG6ou1zpb4Ne4GW7QOXSU= +SIZE (schismtracker-20150425.tar.bz2) = 1276317 diff --git a/audio/schismtracker/patches/patch-modplug_snd_gm_c b/audio/schismtracker/patches/patch-modplug_snd_gm_c deleted file mode 100644 index 960d98e5812..00000000000 --- a/audio/schismtracker/patches/patch-modplug_snd_gm_c +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-modplug_snd_gm_c,v 1.1.1.1 2013/11/13 01:09:51 bcallah Exp $ - -Taken from FreeBSD. - ---- modplug/snd_gm.c.orig Sun Nov 10 15:37:40 2013 -+++ modplug/snd_gm.c Sun Nov 10 15:37:58 2013 -@@ -10,13 +10,14 @@ - #include "mplink.h" // for 'mp', which we shouldn't need - #include "snd_gm.h" - -+/* - #if !defined(HAVE_LOG2) && !defined(__USE_ISOC99) && !defined(log2) - static double log2(double d) - { - return log(d) / log(2.0); - } - #endif -- -+*/ - - #define LinearMidivol 1 - #define PitchBendCenter 0x2000