From 9cf69eeb54519fdd8ff871d5ad6ea3a8a4bd204e Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Mon, 4 Feb 2013 15:36:28 +0000 Subject: More merges from area51 repository: - Chase kdemultimedia4 split/kdegames shlib bump - Convert to new options framework - Trip Makefile header sysutils/k3b-kde4: - add patches to fix build with ffmpeg-devel [1] PR: ports/162261 [1] Submitted by: Phil Oleson --- sysutils/k3b-kde4/files/patch-git8d33a486 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sysutils/k3b-kde4/files/patch-git8d33a486 (limited to 'sysutils/k3b-kde4/files/patch-git8d33a486') diff --git a/sysutils/k3b-kde4/files/patch-git8d33a486 b/sysutils/k3b-kde4/files/patch-git8d33a486 new file mode 100644 index 000000000000..bdefbde5b0be --- /dev/null +++ b/sysutils/k3b-kde4/files/patch-git8d33a486 @@ -0,0 +1,20 @@ +commit 8d33a486082cd9eaa857d6042b1b8870e4bf532b +Author: Rex Dieter +Date: Sat Feb 11 08:34:04 2012 -0600 + + fix for newer (kde-4.7+) FindFFMPEG.cmake + which sets ${FFMPEG_INCLUDE_DIRS} instead of ${FFMPEG_INCLUDE_DIR} + +diff --git a/plugins/decoder/ffmpeg/CMakeLists.txt b/plugins/decoder/ffmpeg/CMakeLists.txt +index d7e25eb..d420a3c 100644 +--- ./plugins/decoder/ffmpeg/CMakeLists.txt ++++ ./plugins/decoder/ffmpeg/CMakeLists.txt +@@ -9,7 +9,7 @@ if(FFMPEG_INCLUDE_DIR_OLD_STYLE) + else(FFMPEG_INCLUDE_DIR_OLD_STYLE) + message(STATUS "found new ffmpegcodecpath") + add_definitions(-DNEWFFMPEGAVCODECPATH) +- include_directories (${FFMPEG_INCLUDE_DIR}) ++ include_directories (${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS}) + endif(FFMPEG_INCLUDE_DIR_OLD_STYLE) + + set(k3bffmpegdecoder_PART_SRCS k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp ) -- cgit v1.2.3