From 986cc14a88c4e699fb812b389a25c61ff4adc22d Mon Sep 17 00:00:00 2001
From: simonb <simonb>
Date: Wed, 27 Feb 2002 23:22:48 +0000
Subject: Use -DREAD_MMAP on all NetBSD targets.  Fixes problems with
 mis-decoding ID3 tags. Reported by Martin Husemann.

---
 audio/mpg123/distinfo         |  4 ++--
 audio/mpg123/patches/patch-aa | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'audio/mpg123')

diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index c528506a5b5..10f4c357aa2 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2002/02/27 21:37:40 martin Exp $
+$NetBSD: distinfo,v 1.7 2002/02/27 23:22:48 simonb Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
 SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
 Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
-SHA1 (patch-aa) = cf27fdcb1953e988d69929735b732710866121ff
+SHA1 (patch-aa) = c1840130e7cc7b78c0692b34c970ae4c4f6d1a15
 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index a725bd57bd3..9c528cf10a2 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.15 2001/02/26 16:30:19 jlam Exp $
+$NetBSD: patch-aa,v 1.16 2002/02/27 23:22:49 simonb Exp $
 
---- Makefile.orig	Mon Feb 26 10:58:56 2001
-+++ Makefile
+--- Makefile.orig	Thu Feb 28 10:17:44 2002
++++ Makefile	Thu Feb 28 10:19:04 2002
 @@ -54,6 +54,10 @@
  	@echo "make aix-tk3play    IBM AIX"
  	@echo "make os2            IBM OS/2"
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.15 2001/02/26 16:30:19 jlam Exp $
 +	$(MAKE) CC=cc LDFLAGS= \
 +		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
 +		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-+			-ffast-math -DREAL_IS_FLOAT \
++			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
 +			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \
 +		mpg123-make
 +
@@ -55,8 +55,9 @@ $NetBSD: patch-aa,v 1.15 2001/02/26 16:30:19 jlam Exp $
 -		OBJECTS='decode.o dct64.o audio_sun.o' \
 +		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
  		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
- 			-funroll-all-loops -ffast-math \
+-			-funroll-all-loops -ffast-math \
 -			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
++			-funroll-all-loops -ffast-math -DREAD_MMAP \
 +			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
  		mpg123-make
  
@@ -64,10 +65,11 @@ $NetBSD: patch-aa,v 1.15 2001/02/26 16:30:19 jlam Exp $
  	$(MAKE) CC=cc LDFLAGS= \
 -		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
 -		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+-			-funroll-all-loops -ffast-math -DROT_I386 \
+-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
 +		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \
 +		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
- 			-funroll-all-loops -ffast-math -DROT_I386 \
--			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
++			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
 +			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
  		mpg123-make
  
-- 
cgit v1.2.3