Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

blender: build with ffmpeg4.4 #15834

Merged
merged 1 commit into from
Feb 23, 2023
Merged

blender: build with ffmpeg4.4 #15834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions mingw-w64-blender/0037-build-with-ffmpeg4.4.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
--- blender-2.93.14/build_files/cmake/platform/platform_win32_mingw64.cmake.orig 2023-02-22 19:42:08.991589800 +0100
+++ blender-2.93.14/build_files/cmake/platform/platform_win32_mingw64.cmake 2023-02-22 19:55:59.658475000 +0100
@@ -205,13 +205,13 @@
mark_as_advanced(FFMPEG)

# lame, but until we have proper find module for ffmpeg
- if(EXISTS "${FFMPEG}/include/ffmpeg/")
- list(APPEND FFMPEG_INCLUDE_DIRS "${FFMPEG}/include/ffmpeg")
+ if(EXISTS "${FFMPEG}/include/ffmpeg4.4/")
+ list(APPEND FFMPEG_INCLUDE_DIRS "${FFMPEG}/include/ffmpeg4.4")
endif()
# end lameness

mark_as_advanced(FFMPEG_LIBRARIES)
- set(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ set(FFMPEG_LIBPATH ${FFMPEG}/lib/ffmpeg4.4)
endif()

if(WITH_FFTW3)
@@ -414,6 +414,10 @@
endif()
endif()

+if(WITH_CPU_SIMD AND SUPPORT_NEON_BUILD)
+ find_package_wrapper(sse2neon)
+endif()
+
if(WITH_LLVM)
find_package_wrapper(LLVM)

13 changes: 8 additions & 5 deletions mingw-w64-blender/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ _realname=blender
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.93.14
pkgrel=3
pkgrel=4
pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
Expand All @@ -27,7 +27,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-alembic"
"${MINGW_PACKAGE_PREFIX}-embree"
"${MINGW_PACKAGE_PREFIX}-glew"
"${MINGW_PACKAGE_PREFIX}-gmp"
"${MINGW_PACKAGE_PREFIX}-ffmpeg"
"${MINGW_PACKAGE_PREFIX}-ffmpeg4.4"
"${MINGW_PACKAGE_PREFIX}-fftw"
"${MINGW_PACKAGE_PREFIX}-freetype"
#"${MINGW_PACKAGE_PREFIX}-gflags"
Expand Down Expand Up @@ -91,7 +91,8 @@ source=(https://download.blender.org/source/${_realname}-${pkgver}.tar.xz
0033-dont-add-fno-rtti-compile-option.patch
0034-Fix-ARM64-Build.patch
0035-Enable-SSE2NEON-on-Windows-ARM.patch
0036-fix-building-against-boost-1.81.patch)
0036-fix-building-against-boost-1.81.patch
0037-build-with-ffmpeg4.4.patch)
sha256sums=('f7740bd9db5d7c73a39f63d6a8848b05bf4c34efa0dd3e1fa0a360d6bdb531a5'
'6f76d7cbfcbbb9fc823250bfbe9c8eea112aef33880a4665b2be19247048e449'
'c301c9c06d11cc801d5c6d061cc42972e7a5ae770ffc7eca8fb84f60ae2d5050'
Expand Down Expand Up @@ -119,7 +120,8 @@ sha256sums=('f7740bd9db5d7c73a39f63d6a8848b05bf4c34efa0dd3e1fa0a360d6bdb531a5'
'16b560363717357a0e69d3b46269cace9bf978126e08b604ad18a532a8dfd0b2'
'4eed05d38519354f83f70dd3bf3b88682948fc7c56ae998308f911312bb3306f'
'9e4edfb6e7f19d0398e98017ce1fc3640d88002711dec5d49c8c46fbcfb5eb13'
'dd70c472701632018c4e38b64697d8217506c7ab29182003f431031a16dac343')
'dd70c472701632018c4e38b64697d8217506c7ab29182003f431031a16dac343'
'618bf8a25d5c6a4ff85b4b04c3eb6347c584e0b627fe2b33555459fb6f0e30be')

apply_patch_with_msg() {
for _patch in "$@"
Expand Down Expand Up @@ -161,7 +163,8 @@ prepare() {
0033-dont-add-fno-rtti-compile-option.patch \
0034-Fix-ARM64-Build.patch \
0035-Enable-SSE2NEON-on-Windows-ARM.patch \
0036-fix-building-against-boost-1.81.patch
0036-fix-building-against-boost-1.81.patch \
0037-build-with-ffmpeg4.4.patch
}

build() {
Expand Down