Hi ports@,

Here is a diff to update libxmp to latest version (4.4.0).

It adds a patch from upstream to rename the 'clock' function to prevent
a conflict with clock(3), which can be dropped during next update.

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/libxmp/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile    16 Mar 2016 21:19:37 -0000      1.16
+++ Makefile    1 Sep 2016 16:49:37 -0000
@@ -2,10 +2,10 @@
 
 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/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/libxmp/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo    8 Jan 2016 21:16:51 -0000       1.13
+++ distinfo    1 Sep 2016 16:49:37 -0000
@@ -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
Index: patches/patch-src_mix_paula_c
===================================================================
RCS file: patches/patch-src_mix_paula_c
diff -N patches/patch-src_mix_paula_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mix_paula_c       1 Sep 2016 16:49:37 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+--- 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; \

Reply via email to