svn commit: r315699 - in head/audio/playgsf: . files
Emanuel Haupt
ehaupt at FreeBSD.org
Wed Apr 3 08:37:49 UTC 2013
Author: ehaupt
Date: Wed Apr 3 08:37:47 2013
New Revision: 315699
URL: http://svnweb.freebsd.org/changeset/ports/315699
Log:
- Enable build on amd64
- Fix build on 9.1
- Heed CC, CXX, CPPFLAGS, LDFLAGS in all subdir
- Drop ABI version in LIB_DEPENDS
Approved by: portmgr (miwi)
Added:
head/audio/playgsf/files/
head/audio/playgsf/files/extrapatch-VBA__Util.cpp (contents, props changed)
head/audio/playgsf/files/patch-VBA__GBA.cpp (contents, props changed)
head/audio/playgsf/files/patch-libresample-0.1.3__Makefile.in (contents, props changed)
Modified:
head/audio/playgsf/Makefile
head/audio/playgsf/pkg-message
Modified: head/audio/playgsf/Makefile
==============================================================================
--- head/audio/playgsf/Makefile Wed Apr 3 07:50:51 2013 (r315698)
+++ head/audio/playgsf/Makefile Wed Apr 3 08:37:47 2013 (r315699)
@@ -3,7 +3,7 @@
PORTNAME= playgsf
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://projects.raphnet.net/playgsf/ \
CRITICAL
@@ -11,29 +11,32 @@ MASTER_SITES= http://projects.raphnet.ne
MAINTAINER= ehaupt at FreeBSD.org
COMMENT= Command-line player for gsf audio files
-LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao
+LIB_DEPENDS= ao:${PORTSDIR}/audio/libao
USE_GMAKE= yes
+USE_DOS2UNIX= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-# disable optimization flags to avoid a possible bug in gcc
-# (gcc tries to allocate memory in an endless loop)
-CFLAGS+= -O0
-
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= LIBS="${LDFLAGS}"
CONFIGURE_ENV+= LIBS="${LDFLAGS}"
+CONFIGURE_ARGS+= --enable-ccore --disable-optimisations
PLIST_FILES= bin/playgsf
-# contains x86 assembler
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 amd64
PORTSCOUT= skipv:0.7.2
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 901000
+EXTRA_PATCHES= ${FILESDIR}/extrapatch-VBA__Util.cpp
+.endif
+
post-patch:
@${REINPLACE_CMD} \
-e 's|\(@LDFLAGS@\)|\1 ${LDFLAGS}|' \
@@ -51,4 +54,4 @@ do-install:
post-install:
${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Added: head/audio/playgsf/files/extrapatch-VBA__Util.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/playgsf/files/extrapatch-VBA__Util.cpp Wed Apr 3 08:37:47 2013 (r315699)
@@ -0,0 +1,12 @@
+--- ./VBA/Util.cpp.orig 2013-04-02 11:32:02.322879639 +0200
++++ ./VBA/Util.cpp 2013-04-02 11:33:58.107884638 +0200
+@@ -1484,7 +1484,8 @@
+
+ gzFile utilGzOpen(const char *file, const char *mode)
+ {
+- utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite;
++ // utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite;
++ utilGzWriteFunc = (int (ZEXPORT *)(gzFile_s*, void * const, unsigned int))gzwrite;
+ utilGzReadFunc = gzread;
+ utilGzCloseFunc = gzclose;
+
Added: head/audio/playgsf/files/patch-VBA__GBA.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/playgsf/files/patch-VBA__GBA.cpp Wed Apr 3 08:37:47 2013 (r315699)
@@ -0,0 +1,17 @@
+--- ./VBA/GBA.cpp.orig 2013-04-02 11:31:53.610879624 +0200
++++ ./VBA/GBA.cpp 2013-04-02 11:31:53.631880125 +0200
+@@ -1054,12 +1054,12 @@
+ {
+ rom = (u8 *)malloc(0x200);
+ loadedsize=0;
+- i = (int)utilLoad(szFile,utilIsGBAImage,whereToLoad,size);
++ i = (long)utilLoad(szFile,utilIsGBAImage,whereToLoad,size);
+ }
+ else
+ {
+ rom = utilLoad(szFile,utilIsGBAImage,whereToLoad,size);
+- i = (int) rom;
++ i = (long) rom;
+ }
+
+ //loadedsize = sizeof(*rom);
Added: head/audio/playgsf/files/patch-libresample-0.1.3__Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/playgsf/files/patch-libresample-0.1.3__Makefile.in Wed Apr 3 08:37:47 2013 (r315699)
@@ -0,0 +1,13 @@
+--- ./libresample-0.1.3/Makefile.in.orig 2013-03-30 04:01:28.000000000 +0100
++++ ./libresample-0.1.3/Makefile.in 2013-03-30 14:03:51.000000000 +0100
+@@ -3,8 +3,8 @@
+ # systems, use this file as a template to create a
+ # working Makefile.
+
+-CC = @CC@
+-CFLAGS = @CFLAGS@ -Wall
++CC ?= @CC@
++CFLAGS ?= @CFLAGS@ -Wall
+
+ LIBS = @LIBS@ -lm
+
Modified: head/audio/playgsf/pkg-message
==============================================================================
--- head/audio/playgsf/pkg-message Wed Apr 3 07:50:51 2013 (r315698)
+++ head/audio/playgsf/pkg-message Wed Apr 3 08:37:47 2013 (r315699)
@@ -1,4 +1,5 @@
================================================================================
-A huge gsf file collection can be found at:
- http://www.caitsith2.com/gsf/ or http://www.zophar.net/gsf/
+A huge gsf collection can be found at:
+ * http://www.caitsith2.com/gsf/
+ * http://www.zophar.net/gsf/
================================================================================
More information about the svn-ports-all
mailing list