From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 04:20:20 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B53DE5C9527; Wed, 7 Apr 2021 04:20:20 +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 4FFWQX3QdTz3nTX; Wed, 7 Apr 2021 04:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AB3D718D9F; Wed, 7 Apr 2021 04:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1374KG5c022809; Wed, 7 Apr 2021 04:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1374KGho022803; Wed, 7 Apr 2021 04:20:16 GMT (envelope-from git) Date: Wed, 7 Apr 2021 04:20:16 GMT Message-Id: <202104070420.1374KGho022803@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 157731dfea52 - main - x11-wm/mutter: Attempt to fix build order bug (D29353) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 157731dfea5228f4da2ab9188dad3351ee3eeec8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 04:20:20 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=157731dfea5228f4da2ab9188dad3351ee3eeec8 commit 157731dfea5228f4da2ab9188dad3351ee3eeec8 Author: Tobias Kortkamp AuthorDate: 2021-04-07 03:44:08 +0000 Commit: Tobias Kortkamp CommitDate: 2021-04-07 04:19:59 +0000 x11-wm/mutter: Attempt to fix build order bug (D29353) Uncovered while building with devel/samurai but can probably also happen with ninja eventually. In file included from ../src/core/mutter.c:26: In file included from ../src/compositor/meta-plugin-manager.h:25: In file included from ../src/core/util-private.h:30: In file included from ../src/meta/util.h:29: In file included from ../src/meta/common.h:34: In file included from ../clutter/clutter/clutter.h:32: In file included from ../clutter/clutter/clutter-types.h:32: In file included from ../cogl/cogl/cogl.h:142: ../cogl/cogl-path/cogl-path.h:55:10: fatal error: 'cogl-path/cogl-path-enum-types.h' file not found #include ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. samu: subcommands failed http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/mutter-3.36.6.log PR: 254678 Obtained from: Aports --- .../mutter/files/patch-clutter_clutter_meson.build | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/x11-wm/mutter/files/patch-clutter_clutter_meson.build b/x11-wm/mutter/files/patch-clutter_clutter_meson.build new file mode 100644 index 000000000000..0e6f0d08e2e1 --- /dev/null +++ b/x11-wm/mutter/files/patch-clutter_clutter_meson.build @@ -0,0 +1,25 @@ +This ensures that libmutter_cogl_path_dep is built before other targets, +fixing the build with many buildjobs + +Obtained from: Aports + +--- clutter/clutter/meson.build.orig 2020-09-07 19:18:23 UTC ++++ clutter/clutter/meson.build +@@ -424,7 +424,7 @@ libmutter_clutter = shared_library(libmutter_clutter_n + soversion: 0, + c_args: clutter_c_args, + include_directories: clutter_includes, +- dependencies: [clutter_deps], ++ dependencies: [clutter_deps,libmutter_cogl_path_dep], + gnu_symbol_visibility: 'hidden', + link_with: [ + libmutter_cogl, +@@ -436,7 +436,7 @@ libmutter_clutter = shared_library(libmutter_clutter_n + install: true, + ) + libmutter_clutter_dep = declare_dependency( +- sources: [clutter_enum_types[1]], ++ sources: [clutter_enum_types[1],libmutter_cogl_path_enum_types[1]], + link_with: libmutter_clutter, + dependencies: clutter_deps, + )