From 50439ed0fac57f52a76a6a798d07f2f5bb6714b3 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Thu, 23 Oct 2003 02:25:27 +0000
Subject: Port to amd64, and hopefully ia64 and sparc64 at the same time.

---
 audio/mpg123/files/patch-aa |  6 ++---
 audio/mpg123/files/patch-ah | 56 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 audio/mpg123/files/patch-ah

(limited to 'audio/mpg123')

diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index 390bf3bb0126..5669c80b58c3 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile	2001/04/10 11:50:14	1.1
-+++ Makefile	2001/04/10 11:51:38
+--- Makefile.orig	Wed Oct 22 17:52:17 2003
++++ Makefile	Wed Oct 22 19:21:17 2003
 @@ -4,13 +4,15 @@
  
  # Where to install binary and manpage on "make install":
@@ -55,7 +55,7 @@
 +	${INSTALL} ./precompiled/linux-i386/decode_3dnow.o .
 +.endif
 +.endif
-+.elif ${MACHINE_ARCH} == "alpha"
++.else 
 +ARCHOPT= -funroll-loops
 +ARCHFILES= decode.o dct64.o
 +.endif
diff --git a/audio/mpg123/files/patch-ah b/audio/mpg123/files/patch-ah
new file mode 100644
index 000000000000..a2154c97378f
--- /dev/null
+++ b/audio/mpg123/files/patch-ah
@@ -0,0 +1,56 @@
+--- layer3.c.xx	Wed Oct 22 19:19:01 2003
++++ layer3.c	Wed Oct 22 19:20:30 2003
+@@ -608,7 +608,7 @@
+  * Dequantize samples (includes huffman decoding)
+  */
+ /* 24 is enough because tab13 has max. a 19 bit huffvector */
+-#ifdef __alpha
++#ifndef __i386__
+ #define BITSHIFT ((sizeof(int)-1)*8)
+ #define REFRESH_MASK \
+   while(num < BITSHIFT) { \
+@@ -634,7 +634,7 @@
+   int *me;
+ 
+   int num=getbitoffset();
+-#ifdef __alpha
++#ifndef __i386__
+   int mask = (int) getbits(num)<<(BITSHIFT+8-num);
+ #else
+   long mask = (long) getbits(num)<<(BITSHIFT+8-num);
+@@ -722,7 +722,7 @@
+         if(x == 15 && h->linbits) {
+           max[lwin] = cb;
+           REFRESH_MASK;
+-#ifdef __alpha
++#ifndef __i386__
+           x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
+ #else
+           x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+@@ -750,7 +750,7 @@
+         if(y == 15 && h->linbits) {
+           max[lwin] = cb;
+           REFRESH_MASK;
+-#ifdef __alpha
++#ifndef __i386__
+           y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
+ #else
+           y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+@@ -904,7 +904,7 @@
+         if (x == 15 && h->linbits) {
+           max = cb;
+ 	  REFRESH_MASK;
+-#ifdef __alpha
++#ifndef __i386__
+           x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
+ #else
+           x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+@@ -932,7 +932,7 @@
+         if (y == 15 && h->linbits) {
+           max = cb;
+ 	  REFRESH_MASK;
+-#ifdef __alpha
++#ifndef __i386__
+           y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
+ #else
+           y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-- 
cgit v1.2.3