diff options
| -rw-r--r-- | multimedia/ffmpeg2/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/PLIST | 19 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/distinfo | 10 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/patches/patch-configure | 16 | ||||
| -rw-r--r-- | multimedia/ffplay2/Makefile | 3 |
6 files changed, 27 insertions, 28 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index becfc9857af..b24cebbc04f 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2014/12/03 15:06:11 bouyer Exp $ +# $NetBSD: Makefile,v 1.14 2014/12/06 09:18:41 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v2.x) diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common index bc1ede11d3e..75c706e17bd 100644 --- a/multimedia/ffmpeg2/Makefile.common +++ b/multimedia/ffmpeg2/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.25 2014/12/01 11:26:49 adam Exp $ +# $NetBSD: Makefile.common,v 1.26 2014/12/06 09:18:41 adam Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/Makefile -DISTNAME= ffmpeg-2.4.4 +DISTNAME= ffmpeg-2.5 CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/ffmpeg2/PLIST b/multimedia/ffmpeg2/PLIST index edca34be894..46df2517d86 100644 --- a/multimedia/ffmpeg2/PLIST +++ b/multimedia/ffmpeg2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2014/10/01 16:09:16 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2014/12/06 09:18:41 adam Exp $ bin/ffmpeg2 bin/ffprobe2 bin/ffserver2 @@ -11,6 +11,7 @@ include/ffmpeg2/libavcodec/vaapi.h include/ffmpeg2/libavcodec/vda.h include/ffmpeg2/libavcodec/vdpau.h include/ffmpeg2/libavcodec/version.h +include/ffmpeg2/libavcodec/vorbis_parser.h include/ffmpeg2/libavcodec/xvmc.h include/ffmpeg2/libavdevice/avdevice.h include/ffmpeg2/libavdevice/version.h @@ -38,6 +39,7 @@ include/ffmpeg2/libavutil/blowfish.h include/ffmpeg2/libavutil/bprint.h include/ffmpeg2/libavutil/bswap.h include/ffmpeg2/libavutil/buffer.h +include/ffmpeg2/libavutil/cast5.h include/ffmpeg2/libavutil/channel_layout.h include/ffmpeg2/libavutil/common.h include/ffmpeg2/libavutil/cpu.h @@ -55,7 +57,6 @@ include/ffmpeg2/libavutil/hash.h include/ffmpeg2/libavutil/hmac.h include/ffmpeg2/libavutil/imgutils.h include/ffmpeg2/libavutil/intfloat.h -include/ffmpeg2/libavutil/intfloat_readwrite.h include/ffmpeg2/libavutil/intreadwrite.h include/ffmpeg2/libavutil/lfg.h include/ffmpeg2/libavutil/log.h @@ -96,27 +97,27 @@ include/ffmpeg2/libswscale/version.h lib/ffmpeg2/libavcodec.a lib/ffmpeg2/libavcodec.so lib/ffmpeg2/libavcodec.so.56 -lib/ffmpeg2/libavcodec.so.56.1.100 +lib/ffmpeg2/libavcodec.so.56.13.100 lib/ffmpeg2/libavdevice.a lib/ffmpeg2/libavdevice.so lib/ffmpeg2/libavdevice.so.56 -lib/ffmpeg2/libavdevice.so.56.0.100 +lib/ffmpeg2/libavdevice.so.56.3.100 lib/ffmpeg2/libavfilter.a lib/ffmpeg2/libavfilter.so lib/ffmpeg2/libavfilter.so.5 -lib/ffmpeg2/libavfilter.so.5.1.100 +lib/ffmpeg2/libavfilter.so.5.2.103 lib/ffmpeg2/libavformat.a lib/ffmpeg2/libavformat.so lib/ffmpeg2/libavformat.so.56 -lib/ffmpeg2/libavformat.so.56.4.101 +lib/ffmpeg2/libavformat.so.56.15.102 lib/ffmpeg2/libavutil.a lib/ffmpeg2/libavutil.so lib/ffmpeg2/libavutil.so.54 -lib/ffmpeg2/libavutil.so.54.7.100 +lib/ffmpeg2/libavutil.so.54.15.100 lib/ffmpeg2/libpostproc.a lib/ffmpeg2/libpostproc.so lib/ffmpeg2/libpostproc.so.53 -lib/ffmpeg2/libpostproc.so.53.0.100 +lib/ffmpeg2/libpostproc.so.53.3.100 lib/ffmpeg2/libswresample.a lib/ffmpeg2/libswresample.so lib/ffmpeg2/libswresample.so.1 @@ -124,7 +125,7 @@ lib/ffmpeg2/libswresample.so.1.1.100 lib/ffmpeg2/libswscale.a lib/ffmpeg2/libswscale.so lib/ffmpeg2/libswscale.so.3 -lib/ffmpeg2/libswscale.so.3.0.100 +lib/ffmpeg2/libswscale.so.3.1.101 lib/ffmpeg2/pkgconfig/libavcodec.pc lib/ffmpeg2/pkgconfig/libavdevice.pc lib/ffmpeg2/pkgconfig/libavfilter.pc diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo index 431094ce663..4208f858519 100644 --- a/multimedia/ffmpeg2/distinfo +++ b/multimedia/ffmpeg2/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.24 2014/12/03 15:06:11 bouyer Exp $ +$NetBSD: distinfo,v 1.25 2014/12/06 09:18:41 adam Exp $ -SHA1 (ffmpeg-2.4.4.tar.bz2) = c0a0829fbb4cf423eed77f39d3661d1a34ac7c35 -RMD160 (ffmpeg-2.4.4.tar.bz2) = e38bae3bf539404dc8afdb2805fb717f3cacc6db -Size (ffmpeg-2.4.4.tar.bz2) = 7369780 bytes +SHA1 (ffmpeg-2.5.tar.bz2) = ec0111e8298bdb2291d82e3b4f67354ba48fab19 +RMD160 (ffmpeg-2.5.tar.bz2) = 285404e0e99463769d2e0189a8c1ae8b811453d8 +Size (ffmpeg-2.5.tar.bz2) = 7673841 bytes SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 -SHA1 (patch-configure) = 42be64b0456c4d09d24db2535e22e948034ebd3c +SHA1 (patch-configure) = f3abb73fecf4c1ca4b0d05e8d3fb7a33eb07d08a 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 8182b6f4fd3..1f0360ced78 100644 --- a/multimedia/ffmpeg2/patches/patch-configure +++ b/multimedia/ffmpeg2/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.4 2014/07/25 22:46:00 adam Exp $ +$NetBSD: patch-configure,v 1.5 2014/12/06 09:18:41 adam Exp $ ---- configure.orig 2014-07-16 01:00:37.000000000 +0000 +--- configure.orig 2014-12-04 00:24:39.000000000 +0000 +++ configure -@@ -3929,6 +3929,11 @@ case $target_os in +@@ -4012,6 +4012,11 @@ case $target_os in ;; netbsd) disable symver @@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.4 2014/07/25 22:46:00 adam Exp $ oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" enabled gcc || check_ldflags -Wl,-zmuldefs -@@ -4315,10 +4320,13 @@ check_cc <<EOF && enable attribute_may_a +@@ -4408,10 +4413,13 @@ check_cc <<EOF && enable attribute_may_a union { int x; } __attribute__((may_alias)) x; EOF @@ -30,8 +30,8 @@ $NetBSD: patch-configure,v 1.4 2014/07/25 22:46:00 adam Exp $ -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian if [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] ;then - if ! enabled bigendian ;then -@@ -4997,6 +5005,7 @@ enabled xmm_clobber_test && + if ! enabled bigendian && enabled altivec ;then +@@ -5165,6 +5173,7 @@ enabled xmm_clobber_test && -Wl,--wrap,sws_scale || disable xmm_clobber_test @@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.4 2014/07/25 22:46:00 adam Exp $ echo "X{};" > $TMPV if test_ldflags -Wl,--version-script,$TMPV; then append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' -@@ -5009,6 +5018,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") +@@ -5177,6 +5186,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") void ff_foo(void) {} EOF fi @@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.4 2014/07/25 22:46:00 adam Exp $ if [ -z "$optflags" ]; then if enabled small; then -@@ -5596,7 +5606,7 @@ Version: $version +@@ -5768,7 +5778,7 @@ Version: $version Requires: $(enabled shared || echo $requires) Requires.private: $(enabled shared && echo $requires) Conflicts: diff --git a/multimedia/ffplay2/Makefile b/multimedia/ffplay2/Makefile index 872cbd71be1..37b9e040eac 100644 --- a/multimedia/ffplay2/Makefile +++ b/multimedia/ffplay2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2014/12/03 15:06:11 bouyer Exp $ +# $NetBSD: Makefile,v 1.6 2014/12/06 09:18:41 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffplay2/} -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Simple SDL frontend for FFmpeg |