osg: Make cmake find the right ffmpeg

[Nia Alarie <nia.alarie%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Wed Feb 14 21:41:38 2018 +0000
Changeset:	529b610d57f15363e998464683e00f8dfc0192e1

Modified Files:
	osg/distinfo
Added Files:
	osg/patches/patch-CMakeModules_FindFFmpeg.cmake

Log Message:
osg: Make cmake find the right ffmpeg

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=529b610d57f15363e998464683e00f8dfc0192e1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 osg/distinfo                                    |  1 +
 osg/patches/patch-CMakeModules_FindFFmpeg.cmake | 44 +++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diffs:
diff --git a/osg/distinfo b/osg/distinfo
index 5e4a11b13c..5b40a48e82 100644
--- a/osg/distinfo
+++ b/osg/distinfo
@@ -4,6 +4,7 @@ SHA1 (osg-3.4.1.tar.gz) = 6fc56846f5790d85dd8139aecb958701f4f4e630
 RMD160 (osg-3.4.1.tar.gz) = 299ab7131433e7f36f0da10eb102014bce26ec83
 SHA512 (osg-3.4.1.tar.gz) = 4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143
 Size (osg-3.4.1.tar.gz) = 5686385 bytes
+SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = 42fecd77c2059b6157e5cab7734f7917a81a6a18
 SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b
 SHA1 (patch-ad) = 909075cabe15541b182794b4fdf5baa038f07ed3
 SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
diff --git a/osg/patches/patch-CMakeModules_FindFFmpeg.cmake b/osg/patches/patch-CMakeModules_FindFFmpeg.cmake
new file mode 100644
index 0000000000..40acbb6aa4
--- /dev/null
+++ b/osg/patches/patch-CMakeModules_FindFFmpeg.cmake
@@ -0,0 +1,44 @@
+$NetBSD$
+
+Find ffmpeg from pkgsrc
+
+--- CMakeModules/FindFFmpeg.cmake.orig	2017-08-28 16:50:49.000000000 +0000
++++ CMakeModules/FindFFmpeg.cmake
+@@ -30,7 +30,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ 
+     FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
+         PATHS
+-        ${FFMPEG_ROOT}/include
++        ${FFMPEG_ROOT}/include/ffmpeg2
+         $ENV{FFMPEG_DIR}/include
+         ${FFMPEG_ROOT}
+         $ENV{FFMPEG_DIR}
+@@ -43,7 +43,7 @@ MACRO(FFMPEG_FIND varname shortname head
+         /opt/csw/include # Blastwave
+         /opt/include
+         /usr/freeware/include
+-        PATH_SUFFIXES ffmpeg
++        PATH_SUFFIXES ffmpeg2
+         DOC "Location of FFMPEG Headers"
+     )
+ 
+@@ -69,9 +69,9 @@ MACRO(FFMPEG_FIND varname shortname head
+     FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
+         NAMES ${shortname}
+         PATHS
+-        ${FFMPEG_ROOT}/lib
++        ${FFMPEG_ROOT}/lib/ffmpeg2
+         $ENV{FFMPEG_DIR}/lib
+-        ${FFMPEG_ROOT}/lib${shortname}
++        ${FFMPEG_ROOT}/lib/ffmpeg2${shortname}
+         $ENV{FFMPEG_DIR}/lib${shortname}
+         ~/Library/Frameworks
+         /Library/Frameworks
+@@ -84,6 +84,7 @@ MACRO(FFMPEG_FIND varname shortname head
+         /opt/csw/lib
+         /opt/lib
+         /usr/freeware/lib64
++        PATH_SUFFIXES ffmpeg2
+         DOC "Location of FFMPEG Libraries"
+     )
+