diff options
author | adam <adam> | 2015-02-14 15:41:42 +0000 |
---|---|---|
committer | adam <adam> | 2015-02-14 15:41:42 +0000 |
commit | 969bd43f11e5f2c682c014c9cd5045dbda5b5345 (patch) | |
tree | f5d87aa397ecb0d3c77018563d8d6ee94c1d671f /multimedia | |
parent | f23a938a75bbb48bdfd691305cdb03a260d91777 (diff) | |
download | pkgsrc-969bd43f11e5f2c682c014c9cd5045dbda5b5345.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')
-rw-r--r-- | multimedia/ffmpeg2/Makefile.common | 4 | ||||
-rw-r--r-- | multimedia/ffmpeg2/distinfo | 10 | ||||
-rw-r--r-- | multimedia/ffmpeg2/patches/patch-configure | 16 |
3 files changed, 15 insertions, 15 deletions
diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common index 9ca37f4cad8..659848e3fb8 100644 --- a/multimedia/ffmpeg2/Makefile.common +++ b/multimedia/ffmpeg2/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.28 2015/01/10 19:10:20 adam Exp $ +# $NetBSD: Makefile.common,v 1.29 2015/02/14 15:41:42 adam Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/Makefile -DISTNAME= ffmpeg-2.5.3 +DISTNAME= ffmpeg-2.5.4 CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo index 322bf959715..1968f2fc012 100644 --- a/multimedia/ffmpeg2/distinfo +++ b/multimedia/ffmpeg2/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.27 2015/01/10 19:10:20 adam Exp $ +$NetBSD: distinfo,v 1.28 2015/02/14 15:41:42 adam Exp $ -SHA1 (ffmpeg-2.5.3.tar.bz2) = 160d53a0d6b8df18336fac7f068c390ac2d34cef -RMD160 (ffmpeg-2.5.3.tar.bz2) = c207be91b551090c96a8e410ecfacea7a5d22b08 -Size (ffmpeg-2.5.3.tar.bz2) = 7678005 bytes +SHA1 (ffmpeg-2.5.4.tar.bz2) = e7d0bab14e82876762531a883c6b48918631d48c +RMD160 (ffmpeg-2.5.4.tar.bz2) = 523955845e4880c13e200846daf7787055a6db9b +Size (ffmpeg-2.5.4.tar.bz2) = 7677320 bytes SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 -SHA1 (patch-configure) = f3abb73fecf4c1ca4b0d05e8d3fb7a33eb07d08a +SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179 SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 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: |