From nobody Sat Mar 9 14:10:04 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsQ0Y2bvQz5DFGc; Sat, 9 Mar 2024 14:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsQ0X2bdpz4phM; Sat, 9 Mar 2024 14:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVYcjExY99usT89BQyVOb39Qni6kTtYGFr2ju3st2cw=; b=PcqBsVo6inZ5V99J3vsxIdEl33glCBpBCgIjBJEivTa4uZKuhFPWI3Wywg167ODxHHMZF3 IvgUW9kWaX3ZZ6FsoaBFiiUdcJSrivvBPgZUv5DQ83m9CLGi6Nt6ga/8eX8Ayg7val4RhV vtCj4tF7w4vROl7mU2SKOP50/ElsqpRMQ8GsWtAC/v1wVnbhN3Xto8Lh49C0UwPVPtlpPr CJ40yXPBFWe2mGGfyn2DUPWUM2a7rPG2bS3eDy8oKyMdtKIKdhLmrADmOUFR1xcfhiGnX5 yzVptTjFkeaArlSSgyrHOzx6EFH5GX6d/0lSUeiXzu4ESAsdMPiKvucOttZF/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709993404; a=rsa-sha256; cv=none; b=bo7onxSvIh8bz8JxVoTNgekY6lDk4VjHWTkiwR4Hz15+WL5s8ziFkgWNxCPPtHba3AA0m9 Scd6cRkGdaNa7IcRctIWKDN1sh53jYLRpx4jfwcHrR1aWCsLWHfJ5kcKXODAelD8+S53Zd z6RWyVv+vZurV6OrjReZhUyl0JBnrWR2wp7YSrAJuH/KPOs8jCfOHrCIucT2tedctOhBUS O/o6uTgFk5SJKlmYaxeGe8EIJ146JBQ0kpvMz7K4oZC9RzTmR4TpbsmfpFELlJE/qNHbuO izSYMAJmSY/gd6XIj2LZvyOAq1ZUH8TiTcwuoXqmBpsLJu1w6cVJR4nCleXiiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVYcjExY99usT89BQyVOb39Qni6kTtYGFr2ju3st2cw=; b=YoBknev+QHu2Epi01GzOjN9EOF4UwjeLWvpdNgb02MdLnKkvezf9nvdeXJup2hqvhIw+DU +LlNH1+PBr9kRC9a3gdmzEDEgzBgLZjvgZqJ0AYWEH9XYrXLP40sAUTYKJfNE+IX6X4+AQ P6S1YeDVs/r4hbPYUXKR1IjrQ19kZT4o7IEaJMWGP97yj3NMOJjWMz4Ke99KoR1gSeie2P ZV+VkET5NOG3ih0v2fNkJHPN/9AYZf0d0sSowm6ZJnjg7HRmpjfbnIDeNiTFmdUn4JH+H9 N2fNo0/OxpV/ntmfvrqwCxjuODSxCSbZzedCvX0loxtgEHujnEUuxdF9L8PSqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsQ0X2BzRz14rJ; Sat, 9 Mar 2024 14:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429EA47s096356; Sat, 9 Mar 2024 14:10:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429EA4Bw096349; Sat, 9 Mar 2024 14:10:04 GMT (envelope-from git) Date: Sat, 9 Mar 2024 14:10:04 GMT Message-Id: <202403091410.429EA4Bw096349@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 95323d15a8d1 - main - devel/glog: Update to 0.7.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95323d15a8d1647f87687eaf09cbd6c85e2e2cf7 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=95323d15a8d1647f87687eaf09cbd6c85e2e2cf7 commit 95323d15a8d1647f87687eaf09cbd6c85e2e2cf7 Author: Po-Chuan Hsieh AuthorDate: 2024-03-09 13:44:52 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-03-09 14:05:20 +0000 devel/glog: Update to 0.7.0 - Convert to USES=cmake:testing - Sort PLIST - Bump PORTREVISION of dependent ports for shlib change Broken ports are skipped: - graphics/colmap [1] - graphics/hiptext [2] - graphics/openmvs - sysutils/apache-mesos [2] This port was being skipped on package building cluster due to its LICENSE "License NONE needs confirmation, but BATCH is defined" Changes: https://github.com/google/glog/releases Reference: https://pkg-status.freebsd.org/beefy12/data/140amd64-default/84a61d95b0a5/logs/colmap-3.8_5.log [1] --- chinese/librime/Makefile | 6 ++- chinese/librime/distinfo | 4 +- devel/fbthrift/Makefile | 2 + devel/folly/Makefile | 2 + .../patch-folly_experimental_symbolizer_Elf.cpp | 10 +++++ devel/glog/Makefile | 15 ++++---- devel/glog/distinfo | 8 ++-- devel/glog/files/patch-CMakeLists.txt | 30 +++++---------- devel/glog/files/patch-src-glog-stl_logging.h.in | 44 ---------------------- .../glog/files/patch-src-stacktrace_powerpc-inl.h | 8 ++-- devel/glog/files/patch-src-stl_logging_unittest.cc | 12 ------ devel/glog/pkg-plist | 4 +- graphics/blender/Makefile | 3 +- graphics/opencv/Makefile | 2 +- graphics/s2/Makefile | 1 + math/ceres-solver/Makefile | 2 +- math/openturns/Makefile | 2 +- math/or-tools/Makefile | 2 +- math/py-or-tools/Makefile | 2 +- misc/caffe/Makefile | 3 +- misc/openmvg/Makefile | 2 +- net/fb303/Makefile | 2 + net/fbzmq/Makefile | 3 +- net/mvfst/Makefile | 2 + net/wangle/Makefile | 2 + security/fizz/Makefile | 2 + www/proxygen/Makefile | 2 + 27 files changed, 74 insertions(+), 103 deletions(-) diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile index b1cd8f3abe62..bcbaaa034123 100644 --- a/chinese/librime/Makefile +++ b/chinese/librime/Makefile @@ -1,8 +1,11 @@ PORTNAME= librime PORTVERSION= 1.7.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= chinese textproc +PATCH_SITES= https://github.com/rime/librime/commit/ +PATCHFILES= c34c9ea4069bdba9d0f829e615769d79549701a9.patch:-p1 + MAINTAINER= khng@FreeBSD.org COMMENT= Rime Input Method Engine, the core library WWW= https://rime.github.io/ @@ -27,6 +30,7 @@ CMAKE_OFF= BUILD_TEST USE_CXXSTD= c++14 USE_LDCONFIG= yes USE_XORG= xorgproto +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT LDFLAGS+= -lintl USE_GITHUB= yes GH_ACCOUNT= rime diff --git a/chinese/librime/distinfo b/chinese/librime/distinfo index 8da45344ab8b..b5246846ba5c 100644 --- a/chinese/librime/distinfo +++ b/chinese/librime/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1638225885 +TIMESTAMP = 1709459567 SHA256 (rime-librime-1.7.3_GH0.tar.gz) = c76b937a27d7b9352c3eea9eb3adaebf70c93457104c7d47d40c006009092c20 SIZE (rime-librime-1.7.3_GH0.tar.gz) = 2859513 +SHA256 (c34c9ea4069bdba9d0f829e615769d79549701a9.patch) = a2600c1e70e9d009552a69c71f16d7e73586a1ac42be44afad80b3157841f83d +SIZE (c34c9ea4069bdba9d0f829e615769d79549701a9.patch) = 1751 diff --git a/devel/fbthrift/Makefile b/devel/fbthrift/Makefile index b9385a585fd4..a7293f071ef8 100644 --- a/devel/fbthrift/Makefile +++ b/devel/fbthrift/Makefile @@ -1,6 +1,7 @@ PORTNAME= fbthrift DISTVERSIONPREFIX= v DISTVERSION= 2024.03.04.00 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -39,6 +40,7 @@ CMAKE_ON= BUILD_SHARED_LIBS CMAKE_TESTING_ON= enable_tests CXXFLAGS+= -fPIC # https://github.com/facebook/fbthrift/issues/399 +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT post-install: # https://github.com/facebook/fbthrift/issues/393 @${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete diff --git a/devel/folly/Makefile b/devel/folly/Makefile index 01f0ef611f5c..db803423431a 100644 --- a/devel/folly/Makefile +++ b/devel/folly/Makefile @@ -1,6 +1,7 @@ PORTNAME= folly DISTVERSIONPREFIX= v DISTVERSION= 2024.03.04.00 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -43,6 +44,7 @@ CMAKE_OFF= FREEBSD_BUILD_EXAMPLES FREEBSD_FOLLY_USE_SYMBOLIZER # enabling symbol #CMAKE_OFF+= FOLLY_USE_JEMALLOC # Build fails with FOLLY_USE_JEMALLOC=OFF, see https://github.com/facebook/folly/issues/1893 CXXFLAGS+= -fPIC +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT CXXFLAGS_powerpc64= -DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0 do-test: # tests fail to compile, see https://github.com/facebook/folly/issues/2032 diff --git a/devel/folly/files/patch-folly_experimental_symbolizer_Elf.cpp b/devel/folly/files/patch-folly_experimental_symbolizer_Elf.cpp new file mode 100644 index 000000000000..a829255f948d --- /dev/null +++ b/devel/folly/files/patch-folly_experimental_symbolizer_Elf.cpp @@ -0,0 +1,10 @@ +--- folly/experimental/symbolizer/Elf.cpp.orig 2024-02-16 02:33:47 UTC ++++ folly/experimental/symbolizer/Elf.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/devel/glog/Makefile b/devel/glog/Makefile index 87253513c661..c1f209b7f80b 100644 --- a/devel/glog/Makefile +++ b/devel/glog/Makefile @@ -1,5 +1,5 @@ PORTNAME= glog -PORTVERSION= 0.6.0 +PORTVERSION= 0.7.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -12,15 +12,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgflags.so:devel/gflags \ libunwind.so:devel/libunwind +TEST_DEPENDS= googletest>=0:devel/googletest -USES= cmake compiler:c++11-lang pkgconfig - -CMAKE_ON= BUILD_SHARED_LIBS WITH_CUSTOM_PREFIX WITH_GFLAGS WITH_PKGCONFIG WITH_SYMBOLIZE WITH_THREADS WITH_TLS WITH_UNWIND -CMAKE_OFF= PRINT_UNSYMBOLIZED_STACK_TRACES WITH_GTEST +USES= cmake:testing compiler:c++14-lang +CMAKE_ARGS= -DWITH_FUZZING=none -DWITH_UNWIND=libunwind +CMAKE_OFF= PRINT_UNSYMBOLIZED_STACK_TRACES WITH_GMOCK WITH_GTEST +CMAKE_ON= BUILD_SHARED_LIBS WITH_GFLAGS WITH_PKGCONFIG WITH_SYMBOLIZE WITH_TLS +CMAKE_TESTING_ON= WITH_GMOCK WITH_GTEST LDFLAGS+= -lexecinfo -TEST_TARGET= test -USE_CXXSTD= c++11 +USE_CXXSTD= c++14 USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/devel/glog/distinfo b/devel/glog/distinfo index fbf79f12bee4..4d3884beb31f 100644 --- a/devel/glog/distinfo +++ b/devel/glog/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1650084662 -SHA256 (google-glog-v0.6.0_GH0.tar.gz) = 8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6 -SIZE (google-glog-v0.6.0_GH0.tar.gz) = 193267 +TIMESTAMP = 1709390360 +SHA256 (google-glog-v0.7.0_GH0.tar.gz) = 375106b5976231b92e66879c1a92ce062923b9ae573c42b56ba28b112ee4cc11 +SIZE (google-glog-v0.7.0_GH0.tar.gz) = 182654 +SHA256 (5a7856ab964356990b948e5ea98b55938ed271c7.patch) = fc7c4d2af7c658fa408c60136d60aa3967db20b239c71281060e492e54d4c188 +SIZE (5a7856ab964356990b948e5ea98b55938ed271c7.patch) = 2712 diff --git a/devel/glog/files/patch-CMakeLists.txt b/devel/glog/files/patch-CMakeLists.txt index 9b41ba3d0dd9..3099f664f63e 100644 --- a/devel/glog/files/patch-CMakeLists.txt +++ b/devel/glog/files/patch-CMakeLists.txt @@ -1,23 +1,11 @@ ---- CMakeLists.txt.orig 2021-05-07 23:05:04 UTC +--- CMakeLists.txt.orig 2024-02-17 17:49:26 UTC +++ CMakeLists.txt -@@ -113,8 +113,6 @@ check_include_file_cxx (unistd.h HAVE_UNISTD_H) - check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP) - check_include_file_cxx ("ext/hash_set" HAVE_EXT_HASH_SET) - check_include_file_cxx ("ext/slist" HAVE_EXT_SLIST) --check_include_file_cxx ("tr1/unordered_map" HAVE_TR1_UNORDERED_MAP) --check_include_file_cxx ("tr1/unordered_set" HAVE_TR1_UNORDERED_SET) - check_include_file_cxx ("unordered_map" HAVE_UNORDERED_MAP) - check_include_file_cxx ("unordered_set" HAVE_UNORDERED_SET) +@@ -970,7 +970,7 @@ if (WITH_PKGCONFIG) + if (WITH_PKGCONFIG) + install ( + FILES "${glog_BINARY_DIR}/libglog.pc" +- DESTINATION "${_glog_CMake_LIBDIR}/pkgconfig" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" + ) + endif (WITH_PKGCONFIG) -@@ -678,11 +676,6 @@ if (BUILD_TESTING) - target_compile_definitions (stl_logging_unittest PRIVATE - GLOG_STL_LOGGING_FOR_UNORDERED) - endif (HAVE_UNORDERED_MAP AND HAVE_UNORDERED_SET) -- -- if (HAVE_TR1_UNORDERED_MAP AND HAVE_TR1_UNORDERED_SET) -- target_compile_definitions (stl_logging_unittest PRIVATE -- GLOG_STL_LOGGING_FOR_TR1_UNORDERED) -- endif (HAVE_TR1_UNORDERED_MAP AND HAVE_TR1_UNORDERED_SET) - - if (HAVE_EXT_HASH_MAP AND HAVE_EXT_HASH_SET) - target_compile_definitions (stl_logging_unittest PRIVATE diff --git a/devel/glog/files/patch-src-glog-stl_logging.h.in b/devel/glog/files/patch-src-glog-stl_logging.h.in deleted file mode 100644 index ba10427f9ce1..000000000000 --- a/devel/glog/files/patch-src-glog-stl_logging.h.in +++ /dev/null @@ -1,44 +0,0 @@ ---- src/glog/stl_logging.h.in.orig 2021-05-07 23:05:04 UTC -+++ src/glog/stl_logging.h.in -@@ -39,7 +39,6 @@ - // need to define macros before including this file: - // - // - GLOG_STL_LOGGING_FOR_UNORDERED - and --// - GLOG_STL_LOGGING_FOR_TR1_UNORDERED - - // - GLOG_STL_LOGGING_FOR_EXT_HASH - - // - GLOG_STL_LOGGING_FOR_EXT_SLIST - - // -@@ -64,11 +63,6 @@ - # include - #endif - --#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED --# include --# include --#endif -- - #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH - # include - # include -@@ -134,10 +128,6 @@ OUTPUT_FOUR_ARG_CONTAINER(std::multimap) - OUTPUT_FOUR_ARG_CONTAINER(std::unordered_set) - OUTPUT_FOUR_ARG_CONTAINER(std::unordered_multiset) - #endif --#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED --OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_set) --OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_multiset) --#endif - #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH - OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_set) - OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_multiset) -@@ -156,10 +146,6 @@ inline std::ostream& operator<<(std::ostream& out, \ - #ifdef GLOG_STL_LOGGING_FOR_UNORDERED - OUTPUT_FIVE_ARG_CONTAINER(std::unordered_map) - OUTPUT_FIVE_ARG_CONTAINER(std::unordered_multimap) --#endif --#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED --OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_map) --OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_multimap) - #endif - #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH - OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_map) diff --git a/devel/glog/files/patch-src-stacktrace_powerpc-inl.h b/devel/glog/files/patch-src-stacktrace_powerpc-inl.h index 45d700c3489a..3703766a0a35 100644 --- a/devel/glog/files/patch-src-stacktrace_powerpc-inl.h +++ b/devel/glog/files/patch-src-stacktrace_powerpc-inl.h @@ -1,11 +1,11 @@ ---- src/stacktrace_powerpc-inl.h.orig 2019-12-01 18:35:43 UTC +--- src/stacktrace_powerpc-inl.h.orig 2024-02-17 17:49:26 UTC +++ src/stacktrace_powerpc-inl.h -@@ -107,7 +107,7 @@ int GetStackTrace(void** result, int max_depth, int sk +@@ -111,7 +111,7 @@ int GetStackTrace(void** result, int max_depth, int sk // Link Register is. For DARWIN and AIX (used by apple and // linux ppc64), it's in sp[2]. For SYSV (used by linux ppc), // it's in sp[1]. -#if defined(_CALL_AIX) || defined(_CALL_DARWIN) +#if defined(_CALL_AIX) || defined(_CALL_DARWIN) || defined(_CALL_ELF) - result[n++] = *(sp+2); + result[n++] = *(sp + 2); #elif defined(_CALL_SYSV) - result[n++] = *(sp+1); + result[n++] = *(sp + 1); diff --git a/devel/glog/files/patch-src-stl_logging_unittest.cc b/devel/glog/files/patch-src-stl_logging_unittest.cc deleted file mode 100644 index dcf45e53b816..000000000000 --- a/devel/glog/files/patch-src-stl_logging_unittest.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/stl_logging_unittest.cc.orig 2021-05-07 23:05:04 UTC -+++ src/stl_logging_unittest.cc -@@ -52,9 +52,6 @@ - # ifndef GLOG_STL_LOGGING_FOR_EXT_SLIST - # define GLOG_STL_LOGGING_FOR_EXT_SLIST - # endif --# ifndef GLOG_STL_LOGGING_FOR_TR1_UNORDERED --# define GLOG_STL_LOGGING_FOR_TR1_UNORDERED --# endif - # endif - #endif - diff --git a/devel/glog/pkg-plist b/devel/glog/pkg-plist index 88328a610726..cebcc9ad8535 100644 --- a/devel/glog/pkg-plist +++ b/devel/glog/pkg-plist @@ -1,9 +1,11 @@ include/glog/export.h +include/glog/flags.h include/glog/log_severity.h include/glog/logging.h include/glog/platform.h include/glog/raw_logging.h include/glog/stl_logging.h +include/glog/types.h include/glog/vlog_is_on.h lib/cmake/glog/glog-config-version.cmake lib/cmake/glog/glog-config.cmake @@ -11,7 +13,7 @@ lib/cmake/glog/glog-modules.cmake lib/cmake/glog/glog-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/glog/glog-targets.cmake lib/libglog.so -lib/libglog.so.1 lib/libglog.so.%%PORTVERSION%% +lib/libglog.so.2 libdata/pkgconfig/libglog.pc %%DATADIR%%/cmake/FindUnwind.cmake diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 9ea843b1f390..8a2577e5e206 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,6 +1,6 @@ PORTNAME= blender DISTVERSION= 3.6.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -42,6 +42,7 @@ SHEBANG_FILES= scripts/modules/bl_i18n_utils/merge_po.py \ CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_gcc= -Wno-float-conversion CFLAGS_i386= -march=i586 +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT CXXFLAGS_i386= -march=i586 PLIST_SUB+= VER=${DISTVERSION:R} diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 92dd1d81cbe6..b22f8cf4aeb1 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencv DISTVERSION= 4.6.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ diff --git a/graphics/s2/Makefile b/graphics/s2/Makefile index bb7c57aa5e2a..11c5595c864f 100644 --- a/graphics/s2/Makefile +++ b/graphics/s2/Makefile @@ -1,5 +1,6 @@ PORTNAME= s2 PORTVERSION= 0.11.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= graphics diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index abcfb46e2d2c..0b4e083ea19b 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -1,6 +1,6 @@ PORTNAME= ceres-solver DISTVERSION= 2.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/openturns/Makefile b/math/openturns/Makefile index b2d9c6520053..32ecfac2a9a5 100644 --- a/math/openturns/Makefile +++ b/math/openturns/Makefile @@ -1,7 +1,7 @@ PORTNAME= openturns DISTVERSIONPREFIX= v DISTVERSION= 1.22 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile index b2eea9e6099a..fe520dd8ede8 100644 --- a/math/or-tools/Makefile +++ b/math/or-tools/Makefile @@ -1,7 +1,7 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v DISTVERSION= 9.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile index 397e0d8a537a..49df6989db25 100644 --- a/math/py-or-tools/Makefile +++ b/math/py-or-tools/Makefile @@ -1,7 +1,7 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v DISTVERSION= 9.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/caffe/Makefile b/misc/caffe/Makefile index 28de9bf51bff..dad6a4a66330 100644 --- a/misc/caffe/Makefile +++ b/misc/caffe/Makefile @@ -1,7 +1,7 @@ PORTNAME= caffe DISTVERSION= 1.0-136 DISTVERSIONSUFFIX= -g9b891540 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc # machine-learning PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -46,6 +46,7 @@ GH_ACCOUNT= BVLC CMAKE_ARGS= -DBLAS=Open \ -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ -DFREEBSD_PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT LDFLAGS+= -lpython${PYTHON_VER} PORTSCOUT= limit:^[0-9].*[0-9]$$ # should begin and end with a digit to prevent tags like rcnn-release and rc5 diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile index 8a432ef290b2..fdc1ab4333b3 100644 --- a/misc/openmvg/Makefile +++ b/misc/openmvg/Makefile @@ -1,7 +1,7 @@ PORTNAME= openmvg DISTVERSIONPREFIX= v DISTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc science MAINTAINER= yuri@FreeBSD.org diff --git a/net/fb303/Makefile b/net/fb303/Makefile index 7e812d1d37d5..eb27ff0cb247 100644 --- a/net/fb303/Makefile +++ b/net/fb303/Makefile @@ -1,6 +1,7 @@ PORTNAME= fb303 DISTVERSIONPREFIX= v DISTVERSION= 2024.03.04.00 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -36,6 +37,7 @@ USE_GITHUB= yes GH_ACCOUNT= facebook CXXFLAGS+= -fPIC +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= PYTHON_EXTENSIONS diff --git a/net/fbzmq/Makefile b/net/fbzmq/Makefile index f96b77bf6346..bb09279b7e01 100644 --- a/net/fbzmq/Makefile +++ b/net/fbzmq/Makefile @@ -1,7 +1,7 @@ PORTNAME= fbzmq DISTVERSIONPREFIX= v DISTVERSION= 2022.05.30.00 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -38,5 +38,6 @@ CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_TESTS CXXFLAGS+= -I${LOCALBASE}/include/libepoll-shim -fPIC +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT .include diff --git a/net/mvfst/Makefile b/net/mvfst/Makefile index ade334e8b274..81974e4f45cf 100644 --- a/net/mvfst/Makefile +++ b/net/mvfst/Makefile @@ -1,6 +1,7 @@ PORTNAME= mvfst DISTVERSIONPREFIX= v DISTVERSION= 2024.03.04.00 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -39,5 +40,6 @@ CMAKE_OFF= BUILD_TESTS CMAKE_TESTING_ON= BUILD_TESTS # several tests fail, see https://github.com/facebookincubator/mvfst/issues/275 CXXFLAGS+= -fPIC +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT .include diff --git a/net/wangle/Makefile b/net/wangle/Makefile index 08aaee1f7a65..04b2246b11a9 100644 --- a/net/wangle/Makefile +++ b/net/wangle/Makefile @@ -1,6 +1,7 @@ PORTNAME= wangle DISTVERSIONPREFIX= v DISTVERSION= 2024.03.04.00 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -35,6 +36,7 @@ WRKSRC_SUBDIR= ${PORTNAME} CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_TESTS +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT post-install: # https://github.com/facebook/wangle/issues/179 cd ${STAGEDIR}${PREFIX} && \ diff --git a/security/fizz/Makefile b/security/fizz/Makefile index 2043385b0693..1ad98af2bd9e 100644 --- a/security/fizz/Makefile +++ b/security/fizz/Makefile @@ -1,6 +1,7 @@ PORTNAME= fizz DISTVERSIONPREFIX= v DISTVERSION= 2024.03.04.00 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= yuri@FreeBSD.org @@ -38,6 +39,7 @@ WRKSRC_SUBDIR= ${PORTNAME} CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_TESTS BUILD_EXAMPLES CMAKE_TESTING_ON= BUILD_TESTS +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT post-install: # https://github.com/facebookincubator/fizz/issues/55 cd ${STAGEDIR}${PREFIX} && ${RMDIR} include/fizz/tool/test include/fizz/util/test diff --git a/www/proxygen/Makefile b/www/proxygen/Makefile index 0dee9104fe92..f4cb3e3c2dc0 100644 --- a/www/proxygen/Makefile +++ b/www/proxygen/Makefile @@ -1,6 +1,7 @@ PORTNAME= proxygen DISTVERSIONPREFIX= v DISTVERSION= 2024.03.04.00 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org @@ -37,6 +38,7 @@ GH_ACCOUNT= facebook USE_LDCONFIG= yes CXXFLAGS+= -fPIC +CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT LDFLAGS+= -lexecinfo CMAKE_ON= BUILD_SHARED_LIBS