From nobody Wed Nov 12 10:47:00 2025 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 4d60TK1Q7Wz6Gp5j; Wed, 12 Nov 2025 10:47:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d60TK04YNz3Scp; Wed, 12 Nov 2025 10:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762944421; 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=cQr+H9+7UP8fPTu/hRW9x7yCdkZ1EunWMgK9YswxnLI=; b=E19C1am8IuXsJ1cDlJzEKdnxh1LcheH4/M4t0j2Fnpo36IJnXUPdclMetXIUgwYee5rIUG 2Se2hf+C6ctZ/Tqv5Qv1Ka7Bp+iGz6SE5j/j6BRiaWlJp/NeRnO9lUwCgIEWiuqdeBoMdT 52kdm8+dbEUMO9SaM48UjUHBWasvR1kiELfH8tqhbhUctMhWsu1p24Xyh9kcwdoW4NfSTK Etit0a9w6P95xELbVTaHyP6miBTSlT6dzdbGe/353vPBPFdU2Ca2quywTKygHz53n2wgmE LdcHTklszmJWTImG8GufJof1+lo7B91WhWs4eUOaQMCN1bLhY/kqSh+R1wURdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762944421; 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=cQr+H9+7UP8fPTu/hRW9x7yCdkZ1EunWMgK9YswxnLI=; b=l/o0s4/aVqudFgUHsZCyB080HjscAPJhY+f1CrY9SgJwU9432xwyfupuGmRaRCOG+0vbVO Dueuq5dWTQnOeOETDv92rNJXbYh6zZ1Hc2Z+5jKeNCdJKRG7kQSVzNs3tdBtPRhSoSDIas KVx/2+AEy48fqvF1+F2FTyXHbGrZnLqhWaQkcadn7voKV7aWtW+A06Joln0+KU1Xzpkygb T/5b0i2pQUVWfbewYPeetszvVv36OwxD+x3f8DWeIDxSiTT5pkQBjaQr/jgrFYmbxLRTMc yX0JSe83vUtvSWbnQFS17ZBnIXstbaBI7UGWKv/ofTQGMqsQnGJ5kmFabLJMrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762944421; a=rsa-sha256; cv=none; b=aaTmpDLFrOYOEpCVn2pjzE4up5aH8dpY5l+bxgbOik8r9YtBeZsqkFZOXmytr5zqRo0dru pgTEYY5s8T+CKJ6vUWzGjT1XuuwyJhVJxsrSdtNodpbBXPkTv+o5JP22Nj8Hz+sR8b/9Yk 8rHc+SwAafYmOiTebBKsyWF6+mCKoTguPkiDKhHCfV7sk7zN1VTvYxxzt1pZhvQU65ey1E PSFaII6pQLzvxzdvV86gdpJR+sCP/fWvdODDNoAMvfQTPenUKd5d4zX9e+CgAZlxSyqzKU 3Vhp7zfhMIfYtMZDWFXgT1LFEMiKkyqAvP2ivVdK+CgOczZRf+V16/X4wf+eLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d60TJ66tDzX1S; Wed, 12 Nov 2025 10:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ACAl0cD091615; Wed, 12 Nov 2025 10:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACAl0kd091612; Wed, 12 Nov 2025 10:47:00 GMT (envelope-from git) Date: Wed, 12 Nov 2025 10:47:00 GMT Message-Id: <202511121047.5ACAl0kd091612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: aad40d37a512 - main - =?utf-8?Q?math/or-tools: update 9.12-20250219 =E2=86=92 9.14?= 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aad40d37a512672745fc19ddb8dd9b2d87f70315 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=aad40d37a512672745fc19ddb8dd9b2d87f70315 commit aad40d37a512672745fc19ddb8dd9b2d87f70315 Author: Yuri Victorovich AuthorDate: 2025-11-12 10:24:48 +0000 Commit: Yuri Victorovich CommitDate: 2025-11-12 10:46:41 +0000 math/or-tools: update 9.12-20250219 → 9.14 --- cad/openroad/Makefile | 2 +- math/or-tools/Makefile | 12 ++- math/or-tools/distinfo | 6 +- math/or-tools/files/patch-ortools_base_numbers.cc | 13 ---- math/or-tools/pkg-plist | 91 +++++++++++++++-------- 5 files changed, 70 insertions(+), 54 deletions(-) diff --git a/cad/openroad/Makefile b/cad/openroad/Makefile index 11584cb68b78..4a10214f494b 100644 --- a/cad/openroad/Makefile +++ b/cad/openroad/Makefile @@ -1,7 +1,7 @@ PORTNAME= openroad DISTVERSIONPREFIX= v DISTVERSION= 2.0-20250216 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= cad diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile index b04d163f5067..abb56e7e8a4c 100644 --- a/math/or-tools/Makefile +++ b/math/or-tools/Makefile @@ -1,7 +1,6 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v -DISTVERSION= 9.12-20250219 # tag from the 'main' branch -PORTREVISION= 2 +DISTVERSION= 9.14 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -15,6 +14,7 @@ PATCH_DEPENDS= gsed:textproc/gsed xBUILD_DEPENDS= benchmark>0:devel/benchmark \ googletest>0:devel/googletest LIB_DEPENDS= libabsl_base.so:devel/abseil \ + libbzip2.so:misc/vxl \ libCbc.so:math/cbc \ libCgl.so:math/cgl \ libcoinasl.so:math/asl \ @@ -28,8 +28,7 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libOsi.so:math/osi \ libOsiClp.so:math/clp \ libprotobuf.so:devel/protobuf \ - libre2.so:devel/re2 \ - libscip.so:math/SCIP + libre2.so:devel/re2 TEST_DEPENDS= googletest>0:devel/googletest USES= blaslapack cmake:testing compiler:c++17-lang eigen:3 pkgconfig @@ -37,13 +36,11 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= e0f2787c5050c7cf6bc3e5f902fdb8fc11bd3f38 # tag from the 'main' branch (as opposedto 'stable' branch) that includes the fix for https://github.com/google/or-tools/issues/4548 CMAKE_OFF= BUILD_PYTHON BUILD_DEPS INSTALL_BUILD_DEPS \ BUILD_TESTING BUILD_EXAMPLES BUILD_SAMPLES CMAKE_ON= BUILD_CXX \ - USE_PDLP \ - USE_SCIP + USE_PDLP CMAKE_TESTING_ON= BUILD_TESTING BUILD_EXAMPLES BUILD_CXX_EXAMPLES CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} @@ -58,6 +55,7 @@ FLATZINC_CMAKE_BOOL= BUILD_FLATZINC SCIP_DESC= Use the SCIP solver # SCIP package isn't built because of licensing restrictions SCIP_CMAKE_BOOL= USE_SCIP SCIP_LIB_DEPENDS= libscip.so:math/SCIP +SCIP_BROKN= configure fails, see https://github.com/google/or-tools/issues/4912 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/-//} PORTDOCS= * diff --git a/math/or-tools/distinfo b/math/or-tools/distinfo index c88c1168831c..25a04e2e86be 100644 --- a/math/or-tools/distinfo +++ b/math/or-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739999958 -SHA256 (google-or-tools-v9.12-20250219-e0f2787c5050c7cf6bc3e5f902fdb8fc11bd3f38_GH0.tar.gz) = 681c1cc3ebb6c9cc364bc0d9930e299a838319b6aae02355a386e751776d11a2 -SIZE (google-or-tools-v9.12-20250219-e0f2787c5050c7cf6bc3e5f902fdb8fc11bd3f38_GH0.tar.gz) = 21136421 +TIMESTAMP = 1762939245 +SHA256 (google-or-tools-v9.14_GH0.tar.gz) = 9019facf316b54ee72bb58827efc875df4cfbb328fbf2b367615bf2226dd94ca +SIZE (google-or-tools-v9.14_GH0.tar.gz) = 21397016 diff --git a/math/or-tools/files/patch-ortools_base_numbers.cc b/math/or-tools/files/patch-ortools_base_numbers.cc deleted file mode 100644 index 0fb41bd3adc4..000000000000 --- a/math/or-tools/files/patch-ortools_base_numbers.cc +++ /dev/null @@ -1,13 +0,0 @@ -- workaround for https://github.com/google/or-tools/issues/3622 - ---- ortools/base/numbers.cc.orig 2023-01-07 08:24:55 UTC -+++ ortools/base/numbers.cc -@@ -23,6 +23,8 @@ - #include - #include - -+#include -+ - // #include "ortools/base/logging.h" - #include "absl/strings/ascii.h" - #include "ortools/base/strtoint.h" diff --git a/math/or-tools/pkg-plist b/math/or-tools/pkg-plist index ea2c7d700f69..7ea8c80a910b 100644 --- a/math/or-tools/pkg-plist +++ b/math/or-tools/pkg-plist @@ -19,6 +19,8 @@ include/ortools/algorithms/sparse_permutation.h include/ortools/base/accurate_sum.h include/ortools/base/adjustable_priority_queue-inl.h include/ortools/base/adjustable_priority_queue.h +include/ortools/base/array.h +include/ortools/base/array_internal.h include/ortools/base/base_export.h include/ortools/base/basictypes.h include/ortools/base/bitmap.h @@ -97,7 +99,24 @@ include/ortools/constraint_solver/constraint_solver.h include/ortools/constraint_solver/constraint_solveri.h include/ortools/constraint_solver/demon_profiler.pb.h include/ortools/constraint_solver/java/javawrapcp_util.h -include/ortools/constraint_solver/python/constraint_solver_doc.h +include/ortools/constraint_solver/routing.h +include/ortools/constraint_solver/routing_constraints.h +include/ortools/constraint_solver/routing_decision_builders.h +include/ortools/constraint_solver/routing_enums.pb.h +include/ortools/constraint_solver/routing_filter_committables.h +include/ortools/constraint_solver/routing_filters.h +include/ortools/constraint_solver/routing_ils.h +include/ortools/constraint_solver/routing_ils.pb.h +include/ortools/constraint_solver/routing_index_manager.h +include/ortools/constraint_solver/routing_insertion_lns.h +include/ortools/constraint_solver/routing_lp_scheduling.h +include/ortools/constraint_solver/routing_neighborhoods.h +include/ortools/constraint_solver/routing_parameters.h +include/ortools/constraint_solver/routing_parameters.pb.h +include/ortools/constraint_solver/routing_parameters_utils.h +include/ortools/constraint_solver/routing_search.h +include/ortools/constraint_solver/routing_types.h +include/ortools/constraint_solver/routing_utils.h include/ortools/constraint_solver/search_limit.pb.h include/ortools/constraint_solver/search_stats.pb.h include/ortools/constraint_solver/solver_parameters.pb.h @@ -135,14 +154,15 @@ include/ortools/graph/bounded_dijkstra.h include/ortools/graph/christofides.h include/ortools/graph/cliques.h include/ortools/graph/connected_components.h +include/ortools/graph/dag_connectivity.h include/ortools/graph/dag_constrained_shortest_path.h include/ortools/graph/dag_shortest_path.h -include/ortools/graph/ebert_graph.h include/ortools/graph/eulerian_path.h include/ortools/graph/flow_graph.h include/ortools/graph/flow_problem.pb.h include/ortools/graph/generic_max_flow.h include/ortools/graph/graph.h +include/ortools/graph/graph_generator.h include/ortools/graph/graph_io.h include/ortools/graph/hamiltonian_path.h include/ortools/graph/iterators.h @@ -283,6 +303,28 @@ include/ortools/math_opt/cpp/streamable_solver_init_arguments.h include/ortools/math_opt/cpp/update_result.h include/ortools/math_opt/cpp/update_tracker.h include/ortools/math_opt/cpp/variable_and_expressions.h +include/ortools/math_opt/elemental/arrays.h +include/ortools/math_opt/elemental/attr_diff.h +include/ortools/math_opt/elemental/attr_key.h +include/ortools/math_opt/elemental/attr_storage.h +include/ortools/math_opt/elemental/attributes.h +include/ortools/math_opt/elemental/codegen/gen.h +include/ortools/math_opt/elemental/codegen/gen_c.h +include/ortools/math_opt/elemental/codegen/gen_python.h +include/ortools/math_opt/elemental/codegen/testing.h +include/ortools/math_opt/elemental/derived_data.h +include/ortools/math_opt/elemental/diff.h +include/ortools/math_opt/elemental/element_diff.h +include/ortools/math_opt/elemental/element_ref_tracker.h +include/ortools/math_opt/elemental/element_storage.h +include/ortools/math_opt/elemental/elemental.h +include/ortools/math_opt/elemental/elemental_differencer.h +include/ortools/math_opt/elemental/elemental_matcher.h +include/ortools/math_opt/elemental/elements.h +include/ortools/math_opt/elemental/safe_attr_ops.h +include/ortools/math_opt/elemental/symmetry.h +include/ortools/math_opt/elemental/testing.h +include/ortools/math_opt/elemental/thread_safe_id_map.h include/ortools/math_opt/infeasible_subsystem.pb.h include/ortools/math_opt/io/lp/lp_model.h include/ortools/math_opt/io/lp/lp_name.h @@ -349,11 +391,14 @@ include/ortools/math_opt/solvers/xpress/g_xpress.h include/ortools/math_opt/solvers/xpress_solver.h include/ortools/math_opt/sparse_containers.pb.h include/ortools/math_opt/storage/atomic_constraint_storage.h +include/ortools/math_opt/storage/atomic_constraints_v2.h include/ortools/math_opt/storage/iterators.h include/ortools/math_opt/storage/linear_constraint_storage.h include/ortools/math_opt/storage/linear_expression_data.h include/ortools/math_opt/storage/model_storage.h +include/ortools/math_opt/storage/model_storage_item.h include/ortools/math_opt/storage/model_storage_types.h +include/ortools/math_opt/storage/model_storage_v2.h include/ortools/math_opt/storage/objective_storage.h include/ortools/math_opt/storage/range.h include/ortools/math_opt/storage/sparse_coefficient_map.h @@ -403,21 +448,6 @@ include/ortools/port/proto_utils.h include/ortools/port/scoped_std_stream_capture.h include/ortools/port/sysinfo.h include/ortools/port/utf8.h -include/ortools/routing/constraints.h -include/ortools/routing/decision_builders.h -include/ortools/routing/enums.pb.h -include/ortools/routing/filter_committables.h -include/ortools/routing/filters.h -include/ortools/routing/ils.h -include/ortools/routing/ils.pb.h -include/ortools/routing/index_manager.h -include/ortools/routing/insertion_lns.h -include/ortools/routing/lp_scheduling.h -include/ortools/routing/neighborhoods.h -include/ortools/routing/parameters.h -include/ortools/routing/parameters.pb.h -include/ortools/routing/parameters_utils.h -include/ortools/routing/parsers/capacity_planning.pb.h include/ortools/routing/parsers/carp_parser.h include/ortools/routing/parsers/cvrptw_lib.h include/ortools/routing/parsers/dow_parser.h @@ -429,13 +459,7 @@ include/ortools/routing/parsers/solomon_parser.h include/ortools/routing/parsers/solution_serializer.h include/ortools/routing/parsers/tsplib_parser.h include/ortools/routing/parsers/tsptw_parser.h -include/ortools/routing/python/doc.h -include/ortools/routing/python/index_manager_doc.h -include/ortools/routing/python/parameters_doc.h -include/ortools/routing/routing.h -include/ortools/routing/search.h -include/ortools/routing/types.h -include/ortools/routing/utils.h +include/ortools/sat/2d_distances_propagator.h include/ortools/sat/2d_mandatory_overlap_propagator.h include/ortools/sat/2d_orthogonal_packing.h include/ortools/sat/2d_orthogonal_packing_testing.h @@ -508,12 +532,14 @@ include/ortools/sat/pb_constraint.h include/ortools/sat/precedences.h include/ortools/sat/presolve_context.h include/ortools/sat/presolve_util.h +include/ortools/sat/primary_variables.h include/ortools/sat/probing.h include/ortools/sat/pseudo_costs.h include/ortools/sat/python/linear_expr.h include/ortools/sat/python/linear_expr_doc.h include/ortools/sat/restart.h include/ortools/sat/rins.h +include/ortools/sat/routes_support_graph.pb.h include/ortools/sat/routing_cuts.h include/ortools/sat/sat_base.h include/ortools/sat/sat_cnf_reader.h @@ -533,7 +559,6 @@ include/ortools/sat/symmetry.h include/ortools/sat/symmetry_util.h include/ortools/sat/synchronization.h include/ortools/sat/table.h -include/ortools/sat/theta_tree.h include/ortools/sat/timetable.h include/ortools/sat/timetable_edgefinding.h include/ortools/sat/util.h @@ -546,16 +571,21 @@ include/ortools/scheduling/jobshop_scheduling_parser.h include/ortools/scheduling/rcpsp.pb.h include/ortools/scheduling/rcpsp_parser.h include/ortools/set_cover/assignment.h +include/ortools/set_cover/base_types.h include/ortools/set_cover/capacity.pb.h include/ortools/set_cover/capacity_invariant.h include/ortools/set_cover/capacity_model.h include/ortools/set_cover/set_cover.pb.h +include/ortools/set_cover/set_cover_cft.h include/ortools/set_cover/set_cover_heuristics.h include/ortools/set_cover/set_cover_invariant.h include/ortools/set_cover/set_cover_lagrangian.h include/ortools/set_cover/set_cover_mip.h include/ortools/set_cover/set_cover_model.h include/ortools/set_cover/set_cover_reader.h +include/ortools/set_cover/set_cover_submodel.h +include/ortools/set_cover/set_cover_views.h +include/ortools/set_cover/views.h include/ortools/util/adaptative_parameter_value.h include/ortools/util/affine_relation.h include/ortools/util/aligned_memory.h @@ -592,6 +622,7 @@ include/ortools/util/return_macros.h include/ortools/util/rev.h include/ortools/util/running_stat.h include/ortools/util/saturated_arithmetic.h +include/ortools/util/scheduling.h include/ortools/util/sigint.h include/ortools/util/solve_interrupter.h include/ortools/util/sort.h @@ -613,20 +644,20 @@ include/ortools_export.h lib/cmake/ortools/modules/FindCbc.cmake lib/cmake/ortools/modules/FindClp.cmake lib/cmake/ortools/modules/FindEigen3.cmake -lib/cmake/ortools/modules/FindSCIP.cmake lib/cmake/ortools/modules/Findre2.cmake lib/cmake/ortools/ortoolsConfig.cmake lib/cmake/ortools/ortoolsConfigVersion.cmake lib/cmake/ortools/ortoolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ortools/ortoolsTargets.cmake lib/libortools.so -lib/libortools.so.10 -lib/libortools.so.10.0.9999 +lib/libortools.so.9 +lib/libortools.so.9.14.9999 %%FLATZINC%%lib/libortools_flatzinc.so -%%FLATZINC%%lib/libortools_flatzinc.so.10 -%%FLATZINC%%lib/libortools_flatzinc.so.10.0.9999 +%%FLATZINC%%lib/libortools_flatzinc.so.9 +%%FLATZINC%%lib/libortools_flatzinc.so.9.14.9999 %%FLATZINC%%share/minizinc/cp-sat/fzn_all_different_int.mzn %%FLATZINC%%share/minizinc/cp-sat/fzn_circuit.mzn +%%FLATZINC%%share/minizinc/cp-sat/fzn_count_eq.mzn %%FLATZINC%%share/minizinc/cp-sat/fzn_cumulative.mzn %%FLATZINC%%share/minizinc/cp-sat/fzn_cumulative_opt.mzn %%FLATZINC%%share/minizinc/cp-sat/fzn_diffn.mzn