sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

An attempt at making mpg123 work on FreeBSD/Alpha.

Browse source 
Submitted by:		Christian Weisgerber <naddy@mips.inka.de>
This commit is contained in:
Joseph Koshy 2000-05-05 07:20:23 +00:00
parent fa78580a86
commit a0c2e00b0a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=28299
4 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
audio/mpg123/Makefile
View file

@ -12,9 +12,12 @@ MASTER_SITES= http://www.mpg123.de/mpg123/ \
http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \ http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \ ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
http://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/ PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \
PATCHFILES= mpg123-059r-v6-20000217.diff.gz http://www.unix-ag.org/Linux-Alpha/Packages/
PATCHFILES= mpg123-059r-v6-20000217.diff.gz \
l3.diff.gz
PATCH_DIST_STRIP= -p1 PATCH_DIST_STRIP= -p1
MAINTAINER= jkoshy@freebsd.org MAINTAINER= jkoshy@freebsd.org
@ -23,8 +26,6 @@ MAINTAINER= jkoshy@freebsd.org
LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound
.endif .endif
ONLY_FOR_ARCHS= i386
MAN1= mpg123.1 MAN1= mpg123.1
.include <bsd.port.pre.mk> .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} "Note: you can set OPT_ESOUND to \"yes\" to compile mpg123 with esd support."
@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
.endif .endif
.if $(MACHINE_ARCH) == "i386" .if ${MACHINE_ARCH} == "i386"
.if !defined(OPT_ARCH) || (($(OPT_ARCH) != "i486") && ($(OPT_ARCH) != "i586") \ .if !defined(OPT_ARCH) || ((${OPT_ARCH} != "i486") && (${OPT_ARCH} != "i586") \
&& ($(OPT_ARCH) != "3dnow")) && (${OPT_ARCH} != "3dnow"))
@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@${ECHO_MSG} "Note: you can set OPT_ARCH to optimize for your hardware. (Eg:- make OPT_ARCH=i486)" @${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" @${ECHO_MSG} "Valid values are: i486, i586, 3dnow"
.else .else
@${ECHO_MSG} "Valid values are: i486" @${ECHO_MSG} "Valid values are: i486"
.endif .endif
@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
.endif .endif
.endif .if ${PORTOBJFORMAT} == "elf"
.if $(PORTOBJFORMAT) == "elf"
OPT_ARCH?= i586 OPT_ARCH?= i586
.else .else
OPT_ARCH?= i486 OPT_ARCH?= i486
.endif .endif
.endif
# Uncomment this line below to optimise for i486 family CPUs on ELF boxes
# OPT_ARCH= i486
.if defined(OPT_ARCH) .if defined(OPT_ARCH)
MAKE_ARGS+= OPT_ARCH=$(OPT_ARCH) MAKE_ARGS+= OPT_ARCH=${OPT_ARCH}
.endif .endif
.if defined(OPT_ESOUND) .if defined(OPT_ESOUND)
MAKE_ARGS+= OPT_ESOUND=$(OPT_ESOUND) MAKE_ARGS+= OPT_ESOUND=${OPT_ESOUND}
.endif .endif
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
audio/mpg123/distinfo
View file

@ -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 (mpg123-059r-v6-20000217.diff.gz) = 2ecb369d4c6d8b99017e86aeb2313220
MD5 (l3.diff.gz) = b8749f4709ed1a9df8a00d51c4a02dd5

46
audio/mpg123/files/patch-aa
View file

@ -1,5 +1,5 @@
--- Makefile.orig Wed Feb 2 03:34:45 2000 --- Makefile.orig Fri May 5 00:07:57 2000
+++ Makefile Wed Feb 2 03:36:53 2000 +++ Makefile Fri May 5 00:13:05 2000
@@ -4,13 +4,15 @@ @@ -4,13 +4,15 @@
# Where to install binary and manpage on "make install": # Where to install binary and manpage on "make install":
@ -18,39 +18,45 @@
# Additional LIBDIR and libraries if exist # Additional LIBDIR and libraries if exist
IPV6LIBDIR= IPV6LIBDIR=
IPV6LIB= IPV6LIB=
@@ -300,35 +302,49 @@ @@ -300,35 +302,55 @@
#CFLAGS='$(CFLAGS) -DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g' #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' #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 +CC ?= cc
+LDFLAGS = +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 defined(OPT_ARCH)
+.if (${OPT_ARCH} == "i486") +.if (${OPT_ARCH} == "i486")
+ARCHOPT = -DI486_OPT +ARCHOPT+= -DI486_OPT
+ARCHFILES = decode_i486.o dct64_i486.o dct64_i386.o +ARCHFILES+= decode_i486.o dct64_i486.o dct64_i386.o
+.elif (${OPT_ARCH} == "i586") +.elif (${OPT_ARCH} == "i586")
+ARCHOPT = -DPENTIUM_OPT +ARCHOPT+= -DPENTIUM_OPT
+ARCHFILES = decode_i586.o dct64_i386.o +ARCHFILES+= decode_i586.o dct64_i386.o
+.elif (${OPT_ARCH} == "3dnow") +.elif (${OPT_ARCH} == "3dnow")
+ARCHOPT = -DPENTIUM_OPT -DUSE_3DNOW +ARCHOPT+= -DPENTIUM_OPT -DUSE_3DNOW
+ARCHFILES = dct64_3dnow.o decode_3dnow.o +ARCHFILES+= dct64_3dnow.o decode_3dnow.o
+dct64_3dnow.o: +dct64_3dnow.o:
+ ${INSTALL} ./precompiled/linux-i386/dct64_3dnow.o . + ${INSTALL} ./precompiled/linux-i386/dct64_3dnow.o .
+decode_3dnow.o: +decode_3dnow.o:
+ ${INSTALL} ./precompiled/linux-i386/decode_3dnow.o . + ${INSTALL} ./precompiled/linux-i386/decode_3dnow.o .
+.endif +.endif
+.endif +.endif
+.elif ${MACHINE_ARCH} == "alpha"
+ARCHOPT= -funroll-loops -ffast-math
+ARCHFILES= decode.o dct64.o
+.endif
+ +
+CFLAGS +=-Wall -ansi -pedantic -fomit-frame-pointer \ +CFLAGS +=-Wall -ansi -pedantic ${ARCHOPT} \
+ -funroll-all-loops -ffast-math -DROT_I386 \ + -DREAD_MMAP -DUSE_MMAP -DOSS -DTERM_CONTROL
+ -DREAD_MMAP \
+ -DI386_ASSEM ${ARCHOPT} -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DTERM_CONTROL
+ +
+.if defined(OPT_ESOUND) +.if defined(OPT_ESOUND)
+CFLAGS +=-I${PREFIX}/include +CFLAGS +=-I${LOCALBASE}/include
+LDFLAGS+=-L${PREFIX}/lib +LDFLAGS+=-L${LOCALBASE}/lib
+.endif +.endif
+ +
freebsd: freebsd:
@ -60,7 +66,7 @@
- -funroll-all-loops -ffast-math -DROT_I386 \ - -funroll-all-loops -ffast-math -DROT_I386 \
- -DREAD_MMAP \ - -DREAD_MMAP \
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \ - -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 mpg123-make
freebsd-esd: freebsd-esd:
@ -74,13 +80,13 @@
- -I/usr/local/include -L/usr/local/lib \ - -I/usr/local/include -L/usr/local/lib \
- $(CFLAGS)' \ - $(CFLAGS)' \
+ $(MAKE) AUDIO_LIB='-lesd -laudiofile' \ + $(MAKE) AUDIO_LIB='-lesd -laudiofile' \
+ OBJECTS='decode_i386.o ${ARCHFILES} audio_esd.o term.o' \ + OBJECTS='${ARCHFILES} audio_esd.o term.o' \
mpg123-make mpg123-make
freebsd-frontend: freebsd-frontend:
- $(MAKE) CC=cc LDFLAGS= \ - $(MAKE) CC=cc LDFLAGS= \
- OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \ - 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' \ control_sajber.o control_tk3play.o' \
- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- -funroll-all-loops -ffast-math -DROT_I386 \ - -funroll-all-loops -ffast-math -DROT_I386 \
@ -89,7 +95,7 @@
$(FRONTEND) $(FRONTEND)
@@ -567,7 +583,7 @@ @@ -567,7 +589,7 @@
@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123 @ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123
mpg123-make: mpg123-make:

10
audio/mpg123/files/patch-ab
View file

@ -1,17 +1,17 @@
--- mpg123.c.orig Wed Jun 16 01:51:36 1999 --- mpg123.c.orig Fri Jun 18 14:18:11 1999
+++ mpg123.c Fri Aug 13 15:25:52 1999 +++ mpg123.c Fri May 5 00:07:02 2000
@@ -27,6 +27,10 @@ @@ -27,6 +27,10 @@
#include <sched.h> #include <sched.h>
#endif #endif
+#ifdef __FreeBSD__ +#ifdef __FreeBSD__
+#include <floatingpoint.h> +#include <ieeefp.h>
+#endif +#endif
+ +
#include "mpg123.h" #include "mpg123.h"
#include "getlopt.h" #include "getlopt.h"
#include "buffer.h" #include "buffer.h"
@@ -780,6 +784,10 @@ @@ -784,6 +788,10 @@
_wildcard(&argc,&argv); _wildcard(&argc,&argv);
#endif #endif
@ -22,7 +22,7 @@
if(sizeof(short) != 2) { if(sizeof(short) != 2) {
fprintf(stderr,"Ouch SHORT has size of %d bytes (required: '2')\n",(int)sizeof(short)); fprintf(stderr,"Ouch SHORT has size of %d bytes (required: '2')\n",(int)sizeof(short));
exit(1); exit(1);
@@ -913,17 +921,6 @@ @@ -917,17 +925,6 @@
&dirname, &filename)) &dirname, &filename))
fprintf(stderr, "\nDirectory: %s", dirname); fprintf(stderr, "\nDirectory: %s", dirname);
fprintf(stderr, "\nPlaying MPEG stream from %s ...\n", filename); fprintf(stderr, "\nPlaying MPEG stream from %s ...\n", filename);