openscenegraph: build with ffmpeg 4.4

msys2 · Feb 23, 2023 · 2fa3846 · 2fa3846
1 parent 6e3c569
commit 2fa3846
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/mingw-w64-OpenSceneGraph/PKGBUILD b/mingw-w64-OpenSceneGraph/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _pkgver=3.6.5
 pkgver=${_pkgver//-/}
-pkgrel=22
+pkgrel=23
 pkgdesc="High performance 3D graphics toolkit (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -21,7 +21,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-collada-dom"
          "${MINGW_PACKAGE_PREFIX}-curl"
          "${MINGW_PACKAGE_PREFIX}-dcmtk"
-         "${MINGW_PACKAGE_PREFIX}-ffmpeg"
+         "${MINGW_PACKAGE_PREFIX}-ffmpeg4.4"
          "${MINGW_PACKAGE_PREFIX}-fltk"
          "${MINGW_PACKAGE_PREFIX}-freetype"
          "${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -59,6 +59,8 @@ source=(https://github.com/openscenegraph/OpenSceneGraph/archive/${_realname}-${
         0008-opencascade-7.6.0.patch
         # https://github.com/gentoo/gentoo/blob/master/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch
         openscenegraph-3.6.5-openexr3.patch
+        # https://github.com/archlinux/svntogit-community/blob/packages/openscenegraph/trunk/ffmpeg4.4.patch
+        ffmpeg4.4.patch
         )
 sha256sums=('aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12'
             '3c7469cf0741905f2c46e4632159220213532d8f194b711b0600b50ad94ab4f8'
@@ -68,7 +70,8 @@ sha256sums=('aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12'
             '108bc2ab77959b007dbe5a28be4d06bce364959c89d142a02870f6de466af9bb'
             'a70765ce5e4493e9047b33ab89f322a5d6145649d700e5f6a89e84db7880ecb7'
             '0413b3244e91ca7664bd6d6c2a646fae6adb126b181d484eea41a4b7346d1078'
-            '7dd35b920e95a7b0de0c14dee59b28f2a279bfdb8f4971e94395e51a4be9bad9')
+            '7dd35b920e95a7b0de0c14dee59b28f2a279bfdb8f4971e94395e51a4be9bad9'
+            '64a492d266e49aec611fd609251fa7dd08f75e86b25120a1abaf0328223c921a')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -89,7 +92,8 @@ prepare() {
     backport-1055.patch \
     backport-977.patch \
     0008-opencascade-7.6.0.patch \
-    openscenegraph-3.6.5-openexr3.patch
+    openscenegraph-3.6.5-openexr3.patch \
+    ffmpeg4.4.patch
 }
 
 build() {

diff --git a/mingw-w64-OpenSceneGraph/ffmpeg4.4.patch b/mingw-w64-OpenSceneGraph/ffmpeg4.4.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake
+index d548e7a98..7a53cfe25 100644
+--- a/CMakeModules/FindFFmpeg.cmake
++++ b/CMakeModules/FindFFmpeg.cmake
+@@ -43,7 +43,7 @@ MACRO(FFMPEG_FIND varname shortname headername)
+         /opt/csw/include # Blastwave
+         /opt/include
+         /usr/freeware/include
+-        PATH_SUFFIXES ffmpeg
++        PATH_SUFFIXES ffmpeg ffmpeg4.4
+         DOC "Location of FFMPEG Headers"
+     )
+
+@@ -62,7 +62,7 @@ MACRO(FFMPEG_FIND varname shortname headername)
+         /opt/csw/include # Blastwave
+         /opt/include
+         /usr/freeware/include
+-        PATH_SUFFIXES ffmpeg
++        PATH_SUFFIXES ffmpeg ffmpeg4.4
+         DOC "Location of FFMPEG Headers"
+     )
+
+@@ -84,6 +84,7 @@ MACRO(FFMPEG_FIND varname shortname headername)
+         /opt/csw/lib
+         /opt/lib
+         /usr/freeware/lib64
++        PATH_SUFFIXES ffmpeg4.4
+         DOC "Location of FFMPEG Libraries"
+     )
+