aboutsummaryrefslogtreecommitdiff
path: root/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt')
-rw-r--r--graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt31
1 files changed, 0 insertions, 31 deletions
diff --git a/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt
deleted file mode 100644
index 426b4f3145b3..000000000000
--- a/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/osgPlugins/ffmpeg/CMakeLists.txt.orig 2015-01-07 14:14:55 UTC
-+++ src/osgPlugins/ffmpeg/CMakeLists.txt
-@@ -1,9 +1,9 @@
--INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_INCLUDE_DIRS})
- LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS})
-
- IF(FFMPEG_LIBSWSCALE_FOUND)
-
-- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale )
-+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale)
-
- ADD_DEFINITIONS(-DUSE_SWSCALE)
-
-@@ -12,14 +12,14 @@ IF(FFMPEG_LIBSWSCALE_FOUND)
- ENDIF()
-
- IF(FFMPEG_LIBSWRESAMPLE_FOUND)
-- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample )
-+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample)
-
- ADD_DEFINITIONS(-DUSE_SWRESAMPLE)
-
- SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_LIBSWRESAMPLE_LIBRARIES})
- ENDIF()
- IF(FFMPEG_LIBAVRESAMPLE_FOUND)
-- INCLUDE_DIRECTORIES( ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample )
-+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample)
-
- ADD_DEFINITIONS(-DUSE_AVRESAMPLE)
-