Commit: 7df8347053276da8238be596b541f0f0f0d168bf Author: Christian Rauch Date: Tue Jun 28 02:01:11 2022 +0100 Branches: epoxy https://developer.blender.org/rB7df8347053276da8238be596b541f0f0f0d168bf
add libepoxy source dependency =================================================================== M build_files/build_environment/CMakeLists.txt M build_files/build_environment/cmake/download.cmake M build_files/build_environment/cmake/harvest.cmake A build_files/build_environment/cmake/libepoxy.cmake M build_files/build_environment/cmake/versions.cmake =================================================================== diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index f4361adecc2..c06ff4e0127 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -52,6 +52,7 @@ include(cmake/imath.cmake) include(cmake/openexr.cmake) include(cmake/brotli.cmake) include(cmake/freetype.cmake) +include(cmake/libepoxy.cmake) include(cmake/freeglut.cmake) include(cmake/alembic.cmake) include(cmake/opensubdiv.cmake) diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index c262cfb88a1..191686b0221 100644 --- a/build_files/build_environment/cmake/download.cmake +++ b/build_files/build_environment/cmake/download.cmake @@ -36,6 +36,7 @@ download_source(BLOSC) download_source(PTHREADS) download_source(OPENEXR) download_source(FREETYPE) +download_source(LIBEPOXY) download_source(FREEGLUT) download_source(ALEMBIC) download_source(OPENSUBDIV) diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index c6d687528b3..cae4664456c 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -73,6 +73,8 @@ harvest(fftw3/lib fftw3/lib "*.a") harvest(flac/lib sndfile/lib "libFLAC.a") harvest(freetype/include freetype/include "*.h") harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a) +harvest(libepoxy/include libepoxy/include "*.h") +harvest(libepoxy/lib libepoxy/lib "*.a") harvest(gmp/include gmp/include "*.h") harvest(gmp/lib gmp/lib "*.a") harvest(jemalloc/include jemalloc/include "*.h") diff --git a/build_files/build_environment/cmake/libepoxy.cmake b/build_files/build_environment/cmake/libepoxy.cmake new file mode 100644 index 00000000000..29ec9114049 --- /dev/null +++ b/build_files/build_environment/cmake/libepoxy.cmake @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +ExternalProject_Add(external_libepoxy + URL file://${PACKAGE_DIR}/${LIBEPOXY_FILE} + DOWNLOAD_DIR ${DOWNLOAD_DIR} + URL_HASH ${LIBEPOXY_HASH_TYPE}=${LIBEPOXY_HASH} + PREFIX ${BUILD_DIR}/libepoxy + CONFIGURE_COMMAND meson setup --prefix ${LIBDIR}/libepoxy --default-library static --libdir lib . ../external_libepoxy -Dtests=false + BUILD_COMMAND ninja + INSTALL_COMMAND ninja install +) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 40823cacbe5..7851a5ab186 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -80,6 +80,12 @@ set(FREETYPE_HASH bd4e3b007474319909a6b79d50908e85) set(FREETYPE_HASH_TYPE MD5) set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz) +set(LIBEPOXY_VERSION 1.5.10) +set(LIBEPOXY_URI https://github.com/anholt/libepoxy/archive/refs/tags/${LIBEPOXY_VERSION}.tar.gz) +set(LIBEPOXY_HASH f0730aad115c952e77591fcc805b1dc1) +set(LIBEPOXY_HASH_TYPE MD5) +set(LIBEPOXY_FILE libepoxy-${LIBEPOXY_VERSION}.tar.gz) + set(FREEGLUT_VERSION 3.0.0) set(FREEGLUT_URI http://prdownloads.sourceforge.net/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz) set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754) _______________________________________________ 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