Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Sep 2000 00:57:34 +0200 (CEST)
From:      Anders Nordby <anders@fix.no>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/21337: Update+fix of port: audio/xsidplay
Message-ID:  <20000917225734.D8E6E57B5@totem.fix.no>

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

>Number:         21337
>Category:       ports
>Synopsis:       Update+fix of port: audio/xsidplay
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 17 16:00:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Anders Nordby
>Release:        FreeBSD 4.1-STABLE i386
>Organization:
Fluxpod Information eXchange
>Environment:

FreeBSD eggsilo.localnet 4.1-STABLE FreeBSD 4.1-STABLE #0: Mon Aug 28
10:23:12 CEST 2000     root@:/usr/src/sys/compile/EGGSILO  i386

>Description:

-Updates the port to the latest version.
-Fixes building with gcc >= 2.8.1.
-Removes patch patch-00.
-Thanks to KATO Tsuguru <tkato@prontomail.ne.jp> for patches.

>How-To-Repeat:

	

>Fix:

Apply this:

diff -Nur xsidplay.old/Makefile xsidplay/Makefile
--- xsidplay.old/Makefile	Sun Jun 11 21:06:58 2000
+++ xsidplay/Makefile	Mon Sep 18 00:32:11 2000
@@ -6,32 +6,26 @@
 #
 
 PORTNAME=	xsidplay
-PORTVERSION=	1.3.8
+PORTVERSION=	1.3.9
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ \
 		http://www.freenix.no/~anders/
-DISTNAME=	${PORTNAME}-1_3_8
-EXTRACT_SUFX=   _tar.gz
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
+EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	anders@fix.no
 
-BUILD_DEPENDS=	sidplay:${PORTSDIR}/audio/sidplay
+LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay
 
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
 USE_QT=		YES
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/sidplay" \
-		LDFLAGS=-L${LOCALBASE}/lib
+		-I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 400000
-BROKEN=	"Doesn't build with gcc >= 2.8.1"
-.endif
-
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -Nur xsidplay.old/files/md5 xsidplay/files/md5
--- xsidplay.old/files/md5	Sun Jun 11 21:06:58 2000
+++ xsidplay/files/md5	Mon Sep 18 00:21:15 2000
@@ -1 +1 @@
-MD5 (xsidplay-1_3_8_tar.gz) = 9b22b10115323f87fd208a798b5252f1
+MD5 (xsidplay-1_3_9.tgz) = 0899624e144c6b686d69d7396689e8c5
diff -Nur xsidplay.old/patches/patch-00 xsidplay/patches/patch-00
--- xsidplay.old/patches/patch-00	Wed Jul 19 15:10:32 2000
+++ xsidplay/patches/patch-00	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/Makefile.in.old	Wed Jul 19 14:53:54 2000
-+++ src/Makefile.in	Wed Jul 19 14:54:15 2000
-@@ -22,7 +22,7 @@
- INSTALL_DATA		= @INSTALL_DATA@
- 
- CXX					= @CXX@
--CXXFLAGS			= @CXXFLAGS@
-+CXXFLAGS			= @CXXFLAGS@ -DHAVE_FREEBSD -DHAVE_MACHINE_SOUNDCARD_H
- DEFS				= @DEFS@
- LDFLAGS				= @LDFLAGS@ $(QT_LDFLAGS) $(X_LDFLAGS) $(SIDPLAY_LDFLAGS) 
- 
diff -Nur xsidplay.old/patches/patch-aa xsidplay/patches/patch-aa
--- xsidplay.old/patches/patch-aa	Thu Jan  1 01:00:00 1970
+++ xsidplay/patches/patch-aa	Mon Sep 18 00:30:17 2000
@@ -0,0 +1,36 @@
+--- src/HVSCDialogData.cpp.orig	Fri Oct  9 09:08:24 1998
++++ src/HVSCDialogData.cpp	Tue Sep 12 04:02:45 2000
+@@ -109,9 +109,30 @@
+ 	browseBtn = new QPushButton( this, "BrowseButton" );
+ 	browseBtn->setGeometry( 320, 32, 70, 30 );
+ 	{
+-		QColorGroup normal( QColor( QRgb(0) ), QColor( QRgb(11862015) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(0) ), QColor( QRgb(16777215) ) );
+-		QColorGroup disabled( QColor( QRgb(8421504) ), QColor( QRgb(12632256) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(8421504) ), QColor( QRgb(12632256) ) );
+-		QColorGroup active( QColor( QRgb(0) ), QColor( QRgb(8505544) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(0) ), QColor( QRgb(16777215) ) );
++		QColorGroup normal(
++		 	QColor( (unsigned int)0 ),
++			QColor( (unsigned int)11862015 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)16777215 ) );
++		QColorGroup disabled(
++			QColor( (unsigned int)8421504 ),
++			QColor( (unsigned int)12632256 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)8421504 ),
++			QColor( (unsigned int)12632256 ) );
++		QColorGroup active(
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)8505544 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)16777215 ) );
+ 		QPalette palette( normal, disabled, active );
+ 		browseBtn->setPalette( palette );
+ 	}
diff -Nur xsidplay.old/patches/patch-ab xsidplay/patches/patch-ab
--- xsidplay.old/patches/patch-ab	Thu Jan  1 01:00:00 1970
+++ xsidplay/patches/patch-ab	Mon Sep 18 00:30:17 2000
@@ -0,0 +1,36 @@
+--- src/MainDialog.cpp.orig	Sat Jul  3 12:57:28 1999
++++ src/MainDialog.cpp	Tue Sep 12 03:47:31 2000
+@@ -152,9 +152,30 @@
+     timeLCD->setMode( QLCDNumber::DEC );
+     timeLCD->setSegmentStyle( QLCDNumber::Filled );
+     {
+-        QColorGroup normal( QColor( QRgb(0) ), QColor( QRgb(11513755) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(0) ), QColor( QRgb(16777215) ) );
+-        QColorGroup disabled( QColor( QRgb(8421504) ), QColor( QRgb(12632256) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(8421504) ), QColor( QRgb(12632256) ) );
+-        QColorGroup active( QColor( QRgb(0) ), QColor( QRgb(12632256) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(0) ), QColor( QRgb(16777215) ) );
++        QColorGroup normal(
++		QColor( (unsigned int)0 ),
++		QColor( (unsigned int)11513755 ),
++		QColor( (unsigned int)16777215 ),
++		QColor( (unsigned int)6316128 ),
++		QColor( (unsigned int)10789024 ),
++		QColor( (unsigned int)0 ),
++		QColor( (unsigned int)16777215 ) );
++        QColorGroup disabled(
++		QColor( (unsigned int)8421504 ),
++		QColor( (unsigned int)12632256 ),
++		QColor( (unsigned int)16777215 ),
++		QColor( (unsigned int)6316128 ),
++		QColor( (unsigned int)10789024 ),
++		QColor( (unsigned int)8421504 ),
++		QColor( (unsigned int)12632256 ) );
++        QColorGroup active(
++		QColor( (unsigned int)0 ),
++		QColor( (unsigned int)12632256 ),
++		QColor( (unsigned int)16777215 ),
++		QColor( (unsigned int)6316128 ),
++		QColor( (unsigned int)10789024 ),
++		QColor( (unsigned int)0 ),
++		QColor( (unsigned int)16777215 ) );
+         QPalette palette( normal, disabled, active );
+         timeLCD->setPalette( palette );
+ 	}
diff -Nur xsidplay.old/patches/patch-ac xsidplay/patches/patch-ac
--- xsidplay.old/patches/patch-ac	Thu Jan  1 01:00:00 1970
+++ xsidplay/patches/patch-ac	Mon Sep 18 00:30:17 2000
@@ -0,0 +1,70 @@
+--- src/MainDialogData.cpp.orig	Mon Dec 14 06:50:51 1998
++++ src/MainDialogData.cpp	Tue Sep 12 03:57:49 2000
+@@ -43,9 +43,30 @@
+ 	songLCD = new QLCDNumber( this, "LCDNumber_2" );
+ 	songLCD->setGeometry( 90, 35, 40, 30 );
+ 	{
+-		QColorGroup normal( QColor( QRgb(0) ), QColor( QRgb(11513755) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(0) ), QColor( QRgb(16777215) ) );
+-		QColorGroup disabled( QColor( QRgb(8421504) ), QColor( QRgb(12632256) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(8421504) ), QColor( QRgb(12632256) ) );
+-		QColorGroup active( QColor( QRgb(0) ), QColor( QRgb(12632256) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(0) ), QColor( QRgb(16777215) ) );
++		QColorGroup normal(
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)11513755 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)16777215 ) );
++		QColorGroup disabled(
++			QColor( (unsigned int)8421504 ),
++			QColor( (unsigned int)12632256 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)8421504 ),
++			QColor( (unsigned int)12632256 ) );
++		QColorGroup active(
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)12632256 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)16777215 ) );
+ 		QPalette palette( normal, disabled, active );
+ 		songLCD->setPalette( palette );
+ 	}
+@@ -58,9 +79,30 @@
+ 	timeLCD = new TimeLCD( this, "TimeLCD_1" );
+ 	timeLCD->setGeometry( 10, 35, 75, 30 );
+ 	{
+-		QColorGroup normal( QColor( QRgb(0) ), QColor( QRgb(11513755) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(0) ), QColor( QRgb(16777215) ) );
+-		QColorGroup disabled( QColor( QRgb(8421504) ), QColor( QRgb(12632256) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(8421504) ), QColor( QRgb(12632256) ) );
+-		QColorGroup active( QColor( QRgb(0) ), QColor( QRgb(12632256) ), QColor( QRgb(16777215) ), QColor( QRgb(6316128) ), QColor( QRgb(10789024) ), QColor( QRgb(0) ), QColor( QRgb(16777215) ) );
++		QColorGroup normal(
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)11513755 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)16777215 ) );
++		QColorGroup disabled(
++			QColor( (unsigned int)8421504 ),
++			QColor( (unsigned int)12632256 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)8421504 ),
++			QColor( (unsigned int)12632256 ) );
++		QColorGroup active(
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)12632256 ),
++			QColor( (unsigned int)16777215 ),
++			QColor( (unsigned int)6316128 ),
++			QColor( (unsigned int)10789024 ),
++			QColor( (unsigned int)0 ),
++			QColor( (unsigned int)16777215 ) );
+ 		QPalette palette( normal, disabled, active );
+ 		timeLCD->setPalette( palette );
+ 	}
diff -Nur xsidplay.old/pkg/DESCR xsidplay/pkg/DESCR
--- xsidplay.old/pkg/DESCR	Sun Jun 11 21:06:58 2000
+++ xsidplay/pkg/DESCR	Mon Sep 18 00:46:48 2000
@@ -4,4 +4,4 @@
 to all those SID-tunes you remember so well again.
 
 WWW: http://www.geocities.com/SiliconValley/Lakes/5147/
-HVSC: http://home.freeuk.net/wazzaw/HVSC/
+HVSC: http://www.hvsc.c64.org/

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




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