Commit: ba7afbe3a124c170580f12a9222ab18faf38770c
Author: Campbell Barton
Date: Fri Dec 16 15:33:15 2022 +1100
Branches: master
https://developer.blender.org/rBba7afbe3a124c170580f12a9222ab18faf38770c
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}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
