fixes to compile on darwin

8 files changed, 97 insertions, 16 deletions

diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 636a58f9cf6..eac900515fe 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,15 +1,18 @@
-$NetBSD: distinfo,v 1.12 2006/12/23 20:53:42 jdc Exp $
+$NetBSD: distinfo,v 1.13 2007/08/02 21:48:33 dbj Exp $
 
 SHA1 (ffmpeg-0.4.9-pre1.tar.gz) = aad00445137520bec19e56bcb042e75a10c53bb3
 RMD160 (ffmpeg-0.4.9-pre1.tar.gz) = fd682846f97ada32951af7844e185c42783189a4
 Size (ffmpeg-0.4.9-pre1.tar.gz) = 1611332 bytes
-SHA1 (patch-aa) = acc31f2c428411f912750e05703f5cad506c12bc
+SHA1 (patch-aa) = c1cbba3599d495e70bc26edd026e18e0f5101070
 SHA1 (patch-ab) = 15c7def153b0854169f36ebc7c1e8ae49a0268ea
-SHA1 (patch-ac) = 2e7aa9021ddfe46cda35a9399e59f63848610d83
-SHA1 (patch-ad) = 95eea8ef74a270a0c60243eff740aa3346efaaaf
-SHA1 (patch-ae) = 3ef9f2a6acb5a75d0633ba9af2e049b1ebb5d526
+SHA1 (patch-ac) = 176a15b8c55f14269b5cb0123b4c88a52e9de19e
+SHA1 (patch-ad) = 933d57aea5721c4562773b97086ff672bd2a4ea9
+SHA1 (patch-ae) = a6e5452b1590a9cdc2a50b4579c88855e3952fdd
 SHA1 (patch-af) = 82f7e656ab01320235c85e98ec4c57277956ceb8
 SHA1 (patch-ag) = 69656d16d44d3321bdf9b790e6263db1529d2c99
 SHA1 (patch-ah) = 3b600dd8d5bc0d4363139cea0ba8338691d8fa75
 SHA1 (patch-ai) = fe1bbecd05f2eef812650efa83223a3b6417ed6a
 SHA1 (patch-aj) = b998fdc2b3cc5f6efd2fb4f12fbb630d5832004b
+SHA1 (patch-ak) = 564d7d55372281909f70c63c6a72eb7d97afd99d
+SHA1 (patch-an) = 3e2327f2a30571daf82edd67128c63845819224e
+SHA1 (patch-ao) = f1e8f504a951ab02d70aae083862414b32d8b55a
diff --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa
index 0e9bd4e7ec7..7d0e1f7f535 100644
--- a/multimedia/ffmpeg/patches/patch-aa
+++ b/multimedia/ffmpeg/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2006/02/16 10:26:30 abs Exp $
+$NetBSD: patch-aa,v 1.6 2007/08/02 21:48:34 dbj Exp $
 
---- configure.orig	2004-11-28 16:56:25.000000000 +0100
-+++ configure
+--- configure.orig	2004-07-05 11:06:16.000000000 -0700
++++ configure	2007-08-02 12:56:27.000000000 -0700
 @@ -224,11 +224,10 @@ FFSLDFLAGS=""
  need_inet_aton="yes"
  extralibs="$extralibs -lsocket -lnsl"
@@ -15,3 +15,11 @@ $NetBSD: patch-aa,v 1.5 2006/02/16 10:26:30 abs Exp $
  CFLAGS="-pthread"
  LDFLAGS="$LDFLAGS -export-dynamic -pthread"
  ;;
+@@ -244,7 +243,6 @@ cc="cc"
+ v4l="no"
+ audio_oss="no"
+ dv1394="no"
+-ffserver="no"
+ SHFLAGS="-dynamiclib"
+ extralibs=""
+ darwin="yes"
diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac
index 9c171b87d07..18c3cc94e87 100644
--- a/multimedia/ffmpeg/patches/patch-ac
+++ b/multimedia/ffmpeg/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2006/02/16 10:26:30 abs Exp $
+$NetBSD: patch-ac,v 1.4 2007/08/02 21:48:34 dbj Exp $
 
 --- Makefile.orig	2004-07-08 13:02:04.000000000 +0200
 +++ Makefile
@@ -9,7 +9,7 @@ $NetBSD: patch-ac,v 1.3 2006/02/16 10:26:30 abs Exp $
 -
 -CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 -LDFLAGS+= -g 
-+CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS= $(SHCFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
  
  ifeq ($(TARGET_GPROF),yes)
  CFLAGS+=-p
diff --git a/multimedia/ffmpeg/patches/patch-ad b/multimedia/ffmpeg/patches/patch-ad
index 38fb253d916..ac4365dd875 100644
--- a/multimedia/ffmpeg/patches/patch-ad
+++ b/multimedia/ffmpeg/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.4 2006/02/16 10:26:30 abs Exp $
+$NetBSD: patch-ad,v 1.5 2007/08/02 21:48:34 dbj Exp $
 
---- libavformat/Makefile.orig	2004-04-24 17:16:23.000000000 +0200
-+++ libavformat/Makefile
+--- libavformat/Makefile.orig	2004-04-24 08:16:23.000000000 -0700
++++ libavformat/Makefile	2007-08-02 10:47:18.000000000 -0700
+@@ -6,7 +6,7 @@ include ../config.mak
+ 
+ VPATH=$(SRC_PATH)/libavformat
+ 
+-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ OBJS= utils.o cutils.o os_support.o allformats.o
+ PPOBJS=
 @@ -68,6 +68,11 @@ endif
  
  ifeq ($(CONFIG_VORBIS),yes)
diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae
index 2ea82da4afb..452783be322 100644
--- a/multimedia/ffmpeg/patches/patch-ae
+++ b/multimedia/ffmpeg/patches/patch-ae
@@ -1,6 +1,16 @@
--$NetBSD: patch-ae,v 1.6 2006/12/23 20:53:42 jdc Exp $
---- libavcodec/Makefile.orig	2004-06-18 14:11:15.000000000 +0100
-+++ libavcodec/Makefile	2006-12-18 16:06:24.000000000 +0000
+-$NetBSD: patch-ae,v 1.7 2007/08/02 21:48:34 dbj Exp $
+
+--- libavcodec/Makefile.orig	2004-06-18 06:11:15.000000000 -0700
++++ libavcodec/Makefile	2007-08-02 10:50:10.000000000 -0700
+@@ -7,7 +7,7 @@ include ../config.mak
+ VPATH=$(SRC_PATH)/libavcodec
+ 
+ # NOTE: -I.. is needed to include config.h
+-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(SHCFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ OBJS= common.o utils.o mem.o allcodecs.o \
+       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
 @@ -165,7 +165,7 @@ endif
  ifeq ($(TARGET_ARCH_SPARC),yes)
  OBJS+=sparc/dsputil_vis.o
diff --git a/multimedia/ffmpeg/patches/patch-ak b/multimedia/ffmpeg/patches/patch-ak
new file mode 100644
index 00000000000..c73046a2147
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1 2007/08/02 21:48:34 dbj Exp $
+
+--- libavcodec/msmpeg4.c.orig	2004-05-25 11:07:24.000000000 -0700
++++ libavcodec/msmpeg4.c	2007-08-02 11:27:58.000000000 -0700
+@@ -716,7 +716,11 @@ static inline int msmpeg4_pred_dc(MpegEn
+        necessitate to modify mpegvideo.c. The problem comes from the
+        fact they decided to store the quantized DC (which would lead
+        to problems if Q could vary !) */
+-#if defined ARCH_X86 && !defined PIC
++/* XXX
++ * i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5367)
++ * error: can't find a register in class ?BREG? while reloading ?asm?
++ */
++#if defined ARCH_X86 && !defined PIC && !defined __APPLE__
+     asm volatile(
+         "movl %3, %%eax		\n\t"
+ 	"shrl $1, %%eax		\n\t"
diff --git a/multimedia/ffmpeg/patches/patch-an b/multimedia/ffmpeg/patches/patch-an
new file mode 100644
index 00000000000..9504783a636
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-an
@@ -0,0 +1,21 @@
+$NetBSD: patch-an,v 1.1 2007/08/02 21:48:34 dbj Exp $
+
+--- libavcodec/liba52/resample.c.orig	2003-11-03 10:06:54.000000000 -0800
++++ libavcodec/liba52/resample.c	2007-08-02 12:37:36.000000000 -0700
+@@ -13,14 +13,14 @@ int (* a52_resample) (float * _f, int16_
+ 
+ #include "resample_c.c"
+ 
+-#ifdef ARCH_X86
++#ifdef HAVE_MMX
+ #include "resample_mmx.c"
+ #endif
+ 
+ void* a52_resample_init(uint32_t mm_accel,int flags,int chans){
+ void* tmp;
+ 
+-#ifdef ARCH_X86
++#ifdef HAVE_MMX
+     if(mm_accel&MM_ACCEL_X86_MMX){
+ 	tmp=a52_resample_MMX(flags,chans);
+ 	if(tmp){
diff --git a/multimedia/ffmpeg/patches/patch-ao b/multimedia/ffmpeg/patches/patch-ao
new file mode 100644
index 00000000000..8fb3251613c
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2007/08/02 21:48:34 dbj Exp $
+
+--- libavformat/tcp.c.orig	2004-06-18 20:59:34.000000000 -0700
++++ libavformat/tcp.c	2007-08-02 12:51:07.000000000 -0700
+@@ -21,7 +21,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+-#if defined(__APPLE__) || defined(__BEOS__)
++#if defined(__BEOS__)
+ typedef int socklen_t;
+ #endif
+ #ifndef __BEOS__