openscenegraph: disable ffmpeg

fix #1230
pull/1233/head
Boris Nagaev 8 years ago
parent 58305242a2
commit f6d028fb02

@ -155,3 +155,30 @@ index 1111111..2222222 100644
macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
find_path(${_component_prefix}_INCLUDE_DIRS
NAMES ${_header}
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 22 Feb 2016 03:35:28 +0300
Subject: [PATCH] disable ffmpeg
OpenSceneGraph is using removed features of ffmpeg, which have
been deprecated for 3+ years.
See https://github.com/mxe/mxe/issues/1230#issuecomment-186936198
Source of patch: http://forum.openscenegraph.org/viewtopic.php?t=10485
diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/osgPlugins/CMakeLists.txt
+++ b/src/osgPlugins/CMakeLists.txt
@@ -199,10 +199,6 @@ IF(XINE_FOUND)
ADD_SUBDIRECTORY(xine)
ENDIF()
-IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
- ADD_SUBDIRECTORY(ffmpeg)
-ENDIF()
-
IF(GSTREAMER_FOUND AND GLIB_FOUND)
ADD_SUBDIRECTORY(gstreamer)
ENDIF()

@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e30
$(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION)
$(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip
$(PKG)_URL := http://trac.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE)
$(PKG)_DEPS := gcc boost curl dcmtk ffmpeg freetype gdal giflib gstreamer \
$(PKG)_DEPS := gcc boost curl dcmtk freetype gdal giflib gstreamer \
gta jasper jpeg libpng openal openexr openthreads poppler \
qt tiff xine-lib zlib

Loading…
Cancel
Save