Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 May 2000 01:15:07 +0900
From:      FUJISHIMA Satsuki <k5@cheerful.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/18487: fix: audio/gogo
Message-ID:  <86snvqz8j8.wl@cheerful.com>

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

>Number:         18487
>Category:       ports
>Synopsis:       update: audio/gogo
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 10 09:20:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     FUJISHIMA Satsuki
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
N/A
>Environment:
>Description:

	GOGO port is broken. It compiles OK but port Makefile tries to
	install nonexistent files. I wonder no one use this port. :)

	This patches are:
	o named version to 2.31f. Distfile and documents in it describe
	  itself 2.30f but source calls it 2.31f. Which is the proper
	  one in this case? I believe in sources.
	o depends on cdrecord should be optional.
	o -DKANJI or something is obsolete.
	o install proper documents.
	o honor CC and CFLAGS. This is very important for this kind of
	  software.
	o add sample of optimized CFLAGS. Useful for this kind...:)
	o optional support for linuxthreads.
	o GOGO is `GOGO-no-coda' and not 'gogo no coder'.
	o cleanup COMMENT and DESCR.
	o reviewed by tkato@prontmail.ne.jp.
	o ignored by MAINTAINER for 2 weeks.

>How-To-Repeat:

/usr/ports/audio/gogo# make install
===>  Installing for gogo-2.30f
===>   gogo-2.30f depends on executable: cdda2wav - found
===>   gogo-2.30f depends on executable: list_audio_tracks - found
install -C -s -o root -g wheel -m 555 /home/2tmp/a/marie/s/packages/F/ports/audio/gogo/work/gogo231f/gogo /usr/local/bin
install -C -o root -g wheel -m 555 /home/2tmp/a/marie/s/packages/F/ports/audio/gogo/work/gogo231f/sakai/cdda2mp3.bsd  /usr/local/bin/cdda2mp3.gogo
install: /home/2tmp/a/marie/s/packages/F/ports/audio/gogo/work/gogo231f/sakai/cdda2mp3.bsd: No such file or directory
*** Error code 71

Stop in /a/marie/s/packages/F/ports/audio/gogo.
*** Error code 1

Stop in /a/marie/s/packages/F/ports/audio/gogo.
*** Error code 1

Stop in /a/marie/s/packages/F/ports/audio/gogo.

>Fix:

	New file: patches/patch-ac

diff -xCVS -xCFLAGS -urN /usr/ports/audio/gogo/Makefile gogo/Makefile
--- /usr/ports/audio/gogo/Makefile	Wed Apr 19 13:46:02 2000
+++ gogo/Makefile	Thu Apr 27 07:27:22 2000
@@ -1,12 +1,12 @@
-# New ports collection makefile for:   gogo no coder
-# Date created:        01 July 1999
-# Whom:                Yukihiro Nakai <Nacai@iname.com>
+# New ports collection makefile for:	GOGO-no-coda
+# Date created:		01 July 1999
+# Whom:			Yukihiro Nakai <Nacai@iname.com>
 #
 # $FreeBSD: ports/audio/gogo/Makefile,v 1.16 2000/04/19 04:46:02 nakai Exp $
 #
 
 PORTNAME=	gogo
-PORTVERSION=	2.30f
+PORTVERSION=	2.31f
 CATEGORIES=	audio
 MASTER_SITES=	http://homepage1.nifty.com/herumi/soft/gogo2/src/
 DISTNAME=	gogo230f
@@ -16,34 +16,41 @@
 
 # More than version 0.98
 BUILD_DEPENDS=	nasm-0.98:${PORTSDIR}/devel/nasm
-.if !defined(MINIMAL)
-RUN_DEPENDS=	cdda2wav:${PORTSDIR}/sysutils/cdrecord \
-		list_audio_tracks:${PORTSDIR}/sysutils/cdrecord
-.endif
 
 USE_GMAKE=	yes
 ALL_TARGET=	gogo
-.if(!defined(KANJI))
-MAKE_ARGS+=	DONT_USE_KANJI=-DNO_KANJI
-.else
-MAKE_ARGS+=	DONT_USE_KANJI=
-.endif
+
 RESTRICTED=	Condition is not clear
 
 WRKSRC=		${WRKDIR}/gogo231f
 
+# A sample of heavily optimized CFLAGS(typically used with pgcc).
+# Recommended ONLY for benchmarks.
+# CFLAGS=-march=pentiumpro -O6 -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -foptimize-register-move -ffast-math -fdefer-pop -mfancy-math-387
+
+MAKE_ENV=	"CC=$(CCMD)" "LD=$(CC)"
+
+CCMD!=		${ECHO} "$(CC) -c $(CFLAGS) -DRAW_INPUT"
+
+pre-fetch:
+.if !defined(USE_MT)
+	@${ECHO_MSG} "set USE_MT to compile with linuxthreads."
+	@${ECHO_MSG} "It would increase performance in SMP environment."
+.else
+MAKE_ENV+=	"USE_MT=yes"
+LIB_DEPENDS=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gogo ${PREFIX}/bin
-.if !defined(MINIMAL)
-	${INSTALL_SCRIPT} ${WRKSRC}/sakai/cdda2mp3.bsd \
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/cdda2mp3.bsd \
 		${PREFIX}/bin/cdda2mp3.gogo
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/gogo
-	${INSTALL_DATA} ${WRKSRC}/sakai/cdda2mp3.txt \
-		${PREFIX}/share/doc/gogo/cdda2mp3.gogo.jp
-	${INSTALL_DATA} ${WRKSRC}/sakai/readme_e.txt \
+	${INSTALL_DATA} ${WRKSRC}/contrib/cdda2mp3.txt \
 		${PREFIX}/share/doc/gogo/cdda2mp3.gogo.en
-.endif
+	${INSTALL_DATA} ${WRKSRC}/contrib/cdda2mp3.euc \
+		${PREFIX}/share/doc/gogo/cdda2mp3.gogo.ja
 .endif
 
 .include <bsd.port.mk>
diff -xCVS -xCFLAGS -urN /usr/ports/audio/gogo/patches/patch-ac gogo/patches/patch-ac
--- /usr/ports/audio/gogo/patches/patch-ac	Thu Jan  1 09:00:00 1970
+++ gogo/patches/patch-ac	Wed May 10 23:52:42 2000
@@ -0,0 +1,28 @@
+--- Makefile.orig	Tue Apr 11 12:07:39 2000
++++ Makefile	Wed May 10 23:51:38 2000
+@@ -30,10 +30,10 @@
+ endif
+ 
+ # common definition
+-LD=gcc
++#LD=gcc
+ #LD=gcc -Wl,-Map,gogo.map
+ LIBS=-lm
+-CC=gcc -c -m486 -O3 -finline-functions -fomit-frame-pointer -funroll-loops
++#CC=gcc -c -m486 -O3 -finline-functions -fomit-frame-pointer -funroll-loops
+ # This option is available for gcc-2.8.x
+ #CC=gcc -c -mcpu=pentiumpro -malign-double -O6 -fstrength-reduce -fexpensive-optimizations  -finline-functions -fomit-frame-pointer -funroll-loops
+ # This option is available for gcc-2.95.1, gcc-2.95.2, gcc-2.95.3,...
+@@ -62,10 +62,8 @@
+ ifeq ($(OS),FreeBSD)
+ 	CFLAGS+= -DDISPLAY_REALTIME
+ 	ifeq ($(USE_MT),yes)
+-		LIBS+= -L/usr/local/lib -llthread
+-		CFLAGS+= -DUSE_PTHREAD -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads
+-		CC+=-kthread
+-		LD+=-kthread
++		LIBS+= -L${LOCALBASE}/lib -llthread -llgcc_r
++		CFLAGS+= -DUSE_PTHREAD -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
+ 	endif
+ endif
+ ifeq ($(OS),OpenBSD)
diff -xCVS -xCFLAGS -urN /usr/ports/audio/gogo/pkg/COMMENT gogo/pkg/COMMENT
--- /usr/ports/audio/gogo/pkg/COMMENT	Fri Oct  1 17:46:14 1999
+++ gogo/pkg/COMMENT	Wed May 10 23:32:19 2000
@@ -1 +1 @@
-Very fast MP3 encoder with MMX, 3D Now! and PentiumIII SSE support
+Very fast MP3 encoder using recent x86 processors' features
diff -xCVS -xCFLAGS -urN /usr/ports/audio/gogo/pkg/DESCR gogo/pkg/DESCR
--- /usr/ports/audio/gogo/pkg/DESCR	Thu Jan 27 03:15:07 2000
+++ gogo/pkg/DESCR	Wed May 10 23:32:55 2000
@@ -1,12 +1,12 @@
-gogo, 'Gogo no coder' (which means 'afternoon coder'), is very fast
-MP3 encoder based on lame-3.23 which is optimized for MMX, K6-2 3DNow!
-and Intel PentiumIII SSE. The latter is available when FreeBSD
-supports SSE. (Linux supports it.)
+GOGO-no-coda is very fast MP3 encoder based on lame-3.29beta,
+optimized with MMX, 3DNow!, Enhanced 3DNow! and SSE (patched nasm required
+to compile with E3DNow! and kernel support needed to enable SSE but FreeBSD
+does not have it yet).
 
-*** DON'T OVERCLOCK YOUR K6-2 ***
-Gogo heavily uses the 3DNow! unit that almost sleeps in usual,
-and the encoding CPU becomes very hot even with its normal clock.
-So overclock may cause serious internal errors or crazy results.
-Also, this may be same on PentiumIII or others.
+*** DO NOT OVERCLOCK YOUR CPUs ***
+GOGO heavily uses the part of processors that almost sleeps in usual,
+so makes them very hot even it runs standard clock.
+Overclocking may cause serious internal errors and crazy results.
+Or you need gigantic heatsink and extra-noisy fans. :-)
 
 WWW: http://homepage1.nifty.com/herumi/gogo_e.html
diff -xCVS -xCFLAGS -urN /usr/ports/audio/gogo/pkg/PLIST gogo/pkg/PLIST
--- /usr/ports/audio/gogo/pkg/PLIST	Fri Jan 28 03:43:27 2000
+++ gogo/pkg/PLIST	Wed May 10 23:54:15 2000
@@ -1,5 +1,5 @@
 bin/cdda2mp3.gogo
 bin/gogo
 share/doc/gogo/cdda2mp3.gogo.en
-share/doc/gogo/cdda2mp3.gogo.jp
+share/doc/gogo/cdda2mp3.gogo.ja
 @dirrm share/doc/gogo

>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?86snvqz8j8.wl>