[Bf-blender-cvs] [c9bd78890af] geometry-nodes-simulation: Build: remove opus workaround for sndfile
Campbell Barton
noreply at git.blender.org
Mon Dec 19 19:05:23 CET 2022
Commit: c9bd78890afe555e5886e555e2e28cfb8786434f
Author: Campbell Barton
Date: Fri Dec 16 15:33:15 2022 +1100
Branches: geometry-nodes-simulation
https://developer.blender.org/rBc9bd78890afe555e5886e555e2e28cfb8786434f
Build: remove opus workaround for sndfile
For some reason SNDFILE now builds without this workaround,
which broke building FFMPEG.
===================================================================
M build_files/build_environment/cmake/sndfile.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake
index 3ea4c776e56..8fc614c06c3 100644
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -17,19 +17,6 @@ else()
set(SNDFILE_OPTIONS --enable-static --disable-shared )
endif()
-if(UNIX AND NOT APPLE)
- # NOTE(@campbellbarton): For some reason OPUS is alone in referencing the sub-directory,
- # manipulate the package-config file to prevent this from happening.
- # There is no problem with applying this change multiple times.
- #
- # Replace: Cflags: -I${includedir}/opus
- # With: Cflags: -I${includedir}
- set(SNDFILE_ENV
- sed -i s/{includedir}\\/opus/{includedir}/g ${LIBDIR}/opus/lib/pkgconfig/opus.pc &&
- ${SNDFILE_ENV}
- )
-endif()
-
ExternalProject_Add(external_sndfile
URL file://${PACKAGE_DIR}/${SNDFILE_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
More information about the Bf-blender-cvs
mailing list