Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Jul 1999 03:40:07 -0700 (PDT)
From:      sobomax@altavista.net
To:        freebsd-gnats-submit@freebsd.org
Subject:   ports/12814: [PATCH] New version of mpg123 port
Message-ID:  <19990726104007.0455A14BEE@hub.freebsd.org>

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

>Number:         12814
>Category:       ports
>Synopsis:       [PATCH] New version of mpg123 port
>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:   Mon Jul 26 03:50:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Maxim Sobolev
>Release:        3.2-STABLE
>Organization:
Vega International Capital
>Environment:
FreeBSD vega 3.2-STABLE FreeBSD 3.2-STABLE #0: Sat Jul 24 15:19:41 EEST 1999     max@vega:/usr/src/sys/compile/VEGA  i386
>Description:
New version of mpg123 port
>How-To-Repeat:

>Fix:
diff -ruN mpg123.orig/Makefile mpg123/Makefile
--- mpg123.orig/Makefile	Mon Jul 26 13:02:59 1999
+++ mpg123/Makefile	Mon Jul 26 12:18:19 1999
@@ -6,9 +6,10 @@
 # $Id: Makefile,v 1.11 1999/02/01 09:01:09 jkoshy Exp $
 #
 
-DISTNAME=	mpg123-0.59q
+DISTNAME=	mpg123-0.59r
 CATEGORIES=	audio
-MASTER_SITES=	http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
+MASTER_SITES=	http://www.mpg123.de/mpg123/ \
+		http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
 		ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
 		http://ftp.tu-clausthal.de/pub/unix/audio/mpg123/
 
diff -ruN mpg123.orig/files/md5 mpg123/files/md5
--- mpg123.orig/files/md5	Mon Jul 26 13:02:59 1999
+++ mpg123/files/md5	Mon Jul 26 12:17:11 1999
@@ -1 +1 @@
-MD5 (mpg123-0.59q.tar.gz) = 004b50277781704142964a728687224e
+MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7
diff -ruN mpg123.orig/patches/patch-aa mpg123/patches/patch-aa
--- mpg123.orig/patches/patch-aa	Mon Jul 26 13:02:59 1999
+++ mpg123/patches/patch-aa	Mon Jul 26 12:59:44 1999
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Jan 26 15:35:18 1999
-+++ Makefile	Mon Jun 14 22:21:57 1999
+--- Makefile.orig	Tue Jun 15 23:39:06 1999
++++ Makefile	Mon Jul 26 12:59:24 1999
 @@ -4,7 +4,7 @@
  
  # Where to install binary and manpage on "make install":
@@ -9,16 +9,10 @@
  BINDIR=$(PREFIX)/bin
  MANDIR=$(PREFIX)/man
  SECTION=1
-@@ -247,24 +247,27 @@
+@@ -285,14 +285,17 @@
  #CFLAGS='-DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
  #CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
  
-+.if $(PORTOBJFORMAT) == "elf"
-+GETBITS=getbits.o
-+.else
-+GETBITS=getbits_.o
-+.endif
-+
 +CC ?= cc
 +LDFLAGS =
 +CFLAGS ?=-O4 -m486
@@ -29,19 +23,24 @@
 +
  freebsd:
 -	$(MAKE) CC=cc LDFLAGS= \
--		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o' \
+-		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
 -		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 -			-funroll-all-loops -ffast-math -DROT_I386 \
 -			-DREAD_MMAP \
 -			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
-+	${MAKE}	OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_oss.o' \
+-		mpg123-make
++	${MAKE}	OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
++ 		mpg123-make
+ 
+ freebsd-esd:
+ 	$(MAKE) CC=cc LDFLAGS= \
+@@ -307,13 +310,8 @@
  		mpg123-make
  
--
  freebsd-frontend:
 -	$(MAKE) CC=cc LDFLAGS= \
--		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o \
-+	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_oss.o \
+-		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
++	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
  			control_sajber.o control_tk3play.o' \
 -		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 -			-funroll-all-loops -ffast-math -DROT_I386 \
@@ -50,12 +49,3 @@
  		$(FRONTEND)
   
  
-@@ -414,7 +417,7 @@
- 	@ $(MAKE) BINNAME=mpg123m mpg123
- 
- mpg123-make:
--	@ $(MAKE) BINNAME=mpg123 mpg123
-+	@ $(MAKE) CFLAGS="$(CFLAGS)" BINNAME=mpg123 mpg123
- 
- mpg123: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \
- 		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \
diff -ruN mpg123.orig/pkg/DESCR mpg123/pkg/DESCR
--- mpg123.orig/pkg/DESCR	Mon Jul 26 13:02:59 1999
+++ mpg123/pkg/DESCR	Mon Jul 26 12:16:35 1999
@@ -3,5 +3,5 @@
 outputs them to stdout.  file/URL is assumed to be an MPEG-1/2 audio
 bit stream.
 
-WWW: http://mpg.123.org	 
-http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123.html
+WWW: http://www.mpg123.de/
+


>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?19990726104007.0455A14BEE>