rpms/k9copy/F-9 k9copy-2.0.2-ffmpeg.patch, 1.1, 1.2 k9copy.spec, 1.3, 1.4

[Dominik 'Rathann' Mierzejewski]

On Tuesday, 16 September 2008 at 22:37, Rex Dieter wrote:
> Author: rdieter
> 
> Update of /cvs/free/rpms/k9copy/F-9
> In directory se02.es.rpmfusion.net:/tmp/cvs-serv29199
> 
> Modified Files:
> 	k9copy-2.0.2-ffmpeg.patch k9copy.spec 
> Log Message:
> hack missing BR
> 
> 
> k9copy-2.0.2-ffmpeg.patch:
> 
> Index: k9copy-2.0.2-ffmpeg.patch
> ===================================================================
> RCS file: /cvs/free/rpms/k9copy/F-9/k9copy-2.0.2-ffmpeg.patch,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- k9copy-2.0.2-ffmpeg.patch	16 Sep 2008 20:01:09 -0000	1.1
> +++ k9copy-2.0.2-ffmpeg.patch	16 Sep 2008 20:37:29 -0000	1.2
> @@ -1,6 +1,42 @@
> +diff -up k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake.ffmpeg k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake
> +--- k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake.ffmpeg	2008-07-05 01:08:53.000000000 -0500
> ++++ k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake	2008-09-16 15:04:11.000000000 -0500
> +@@ -1,6 +1,6 @@
> + MACRO (FINDFFMPEG _include _lib)
> + 
> +-FIND_PATH(FFMPEG_INCLUDE_DIR ${_include} PATHS)
> ++FIND_PATH(FFMPEG_INCLUDE_DIR ${_include}/ffmpeg PATHS)

pkg-config --cflags libavcodec libavutil libavformat libswscale libpostproc
(remove any that k9copy doesn't use)

> + FIND_LIBRARY(FFMPEG_LIBRARY NAMES ${_lib} PATHS ) 
> + 
> + IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY)
> +@@ -16,4 +16,4 @@ IF (INC_FOUND)
> + ELSE (INC_FOUND)
> +       MESSAGE(FATAL_ERROR "Could not find ${_lib}")
> + ENDIF (INC_FOUND)
> +-ENDMACRO (FINDFFMPEG _include _lib )
> +\ No newline at end of file
> ++ENDMACRO (FINDFFMPEG _include _lib )
> +diff -up k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake.ffmpeg k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake
> +--- k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake.ffmpeg	2008-07-05 01:08:53.000000000 -0500
> ++++ k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake	2008-09-16 15:04:33.000000000 -0500
> +@@ -1,6 +1,6 @@
> + MACRO (FINDFFMPEGSCALE _include _lib)
> + 
> +-FIND_PATH(FFMPEGSCALE_INCLUDE_DIR ${_include} PATHS)
> ++FIND_PATH(FFMPEGSCALE_INCLUDE_DIR ${_include}/ffmpeg PATHS)

As above.

Regards,
R.

-- 
Fedora http://fedoraproject.org/wiki/User:Rathann
Livna http://rpm.livna.org | MPlayer http://mplayerhq.hu
"Faith manages."
        -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"