diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile index ddea986b420c..f503a145e964 100644 --- a/x11-wm/picom/Makefile +++ b/x11-wm/picom/Makefile @@ -1,78 +1,77 @@ PORTNAME= picom DISTVERSIONPREFIX= v -DISTVERSION= 12.1 -PORTREVISION= 1 +DISTVERSION= 12.2 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 TEST_TARGET= test PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}-inspect \ bin/${PORTNAME}-trans \ "@sample etc/xdg/${PORTNAME}.conf.sample" \ etc/xdg/autostart/${PORTNAME}.desktop \ libdata/pkgconfig/${PORTNAME}-api.pc \ share/applications/${PORTNAME}.desktop OPTIONS_DEFINE= CONFIG DBUS DOCS DRM OPENGL PCRE OPTIONS_DEFAULT= CONFIG DBUS OPENGL PCRE CONFIG_DESC= Configuration file parsing support DRM_DESC= DRM VSync fallback (deprecated) 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 DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm DRM_MESON_TRUE= vsync_drm 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/distinfo b/x11-wm/picom/distinfo index 73806133d558..627588ab94aa 100644 --- a/x11-wm/picom/distinfo +++ b/x11-wm/picom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727632550 -SHA256 (yshui-picom-v12.1_GH0.tar.gz) = d1aab4277e3a123c41621fa57c1ed66cc4a6553174a69e259d3027cf984c452c -SIZE (yshui-picom-v12.1_GH0.tar.gz) = 672958 +TIMESTAMP = 1728619456 +SHA256 (yshui-picom-v12.2_GH0.tar.gz) = c9c24e10ea57d740fc781b47bf5e423ab08216c3056c270a83de35a7f8317a28 +SIZE (yshui-picom-v12.2_GH0.tar.gz) = 673913 diff --git a/x11-wm/picom/files/patch-meson.build b/x11-wm/picom/files/patch-meson.build index ad737789a858..786ada675d26 100644 --- a/x11-wm/picom/files/patch-meson.build +++ b/x11-wm/picom/files/patch-meson.build @@ -1,39 +1,39 @@ # Configure PICOM_VERSION and PICOM_FULL_VERSION ---- meson.build.orig 2024-09-28 23:22:13 UTC +--- meson.build.orig 2024-10-10 12:00:52 UTC +++ meson.build @@ -3,33 +3,8 @@ 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="v12.1"', language: 'c') -+add_global_arguments('-DPICOM_FULL_VERSION="v12.1"', language: 'c') ++add_global_arguments('-DPICOM_VERSION="v12.2"', language: 'c') ++add_global_arguments('-DPICOM_FULL_VERSION="v12.2"', language: 'c') if get_option('buildtype') == 'release' add_global_arguments('-DNDEBUG', language: 'c') diff --git a/x11-wm/picom/files/patch-src_transition_script.h b/x11-wm/picom/files/patch-src_transition_script.h deleted file mode 100644 index 0c74aa74a935..000000000000 --- a/x11-wm/picom/files/patch-src_transition_script.h +++ /dev/null @@ -1,12 +0,0 @@ -# Official fixes for 32-bit compilation ---- src/transition/script.h.orig 2024-09-28 23:22:13 UTC -+++ src/transition/script.h -@@ -45,8 +45,6 @@ typedef struct config_setting_t config_setting_t; - SCRIPT_EVAL_OK, - }; - typedef struct config_setting_t config_setting_t; --static_assert(alignof(double) > alignof(unsigned), "double/unsigned has unexpected " -- "alignment"); - - #define SCRIPT_CTX_PLACEHOLDER_BASE (0x40000000) - diff --git a/x11-wm/picom/files/patch-src_vblank.c b/x11-wm/picom/files/patch-src_vblank.c deleted file mode 100644 index b6f42d3023ef..000000000000 --- a/x11-wm/picom/files/patch-src_vblank.c +++ /dev/null @@ -1,12 +0,0 @@ -# Official fixes for 32-bit compilation ---- src/vblank.c.orig 2024-09-28 23:22:13 UTC -+++ src/vblank.c -@@ -409,7 +409,7 @@ static void handle_present_complete_notify(struct pres - - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); -- auto now_us = (unsigned long)(now.tv_sec * 1000000L + now.tv_nsec / 1000); -+ auto now_us = (uint64_t)now.tv_sec * 1000000UL + (uint64_t)now.tv_nsec / 1000; - - // X sometimes sends duplicate/bogus MSC events, when screen has just been turned - // off. Don't use the msc value in these events. We treat this as not receiving a diff --git a/x11-wm/picom/files/patch-src_wm_wm.h b/x11-wm/picom/files/patch-src_wm_wm.h deleted file mode 100644 index 7e84979d2cb8..000000000000 --- a/x11-wm/picom/files/patch-src_wm_wm.h +++ /dev/null @@ -1,12 +0,0 @@ -# Official fixes for 32-bit compilation ---- src/wm/wm.h.orig 2024-09-28 23:22:13 UTC -+++ src/wm/wm.h -@@ -63,7 +63,7 @@ typedef struct wm_treeid { - typedef struct wm_treeid { - /// The generation of the window ID. This is used to detect if the window ID is - /// reused. Inherited from the wm_tree at cr -- uint64_t gen; -+ alignas(8) uint64_t gen; - /// The X window ID. - xcb_window_t x; -