Date: Sat, 30 May 2026 14:30:24 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 166cb5a5a5a8 - main - x11-wm/picom: Improve "disable git" patch Message-ID: <6a1af480.36b2b.69a484b3@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=166cb5a5a5a8c662b88b6b356cc5bb057ee5968d commit 166cb5a5a5a8c662b88b6b356cc5bb057ee5968d Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-05-30 14:27:32 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-05-30 14:27:32 +0000 x11-wm/picom: Improve "disable git" patch Make it ready for upstream: https://github.com/yshui/picom/pull/1520 While here remove unnecessary GH_PROJECT - it have default value. PR: 295255 Approved by: José Maldonado <yukiteruamano@volfread.xyz> (maintainer, timeout 2 weeks) Sponsored by: UNIS Labs MFH: 2026Q2 --- x11-wm/picom/Makefile | 3 +- x11-wm/picom/files/patch-meson.build | 47 ++++++++--------------------- x11-wm/picom/files/patch-meson__options.txt | 11 +++++++ 3 files changed, 25 insertions(+), 36 deletions(-) diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile index 8dd5e3e043ba..804523334729 100644 --- a/x11-wm/picom/Makefile +++ b/x11-wm/picom/Makefile @@ -23,11 +23,10 @@ USES= compiler:c11 desktop-file-utils localbase meson pkgconfig xorg USE_GITHUB= yes GH_ACCOUNT= yshui -GH_PROJECT= picom USE_XORG= pixman x11 xcb xext -MESON_ARGS= -Dcompton=false -Dunittest=true +MESON_ARGS= -Dcompton=false -Dgit=false -Dunittest=true TEST_TARGET= test PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}-inspect \ diff --git a/x11-wm/picom/files/patch-meson.build b/x11-wm/picom/files/patch-meson.build index 5d6b6c91eae1..7e798c25cd6d 100644 --- a/x11-wm/picom/files/patch-meson.build +++ b/x11-wm/picom/files/patch-meson.build @@ -1,39 +1,18 @@ -# Configure PICOM_VERSION and PICOM_FULL_VERSION ---- meson.build.orig 2024-10-14 15:45:15 UTC +--- meson.build.orig 2026-02-07 06:29:30 UTC +++ meson.build -@@ -3,33 +3,8 @@ cc = meson.get_compiler('c') +@@ -3,6 +3,7 @@ cc = meson.get_compiler('c') cc = meson.get_compiler('c') --# use git describe if that's available --git = find_program('git', required: false) --if git.found() -- gitv = run_command('git', 'rev-parse', '--short=7', 'HEAD', check: false) -- if gitv.returncode() == 0 -- commit_hash_short = gitv.stdout().strip() -- endif -- git_upstream = run_command('git', 'rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}', check: false) -- if git_upstream.returncode() == 0 -- remote = git_upstream.stdout().strip().split('/')[0] -- else -- remote = 'origin' -- endif -- git_repository = run_command('git', 'remote', 'get-url', remote, check: false) -- if git_repository.returncode() == 0 -- repository = git_repository.stdout().strip() -- endif --endif -- --add_global_arguments('-DPICOM_VERSION="v'+meson.project_version()+'"', language: 'c') --if is_variable('repository') -- add_global_arguments('-DPICOM_FULL_VERSION="v'+meson.project_version()+' ('+repository+' revision '+commit_hash_short+')"', language: 'c') --elif is_variable('commit_hash_short') -- add_global_arguments('-DPICOM_FULL_VERSION="v'+meson.project_version()+' (revision '+commit_hash_short+')"', language: 'c') --else -- add_global_arguments('-DPICOM_FULL_VERSION="v'+meson.project_version()+'"', language: 'c') --endif -+add_global_arguments('-DPICOM_VERSION="v13"', language: 'c') -+add_global_arguments('-DPICOM_FULL_VERSION="v13"', language: 'c') ++if get_option('git') + # use git describe if that's available + git = find_program('git', required: false) + if git.found() +@@ -20,6 +21,7 @@ if git.found() + if git_repository.returncode() == 0 + repository = git_repository.stdout().strip() + endif ++endif + endif - if get_option('buildtype') == 'release' - add_global_arguments('-DNDEBUG', language: 'c') + add_global_arguments('-DPICOM_VERSION="v'+meson.project_version()+'"', language: 'c') diff --git a/x11-wm/picom/files/patch-meson__options.txt b/x11-wm/picom/files/patch-meson__options.txt new file mode 100644 index 000000000000..7360f2bdee30 --- /dev/null +++ b/x11-wm/picom/files/patch-meson__options.txt @@ -0,0 +1,11 @@ +--- meson_options.txt.orig 2026-02-07 06:29:30 UTC ++++ meson_options.txt +@@ -10,6 +10,8 @@ option('unittest', type: 'boolean', value: false, desc + + option('unittest', type: 'boolean', value: false, description: 'Enable unittests in the code') + ++option('git', type: 'boolean', value: true, description: 'Use git describe if that\'s available') ++ + # Experimental options + + option('modularize', type: 'boolean', value: false, description: 'Build with clang\'s module system (experimental)')home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1af480.36b2b.69a484b3>