Import ffmpeg1-1.2.7 as multimedia/ffmpeg1.

FFmpeg is a complete, cross-platform solution to record, convert
and stream audio and video.  It includes libavcodec - the leading
audio/video codec library.

This package contains major version 1.

4 files changed, 120 insertions, 0 deletions

diff --git a/multimedia/ffmpeg1/patches/patch-aa b/multimedia/ffmpeg1/patches/patch-aa
new file mode 100644
index 00000000000..093130a8d15
--- /dev/null
+++ b/multimedia/ffmpeg1/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2014/08/11 23:01:50 wiz Exp $
+
+--- libavutil/x86/cpu.c.orig	2013-01-06 21:53:29.000000000 +0000
++++ libavutil/x86/cpu.c
+@@ -115,6 +115,7 @@ int ff_get_cpu_flags_x86(void)
+ #if HAVE_SSE
+         if (std_caps & (1 << 25))
+             rval |= AV_CPU_FLAG_SSE;
++#if !defined(__GNUC__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+         if (std_caps & (1 << 26))
+             rval |= AV_CPU_FLAG_SSE2;
+         if (ecx & 1)
+@@ -134,6 +135,7 @@ int ff_get_cpu_flags_x86(void)
+                 rval |= AV_CPU_FLAG_AVX;
+         }
+ #endif /* HAVE_AVX */
++#endif /* gcc >= 4.2 */
+ #endif /* HAVE_SSE */
+     }
+ 
diff --git a/multimedia/ffmpeg1/patches/patch-ac b/multimedia/ffmpeg1/patches/patch-ac
new file mode 100644
index 00000000000..42d95d68176
--- /dev/null
+++ b/multimedia/ffmpeg1/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2014/08/11 23:01:50 wiz Exp $
+
+--- Makefile.orig	2012-09-28 01:37:35.000000000 +0000
++++ Makefile
+@@ -139,8 +139,8 @@ install-progs: install-progs-yes $(PROGS
+ 
+ install-data: $(DATA_FILES) $(EXAMPLES_FILES)
+ 	$(Q)mkdir -p "$(DATADIR)/examples"
+-	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
+-	$(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
++	$(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
++	$(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
+ 
+ uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
+ 
diff --git a/multimedia/ffmpeg1/patches/patch-ap b/multimedia/ffmpeg1/patches/patch-ap
new file mode 100644
index 00000000000..2ae5e4253c0
--- /dev/null
+++ b/multimedia/ffmpeg1/patches/patch-ap
@@ -0,0 +1,27 @@
+$NetBSD: patch-ap,v 1.1 2014/08/11 23:01:50 wiz Exp $
+
+--- libavutil/common.h.orig	2013-01-06 21:53:29.000000000 +0000
++++ libavutil/common.h
+@@ -39,6 +39,22 @@
+ #include "version.h"
+ #include "libavutil/avconfig.h"
+ 
++#if defined(__cplusplus)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__)
++#undef _STDINT_H_
++#undef _SYS_STDINT_H_
++#undef _STDINT_H
++#undef _GCC_WRAP_STDINT_H
++#ifndef __STDC_CONSTANT_MACROS
++#define __STDC_CONSTANT_MACROS
++#endif
++#include <stdint.h>
++#endif /* FreeBSD | OpenBSD | linux */
++#if defined(__DragonFly__) || defined(__NetBSD__)
++#include <machine/int_const.h>
++#endif /* DragonFly | NetBSD */
++#endif /* __cplusplus */
++
+ #if AV_HAVE_BIGENDIAN
+ #   define AV_NE(be, le) (be)
+ #else
diff --git a/multimedia/ffmpeg1/patches/patch-configure b/multimedia/ffmpeg1/patches/patch-configure
new file mode 100644
index 00000000000..45612a1e242
--- /dev/null
+++ b/multimedia/ffmpeg1/patches/patch-configure
@@ -0,0 +1,58 @@
+$NetBSD: patch-configure,v 1.1 2014/08/11 23:01:50 wiz Exp $
+
+--- configure.orig	2013-07-27 23:49:20.000000000 +0000
++++ configure
+@@ -3225,6 +3225,11 @@ case $target_os in
+         ;;
+     netbsd)
+         disable symver
++        # NetBSD/macppc *really* needs PIC enabled.  ffmpeg has repeatedly
++        # broken time and time again because PIC support has been removed
++        # from architectures that need it.  So, if you touch this, please
++        # be careful and make sure that your changes work.
++        test "${subarch}" != "x86_32" && enable pic
+         oss_indev_extralibs="-lossaudio"
+         oss_outdev_extralibs="-lossaudio"
+         enabled gcc || check_ldflags -Wl,-zmuldefs
+@@ -3555,10 +3560,13 @@ check_cc <<EOF && enable attribute_may_a
+ union { int x; } __attribute__((may_alias)) x;
+ EOF
+ 
+-check_cc <<EOF || die "endian test failed"
+-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
++check_exec <<EOF || enable bigendian
++int main()
++{
++ long one = 1;
++ return !(*((char *)(&one)));
++}
+ EOF
+-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
+ 
+ if enabled alpha; then
+ 
+@@ -4092,6 +4100,7 @@ enabled xmm_clobber_test &&
+                   -Wl,--wrap,sws_scale ||
+     disable xmm_clobber_test
+ 
++if false; then
+ echo "X{};" > $TMPV
+ if test_ldflags -Wl,--version-script,$TMPV; then
+     append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
+@@ -4104,6 +4113,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+ void ff_foo(void) {}
+ EOF
+ fi
++fi
+ 
+ if [ -z "$optflags" ]; then
+     if enabled small; then
+@@ -4560,7 +4570,7 @@ Version: $version
+ Requires: $(enabled shared || echo $requires)
+ Requires.private: $(enabled shared && echo $requires)
+ Conflicts:
+-Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
++Libs: -L\${libdir} -Wl,-R\${libdir} -l${shortname} $(enabled shared || echo $libs)
+ Libs.private: $(enabled shared && echo $libs)
+ Cflags: -I\${includedir}
+ EOF