10 files changed, 39 insertions, 179 deletions

diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
deleted file mode 100644
index ce62c6afcb10..000000000000
--- a/multimedia/ffmpeg/files/patch-configure
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.orig	2008-07-24 06:53:32.000000000 -0400
-+++ configure	2008-08-11 00:23:15.000000000 -0400
-@@ -1596,8 +1596,8 @@ od -A n -t x1 $TMPO | grep -q '42 *49 *4
- 
- if check_func dlopen; then
-     ldl=
--elif check_func dlopen -ldl; then
--    ldl=-ldl
-+elif check_func dlopen ; then
-+    ldl=
- fi
- 
- check_func  fork
-@@ -1718,10 +1718,17 @@ fi
- if enabled vhook; then
-     check_ldflags -rdynamic
-     check_ldflags -export-dynamic
-+    if enabled imlib2; then
-+        check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
-+    fi
-+    if enabled freetype2; then
-+        check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
-+    fi
-+else
-+    disable imlib2
-+    disable freetype2
- fi
- 
--check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
--check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
- 
- ##########################################
- # SDL check
-@@ -2072,7 +2079,7 @@ get_version(){
-     eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
-     lcname=$(tolower $name)
-     eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
--    eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
-+    eval echo "${lcname}_VERSION_MAJOR=1" >> config.mak
- }
- 
- get_version LIBSWSCALE  libswscale/swscale.h
-@@ -2096,7 +2103,7 @@ if enabled shared; then
-     echo "SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}" >> config.mak
- fi
- echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
--echo "EXTRALIBS=$extralibs" >> config.mak
-+echo "EXTRALIBS=-L/usr/local/lib -L/usr/local/lib -L/usr/local/lib $extralibs" >> config.mak
- 
- print_config ARCH_   $TMPH config.mak $ARCH_LIST
- print_config HAVE_   $TMPH config.mak $HAVE_LIST
-@@ -2206,7 +2213,7 @@ Requires.private: $(enabled shared && ec
- Conflicts:
- Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
- Libs.private: $(enabled shared && echo $libs)
--Cflags: -I\${includedir}
-+Cflags: -I\${includedir} -I\${includedir}/ffmpeg
- EOF
- cat <<EOF > $name/$name-uninstalled.pc
- prefix=
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_Makefile b/multimedia/ffmpeg/files/patch-libavcodec_Makefile
deleted file mode 100644
index 178aebe3d41a..000000000000
--- a/multimedia/ffmpeg/files/patch-libavcodec_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavcodec/Makefile.orig	2008-08-14 14:31:06.000000000 -0400
-+++ libavcodec/Makefile	2008-08-14 14:31:16.000000000 -0400
-@@ -373,9 +373,7 @@ OBJS-$(HAVE_W32THREADS)                +
- 
- OBJS-$(HAVE_XVMC)                      += xvmcvideo.o
- 
--ifndef CONFIG_SWSCALE
- OBJS += imgresample.o
--endif
- 
- # processor-specific code
- ifdef HAVE_MMX
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_imgconvert.c b/multimedia/ffmpeg/files/patch-libavcodec_imgconvert.c
deleted file mode 100644
index 426fd546ffd7..000000000000
--- a/multimedia/ffmpeg/files/patch-libavcodec_imgconvert.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libavcodec/imgconvert.c.orig	2008-08-14 14:31:37.000000000 -0400
-+++ libavcodec/imgconvert.c	2008-08-14 14:31:54.000000000 -0400
-@@ -2108,7 +2108,6 @@ int img_pad(AVPicture *dst, const AVPict
- }
- #endif
- 
--#ifndef CONFIG_SWSCALE
- static uint8_t y_ccir_to_jpeg[256];
- static uint8_t y_jpeg_to_ccir[256];
- static uint8_t c_ccir_to_jpeg[256];
-@@ -2628,7 +2627,6 @@ int img_convert(AVPicture *dst, int dst_
-     avpicture_free(tmp);
-     return ret;
- }
--#endif
- 
- /* NOTE: we scan all the pixels to have an exact information */
- static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_libx264.c b/multimedia/ffmpeg/files/patch-libavcodec_libx264.c
deleted file mode 100644
index 5c7de00067b5..000000000000
--- a/multimedia/ffmpeg/files/patch-libavcodec_libx264.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./libavcodec/libx264.c.orig	2008-06-12 23:50:13.000000000 +0200
-+++ ./libavcodec/libx264.c	2008-10-13 15:47:05.000000000 +0200
-@@ -124,6 +124,8 @@
- {
-     X264Context *x4 = avctx->priv_data;
- 
-+    av_freep(&avctx->extradata);
-+
-     if(x4->enc)
-         x264_encoder_close(x4->enc);
- 
-@@ -162,7 +164,7 @@
- 
-     x4->params.i_bframe = avctx->max_b_frames;
-     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
--    x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
-+    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
-     x4->params.i_bframe_bias = avctx->bframebias;
-     x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
-     avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
-@@ -227,8 +229,6 @@
-     x4->params.analyse.i_me_range = avctx->me_range;
-     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
- 
--    x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
--    x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
-     x4->params.analyse.b_mixed_references =
-         avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
-     x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
-@@ -253,7 +253,6 @@
-     x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
-     x4->params.rc.f_pb_factor = avctx->b_quant_factor;
-     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
--    x4->params.rc.psz_rc_eq = avctx->rc_eq;
- 
-     x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
-     x4->params.i_log_level = X264_LOG_DEBUG;
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
new file mode 100644
index 000000000000..8ed9552eba79
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
@@ -0,0 +1,14 @@
+--- libavdevice/bktr.c.orig	2009-05-15 17:34:55.000000000 +0200
++++ libavdevice/bktr.c	2009-05-15 17:38:01.000000000 +0200
+@@ -24,6 +24,11 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++typedef unsigned char	u_char;
++typedef unsigned short	u_short;
++typedef unsigned int	u_int;
++typedef unsigned long	u_long;
++
+ #define _BSD_SOURCE 1
+ #include "libavformat/avformat.h"
+ #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c b/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
new file mode 100644
index 000000000000..d3428dd5cefc
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
@@ -0,0 +1,14 @@
+--- libavdevice/oss_audio.c.orig	2009-05-15 17:38:35.000000000 +0200
++++ libavdevice/oss_audio.c	2009-05-15 17:41:27.000000000 +0200
+@@ -19,6 +19,11 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++typedef unsigned char	u_char;
++typedef unsigned short	u_short;
++typedef unsigned int	u_int;
++typedef unsigned long	u_long;
++
+ #include "config.h"
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/multimedia/ffmpeg/files/patch-libavformat-udp.c b/multimedia/ffmpeg/files/patch-libavformat-udp.c
new file mode 100644
index 000000000000..0042372ae7b5
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavformat-udp.c
@@ -0,0 +1,11 @@
+--- libavformat/udp.c.orig	2009-05-15 17:24:45.000000000 +0200
++++ libavformat/udp.c	2009-05-15 17:27:17.000000000 +0200
+@@ -45,6 +45,8 @@
+ #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
+ #endif
+ 
++#define IPPROTO_IPV6 41
++
+ typedef struct {
+     int udp_fd;
+     int ttl;
diff --git a/multimedia/ffmpeg/files/patch-libavutil__bswap.h b/multimedia/ffmpeg/files/patch-libavutil__bswap.h
deleted file mode 100644
index 7cbce43f6018..000000000000
--- a/multimedia/ffmpeg/files/patch-libavutil__bswap.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- libavutil/bswap.h.orig	Mon Nov 28 22:16:18 2005
-+++ libavutil/bswap.h	Mon Nov 28 22:21:22 2005
-@@ -6,8 +6,18 @@
- #ifndef __BSWAP_H__
- #define __BSWAP_H__
- 
-+/* to detect __FreeBSD_version */
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
-+#elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
-+# include <sys/endian.h>
-+# define bswap_16(x) bswap16(x)
-+# define bswap_32(x) bswap32(x)
-+# define bswap_64(x) bswap64(x)
- #else
- 
- #ifdef ARCH_X86_64
diff --git a/multimedia/ffmpeg/files/patch-subdir.mak b/multimedia/ffmpeg/files/patch-subdir.mak
deleted file mode 100644
index 873abcc91fb9..000000000000
--- a/multimedia/ffmpeg/files/patch-subdir.mak
+++ /dev/null
@@ -1,14 +0,0 @@
---- subdir.mak.orig	2008-07-27 15:57:37.873013462 -0500
-+++ subdir.mak	2008-07-27 15:58:54.041106334 -0500
-@@ -54,9 +54,9 @@
- 
- install-headers::
- 	install -d "$(INCINSTDIR)"
--	install -d "$(LIBDIR)/pkgconfig"
-+	install -d "$(prefix)/libdata/pkgconfig"
- 	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
--	install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
-+	install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(prefix)/libdata/pkgconfig"
- 
- uninstall-libs::
- 	-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
diff --git a/multimedia/ffmpeg/files/patch-tkadv2009-004 b/multimedia/ffmpeg/files/patch-tkadv2009-004
deleted file mode 100644
index 9aeb49b8ee8e..000000000000
--- a/multimedia/ffmpeg/files/patch-tkadv2009-004
+++ /dev/null
@@ -1,17 +0,0 @@
---- libavformat/4xm.c.orig	2008-06-03 20:20:54.000000000 +0400
-+++ libavformat/4xm.c	2009-03-08 23:38:44.000000000 +0300
-@@ -163,10 +163,12 @@
-                 return AVERROR_INVALIDDATA;
-             }
-             current_track = AV_RL32(&header[i + 8]);
-+            if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){
-+                av_log(s, AV_LOG_ERROR, "current_track too large\n");
-+                return -1;
-+            }
-             if (current_track + 1 > fourxm->track_count) {
-                 fourxm->track_count = current_track + 1;
--                if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
--                    return -1;
-                 fourxm->tracks = av_realloc(fourxm->tracks,
-                     fourxm->track_count * sizeof(AudioTrack));
-                 if (!fourxm->tracks) {