Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 24 Nov 2016 14:18:53 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427013 - in head/audio/playgsf: . files
Message-ID:  <201611241418.uAOEIrBA066187@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ehaupt
Date: Thu Nov 24 14:18:52 2016
New Revision: 427013
URL: https://svnweb.freebsd.org/changeset/ports/427013

Log:
  - Fix build with libc++ 3.9
  - Switch to USES=localbase
  - Add LICENSE: GPLv2+ for VBA code, LGPL21 for bundled libresample code and
    NONE for playgsf code, as no license is specified neither for it nor for
    code it's based on (http://www.caitsith2.com/gsf/)
  
  PR:		214653
  Submitted by:	amdmi3
  Reported by:	jbeich

Modified:
  head/audio/playgsf/Makefile
  head/audio/playgsf/files/patch-VBA_Util.cpp

Modified: head/audio/playgsf/Makefile
==============================================================================
--- head/audio/playgsf/Makefile	Thu Nov 24 14:05:35 2016	(r427012)
+++ head/audio/playgsf/Makefile	Thu Nov 24 14:18:52 2016	(r427013)
@@ -3,7 +3,7 @@
 
 PORTNAME=	playgsf
 PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/playgsf/ \
 		LOCAL/ehaupt
@@ -11,15 +11,16 @@ MASTER_SITES=	http://projects.raphnet.ne
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command-line player for gsf audio files
 
+LICENSE=	GPLv2+ LGPL21 NONE
+LICENSE_COMB=	multi
+LICENSE_FILE_LGPL21=	${WRKSRC}/libresample-0.1.3/LICENSE.txt
+
 LIB_DEPENDS=	libao.so:audio/libao
 
-USES=		gmake dos2unix
+USES=		dos2unix gmake localbase:ldflags
 GNU_CONFIGURE=	yes
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS+=	--enable-ccore --disable-optimisations
+CONFIGURE_ARGS=	--enable-ccore \
+		--disable-optimisations
 
 PLIST_FILES=	bin/playgsf
 

Modified: head/audio/playgsf/files/patch-VBA_Util.cpp
==============================================================================
--- head/audio/playgsf/files/patch-VBA_Util.cpp	Thu Nov 24 14:05:35 2016	(r427012)
+++ head/audio/playgsf/files/patch-VBA_Util.cpp	Thu Nov 24 14:18:52 2016	(r427013)
@@ -1,5 +1,23 @@
---- VBA/Util.cpp.orig	2016-07-26 15:40:39 UTC
+--- VBA/Util.cpp.orig	2016-11-24 13:15:44 UTC
 +++ VBA/Util.cpp
+@@ -917,7 +917,7 @@ bool utilIsGSF(const char * file)
+   
+ 
+   if(strlen(file) > 4) {
+-    char *p = strrchr(file,'.');
++    const char *p = strrchr(file,'.');
+ 
+ 	if(p != NULL) {
+ 	  if(_stricmp(p, ".gsf") == 0)
+@@ -934,7 +934,7 @@ bool utilIsGBAImage(const char * file)
+ {
+   cpuIsMultiBoot = false;
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       //if(_stricmp(p, ".gba") == 0)
 @@ -1484,7 +1484,8 @@ void utilWriteData(gzFile gzFile, variab
  
  gzFile utilGzOpen(const char *file, const char *mode)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611241418.uAOEIrBA066187>