Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Jan 2014 14:24:18 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341840 - in head/audio/osalp: . files
Message-ID:  <201401301424.s0UEOInn077227@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Thu Jan 30 14:24:18 2014
New Revision: 341840
URL: http://svnweb.freebsd.org/changeset/ports/341840
QAT: https://qat.redports.org/buildarchive/r341840/

Log:
  - Fix build on modern compilers [MFH]
  - STAGE-clean
  
  MFH:		2014Q1

Added:
  head/audio/osalp/files/
  head/audio/osalp/files/patch-aflib_aflibConverter.cc   (contents, props changed)
  head/audio/osalp/files/patch-aflib_aflibConverter.h   (contents, props changed)
  head/audio/osalp/files/patch-aflib_aflibMemCache.cc   (contents, props changed)
  head/audio/osalp/files/patch-formatlib-audiofile-0.2.0-libaudiofile_aiffwrite.c   (contents, props changed)
Modified:
  head/audio/osalp/Makefile

Modified: head/audio/osalp/Makefile
==============================================================================
--- head/audio/osalp/Makefile	Thu Jan 30 14:18:32 2014	(r341839)
+++ head/audio/osalp/Makefile	Thu Jan 30 14:24:18 2014	(r341840)
@@ -21,10 +21,20 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-all
 
 USE_LDCONFIG=	yes
-NO_STAGE=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 CONFLICTS=	libaudiofile-[0-9]*
 
+post-patch:
+	${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -E \
+	    's|iostream.h|iostream|; \
+	     s|[[:space:]]cout| std::cout|g; \
+	     s|[[:space:]]endl| std::endl|g; \
+	     s|[[:space:]]cerr| std::cerr|g;'
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaflib-${PORTVERSION}.so \
+	    ${STAGEDIR}${PREFIX}/lib/aflib/lib*-${PORTVERSION}.so
+
 .include <bsd.port.mk>

Added: head/audio/osalp/files/patch-aflib_aflibConverter.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/osalp/files/patch-aflib_aflibConverter.cc	Thu Jan 30 14:24:18 2014	(r341840)
@@ -0,0 +1,11 @@
+--- ./aflib/aflibConverter.cc.orig	2014-01-30 14:56:04.000000000 +0100
++++ ./aflib/aflibConverter.cc	2014-01-30 14:56:11.000000000 +0100
+@@ -226,7 +226,7 @@
+ 
+ 
+ int
+-aflibConverter::err_ret(char *s)
++aflibConverter::err_ret(const char *s)
+ {
+     aflib_debug("resample: %s \n\n",s); /* Display error message  */
+     return -1;

Added: head/audio/osalp/files/patch-aflib_aflibConverter.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/osalp/files/patch-aflib_aflibConverter.h	Thu Jan 30 14:24:18 2014	(r341840)
@@ -0,0 +1,11 @@
+--- ./aflib/aflibConverter.h.orig	2014-01-30 14:55:43.000000000 +0100
++++ ./aflib/aflibConverter.h	2014-01-30 14:55:50.000000000 +0100
+@@ -110,7 +110,7 @@
+    operator=(const aflibConverter& op);
+ 
+    int
+-   err_ret(char *s);
++   err_ret(const char *s);
+ 
+    void
+    deleteMemory();

Added: head/audio/osalp/files/patch-aflib_aflibMemCache.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/osalp/files/patch-aflib_aflibMemCache.cc	Thu Jan 30 14:24:18 2014	(r341840)
@@ -0,0 +1,10 @@
+--- aflib/aflibMemCache.cc.orig	2014-01-30 12:09:41.000000000 +0100
++++ aflib/aflibMemCache.cc	2014-01-30 12:10:12.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <cstdlib> // getenv
+ 
+ #include "aflibMemCache.h"
+ #include "aflibMemNode.h"

Added: head/audio/osalp/files/patch-formatlib-audiofile-0.2.0-libaudiofile_aiffwrite.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/osalp/files/patch-formatlib-audiofile-0.2.0-libaudiofile_aiffwrite.c	Thu Jan 30 14:24:18 2014	(r341840)
@@ -0,0 +1,10 @@
+--- formatlib/audiofile-0.2.0/libaudiofile/aiffwrite.c.orig	2014-01-30 15:01:36.000000000 +0100
++++ formatlib/audiofile-0.2.0/libaudiofile/aiffwrite.c	2014-01-30 15:01:51.000000000 +0100
+@@ -28,6 +28,7 @@
+ 
+ #include <assert.h>
+ #include <sys/types.h>
++#include <string.h>
+ #include <stdlib.h>
+ 
+ #include "extended.h"



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