summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg2/patches/patch-configure
diff options
context:
space:
mode:
authoradam <adam>2015-02-14 15:41:42 +0000
committeradam <adam>2015-02-14 15:41:42 +0000
commitdeda40c1ac6077f9b10c9ca531f9e55d3fc6eae4 (patch)
treef5d87aa397ecb0d3c77018563d8d6ee94c1d671f /multimedia/ffmpeg2/patches/patch-configure
parentb69f988768ab22a6d97c55d275e9a511a91c0356 (diff)
downloadpkgsrc-deda40c1ac6077f9b10c9ca531f9e55d3fc6eae4.tar.gz
Changes 2.5.4:
* avfilter/dctdnoiz: fix slice_h computation * x86/lossless_audiodsp: fix compilation with --disable-yasm * avutil/opencl: don't include config.h * x86/swr: add missing alignment check to pack_6ch functions
Diffstat (limited to 'multimedia/ffmpeg2/patches/patch-configure')
-rw-r--r--multimedia/ffmpeg2/patches/patch-configure16
1 files changed, 8 insertions, 8 deletions
diff --git a/multimedia/ffmpeg2/patches/patch-configure b/multimedia/ffmpeg2/patches/patch-configure
index 1f0360ced78..aaa968ef049 100644
--- a/multimedia/ffmpeg2/patches/patch-configure
+++ b/multimedia/ffmpeg2/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.5 2014/12/06 09:18:41 adam Exp $
+$NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
---- configure.orig 2014-12-04 00:24:39.000000000 +0000
+--- configure.orig 2015-02-13 15:56:33.000000000 +0000
+++ configure
-@@ -4012,6 +4012,11 @@ case $target_os in
+@@ -4011,6 +4011,11 @@ case $target_os in
;;
netbsd)
disable symver
@@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.5 2014/12/06 09:18:41 adam Exp $
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -4408,10 +4413,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -4407,10 +4412,13 @@ check_cc <<EOF && enable attribute_may_a
union { int x; } __attribute__((may_alias)) x;
EOF
@@ -29,9 +29,9 @@ $NetBSD: patch-configure,v 1.5 2014/12/06 09:18:41 adam Exp $
EOF
-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
- if [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] ;then
+ if [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] || enabled ppc64; then
if ! enabled bigendian && enabled altivec ;then
-@@ -5165,6 +5173,7 @@ enabled xmm_clobber_test &&
+@@ -5163,6 +5171,7 @@ enabled xmm_clobber_test &&
-Wl,--wrap,sws_scale ||
disable xmm_clobber_test
@@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.5 2014/12/06 09:18:41 adam Exp $
echo "X{};" > $TMPV
if test_ldflags -Wl,--version-script,$TMPV; then
append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -5177,6 +5186,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -5175,6 +5184,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
void ff_foo(void) {}
EOF
fi
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.5 2014/12/06 09:18:41 adam Exp $
if [ -z "$optflags" ]; then
if enabled small; then
-@@ -5768,7 +5778,7 @@ Version: $version
+@@ -5767,7 +5777,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts: