cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update libxmp to 4.4.1.

Browse Source 
This is a bugfix release, no bump needed.

OK ajacoutot@
This commit is contained in:
fcambus 2016-12-02 09:39:07 +00:00
parent 48542a42b2
commit 1503d4d563
5 changed files with 14 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/libxmp/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2016/09/02 17:36:25 fcambus Exp $
# $OpenBSD: Makefile,v 1.18 2016/12/02 09:39:07 fcambus Exp $
COMMENT = module player library
DISTNAME = libxmp-4.4.0
DISTNAME = libxmp-4.4.1
CATEGORIES = audio
SHARED_LIBS += xmp 1.0 # 4.4
@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=xmp/}
WANTLIB += m
WANTLIB += m
USE_GMAKE = Yes

4
audio/libxmp/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libxmp-4.4.0.tar.gz) = FIjdlT/TA4T7lGdFERgkrRSlwu2C12r2cayc1zOsXII=
SIZE (libxmp-4.4.0.tar.gz) = 615536
SHA256 (libxmp-4.4.1.tar.gz) = NTU1zITIzdro3s7E5l+kxR/GTyLrCJG8Pa5uryX5zM8=
SIZE (libxmp-4.4.1.tar.gz) = 618448

10
audio/libxmp/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.4 2014/11/15 17:41:16 bcallah Exp $
--- Makefile.in.orig Fri Oct 3 17:26:35 2014
+++ Makefile.in Sat Nov 15 11:44:00 2014
$OpenBSD: patch-Makefile_in,v 1.5 2016/12/02 09:39:07 fcambus Exp $
--- Makefile.in.orig Mon Oct 3 02:24:30 2016
+++ Makefile.in Thu Dec 1 22:17:37 2016
@@ -32,7 +32,7 @@ DDIRS = docs include src loaders prowiz depackers win
V = 0
LIB = libxmp.a
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2014/11/15 17:41:16 bcallah Exp $
SONAME = $(SOLIB).$(VERSION_MAJOR)
DLL = libxmp.dll
DYLIB = libxmp.$(VERSION_MAJOR).dylib
@@ -91,7 +91,7 @@ lib/$(LIB): $(OBJS)
@@ -101,7 +101,7 @@ lib/$(LIB): $(OBJS)
lib/$(SHLIB): $(LOBJS)
@mkdir -p lib
@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2014/11/15 17:41:16 bcallah Exp $
if [ "$(V)" -gt 0 ]; then echo $$CMD; else echo LD $@ ; fi; \
eval $$CMD
ln -sf $(SHLIB) lib/$(SONAME)
@@ -140,8 +140,6 @@ install: all
@@ -150,8 +150,6 @@ install: all
@if [ -f lib/$(SHLIB) ]; then \
echo "Installing $(SHLIB)..."; \
$(INSTALL) -m644 lib/$(SHLIB) $(DESTDIR)$(LIBDIR); \

8
audio/libxmp/patches/patch-src_common_h
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_common_h,v 1.1 2014/12/01 18:03:51 miod Exp $
$OpenBSD: patch-src_common_h,v 1.2 2016/12/02 09:39:07 fcambus Exp $
Disable versioned symbols on platforms using gcc 3.x, for the toolchain does
not support them.
--- src/common.h.orig Mon Nov 10 22:25:25 2014
+++ src/common.h Sun Nov 30 15:20:17 2014
--- src/common.h.orig Thu Dec 1 22:19:37 2016
+++ src/common.h Thu Dec 1 22:18:54 2016
@@ -9,7 +9,7 @@
#include <string.h>
#include "xmp.h"
-#if defined(__GNUC__) || defined(__clang__)
+#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__)
#if !defined(WIN32) && !defined(ANDROID) && !defined(__APPLE__) && !defined(__AMIGA__) && !defined(B_BEOS_VERSION) && !defined(__ATHEOS__) && !defined(EMSCRIPTEN) && !defined(__MINT__)
#if !defined(WIN32) && !defined(__ANDROID__) && !defined(__APPLE__) && !defined(__AMIGA__) && !defined(B_BEOS_VERSION) && !defined(__ATHEOS__) && !defined(EMSCRIPTEN) && !defined(__MINT__)
#define USE_VERSIONED_SYMBOLS
#endif

31
audio/libxmp/patches/patch-src_mix_paula_c
View File

@ -1,31 +0,0 @@
$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; \