Date: Mon, 21 Oct 2013 23:43:03 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331211 - head/multimedia/k9copy-kde4/files Message-ID: <201310212343.r9LNh3rG041204@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Oct 21 23:43:03 2013 New Revision: 331211 URL: http://svnweb.freebsd.org/changeset/ports/331211 Log: multimedia/k9copy-kde4: add missing cmake ffmpeg patch - Add missing cmake ffmpeg patch Added: head/multimedia/k9copy-kde4/files/patch-cmake (contents, props changed) Added: head/multimedia/k9copy-kde4/files/patch-cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/k9copy-kde4/files/patch-cmake Mon Oct 21 23:43:03 2013 (r331211) @@ -0,0 +1,93 @@ +--- cmake/FindAvcodec.cmake.orig 2009-12-06 08:13:37.000000000 -0200 ++++ cmake/FindAvcodec.cmake 2013-10-21 20:25:43.852646966 -0200 +@@ -6,21 +6,21 @@ + SET (FFMPEG_INCLUDE_DIR "") + + IF (AVCODEC_INCLUDE_DIR_FF) +- SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg") ++ SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg0") + ELSE (AVCODEC_INCLUDE_DIR_FF) +- FIND_PATH(AVCODEC_INCLUDE_DIR_LAVC "libavcodec/avcodec.h" PATHS) ++ FIND_PATH(AVCODEC_INCLUDE_DIR_LAVC "ffmpeg0/libavcodec/avcodec.h" PATHS) + IF (AVCODEC_INCLUDE_DIR_LAVC) +- SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}/libavcodec") ++ SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}/ffmpeg0/libavcodec") + ELSE (AVCODEC_INCLUDE_DIR_LAVC) +- FIND_PATH(AVCODEC_INCLUDE_DIR_FF_LAVC "ffmpeg/libavcodec/avcodec.h" PATHS) ++ FIND_PATH(AVCODEC_INCLUDE_DIR_FF_LAVC "ffmpeg0/libavcodec/avcodec.h" PATHS) + IF (AVCODEC_INCLUDE_DIR_FF_LAVC) +- SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg/libavcodec") +- SET (FFMPEG_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg") ++ SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg0/libavcodec") ++ SET (FFMPEG_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg0") + ENDIF (AVCODEC_INCLUDE_DIR_FF_LAVC) + ENDIF (AVCODEC_INCLUDE_DIR_LAVC) + ENDIF (AVCODEC_INCLUDE_DIR_FF) + +-FIND_LIBRARY(AVCODEC_LIBRARY NAMES ${_lib} PATHS ) ++FIND_LIBRARY(AVCODEC_LIBRARY NAMES ${_lib} PATHS %%LOCALBASE%%/lib/ffmpeg0) + + IF (AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY) + SET(INC_FOUND TRUE) +--- cmake/FindAvformat.cmake.orig 2009-12-06 08:13:37.000000000 -0200 ++++ cmake/FindAvformat.cmake 2013-10-21 20:25:23.140646773 -0200 +@@ -2,22 +2,22 @@ + + FIND_PATH(AVFORMAT_INCLUDE_DIR_FF "ffmpeg/avformat.h" PATHS) + IF (AVFORMAT_INCLUDE_DIR_FF) +- SET (AVFORMAT_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg") ++ SET (AVFORMAT_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg0") + ELSE (AVFORMAT_INCLUDE_DIR_FF) +- FIND_PATH(AVFORMAT_INCLUDE_DIR_LAVC "libavformat/avformat.h" PATHS) ++ FIND_PATH(AVFORMAT_INCLUDE_DIR_LAVC "ffmpeg0/libavformat/avformat.h" PATHS) + IF (AVFORMAT_INCLUDE_DIR_LAVC) +- SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/libavformat") ++ SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/ffmpeg0/libavformat") + ELSE (AVFORMAT_INCLUDE_DIR_LAVC) +- FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg/libavformat/avformat.h" PATHS) ++ FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg0/libavformat/avformat.h" PATHS) + IF (AVFORMAT_INCLUDE_DIR_FF_LAVF) +- SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavformat") ++ SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg0/libavformat") + ENDIF (AVFORMAT_INCLUDE_DIR_FF_LAVF) + ENDIF (AVFORMAT_INCLUDE_DIR_LAVC) + ENDIF (AVFORMAT_INCLUDE_DIR_FF) + + + +-FIND_LIBRARY(AVFORMAT_LIBRARY NAMES ${_lib} PATHS ) ++FIND_LIBRARY(AVFORMAT_LIBRARY NAMES ${_lib} PATHS %%LOCALBASE%%/lib/ffmpeg0) + + IF (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY) + SET(INC_FOUND TRUE) +--- cmake/FindFFmpegScale.cmake.orig 2009-12-06 08:13:37.000000000 -0200 ++++ cmake/FindFFmpegScale.cmake 2013-10-21 20:26:07.389647103 -0200 +@@ -3,22 +3,22 @@ + + FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_FF "ffmpeg/swscale.h" PATHS) + IF (FFMPEGSCALE_INCLUDE_DIR_FF) +- SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF}/ffmpeg") ++ SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF}/ffmpeg0") + ELSE (FFMPEGSCALE_INCLUDE_DIR_FF) +- FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_LAVC "libswscale/swscale.h" PATHS) ++ FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_LAVC "ffmpeg0/libswscale/swscale.h" PATHS) + IF (FFMPEGSCALE_INCLUDE_DIR_LAVC) +- SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_LAVC}/libswscale") ++ SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_LAVC}/ffmpeg0/libswscale") + ELSE (FFMPEGSCALE_INCLUDE_DIR_LAVC) +- FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_FF_SCAL "ffmpeg/libswscale/swscale.h" PATHS) ++ FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_FF_SCAL "ffmpeg0/libswscale/swscale.h" PATHS) + IF (FFMPEGSCALE_INCLUDE_DIR_FF_SCAL) +- SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF_SCAL}/ffmpeg/libswscale") ++ SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF_SCAL}/ffmpeg0/libswscale") + ENDIF (FFMPEGSCALE_INCLUDE_DIR_FF_SCAL) + ENDIF (FFMPEGSCALE_INCLUDE_DIR_LAVC) + ENDIF (FFMPEGSCALE_INCLUDE_DIR_FF) + + + +-FIND_LIBRARY(FFMPEGSCALE_LIBRARY NAMES ${_lib} PATHS ) ++FIND_LIBRARY(FFMPEGSCALE_LIBRARY NAMES ${_lib} PATHS %%LOCALBASE%%/lib/ffmpeg0) + + IF (FFMPEGSCALE_INCLUDE_DIR AND FFMPEGSCALE_LIBRARY) + SET(HAVE_SWSCALE TRUE)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310212343.r9LNh3rG041204>