summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg2/patches
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/ffmpeg2/patches')
-rw-r--r--multimedia/ffmpeg2/patches/patch-Makefile15
-rw-r--r--multimedia/ffmpeg2/patches/patch-configure58
-rw-r--r--multimedia/ffmpeg2/patches/patch-libavutil_common.h27
-rw-r--r--multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c20
4 files changed, 120 insertions, 0 deletions
diff --git a/multimedia/ffmpeg2/patches/patch-Makefile b/multimedia/ffmpeg2/patches/patch-Makefile
new file mode 100644
index 00000000000..408706791ea
--- /dev/null
+++ b/multimedia/ffmpeg2/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2013/08/04 10:29:02 adam 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/ffmpeg2/patches/patch-configure b/multimedia/ffmpeg2/patches/patch-configure
new file mode 100644
index 00000000000..563695be053
--- /dev/null
+++ b/multimedia/ffmpeg2/patches/patch-configure
@@ -0,0 +1,58 @@
+$NetBSD: patch-configure,v 1.1 2013/08/04 10:29:02 adam Exp $
+
+--- configure.orig 2013-07-10 00:43:00.000000000 +0000
++++ configure
+@@ -3426,6 +3426,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
+@@ -3782,10 +3787,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
+
+@@ -4348,6 +4356,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'
+@@ -4360,6 +4369,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+ void ff_foo(void) {}
+ EOF
+ fi
++fi
+
+ if [ -z "$optflags" ]; then
+ if enabled small; then
+@@ -4834,7 +4844,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
diff --git a/multimedia/ffmpeg2/patches/patch-libavutil_common.h b/multimedia/ffmpeg2/patches/patch-libavutil_common.h
new file mode 100644
index 00000000000..90867798bc3
--- /dev/null
+++ b/multimedia/ffmpeg2/patches/patch-libavutil_common.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-libavutil_common.h,v 1.1 2013/08/04 10:29:02 adam 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/ffmpeg2/patches/patch-libavutil_x86_cpu.c b/multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c
new file mode 100644
index 00000000000..fe65aa1a126
--- /dev/null
+++ b/multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-libavutil_x86_cpu.c,v 1.1 2013/08/04 10:29:02 adam 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 */
+ }
+