diff options
author | Max Brazhnikov <makc@FreeBSD.org> | 2014-02-18 14:23:03 +0000 |
---|---|---|
committer | Max Brazhnikov <makc@FreeBSD.org> | 2014-02-18 14:23:03 +0000 |
commit | e9c34f4c34b0640b3613f03cd96e9f19730b2a07 (patch) | |
tree | ef2b2b24dfacf6def95c54d3379c421565b1fe2b /multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake | |
parent | Update to 1.88 (diff) |
KDE/FreeBSD team presents KDE SC 4.12.2 and KDE Workspace 4.11.6!
Among changes:
- Switch KDE4_PREFIX to ${LOCALBASE}
- Remove now needless misc/kde4-shared-mime-info port
- Add stage support
- Remove ancient CONFLICTS (KDE 4.9 and less) and LATEST_LINK
- Squeeze MASTER_SITES/MASTER_SITE_SUBDIR
- Convert LIB_DEPENDS to new style
- Use options helpers
- Drop support for FreeBSD 7.x
- Remove Qt/KDE 3 related workarounds
- Remove local patches and use upstream version scheme for libraries
- sysutils/kdeadmin4, net/kdenetwork4, devel/kdesdk4,
and x11-clocks/kdetoys4 ports have been split.
- devel/kcachegrind is now a part of KDE SC [1]
- more logs in area51 repo...
New ports:
devel/kde-dev-scripts: KDE development scripts
devel/kde-dev-utils: KDE development utilities
games/klickety: Tetris themed solitaire
games/picmi: Single player logic-based puzzle game
textproc/libkomparediff2: Library to compare files and strings
The area51 repository features commits by Schaich Alonso, avilla, rakuco
and myself.
PR: ports/186491
Exp-run: by bdrewery
Approved by: beat (former maintainer) [1]
Notes
Notes:
svn path=/head/; revision=344893
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, 0 insertions, 45 deletions
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake b/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake deleted file mode 100644 index 2ab29a6ffb80..000000000000 --- a/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake +++ /dev/null @@ -1,45 +0,0 @@ ---- ./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}) |