Commit: 53ae209d25a5741fe32fc403a4428966e8fca4dd
Author: Sybren A. Stüvel
Date: Fri Aug 2 11:12:05 2019 +0200
Branches: master
https://developer.blender.org/rB53ae209d25a5741fe32fc403a4428966e8fca4dd
make deps: avoid running pdflatex as part of building Theora
On machines with pdflatex installed, this is run to build Theora.pdf.
Unfortunately this process breaks, at least on my Ubuntu 18.04 LTS
system. By setting `HAVE_PDFLATEX=no` (or any other value that is not
"yes") this can be avoided. I don't think that it's important to have
this PDF file built anyway, as it's not a dependency of Blender itself.
===================================================================
M build_files/build_environment/cmake/theora.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/theora.cmake
b/build_files/build_environment/cmake/theora.cmake
index e5f94b15b02..6cb69c73948 100644
--- a/build_files/build_environment/cmake/theora.cmake
+++ b/build_files/build_environment/cmake/theora.cmake
@@ -16,20 +16,22 @@
#
# ***** END GPL LICENSE BLOCK *****
+set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV} && export HAVE_PDFLATEX=no)
+
ExternalProject_Add(external_theora
URL ${THEORA_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH SHA256=${THEORA_HASH}
PREFIX ${BUILD_DIR}/theora
- CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd
${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND}
--prefix=${LIBDIR}/theora
+ CONFIGURE_COMMAND ${THEORA_CONFIGURE_ENV} && cd
${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND}
--prefix=${LIBDIR}/theora
--disable-shared
--enable-static
--with-pic
--with-ogg=${LIBDIR}/ogg
--with-vorbis=${LIBDIR}/vorbis
--disable-examples
- BUILD_COMMAND ${CONFIGURE_ENV} && cd
${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
- INSTALL_COMMAND ${CONFIGURE_ENV} && cd
${BUILD_DIR}/theora/src/external_theora/ && make install
+ BUILD_COMMAND ${THEORA_CONFIGURE_ENV} && cd
${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
+ INSTALL_COMMAND ${THEORA_CONFIGURE_ENV} && cd
${BUILD_DIR}/theora/src/external_theora/ && make install
INSTALL_DIR ${LIBDIR}/theora
)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
