summaryrefslogtreecommitdiff
path: root/audio/mpg123
diff options
context:
space:
mode:
authorJoseph Koshy <jkoshy@FreeBSD.org>2000-05-05 07:20:23 +0000
committerJoseph Koshy <jkoshy@FreeBSD.org>2000-05-05 07:20:23 +0000
commita0c2e00b0a75828e2f43724f5e6f14b587a25e93 (patch)
treeed2916a5314302783ac75ee0ad52454fb17ace18 /audio/mpg123
parentUpdate to version 2.52. (diff)
An attempt at making mpg123 work on FreeBSD/Alpha.
Submitted by: Christian Weisgerber <naddy@mips.inka.de>
Notes
Notes: svn path=/head/; revision=28299
Diffstat (limited to 'audio/mpg123')
-rw-r--r--audio/mpg123/Makefile29
-rw-r--r--audio/mpg123/distinfo3
-rw-r--r--audio/mpg123/files/patch-aa46
-rw-r--r--audio/mpg123/files/patch-ab10
4 files changed, 46 insertions, 42 deletions
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 0f5f9506a830..f46c553b014f 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -12,9 +12,12 @@ 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/
+DISTFILES= mpg123-0.59r-pl1.tar.gz
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES= mpg123-059r-v6-20000217.diff.gz
+PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \
+ http://www.unix-ag.org/Linux-Alpha/Packages/
+PATCHFILES= mpg123-059r-v6-20000217.diff.gz \
+ l3.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= jkoshy@freebsd.org
@@ -23,8 +26,6 @@ MAINTAINER= jkoshy@freebsd.org
LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound
.endif
-ONLY_FOR_ARCHS= i386
-
MAN1= mpg123.1
.include <bsd.port.pre.mk>
@@ -45,35 +46,31 @@ pre-configure:
@${ECHO_MSG} "Note: you can set OPT_ESOUND to \"yes\" to compile mpg123 with esd support."
@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
.endif
-.if $(MACHINE_ARCH) == "i386"
-.if !defined(OPT_ARCH) || (($(OPT_ARCH) != "i486") && ($(OPT_ARCH) != "i586") \
- && ($(OPT_ARCH) != "3dnow"))
+.if ${MACHINE_ARCH} == "i386"
+.if !defined(OPT_ARCH) || ((${OPT_ARCH} != "i486") && (${OPT_ARCH} != "i586") \
+ && (${OPT_ARCH} != "3dnow"))
@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@${ECHO_MSG} "Note: you can set OPT_ARCH to optimize for your hardware. (Eg:- make OPT_ARCH=i486)"
-.if $(PORTOBJFORMAT) == "elf"
+.if ${PORTOBJFORMAT} == "elf"
@${ECHO_MSG} "Valid values are: i486, i586, 3dnow"
.else
@${ECHO_MSG} "Valid values are: i486"
.endif
@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
.endif
-.endif
-
-.if $(PORTOBJFORMAT) == "elf"
+.if ${PORTOBJFORMAT} == "elf"
OPT_ARCH?= i586
.else
OPT_ARCH?= i486
.endif
-
-# Uncomment this line below to optimise for i486 family CPUs on ELF boxes
-# OPT_ARCH= i486
+.endif
.if defined(OPT_ARCH)
-MAKE_ARGS+= OPT_ARCH=$(OPT_ARCH)
+MAKE_ARGS+= OPT_ARCH=${OPT_ARCH}
.endif
.if defined(OPT_ESOUND)
-MAKE_ARGS+= OPT_ESOUND=$(OPT_ESOUND)
+MAKE_ARGS+= OPT_ESOUND=${OPT_ESOUND}
.endif
.include <bsd.port.post.mk>
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 1954cf5c34a0..a1b735739b64 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,2 +1,3 @@
-MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7
+MD5 (mpg123-0.59r-pl1.tar.gz) = 2648708fac9203ef58292adf5e54e4ba
MD5 (mpg123-059r-v6-20000217.diff.gz) = 2ecb369d4c6d8b99017e86aeb2313220
+MD5 (l3.diff.gz) = b8749f4709ed1a9df8a00d51c4a02dd5
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index e9daa5475a2c..4191e08e1af1 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Wed Feb 2 03:34:45 2000
-+++ Makefile Wed Feb 2 03:36:53 2000
+--- Makefile.orig Fri May 5 00:07:57 2000
++++ Makefile Fri May 5 00:13:05 2000
@@ -4,13 +4,15 @@
# Where to install binary and manpage on "make install":
@@ -18,39 +18,45 @@
# Additional LIBDIR and libraries if exist
IPV6LIBDIR=
IPV6LIB=
-@@ -300,35 +302,49 @@
+@@ -300,35 +302,55 @@
#CFLAGS='$(CFLAGS) -DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
#CFLAGS='$(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'
+CC ?= cc
+LDFLAGS =
-+CFLAGS ?=-O4 -m486
+
++.if ${MACHINE_ARCH} == "i386"
++ARCHOPT= -funroll-all-loops -ffast-math -fomit-frame-pointer \
++ -DROT_I386 -DI386_ASSEM -DREAL_IS_FLOAT
++ARCHFILES= decode_i386.o
++CFLAGS ?=-O4 -m486
+.if defined(OPT_ARCH)
+.if (${OPT_ARCH} == "i486")
-+ARCHOPT = -DI486_OPT
-+ARCHFILES = decode_i486.o dct64_i486.o dct64_i386.o
++ARCHOPT+= -DI486_OPT
++ARCHFILES+= decode_i486.o dct64_i486.o dct64_i386.o
+.elif (${OPT_ARCH} == "i586")
-+ARCHOPT = -DPENTIUM_OPT
-+ARCHFILES = decode_i586.o dct64_i386.o
++ARCHOPT+= -DPENTIUM_OPT
++ARCHFILES+= decode_i586.o dct64_i386.o
+.elif (${OPT_ARCH} == "3dnow")
-+ARCHOPT = -DPENTIUM_OPT -DUSE_3DNOW
-+ARCHFILES = dct64_3dnow.o decode_3dnow.o
++ARCHOPT+= -DPENTIUM_OPT -DUSE_3DNOW
++ARCHFILES+= dct64_3dnow.o decode_3dnow.o
+dct64_3dnow.o:
+ ${INSTALL} ./precompiled/linux-i386/dct64_3dnow.o .
+decode_3dnow.o:
+ ${INSTALL} ./precompiled/linux-i386/decode_3dnow.o .
+.endif
+.endif
++.elif ${MACHINE_ARCH} == "alpha"
++ARCHOPT= -funroll-loops -ffast-math
++ARCHFILES= decode.o dct64.o
++.endif
+
-+CFLAGS +=-Wall -ansi -pedantic -fomit-frame-pointer \
-+ -funroll-all-loops -ffast-math -DROT_I386 \
-+ -DREAD_MMAP \
-+ -DI386_ASSEM ${ARCHOPT} -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DTERM_CONTROL
++CFLAGS +=-Wall -ansi -pedantic ${ARCHOPT} \
++ -DREAD_MMAP -DUSE_MMAP -DOSS -DTERM_CONTROL
+
+.if defined(OPT_ESOUND)
-+CFLAGS +=-I${PREFIX}/include
-+LDFLAGS+=-L${PREFIX}/lib
++CFLAGS +=-I${LOCALBASE}/include
++LDFLAGS+=-L${LOCALBASE}/lib
+.endif
+
freebsd:
@@ -60,7 +66,7 @@
- -funroll-all-loops -ffast-math -DROT_I386 \
- -DREAD_MMAP \
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
-+ ${MAKE} OBJECTS='decode_i386.o ${ARCHFILES} audio_oss.o term.o' \
++ ${MAKE} OBJECTS='${ARCHFILES} audio_oss.o term.o' \
mpg123-make
freebsd-esd:
@@ -74,13 +80,13 @@
- -I/usr/local/include -L/usr/local/lib \
- $(CFLAGS)' \
+ $(MAKE) AUDIO_LIB='-lesd -laudiofile' \
-+ OBJECTS='decode_i386.o ${ARCHFILES} audio_esd.o term.o' \
++ OBJECTS='${ARCHFILES} audio_esd.o term.o' \
mpg123-make
freebsd-frontend:
- $(MAKE) CC=cc LDFLAGS= \
- OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
-+ $(MAKE) OBJECTS='decode_i386.o ${ARCHFILES} audio_oss.o \
++ $(MAKE) OBJECTS='${ARCHFILES} audio_oss.o \
control_sajber.o control_tk3play.o' \
- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- -funroll-all-loops -ffast-math -DROT_I386 \
@@ -89,7 +95,7 @@
$(FRONTEND)
-@@ -567,7 +583,7 @@
+@@ -567,7 +589,7 @@
@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123
mpg123-make:
diff --git a/audio/mpg123/files/patch-ab b/audio/mpg123/files/patch-ab
index 640b33d5349a..164299b25200 100644
--- a/audio/mpg123/files/patch-ab
+++ b/audio/mpg123/files/patch-ab
@@ -1,17 +1,17 @@
---- mpg123.c.orig Wed Jun 16 01:51:36 1999
-+++ mpg123.c Fri Aug 13 15:25:52 1999
+--- mpg123.c.orig Fri Jun 18 14:18:11 1999
++++ mpg123.c Fri May 5 00:07:02 2000
@@ -27,6 +27,10 @@
#include <sched.h>
#endif
+#ifdef __FreeBSD__
-+#include <floatingpoint.h>
++#include <ieeefp.h>
+#endif
+
#include "mpg123.h"
#include "getlopt.h"
#include "buffer.h"
-@@ -780,6 +784,10 @@
+@@ -784,6 +788,10 @@
_wildcard(&argc,&argv);
#endif
@@ -22,7 +22,7 @@
if(sizeof(short) != 2) {
fprintf(stderr,"Ouch SHORT has size of %d bytes (required: '2')\n",(int)sizeof(short));
exit(1);
-@@ -913,17 +921,6 @@
+@@ -917,17 +925,6 @@
&dirname, &filename))
fprintf(stderr, "\nDirectory: %s", dirname);
fprintf(stderr, "\nPlaying MPEG stream from %s ...\n", filename);