aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2015-01-10 12:59:32 +0000
committerThomas Zander <riggs@FreeBSD.org>2015-01-10 12:59:32 +0000
commit7c44b4596ffa0dce57716f771670da0e5c124175 (patch)
treee221ebc368d1c68e20a88e4224949366e55c6b23 /multimedia
parent9d0e01515618a14cdf81ce59d82539889de7872d (diff)
downloadports-7c44b4596ffa0dce57716f771670da0e5c124175.tar.gz
ports-7c44b4596ffa0dce57716f771670da0e5c124175.zip
Update to upstream version 2.3.6
Notes
Notes: svn path=/head/; revision=376701
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile3
-rw-r--r--multimedia/ffmpeg/distinfo4
-rw-r--r--multimedia/ffmpeg/files/patch-libavdevice-Makefile11
3 files changed, 3 insertions, 15 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index fc6eff071a4a..2798b8be16e2 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ffmpeg
-PORTVERSION= 2.3.5
-PORTREVISION= 4
+PORTVERSION= 2.3.6
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index edff86a27c69..bfefc67b06e9 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-2.3.5.tar.bz2) = 0762e5ff453352ef1a7bac3285e136d572706609e05b1489181f56cced601909
-SIZE (ffmpeg-2.3.5.tar.bz2) = 7436912
+SHA256 (ffmpeg-2.3.6.tar.bz2) = cf1be1c5c3973b8db16b6b6e8e63a042d414fb5d47d3801a196cbba21a0a624a
+SIZE (ffmpeg-2.3.6.tar.bz2) = 7440172
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-Makefile b/multimedia/ffmpeg/files/patch-libavdevice-Makefile
deleted file mode 100644
index a2f68f3aaaf0..000000000000
--- a/multimedia/ffmpeg/files/patch-libavdevice-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavdevice/Makefile.orig 2014-09-15 12:00:39.254449025 +0200
-+++ libavdevice/Makefile 2014-09-15 12:00:52.715443822 +0200
-@@ -34,7 +34,7 @@
- OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o
- OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o
- OBJS-$(CONFIG_PULSE_INDEV) += pulse_audio_dec.o \
-- pulse_audio_common.o
-+ pulse_audio_common.o timefilter.o
- OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o \
- pulse_audio_common.o
- OBJS-$(CONFIG_QTKIT_INDEV) += qtkit.o