Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Aug 2004 02:30:10 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/70627: Update port: audio/libsidplay2
Message-ID:  <20040819023010.3f22640b.tkato432@yahoo.com>
Resent-Message-ID: <200408181740.i7IHe7XB049985@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         70627
>Category:       ports
>Synopsis:       Update port: audio/libsidplay2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 18 17:40:07 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on -current after gcc 3.4 import

New file:
files/patch-libsidplay::include::sidplay::SmartPtr.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/libsidplay2/Makefile audio/libsidplay2/Makefile
--- /usr/ports/audio/libsidplay2/Makefile	Mon Aug 16 22:35:48 2004
+++ audio/libsidplay2/Makefile	Wed Aug 18 01:07:31 2004
@@ -26,14 +26,8 @@
 		resid/configure
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile with gcc 3.4.2"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \
 		${WRKSRC}/libsidutils/src/ini/ini.cpp
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h
--- /usr/ports/audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h	Thu Jan  1 09:00:00 1970
+++ audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h	Wed Aug 18 00:48:12 2004
@@ -0,0 +1,26 @@
+--- libsidplay/include/sidplay/SmartPtr.h.orig	Tue Jun 15 05:08:04 2004
++++ libsidplay/include/sidplay/SmartPtr.h	Wed Aug 18 00:47:50 2004
+@@ -211,16 +211,16 @@
+ 	{
+ 		if ( bufferLen >= 1 )
+ 		{
+-			pBufCurrent = ( bufBegin = buffer );
+-			bufEnd = bufBegin + bufferLen;
+-			bufLen = bufferLen;
+-			status = true;
++			this->pBufCurrent = ( this->bufBegin = buffer );
++			this->bufEnd = this->bufBegin + bufferLen;
++			this->bufLen = bufferLen;
++			this->status = true;
+ 		}
+ 		else
+ 		{
+-			pBufCurrent = bufBegin = bufEnd = 0;
+-			bufLen = 0;
+-			status = false;
++			this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
++			this->bufLen = 0;
++			this->status = false;
+ 		}
+ 	}
+ };
>Release-Note:
>Audit-Trail:
>Unformatted:



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