From nobody Thu Dec 14 17:03:42 2023 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 4SrdwZ6Wpgz52kq6; Thu, 14 Dec 2023 17:03:42 +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 4SrdwZ5MtGz3ZxN; Thu, 14 Dec 2023 17:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573422; 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=MoWxPs2Pycl+yaFNPcqVwXGBkaEAqUhnPYZSRwspass=; b=Cu0qf5ErvE7nSsLQxI6coS4Qu0QtVcjFrZ6ZI8PxKP7tEJioLqFAR70fw0XX5Zr736NoBN Fkr8EFzghlPm2oYjEFZ3zVlkS5AmRtXKtl847+bAHI9LLUbPkfNx8VUjKCVrxIMvIGi1Ao 47LiVKrDNrzCcLx03npActvwApvNykydYz0gVDp0zOU+5VJhxqg8Qcc1/ABvk0Rd/7kVyc uMlncrv0sfIa4Bavnr0MNY0hZ4OlgNAi65v9AHzLOIv4h2mSLEi6rrMaDskI1M1qP63XMs iu6kvFuuz6gbF9C/f71lOdSOztFCKZtySEGEdeTlFKEyHop2zo0cUYHn67d0ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573422; a=rsa-sha256; cv=none; b=KXDn5wIItcXCcQXoXcCE6AoxnJGrFQACkT1gIZWZXWkUyjd0v/HB/66ocn1UJbK6KeA/4t IIfTmdnTuXwsW5Yq6hFGX407JQ4BwF0/rr1d/sZiJqU4aOQt2Z0Yp7GQ/NqOIRF2R1MRvM ofcx5sEOqex6LaSBJewKsw9FWk/BeygfKX+z6DVKOLtCeZmJKIX+GNrDzEu1gUbr/O5ws0 GH91kX6XD8PPmgEmc75T/3x/xTf7cLV4S10tFi0nBAckUAEsylIUPV8smIxW4i/U5SyRJE x9EZnTASvV+RgyL8p70wkuk4evam7aQ9wjBE+pd/2Ul9TY+lIFZjRDW2Xume1Q== 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=1702573422; 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=MoWxPs2Pycl+yaFNPcqVwXGBkaEAqUhnPYZSRwspass=; b=LJBfsHIbIEH6u5lTb/qi7qZf+sTjQ/3ckG49PHofaV3l/hfh2xOehGuysQM1IQG2ClLoLF Z3n7Om6FSix+pfySYf7Y9kRrZcBeXkmpVoV6Sb40yIs/2Ii57el26o+xYmGMgSAJo+XcXp U8zYdxhfNtFApUYeVMLWNtgG5SKZ0ferpNl+9z1pl6dL50vKK29AaT1E4CR1+AqJQ+icBg 2o30GUKqpfBCeO7ARAAhb0drL8+S95vG/EQFsP7xxR8iyUIR+v3Yz9od7zJlZHpY5dQIHq MN6zxCCZwsBwDD00x8wz2do4fOopsYywAQ77MeV8OfkYqvmHZBHfoYmYiO2LuQ== 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 4SrdwZ4QJ6zbMr; Thu, 14 Dec 2023 17:03:42 +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 3BEH3gdN017349; Thu, 14 Dec 2023 17:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3gHu017346; Thu, 14 Dec 2023 17:03:42 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:42 GMT Message-Id: <202312141703.3BEH3gHu017346@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: 8ab79171c59b - main - multimedia/libopenshot: Fix build with protobuf 22+ 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: 8ab79171c59b509d0c9adab31144c02a0d5f2041 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ab79171c59b509d0c9adab31144c02a0d5f2041 commit 8ab79171c59b509d0c9adab31144c02a0d5f2041 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:48 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:07 +0000 multimedia/libopenshot: Fix build with protobuf 22+ --- multimedia/libopenshot/Makefile | 5 +++-- multimedia/libopenshot/files/patch-CMakeLists.txt | 11 ++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile index 2423d6f4645e..0ca8b1edf710 100644 --- a/multimedia/libopenshot/Makefile +++ b/multimedia/libopenshot/Makefile @@ -33,6 +33,7 @@ CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\ CMAKE_DISABLE_FIND_PACKAGE_Catch2 CMAKE_OFF= ENABLE_PARALLEL_CTEST VERBOSE_TESTS ENABLE_COVERAGE\ APPIMAGE_BUILD BUILD_TESTING ENABLE_TESTS +USE_CXXSTD= c++17 OPTIONS_DEFINE= DOCS IMAGEMAGICK OPENCV RESVG RUBY OPTIONS_DEFAULT= IMAGEMAGICK OPENCV @@ -61,9 +62,9 @@ RUBY_CMAKE_BOOL= ENABLE_RUBY RUBY_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Ruby .if !exists(/usr/include/omp.h) -USES+= compiler:gcc-c++11-lib +USES+= compiler:gcc-c++17-lib .else -USES+= compiler:c++14-lang +USES+= compiler:c++17-lang .endif .include diff --git a/multimedia/libopenshot/files/patch-CMakeLists.txt b/multimedia/libopenshot/files/patch-CMakeLists.txt index fbb39ea66cf8..89ecc6dc4437 100644 --- a/multimedia/libopenshot/files/patch-CMakeLists.txt +++ b/multimedia/libopenshot/files/patch-CMakeLists.txt @@ -1,5 +1,14 @@ ---- CMakeLists.txt.orig 2022-12-01 22:04:03 UTC +--- CMakeLists.txt.orig 2023-04-19 22:01:02 UTC +++ CMakeLists.txt +@@ -102,7 +102,7 @@ if ((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND + endif() + + #### Set C++ standard level +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + @@ -135,7 +135,7 @@ endif() ### Process subdirectories ###