summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorriggs <riggs@FreeBSD.org>2015-07-02 19:40:15 +0000
committerriggs <riggs@FreeBSD.org>2015-07-02 19:40:15 +0000
commitc2783499b2a7eb36c5b79ac4a9fb033a292dc737 (patch)
treeaba8644b51022cc7b8b513dc973d4d5ade949abe
parentf50d8705f3dc28e35de2c901ee77c82f85aee480 (diff)
downloadFreeBSD-ports-c2783499b2a7eb36c5b79ac4a9fb033a292dc737.zip
FreeBSD-ports-c2783499b2a7eb36c5b79ac4a9fb033a292dc737.tar.gz
- Update multimdedia/ffmpeg to latest upstrem version 2.7.1
- Mark ports BROKEN that were discovered not to work with this update; discovered by exp-run in bug 201181 - Note the need for manual upgrade of dependent ports in UPDATING
-rw-r--r--UPDATING14
-rw-r--r--devel/libdlna/Makefile2
-rw-r--r--emulators/kcemu/Makefile2
-rw-r--r--graphics/bugle/Makefile6
-rw-r--r--multimedia/ffmpeg/Makefile6
-rw-r--r--multimedia/ffmpeg/distinfo4
-rw-r--r--multimedia/ffmpeg/files/patch-Makefile8
-rw-r--r--multimedia/ffmpeg/files/patch-configure16
-rw-r--r--multimedia/ffmpeg/files/patch-doc-Makefile8
-rw-r--r--multimedia/ffmpeg/files/patch-libavcodec-Makefile14
-rw-r--r--multimedia/ffmpeg/files/patch-libavdevice-bktr.c6
-rw-r--r--multimedia/ffmpeg/files/patch-libavdevice-oss.c (renamed from multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c)8
-rw-r--r--multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c12
-rw-r--r--multimedia/ffmpeg/files/patch-libavformat-udp.c14
-rw-r--r--multimedia/ffmpeg/files/patch-libavutil-common.h10
-rw-r--r--multimedia/ffmpeg/files/patch-libavutil-x86-asm.h6
-rw-r--r--multimedia/ffmpeg/pkg-descr2
-rw-r--r--multimedia/ffmpeg/pkg-plist50
-rw-r--r--sysutils/k3b-kde4/Makefile6
-rw-r--r--x11-toolkits/nucleo/Makefile4
20 files changed, 119 insertions, 79 deletions
diff --git a/UPDATING b/UPDATING
index dff53ec..c5f12f9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,20 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20150702:
+ AFFECTS: users of multimedia/ffmpeg
+ AUTHOR: riggs@FreeBSD.org
+
+ ffmpeg has been updated to the latest version from the 2.7 branch.
+ If you are using binary pkg, 'pkg upgrade' will do the right thing.
+ Users of portmaster/portupgrade must rebuild all ports that depend
+ on it.
+
+ Portmaster users:
+ portmaster -w -r ffmpeg
+ Portupgrade users:
+ portupgrade -fr multimedia/ffmpeg
+
+20150702:
AFFECTS: users of net/ptpd2-devel
AUTHOR: skreuzer@FreeBSD.org
diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile
index 722e234..480204d 100644
--- a/devel/libdlna/Makefile
+++ b/devel/libdlna/Makefile
@@ -25,6 +25,8 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" --disable-optimize \
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+BROKEN= Does not build with ffmpeg-2.7
+
post-patch:
@${REINPLACE_CMD} -e \
's#\(PKGCONFIG_DIR = \).*#\1${STAGEDIR}${PREFIX}/libdata/pkgconfig#' \
diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile
index 0b4b0d9..801fac8 100644
--- a/emulators/kcemu/Makefile
+++ b/emulators/kcemu/Makefile
@@ -38,4 +38,6 @@ DESKTOP_ENTRIES="KCemu" "${COMMENT}" \
"${LOCALBASE}/share/KCemu/icons/kcemu-icon.png" "kcemu" \
"System;Emulator;" "true"
+BROKEN= Does not build with ffmpeg-2.7
+
.include <bsd.port.mk>
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index fa9ec2e..0b0836e 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -40,6 +40,12 @@ READLINE_CONFIGURE_WITH= readline
THREADS_CONFIGURE_ON= --with-threads=pthreads
THREADS_CONFIGURE_OFF= --with-threads=single
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFFMPEG}
+BROKEN= Does not build with ffmpeg-2.7
+.endif
+
post-patch:
@${REINPLACE_CMD} -e \
's|=-lpthread|=-pthread|g' ${WRKSRC}/configure
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 3713018..76cd5fe 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ffmpeg
-PORTVERSION= 2.3.6
-PORTREVISION= 6
+PORTVERSION= 2.7.1
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -256,6 +255,7 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--mandir="${PREFIX}/man" \
--datadir="${DATADIR}" \
+ --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
--enable-shared \
--enable-gpl \
--enable-postproc \
@@ -353,8 +353,6 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
post-patch:
# {C,LD}FLAGS safeness
- @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/library.mak
@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
${WRKSRC}/ffserver.c
@${REINPLACE_CMD} -E \
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index bfefc67..e15fdfd 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-2.3.6.tar.bz2) = cf1be1c5c3973b8db16b6b6e8e63a042d414fb5d47d3801a196cbba21a0a624a
-SIZE (ffmpeg-2.3.6.tar.bz2) = 7440172
+SHA256 (ffmpeg-2.7.1.tar.bz2) = 7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720
+SIZE (ffmpeg-2.7.1.tar.bz2) = 8152634
diff --git a/multimedia/ffmpeg/files/patch-Makefile b/multimedia/ffmpeg/files/patch-Makefile
index ccbef27..0b2343d 100644
--- a/multimedia/ffmpeg/files/patch-Makefile
+++ b/multimedia/ffmpeg/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig 2012-05-04 12:24:34.447846798 +0200
-+++ Makefile 2012-05-04 12:24:42.471850113 +0200
-@@ -79,7 +79,7 @@
+--- Makefile.orig 2015-06-19 20:44:35 UTC
++++ Makefile
+@@ -92,7 +92,7 @@ define DOSUBDIR
$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
SUBDIR := $(1)/
include $(SRC_PATH)/$(1)/Makefile
--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
+-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
include $(SRC_PATH)/library.mak
endef
-
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 81c455b..a6b3900 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2014-08-17 15:33:04.000000000 +0200
-+++ configure 2014-09-12 15:07:50.647439045 +0200
-@@ -2649,12 +2649,7 @@
+--- configure.orig 2015-06-19 20:47:55 UTC
++++ configure
+@@ -2814,12 +2814,7 @@ target_os_default=$(tolower $(uname -s))
host_os=$target_os_default
# machine
@@ -12,18 +12,18 @@
-fi
+arch_default=$(uname -p)
cpu="generic"
+ intrinsics="none"
- # configurable options
-@@ -5381,7 +5376,7 @@
+@@ -5823,7 +5818,7 @@ ifndef MAIN_MAKEFILE
SRC_PATH:=\$(SRC_PATH:.%=..%)
endif
CC_IDENT=$cc_ident
-ARCH=$arch
+FFMPEG_ARCH=$arch
+ INTRINSICS=$intrinsics
CC=$cc
CXX=$cxx
- AS=$as
-@@ -5590,7 +5585,7 @@
+@@ -6035,7 +6030,7 @@ exec_prefix=\${prefix}
libdir=$libdir
includedir=$incdir
@@ -32,7 +32,7 @@
Description: $comment
Version: $version
Requires: $(enabled shared || echo $requires)
-@@ -5604,10 +5599,10 @@
+@@ -6049,10 +6044,10 @@ EOF
mkdir -p doc/examples/pc-uninstalled
includedir=${source_path}
[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
diff --git a/multimedia/ffmpeg/files/patch-doc-Makefile b/multimedia/ffmpeg/files/patch-doc-Makefile
index 4b70277..52ab403 100644
--- a/multimedia/ffmpeg/files/patch-doc-Makefile
+++ b/multimedia/ffmpeg/files/patch-doc-Makefile
@@ -1,7 +1,7 @@
---- doc/Makefile.orig 2012-09-28 03:37:35.000000000 +0200
-+++ doc/Makefile 2012-10-12 21:36:56.461440175 +0200
-@@ -57,7 +57,7 @@
- install-man:
+--- doc/Makefile.orig 2015-06-19 20:44:35 UTC
++++ doc/Makefile
+@@ -145,7 +145,7 @@ install-html: $(HTMLPAGES)
+ endif
ifdef CONFIG_MANPAGES
-install-progs-$(CONFIG_DOC): install-man
diff --git a/multimedia/ffmpeg/files/patch-libavcodec-Makefile b/multimedia/ffmpeg/files/patch-libavcodec-Makefile
index 0e64d96..32f70f0 100644
--- a/multimedia/ffmpeg/files/patch-libavcodec-Makefile
+++ b/multimedia/ffmpeg/files/patch-libavcodec-Makefile
@@ -1,11 +1,11 @@
---- libavcodec/Makefile.orig 2012-08-06 10:06:26.000000000 +0200
-+++ libavcodec/Makefile 2012-08-06 10:36:33.478505808 +0200
-@@ -793,7 +793,7 @@
- codec_names.h \
- fft-internal.h \
+--- libavcodec/Makefile.orig 2015-06-19 20:44:36 UTC
++++ libavcodec/Makefile
+@@ -877,7 +877,7 @@ SKIPHEADERS +
+ old_codec_ids.h \
tableprint.h \
+ tableprint_vlc.h \
- $(ARCH)/vp56_arith.h \
-+ $(FFMPEG_ARCH)/vp56_arith.h \
++ $(FFMPEG_ARCH)/vp56_arith.h \
+ SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h
SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
index c64d182..325d4b6 100644
--- a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
+++ b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
@@ -1,5 +1,5 @@
---- libavdevice/bktr.c.orig 2012-01-22 14:41:15.000000000 +0100
-+++ libavdevice/bktr.c 2012-01-22 16:07:07.873280412 +0100
+--- libavdevice/bktr.c.orig 2015-06-19 20:44:50 UTC
++++ libavdevice/bktr.c
@@ -24,6 +24,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -10,5 +10,5 @@
+typedef unsigned long u_long;
+
#include "libavformat/internal.h"
+ #include "libavutil/internal.h"
#include "libavutil/log.h"
- #include "libavutil/opt.h"
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c b/multimedia/ffmpeg/files/patch-libavdevice-oss.c
index d3428dd..863b5908 100644
--- a/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
+++ b/multimedia/ffmpeg/files/patch-libavdevice-oss.c
@@ -1,5 +1,5 @@
---- libavdevice/oss_audio.c.orig 2009-05-15 17:38:35.000000000 +0200
-+++ libavdevice/oss_audio.c 2009-05-15 17:41:27.000000000 +0200
+--- libavdevice/oss.c.orig 2015-06-19 20:44:50 UTC
++++ libavdevice/oss.c
@@ -19,6 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -10,5 +10,5 @@
+typedef unsigned long u_long;
+
#include "config.h"
- #include <stdlib.h>
- #include <stdio.h>
+
+ #include <string.h>
diff --git a/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c b/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
index ded99fa..815ef14 100644
--- a/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
+++ b/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
@@ -1,12 +1,12 @@
---- libavfilter/vf_libopencv.c.orig 2012-08-05 14:09:37.882506740 +0200
-+++ libavfilter/vf_libopencv.c 2012-08-05 14:10:24.508510133 +0200
-@@ -25,8 +25,7 @@
-
- /* #define DEBUG */
+--- libavfilter/vf_libopencv.c.orig 2015-06-19 20:44:50 UTC
++++ libavfilter/vf_libopencv.c
+@@ -23,8 +23,7 @@
+ * libopencv wrapper functions
+ */
-#include <opencv/cv.h>
-#include <opencv/cxcore.h>
+#include <opencv2/imgproc/imgproc_c.h>
#include "libavutil/avstring.h"
+ #include "libavutil/common.h"
#include "libavutil/file.h"
- #include "avfilter.h"
diff --git a/multimedia/ffmpeg/files/patch-libavformat-udp.c b/multimedia/ffmpeg/files/patch-libavformat-udp.c
index 0042372..5f8746c 100644
--- a/multimedia/ffmpeg/files/patch-libavformat-udp.c
+++ b/multimedia/ffmpeg/files/patch-libavformat-udp.c
@@ -1,11 +1,11 @@
---- libavformat/udp.c.orig 2009-05-15 17:24:45.000000000 +0200
-+++ libavformat/udp.c 2009-05-15 17:27:17.000000000 +0200
-@@ -45,6 +45,8 @@
- #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
- #endif
+--- libavformat/udp.c.orig 2015-06-19 20:44:53 UTC
++++ libavformat/udp.c
+@@ -71,6 +71,8 @@
+ #define UDP_MAX_PKT_SIZE 65536
+ #define UDP_HEADER_SIZE 8
+#define IPPROTO_IPV6 41
+
- typedef struct {
+ typedef struct UDPContext {
+ const AVClass *class;
int udp_fd;
- int ttl;
diff --git a/multimedia/ffmpeg/files/patch-libavutil-common.h b/multimedia/ffmpeg/files/patch-libavutil-common.h
index e4a3862..2c8c84e 100644
--- a/multimedia/ffmpeg/files/patch-libavutil-common.h
+++ b/multimedia/ffmpeg/files/patch-libavutil-common.h
@@ -1,8 +1,8 @@
---- libavutil/common.h.orig 2010-07-07 19:27:45.000000000 +0200
-+++ libavutil/common.h 2010-08-01 22:27:42.964629491 +0200
-@@ -36,6 +36,10 @@
- #include <string.h>
- #include "attributes.h"
+--- libavutil/common.h.orig 2015-06-19 20:44:53 UTC
++++ libavutil/common.h
+@@ -49,6 +49,10 @@
+ # define AV_NE(be, le) (le)
+ #endif
+#ifndef UINT64_C
+#define UINT64_C(c) (c ## UL)
diff --git a/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h b/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
index 52ff6d3..71e31a0 100644
--- a/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
+++ b/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
@@ -1,6 +1,6 @@
---- ./libavutil/x86/asm.h.orig 2013-11-01 13:02:26.000000000 -0400
-+++ ./libavutil/x86/asm.h 2013-11-01 13:03:00.000000000 -0400
-@@ -70,7 +70,7 @@
+--- libavutil/x86/asm.h.orig 2015-06-19 20:44:54 UTC
++++ libavutil/x86/asm.h
+@@ -71,7 +71,7 @@ typedef int32_t x86_reg;
typedef int x86_reg;
#endif
diff --git a/multimedia/ffmpeg/pkg-descr b/multimedia/ffmpeg/pkg-descr
index 75f1916..0f1ba5e 100644
--- a/multimedia/ffmpeg/pkg-descr
+++ b/multimedia/ffmpeg/pkg-descr
@@ -2,6 +2,4 @@ FFmpeg is a complete, cross-platform solution to record, convert and stream
audio and video. It includes libavcodec - the leading audio/video codec
library.
-This version is from the 2.0 release branch.
-
WWW: http://ffmpeg.org/
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 722299e..e06807a 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -5,13 +5,16 @@ bin/ffprobe
%%FFSERVER%%@sample etc/ffserver.conf.sample
include/libavcodec/avcodec.h
include/libavcodec/avfft.h
+include/libavcodec/d3d11va.h
include/libavcodec/dv_profile.h
include/libavcodec/dxva2.h
include/libavcodec/old_codec_ids.h
+include/libavcodec/qsv.h
include/libavcodec/vaapi.h
include/libavcodec/vda.h
include/libavcodec/vdpau.h
include/libavcodec/version.h
+include/libavcodec/vorbis_parser.h
include/libavcodec/xvmc.h
include/libavdevice/avdevice.h
include/libavdevice/version.h
@@ -41,6 +44,8 @@ include/libavutil/blowfish.h
include/libavutil/bprint.h
include/libavutil/bswap.h
include/libavutil/buffer.h
+include/libavutil/camellia.h
+include/libavutil/cast5.h
include/libavutil/channel_layout.h
include/libavutil/common.h
include/libavutil/cpu.h
@@ -58,7 +63,6 @@ include/libavutil/hash.h
include/libavutil/hmac.h
include/libavutil/imgutils.h
include/libavutil/intfloat.h
-include/libavutil/intfloat_readwrite.h
include/libavutil/intreadwrite.h
include/libavutil/lfg.h
include/libavutil/log.h
@@ -67,11 +71,13 @@ include/libavutil/macros.h
include/libavutil/mathematics.h
include/libavutil/md5.h
include/libavutil/mem.h
+include/libavutil/motion_vector.h
include/libavutil/murmur3.h
include/libavutil/old_pix_fmts.h
include/libavutil/opt.h
include/libavutil/parseutils.h
include/libavutil/pixdesc.h
+include/libavutil/pixelutils.h
include/libavutil/pixfmt.h
include/libavutil/random_seed.h
include/libavutil/rational.h
@@ -81,10 +87,11 @@ include/libavutil/samplefmt.h
include/libavutil/sha.h
include/libavutil/sha512.h
include/libavutil/stereo3d.h
+include/libavutil/threadmessage.h
include/libavutil/time.h
include/libavutil/timecode.h
include/libavutil/timestamp.h
-include/libavutil/threadmessage.h
+include/libavutil/twofish.h
include/libavutil/version.h
include/libavutil/xtea.h
include/libpostproc/postprocess.h
@@ -95,40 +102,40 @@ include/libswscale/swscale.h
include/libswscale/version.h
lib/libavcodec.a
lib/libavcodec.so
-lib/libavcodec.so.55
-lib/libavcodec.so.55.69.100
+lib/libavcodec.so.56
+lib/libavcodec.so.56.41.100
lib/libavdevice.a
lib/libavdevice.so
-lib/libavdevice.so.55
-lib/libavdevice.so.55.13.102
+lib/libavdevice.so.56
+lib/libavdevice.so.56.4.100
lib/libavfilter.a
lib/libavfilter.so
-lib/libavfilter.so.4
-lib/libavfilter.so.4.11.100
+lib/libavfilter.so.5
+lib/libavfilter.so.5.16.101
lib/libavformat.a
lib/libavformat.so
-lib/libavformat.so.55
-lib/libavformat.so.55.48.100
+lib/libavformat.so.56
+lib/libavformat.so.56.36.100
lib/libavresample.a
lib/libavresample.so
-lib/libavresample.so.1
-lib/libavresample.so.1.3.0
+lib/libavresample.so.2
+lib/libavresample.so.2.1.0
lib/libavutil.a
lib/libavutil.so
-lib/libavutil.so.52
-lib/libavutil.so.52.92.100
+lib/libavutil.so.54
+lib/libavutil.so.54.27.100
lib/libpostproc.a
lib/libpostproc.so
-lib/libpostproc.so.52
-lib/libpostproc.so.52.3.100
+lib/libpostproc.so.53
+lib/libpostproc.so.53.3.100
lib/libswresample.a
lib/libswresample.so
-lib/libswresample.so.0
-lib/libswresample.so.0.19.100
+lib/libswresample.so.1
+lib/libswresample.so.1.2.100
lib/libswscale.a
lib/libswscale.so
-lib/libswscale.so.2
-lib/libswscale.so.2.6.100
+lib/libswscale.so.3
+lib/libswscale.so.3.1.101
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavdevice.pc
libdata/pkgconfig/libavfilter.pc
@@ -144,14 +151,17 @@ man/man1/ffprobe.1.gz
%%FFSERVER%%man/man1/ffserver.1.gz
%%DATADIR%%/examples/Makefile
%%DATADIR%%/examples/README
+%%DATADIR%%/examples/avio_list_dir.c
%%DATADIR%%/examples/avio_reading.c
%%DATADIR%%/examples/decoding_encoding.c
%%DATADIR%%/examples/demuxing_decoding.c
+%%DATADIR%%/examples/extract_mvs.c
%%DATADIR%%/examples/filter_audio.c
%%DATADIR%%/examples/filtering_audio.c
%%DATADIR%%/examples/filtering_video.c
%%DATADIR%%/examples/metadata.c
%%DATADIR%%/examples/muxing.c
+%%DATADIR%%/examples/qsvdec.c
%%DATADIR%%/examples/remuxing.c
%%DATADIR%%/examples/resampling_audio.c
%%DATADIR%%/examples/scaling_video.c
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index d4e5b9a..ff0a21d 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -94,4 +94,10 @@ TAGLIB_CMAKE_OFF= -DK3B_ENABLE_TAGLIB:BOOL=OFF
TRANSCODE_DESC= Misc: Transcode (DVD ripping)
TRANSCODE_RUN_DEPENDS= transcode:${PORTSDIR}/multimedia/transcode
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFFMPEG}
+BROKEN= Does not build with ffmpeg-2.7
+.endif
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index 99bf5d3..601b701 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -57,6 +57,10 @@ QT4_MAKE_ARGS= QT4MOC="${MOC}"
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MFFMPEG}
+BROKEN= Does not build with ffmpeg-2.7
+.endif
+
.if ! ${PORT_OPTIONS:MAVAHI} && ! ${PORT_OPTIONS:MMDNSRESPONDER}
CONFIGURE_ARGS+= --without-dns-sd
.endif
OpenPOWER on IntegriCloud