commit: a9f3b3cc31e0fa431149eb3737a329ae95fc8bf1 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Tue May 6 20:58:17 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 8 06:26:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f3b3cc
media-gfx/blender: use system glog Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41967 Signed-off-by: Sam James <sam <AT> gentoo.org> ...lender-4.2.9.ebuild => blender-4.2.9-r1.ebuild} | 1 + ...der-4.3.2-r3.ebuild => blender-4.3.2-r4.ebuild} | 2 +- ...lender-4.4.1.ebuild => blender-4.4.1-r1.ebuild} | 2 +- media-gfx/blender/blender-9999.ebuild | 2 +- ...gtest.patch => blender-4.3.2-system-glog.patch} | 48 ++++++++++++++++------ 5 files changed, 39 insertions(+), 16 deletions(-) diff --git a/media-gfx/blender/blender-4.2.9.ebuild b/media-gfx/blender/blender-4.2.9-r1.ebuild similarity index 99% rename from media-gfx/blender/blender-4.2.9.ebuild rename to media-gfx/blender/blender-4.2.9-r1.ebuild index 62fd0fd5e73c..26ab39df775c 100644 --- a/media-gfx/blender/blender-4.2.9.ebuild +++ b/media-gfx/blender/blender-4.2.9-r1.ebuild @@ -184,6 +184,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.2.9-python3.13.patch" "${FILESDIR}/${PN}-4.2.9-python3.12_1.patch" "${FILESDIR}/${PN}-4.3.2-optix-8.1.0.patch" + "${FILESDIR}/${PN}-4.3.2-system-glog.patch" "${FILESDIR}/${PN}-4.4.0-optix-compile-flags.patch" ) diff --git a/media-gfx/blender/blender-4.3.2-r3.ebuild b/media-gfx/blender/blender-4.3.2-r4.ebuild similarity index 99% rename from media-gfx/blender/blender-4.3.2-r3.ebuild rename to media-gfx/blender/blender-4.3.2-r4.ebuild index 4a6f32bc8334..287b8b6c9839 100644 --- a/media-gfx/blender/blender-4.3.2-r3.ebuild +++ b/media-gfx/blender/blender-4.3.2-r4.ebuild @@ -248,7 +248,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.3.2-ffmpeg7.patch" "${FILESDIR}/${PN}-4.3.2-openvdb-12.patch" "${FILESDIR}/${PN}-4.3.2-optix-8.1.0.patch" - "${FILESDIR}/${PN}-4.3.2-system-gtest.patch" + "${FILESDIR}/${PN}-4.3.2-system-glog.patch" "${FILESDIR}/${PN}-4.4.0-optix-compile-flags.patch" ) diff --git a/media-gfx/blender/blender-4.4.1.ebuild b/media-gfx/blender/blender-4.4.1-r1.ebuild similarity index 99% rename from media-gfx/blender/blender-4.4.1.ebuild rename to media-gfx/blender/blender-4.4.1-r1.ebuild index e138b5e0bfff..c26db7f532a1 100644 --- a/media-gfx/blender/blender-4.4.1.ebuild +++ b/media-gfx/blender/blender-4.4.1-r1.ebuild @@ -241,7 +241,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.0.2-FindClang.patch" "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" "${FILESDIR}/${PN}-4.1.1-numpy.patch" - "${FILESDIR}/${PN}-4.3.2-system-gtest.patch" + "${FILESDIR}/${PN}-4.3.2-system-glog.patch" "${FILESDIR}/${PN}-4.4.0-optix-compile-flags.patch" ) diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index fe53c38503f0..decfddd094f0 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -242,7 +242,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.0.2-FindClang.patch" "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" "${FILESDIR}/${PN}-4.1.1-numpy.patch" - "${FILESDIR}/${PN}-4.3.2-system-gtest.patch" + "${FILESDIR}/${PN}-4.3.2-system-glog.patch" "${FILESDIR}/${PN}-4.4.0-optix-compile-flags.patch" ) diff --git a/media-gfx/blender/files/blender-4.3.2-system-gtest.patch b/media-gfx/blender/files/blender-4.3.2-system-glog.patch similarity index 55% rename from media-gfx/blender/files/blender-4.3.2-system-gtest.patch rename to media-gfx/blender/files/blender-4.3.2-system-glog.patch index 4ac21c2007bd..9bf54f0e7bd5 100644 --- a/media-gfx/blender/files/blender-4.3.2-system-gtest.patch +++ b/media-gfx/blender/files/blender-4.3.2-system-glog.patch @@ -1,7 +1,7 @@ From 6284e504b144619411ac41092d53fc8541c84cdb Mon Sep 17 00:00:00 2001 From: Paul Zander <[email protected]> Date: Tue, 15 Apr 2025 13:48:00 +0200 -Subject: [PATCH] system gtest +Subject: [PATCH] system glog Signed-off-by: Paul Zander <[email protected]> @@ -9,7 +9,7 @@ diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 418d2255a75..6b5cd31f9b7 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt -@@ -77,12 +77,14 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) +@@ -77,7 +77,9 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) if(NOT WITH_SYSTEM_GFLAGS) add_subdirectory(gflags) endif() @@ -19,23 +19,16 @@ index 418d2255a75..6b5cd31f9b7 100644 + endif() endif() --if(WITH_GTESTS) -- add_subdirectory(gtest) -- add_subdirectory(gmock) -+if(WITH_GTESTS AND NOT WITH_SYSTEM_GTEST) -+ add_subdirectory(gtest) -+ add_subdirectory(gmock) - endif() - - if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE) + if(WITH_GTESTS) diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index 965d0028020..825c2141f5a 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt -@@ -34,6 +34,7 @@ if(WITH_LIBMV) +@@ -34,6 +34,8 @@ if(WITH_LIBMV) ${GLOG_INCLUDE_DIRS} ../guardedalloc ) ++ + list(REMOVE_DUPLICATES INC) list(APPEND INC_SYS @@ -44,10 +37,11 @@ diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLis index ff7f6905836..d46b1d65174 100644 --- a/tests/gtests/testing/CMakeLists.txt +++ b/tests/gtests/testing/CMakeLists.txt -@@ -13,6 +13,7 @@ set(INC +@@ -13,6 +13,8 @@ set(INC ${GFLAGS_INCLUDE_DIRS} ../../../extern/gtest/include ) ++ +list(REMOVE_DUPLICATES INC) set(INC_SYS @@ -55,3 +49,31 @@ index ff7f6905836..d46b1d65174 100644 -- 2.49.0 +From 0547b825d9ab0b7c89a41eb4000f0d2892c17d85 Mon Sep 17 00:00:00 2001 +From: Paul Zander <[email protected]> +Date: Tue, 29 Apr 2025 18:22:53 +0200 +Subject: [PATCH] fix-system-glog + +Signed-off-by: Paul Zander <[email protected]> + +diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt +index fe28dfd66ce..03c17167269 100644 +--- a/intern/cycles/util/CMakeLists.txt ++++ b/intern/cycles/util/CMakeLists.txt +@@ -130,6 +130,13 @@ if(CXX_HAS_AVX2) + set_source_files_properties(transform_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_FLAGS}") + endif() + ++if(WITH_CYCLES_LOGGING) ++ list(APPEND LIB ++ ${GLOG_LIBRARIES} ++ ${GFLAGS_LIBRARIES} ++ ) ++endif() ++ + include_directories(${INC}) + include_directories(SYSTEM ${INC_SYS}) + +-- +2.49.0 +
