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 @@ -1,75 +1,74 @@ PORTNAME= picom DISTVERSIONPREFIX= v DISTVERSION= 13 CATEGORIES= x11-wm MAINTAINER= yukiteruamano@volfread.xyz COMMENT= Lightweight X11 compositor WWW= https://github.com/yshui/picom LICENSE= MIT MPL20 LICENSE_COMB= multi LICENSE_FILE_MIT= ${WRKSRC}/LICENSES/MIT BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash LIB_DEPENDS= libev.so:devel/libev \ libxcb-image.so:x11/xcb-util-image \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-util.so:x11/xcb-util RUN_DEPENDS= xprop:x11/xprop \ xwininfo:x11/xwininfo 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 \ bin/${PORTNAME}-trans \ "@sample etc/xdg/${PORTNAME}.conf.sample" \ etc/xdg/autostart/${PORTNAME}.desktop \ include/${PORTNAME}/api.h \ include/${PORTNAME}/backend.h \ libdata/pkgconfig/${PORTNAME}-api.pc \ share/applications/${PORTNAME}.desktop OPTIONS_DEFINE= CONFIG DBUS DOCS OPENGL PCRE OPTIONS_DEFAULT= CONFIG DBUS OPENGL PCRE CONFIG_DESC= Configuration file parsing support CONFIG_LIB_DEPENDS= libconfig.so:devel/libconfig DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_MESON_TRUE= dbus DOCS_BUILD_DEPENDS= a2x:textproc/asciidoc \ asciidoctor:textproc/rubygem-asciidoctor DOCS_MESON_TRUE= with_docs DOCS_PLIST_FILES= share/man/man1/${PORTNAME}-inspect.1.gz \ share/man/man1/${PORTNAME}-trans.1.gz \ share/man/man1/${PORTNAME}.1.gz OPENGL_LIB_DEPENDS= libepoxy.so:graphics/libepoxy OPENGL_MESON_TRUE= opengl PCRE_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE_MESON_TRUE= regex post-patch: @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ ${WRKSRC}/man/${PORTNAME}.1.adoc \ ${WRKSRC}/src/config.c post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.sample.conf \ ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}.conf.sample .include 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)')