Update libxmp to 4.4.0

OK edd@
This commit is contained in:
fcambus 2016-09-02 17:36:25 +00:00
parent ae3fff4946
commit e4785eb2b0
3 changed files with 36 additions and 5 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2016/03/16 21:19:37 naddy Exp $
# $OpenBSD: Makefile,v 1.17 2016/09/02 17:36:25 fcambus Exp $
COMMENT = module player library
DISTNAME = libxmp-4.3.10
DISTNAME = libxmp-4.4.0
CATEGORIES = audio
SHARED_LIBS += xmp 1.0 # 4.3
SHARED_LIBS += xmp 1.0 # 4.4
HOMEPAGE = http://xmp.sourceforge.net/

View File

@ -1,2 +1,2 @@
SHA256 (libxmp-4.3.10.tar.gz) = wRwL8n87qXBRzV4+BNm0h/69wxyyzjXkYtcfxYDqpb4=
SIZE (libxmp-4.3.10.tar.gz) = 631117
SHA256 (libxmp-4.4.0.tar.gz) = FIjdlT/TA4T7lGdFERgkrRSlwu2C12r2cayc1zOsXII=
SIZE (libxmp-4.4.0.tar.gz) = 615536

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-src_mix_paula_c,v 1.1 2016/09/02 17:36:25 fcambus Exp $
--- src/mix_paula.c.orig Thu Sep 1 16:54:32 2016
+++ src/mix_paula.c Thu Sep 1 16:55:34 2016
@@ -63,7 +63,7 @@ static void input_sample(struct paula_state *paula, in
}
}
-static void clock(struct paula_state *paula, unsigned int cycles)
+static void do_clock(struct paula_state *paula, unsigned int cycles)
{
int i;
@@ -96,15 +96,15 @@ static void clock(struct paula_state *paula, unsigned
/* input is always sampled at a higher rate than output */ \
for (i = 0; i < num_in - 1; i++) { \
input_sample(vi->paula, sptr[pos]); \
- clock(vi->paula, MINIMUM_INTERVAL); \
+ do_clock(vi->paula, MINIMUM_INTERVAL); \
UPDATE_POS(ministep); \
} \
input_sample(vi->paula, sptr[pos]); \
vi->paula->remainder -= num_in * MINIMUM_INTERVAL; \
\
- clock(vi->paula, (int)vi->paula->remainder); \
+ do_clock(vi->paula, (int)vi->paula->remainder); \
smp_in = output_sample(vi->paula, (x)); \
- clock(vi->paula, MINIMUM_INTERVAL - (int)vi->paula->remainder); \
+ do_clock(vi->paula, MINIMUM_INTERVAL - (int)vi->paula->remainder); \
UPDATE_POS(step - (num_in - 1) * ministep); \
\
vi->paula->remainder += vi->paula->fdiv; \