diff options
author | Max Brazhnikov <makc@FreeBSD.org> | 2013-03-27 11:55:25 +0000 |
---|---|---|
committer | Max Brazhnikov <makc@FreeBSD.org> | 2013-03-27 11:55:25 +0000 |
commit | 24482eebf1b38a1d781b1f6c16bb588f5e652980 (patch) | |
tree | bcb09269855487369fcfd28040255e86e37e1362 /multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake | |
parent | Update to 1.3.2 (diff) |
KDE/FreeBSD team presents KDE SC 4.10.1 ports!
- kdegames4 port has been split.
- kdeutils4-printer-applet and system-config-printer-kde have been
replaced by print/kde4-print-manager.
- Recover misc/kde4-l10n-mr from attic.
- New USE_KDE4 components: kactivities, libkdegames, nepomuk-core,
and nepomuk-widgets.
- Provide sharedmime component with magic: ports don't need to
run update-mime-database themselves now.
- Switch some ports to out-of-source build.
- Update port comments.
- Adjust dependence on Qt4 components.
- x11/kde4 installs modern kdepim4 now.
- Remove redundant aspell and hspell from kdelibs4, both
can be enabled in textproc/enchant if needed.
- Remove stale bits from bsd.kde4.mk
The area51 repository features commits by Schaich Alonso and myself.
Contributors:
- Tobias Berner
Diffstat (limited to 'multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake')
-rw-r--r-- | multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake b/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake new file mode 100644 index 000000000000..2ab29a6ffb80 --- /dev/null +++ b/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake @@ -0,0 +1,45 @@ +--- ./cmake/FindFFmpeg.cmake.orig 2013-03-01 07:07:31.562142000 +0000 ++++ ./cmake/FindFFmpeg.cmake 2013-03-06 00:32:09.269367542 +0000 +@@ -71,13 +71,15 @@ + ${PC_LIB${_component}_INCLUDEDIR} + ${PC_LIB${_component}_INCLUDE_DIRS} + PATH_SUFFIXES +- ffmpeg ++ ffmpeg${FFMPEG_SUFFIX} + ) + + find_library(${_component}_LIBRARIES NAMES ${_library} +- HINTS ++ HINTS + ${PC_LIB${_component}_LIBDIR} + ${PC_LIB${_component}_LIBRARY_DIRS} ++ PATH_SUFFIXES ++ ffmpeg${FFMPEG_SUFFIX} + ) + + set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.") +@@ -97,13 +99,18 @@ + # Check for cached results. If there are skip the costly part. + if (NOT FFMPEG_LIBRARIES) + ++ # Look for ffmpeg1 by default. Use empty suffix for ffmpeg-0.7 ++ if (NOT DEFINED FFMPEG_SUFFIX) ++ set(FFMPEG_SUFFIX 1) ++ endif () ++ + # Check for all possible component. +- find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h) +- find_component(AVFORMAT libavformat avformat libavformat/avformat.h) +- find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h) +- find_component(AVUTIL libavutil avutil libavutil/avutil.h) +- find_component(SWSCALE libswscale swscale libswscale/swscale.h) +- find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h) ++ find_component(AVCODEC libavcodec${FFMPEG_SUFFIX} avcodec${FFMPEG_SUFFIX} libavcodec/avcodec.h) ++ find_component(AVFORMAT libavformat${FFMPEG_SUFFIX} avformat${FFMPEG_SUFFIX} libavformat/avformat.h) ++ find_component(AVDEVICE libavdevice${FFMPEG_SUFFIX} avdevice${FFMPEG_SUFFIX} libavdevice/avdevice.h) ++ find_component(AVUTIL libavutil${FFMPEG_SUFFIX} avutil${FFMPEG_SUFFIX} libavutil/avutil.h) ++ find_component(SWSCALE libswscale${FFMPEG_SUFFIX} swscale${FFMPEG_SUFFIX} libswscale/swscale.h) ++ find_component(POSTPROC libpostproc${FFMPEG_SUFFIX} postproc${FFMPEG_SUFFIX} libpostproc/postprocess.h) + + # Check if the required components were found and add their stuff to the FFMPEG_* vars. + foreach (_component ${FFmpeg_FIND_COMPONENTS}) |