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

Update to vgmplay-0.40.9 -- upstream took all our patches.

Browse Source 
Changelog: https://github.com/vgmrips/vgmplay/compare/0.40.8...0.40.9
This commit is contained in:
bcallah 2018-12-26 15:41:00 +00:00
parent 2cc4bc1104
commit 0af7086efd
10 changed files with 27 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/vgmplay/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
# $OpenBSD: Makefile,v 1.2 2018/12/26 15:41:00 bcallah Exp $
COMMENT = command line audio player for VGM files
CATEGORIES = audio
GH_ACCOUNT = vgmrips
GH_PROJECT = vgmplay
GH_TAGNAME = 0.40.8
GH_TAGNAME = 0.40.9
HOMEPAGE = https://vgmrips.net/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@ -20,6 +20,8 @@ LIB_DEPENDS = audio/libao
USE_GMAKE = Yes
MAKE_FLAGS = CC="${CC}"
FAKE_FLAGS = DESTDIR=
NO_TEST = Yes
WRKSRC = ${WRKDIST}/VGMPlay

4
audio/vgmplay/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (vgmplay-0.40.8.tar.gz) = NxPI02IC2UTiOYjjnJ0J8634fvQYbFFAhBt9v0Gds3g=
SIZE (vgmplay-0.40.8.tar.gz) = 866933
SHA256 (vgmplay-0.40.9.tar.gz) = hPMkovL6AUEKXZZc0ieyRFe5hOG70Ov7doybVFpHtSE=
SIZE (vgmplay-0.40.9.tar.gz) = 905252

34
audio/vgmplay/patches/patch-VGMPlay_Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-VGMPlay_Makefile,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
$OpenBSD: patch-VGMPlay_Makefile,v 1.2 2018/12/26 15:41:00 bcallah Exp $
Remove hardcoded -O3
Fix up include dirs and libs
@ -9,30 +9,32 @@ Use endian-safe code on all archs
Index: VGMPlay/Makefile
--- VGMPlay/Makefile.orig
+++ VGMPlay/Makefile
@@ -31,7 +31,7 @@ USE_LIBAO = 1
# 0 = undefined (use endian-safe code, might be slightly slower)
# 1 = Little Endian (Intel)
@@ -53,7 +53,7 @@ endif
# 1 = Little Endian (Intel) [default]
# 2 = Big Endian (Motorola)
ifndef BYTE_ORDER
-BYTE_ORDER = 1
+BYTE_ORDER = 0
endif
ifdef MACOSX
@@ -43,7 +43,7 @@ endif
CC = gcc
@@ -63,7 +63,7 @@ ifndef PREFIX
PREFIX = /usr/local
#PREFIX = $(HOME)/.local
endif
-MANPREFIX = $(PREFIX)/share/man
+MANPREFIX = $(PREFIX)/man
# -- VGMPlay specific Compile Flags --
MAINFLAGS := -DCONSOLE_MODE -DADDITIONAL_FORMATS -DSET_CONSOLE_TITLE
@@ -84,12 +84,12 @@ endif
ifdef DEBUG
CFLAGS := -g $(CFLAGS)
else
@@ -101,14 +101,14 @@ endif
# -- General Compile Flags --
ifeq ($(DEBUG), 0)
-CFLAGS := -O3 -g0 $(CFLAGS)
+CFLAGS := $(CFLAGS) -I${LOCALBASE}/include
else
CFLAGS := -g $(CFLAGS)
endif
#CFLAGS += -Wall
-CFLAGS += -Wno-unused-variable -Wno-unused-value -Wno-unused-but-set-variable
@ -41,9 +43,9 @@ Index: VGMPlay/Makefile
-LDFLAGS := -lm -lz $(LDFLAGS)
+LDFLAGS := -lm -lz $(LDFLAGS) -L${LOCALBASE}/lib
ifdef WINDOWS
ifeq ($(WINDOWS), 1)
# for Windows, add kernel32 and winmm (Multimedia APIs)
@@ -102,7 +102,7 @@ ifdef MACOSX
@@ -120,7 +120,7 @@ ifeq ($(MACOSX), 1)
#CFLAGS += -I/some/path
else
# for Linux, add librt (clock stuff) and libpthread (threads)
@ -51,8 +53,8 @@ Index: VGMPlay/Makefile
+LDFLAGS += -lpthread -pthread
endif
MAINFLAGS += -pthread -DSHARE_PREFIX=\"$(PREFIX)\"
@@ -216,31 +216,23 @@ EXTRA_OBJS = $(VGMPLAY_OBJS) $(VGM2PCM_OBJS) $(VGM2WAV
endif
@@ -237,31 +237,23 @@ EXTRA_OBJS = $(VGMPLAY_OBJS) $(VGM2PCM_OBJS) $(VGM2WAV
all: vgmplay vgm2pcm vgm2wav
vgmplay: $(EMUOBJS) $(MAINOBJS) $(VGMPLAY_OBJS)

16
audio/vgmplay/patches/patch-VGMPlay_Stream_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-VGMPlay_Stream_c,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
OpenBSD support; we always use libao.
Index: VGMPlay/Stream.c
--- VGMPlay/Stream.c.orig
+++ VGMPlay/Stream.c
@@ -16,7 +16,7 @@
#include <fcntl.h>
#ifdef __NetBSD__
#include <sys/audioio.h>
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__OpenBSD__)
// nothing
#else
#include <linux/soundcard.h>

22
audio/vgmplay/patches/patch-VGMPlay_VGMPlayUI_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-VGMPlay_VGMPlayUI_c,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
Fix formatting
Index: VGMPlay/VGMPlayUI.c
--- VGMPlay/VGMPlayUI.c.orig
+++ VGMPlay/VGMPlayUI.c
@@ -2246,11 +2246,11 @@ static void PlayVGM_UI(void)
if (Show95Cmds && Last95Max != 0xFFFF)
{
if (Show95Cmds == 0x01)
- printf(" %02hX / %02hX", 1 + Last95Drum, Last95Max);
+ printf(" %02X / %02hX", 1 + Last95Drum, Last95Max);
else if (Show95Cmds == 0x02)
- printf(" %02hX / %02hX at %5u Hz", 1 + Last95Drum, Last95Max, Last95Freq);
+ printf(" %02X / %02hX at %5u Hz", 1 + Last95Drum, Last95Max, Last95Freq);
else if (Show95Cmds == 0x03)
- printf(" %02hX / %02hX at %4.1f KHz", 1 + Last95Drum, Last95Max,
+ printf(" %02X / %02hX at %4.1f KHz", 1 + Last95Drum, Last95Max,
Last95Freq / 1000.0);
}
//printf(" %u / %u", multipcm_get_channels(0, NULL), 28);

16
audio/vgmplay/patches/patch-VGMPlay_VGMPlay_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-VGMPlay_VGMPlay_c,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
Fix formatting
Index: VGMPlay/VGMPlay.c
--- VGMPlay/VGMPlay.c.orig
+++ VGMPlay/VGMPlay.c
@@ -5635,7 +5635,7 @@ static void InterpretVGM(UINT32 SampleCount)
#ifdef CONSOLE_MODE
if (! CmdList[Command])
{
- printf("Unknown command: %02hX\n", Command);
+ printf("Unknown command: %02hhX\n", Command);
CmdList[Command] = true;
}
#endif

15
audio/vgmplay/patches/patch-VGMPlay_chips_mamedef_h
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-VGMPlay_chips_mamedef_h,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
Already have M_PI in math.h
Index: VGMPlay/chips/mamedef.h
--- VGMPlay/chips/mamedef.h.orig
+++ VGMPlay/chips/mamedef.h
@@ -49,7 +49,6 @@ typedef INT32 stream_sample_t;
#else
#define INLINE static inline
#endif
-#define M_PI 3.14159265358979323846
#ifdef _DEBUG
#define logerror printf

16
audio/vgmplay/patches/patch-VGMPlay_vgm2pcm_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-VGMPlay_vgm2pcm_c,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
Fix formatting
Index: VGMPlay/vgm2pcm.c
--- VGMPlay/vgm2pcm.c.orig
+++ VGMPlay/vgm2pcm.c
@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
sampleBuffer = (WAVE_16BS*)malloc(SAMPLESIZE * SampleRate);
if (sampleBuffer == NULL) {
- fprintf(stderr, "vgm2pcm: error: failed to allocate %u bytes of memory\n", SAMPLESIZE * SampleRate);
+ fprintf(stderr, "vgm2pcm: error: failed to allocate %lu bytes of memory\n", SAMPLESIZE * SampleRate);
return 1;
}

16
audio/vgmplay/patches/patch-VGMPlay_vgm2wav_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-VGMPlay_vgm2wav_c,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
Fix formatting.
Index: VGMPlay/vgm2wav.c
--- VGMPlay/vgm2wav.c.orig
+++ VGMPlay/vgm2wav.c
@@ -227,7 +227,7 @@ int main(int argc, char *argv[]) {
sampleBuffer = (WAVE_16BS*)malloc(SAMPLESIZE * SampleRate);
if (sampleBuffer == NULL) {
- fprintf(stderr, "vgm2wav: error: failed to allocate %u bytes of memory\n", SAMPLESIZE * SampleRate);
+ fprintf(stderr, "vgm2wav: error: failed to allocate %lu bytes of memory\n", SAMPLESIZE * SampleRate);
return 1;
}

4
audio/vgmplay/pkg/PLIST
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/07/29 03:56:14 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.2 2018/12/26 15:41:00 bcallah Exp $
@bin bin/vgm2pcm
@bin bin/vgm2wav
@bin bin/vgmplay
@man man/man1/vgmplay.1
share/vgmplay/