diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-02-22 19:47:03 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-02-22 19:47:03 (GMT) |
| commit | d9ef382a46b76d076a86a5123cab547a68f2096d (patch) | |
| tree | 591370b56b4187d1fce85f67bf4453c0afbca5be | |
| parent | 58305242a2c0c4282b685b31a58d0332b6158025 (diff) | |
| parent | f6d028fb02ae5959601cfae28a659ace0ac4c425 (diff) | |
| download | mxe-d9ef382a46b76d076a86a5123cab547a68f2096d.zip mxe-d9ef382a46b76d076a86a5123cab547a68f2096d.tar.gz mxe-d9ef382a46b76d076a86a5123cab547a68f2096d.tar.bz2 | |
Merge pull request #1233 from LuaAndC/openscenegraph-no-ffmpeg
openscenegraph: disable ffmpeg
| -rw-r--r-- | src/openscenegraph-1-fixes.patch | 27 | ||||
| -rw-r--r-- | src/openscenegraph.mk | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/openscenegraph-1-fixes.patch b/src/openscenegraph-1-fixes.patch index 2e97c39..a372c1d 100644 --- a/src/openscenegraph-1-fixes.patch +++ b/src/openscenegraph-1-fixes.patch @@ -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() diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index c7551ec..911554c 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -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 |