Index: head/audio/mpg123/Makefile =================================================================== --- head/audio/mpg123/Makefile (revision 118729) +++ head/audio/mpg123/Makefile (revision 118730) @@ -1,105 +1,106 @@ # New ports collection makefile for: mpg123 # Date created: 25 June 1997 # Whom: Carey Jones # # $FreeBSD$ # PORTNAME= mpg123 PORTVERSION= 0.59r PORTREVISION= 14 CATEGORIES= audio ipv6 MASTER_SITES= http://www.mpg123.de/mpg123/ \ http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ DISTNAME= mpg123-0.59r-pl1 PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/:ipv6 \ http://www.unix-ag.org/Linux-Alpha/Packages/:l3 \ ${MASTER_SITE_LOCAL:S/%SUBDIR%/sobomax/}:recode PATCHFILES= mpg123-059r-v6-20000713b.diff.gz:ipv6 \ mpg123-059r-recode-20010410.diff.gz:recode \ l3.diff.gz:l3 PATCH_DIST_STRIP= -p1 MAINTAINER= bogorodskiy@inbox.ru COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio WANT_GNOME= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .if defined(WITH_ICONV) MAKE_ARGS+= WITH_ICONV=yes .if defined(DEFAULT_RECODE) MAKE_ARGS+= DEFAULT_RECODE=${DEFAULT_RECODE} .endif USE_ICONV= yes .endif .if defined(WITH_NAS) HAVE_NAS= yes LIB_DEPENDS= audio.2:${PORTSDIR}/audio/nas MAKE_ENV+= HAVE_NAS=${HAVE_NAS} .endif MAN1= mpg123.1 PLIST_FILES= bin/mpg123 .include .if ${OSVERSION} >= 400014 MAKE_ENV+= USE_INET6=yes .endif .if ${HAVE_GNOME:Mesound}!="" USE_GNOME+= esound ALL_TARGET= freebsd-esd PKGNAMESUFFIX= -esound MAKE_ENV+= HAVE_ESOUND=yes .elif defined(HAVE_NAS) PKGNAMESUFFIX= -nas ALL_TARGET= freebsd-nas .else ALL_TARGET= freebsd +CFLAGS+= -DWITH_FREEBSD_DSP_ONLY .endif pre-fetch: .if !defined(WITH_NAS) @${ECHO_MSG} @${ECHO_MSG} "If you want to compile with NAS support," @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_NAS=yes\"" @${ECHO_MSG} .endif .if !defined(WITH_ICONV) @${ECHO_MSG} @${ECHO_MSG} "If you want to enable ID3 tags charset recoding," @${ECHO_MSG} "hit Ctrl-C and use \"make WITH_ICONV=yes\"; you can" @${ECHO_MSG} "also specify DEFAULT_RECODE in 'from:to' format" @${ECHO_MSG} .endif .if ${ARCH} == "i386" .if ${OSVERSION} >= 430000 .if ${MACHINE_CPU:M3dnow} OPT_ARCH= 3dnow .elif ${MACHINE_CPU:Mi586} OPT_ARCH= i586 .elif ${MACHINE_CPU:Mi486} OPT_ARCH= i486 .endif .else .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." @${ECHO_MSG} "(e.g. make OPT_ARCH=i486)." @${ECHO_MSG} "Valid values are: i486, i586, 3dnow" @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" OPT_ARCH?= i586 .endif .endif .endif .if defined(OPT_ARCH) MAKE_ARGS+= OPT_ARCH=${OPT_ARCH} .endif .include Property changes on: head/audio/mpg123/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.60 \ No newline at end of property +1.61 \ No newline at end of property Index: head/audio/mpg123/files/patch-aa =================================================================== --- head/audio/mpg123/files/patch-aa (revision 118729) +++ head/audio/mpg123/files/patch-aa (revision 118730) @@ -1,124 +1,123 @@ ---- Makefile.orig Sat Jan 31 13:43:04 2004 -+++ Makefile Sat Jan 31 13:44:35 2004 +--- Makefile.orig Wed Sep 15 21:14:24 2004 ++++ Makefile Wed Sep 15 21:14:41 2004 @@ -4,13 +4,15 @@ # Where to install binary and manpage on "make install": -PREFIX=/usr/local +#PREFIX=/usr/local BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/man SECTION=1 # Enable the below line If your plathome support IPv6 -#CFLAGS+= -DINET6 +.if defined(USE_INET6) +CFLAGS+= -DINET6 +.endif # Additional LIBDIR and libraries if exist IPV6LIBDIR= IPV6LIB= @@ -300,6 +302,9 @@ #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 = + .if defined(WITH_ICONV) CFLAGS+=-DWITH_ICONV -I${LOCALBASE}/include LDFLAGS+=-L${LOCALBASE}/lib -liconv -@@ -308,35 +313,63 @@ +@@ -308,35 +313,62 @@ .endif .endif +.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) +ARCHFILES+= dct64_i386.c +.else +.if (${OPT_ARCH} == "i486") +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 +.elif (${OPT_ARCH} == "3dnow") +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 +.else +ARCHOPT= -funroll-loops +ARCHFILES= decode.o dct64.o +.endif + +CFLAGS +=-Wall -ansi -pedantic ${ARCHOPT} \ + -DREAD_MMAP -DUSE_MMAP -DOSS -DTERM_CONTROL + +.if defined(HAVE_ESOUND) +CFLAGS +=-I${LOCALBASE}/include +LDFLAGS+=-L${LOCALBASE}/lib +.elif defined(HAVE_NAS) +CFLAGS +=-I${X11BASE}/include -DNAS +LDFLAGS+=-L${X11BASE}/lib +.endif + freebsd: - $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \ - CFLAGS='$(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='${ARCHFILES} audio_oss.o term.o' \ -+ CFLAGS="${CFLAGS} -DWITH_FREEBSD_DSP_ONLY" \ mpg123-make freebsd-esd: - $(MAKE) CC=cc LDFLAGS= \ - AUDIO_LIB='-lesd -laudiofile' \ - OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \ - CFLAGS='$(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 \ - -I/usr/local/include -L/usr/local/lib \ - $(CFLAGS)' \ + $(MAKE) AUDIO_LIB='-lesd -laudiofile' \ + OBJECTS='${ARCHFILES} audio_esd.o term.o' \ + mpg123-make + +freebsd-nas: + $(MAKE) AUDIO_LIB='-laudio -lXau -lXt' \ + OBJECTS='${ARCHFILES} audio_nas.o term.o' \ mpg123-make freebsd-frontend: - $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o 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 \ - -DFRONTEND \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \ $(FRONTEND) -@@ -575,7 +608,7 @@ +@@ -575,7 +607,7 @@ @ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123 mpg123-make: - @ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123 mpg123 + @ $(MAKE) LDFLAGS='$(LDFLAGS)' 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 \ Property changes on: head/audio/mpg123/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property