diff --git a/devel/wf-config/Makefile b/devel/wf-config/Makefile index 2cc766138e6a..dd09acff69a8 100644 --- a/devel/wf-config/Makefile +++ b/devel/wf-config/Makefile @@ -2,9 +2,8 @@ PORTNAME= wf-config DISTVERSIONPREFIX= v -DISTVERSION= 0.1-10 -DISTVERSIONSUFFIX= -gf9c97d0 -PORTREVISION= 1 +DISTVERSION= 0.1-13 +DISTVERSIONSUFFIX= -g21e9ee9 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/wf-config/distinfo b/devel/wf-config/distinfo index 8622372dc8e6..e65113b36a29 100644 --- a/devel/wf-config/distinfo +++ b/devel/wf-config/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560885019 -SHA256 (WayfireWM-wf-config-v0.1-10-gf9c97d0_GH0.tar.gz) = 2a177e585bae83a311ca7fde5173502788d049167b766becdb2d9715c6d4b872 -SIZE (WayfireWM-wf-config-v0.1-10-gf9c97d0_GH0.tar.gz) = 9206 +TIMESTAMP = 1569952160 +SHA256 (WayfireWM-wf-config-v0.1-13-g21e9ee9_GH0.tar.gz) = 2b99beb507ab3f14766cf2288166cc18a4ac20b6f71efe50733a01b1e0454435 +SIZE (WayfireWM-wf-config-v0.1-13-g21e9ee9_GH0.tar.gz) = 9306 diff --git a/devel/wf-config/pkg-plist b/devel/wf-config/pkg-plist index 2b1fc7bcb8f2..4e0640761290 100644 --- a/devel/wf-config/pkg-plist +++ b/devel/wf-config/pkg-plist @@ -1,4 +1,6 @@ include/wayfire/animation.hpp include/wayfire/config.hpp lib/libwf-config.so +lib/libwf-config.so.0 +lib/libwf-config.so.0.1 libdata/pkgconfig/wf-config.pc diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 7f60bdf257b8..d99a5d2b3f20 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -2,15 +2,10 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v -DISTVERSION= 0.2 -PORTREVISION= 1 +DISTVERSION= 0.2-145 +DISTVERSIONSUFFIX= -g612d74a CATEGORIES= x11-wm -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= c51e3eda7fa0.patch:-p1 # drop unused -PATCHFILES+= c4d4c941e773.patch:-p1 # support SUID -PATCHFILES+= 45535347c922.patch:-p1 # wlroots 0.7 - MAINTAINER= jbeich@FreeBSD.org COMMENT= 3D wayland compositor diff --git a/x11-wm/wayfire/distinfo b/x11-wm/wayfire/distinfo index 1b05ca609caa..8d25e9c2b4bd 100644 --- a/x11-wm/wayfire/distinfo +++ b/x11-wm/wayfire/distinfo @@ -1,9 +1,3 @@ -TIMESTAMP = 1547849902 -SHA256 (WayfireWM-wayfire-v0.2_GH0.tar.gz) = 94fe93bb2b86048fd1c7601f97b167767e19618bb6b6226e21c22fbd052540bf -SIZE (WayfireWM-wayfire-v0.2_GH0.tar.gz) = 212795 -SHA256 (c51e3eda7fa0.patch) = 43187242154b6ed4053a02183d7c87826ff58e442fa28e1327494b9bc905f50d -SIZE (c51e3eda7fa0.patch) = 1327 -SHA256 (c4d4c941e773.patch) = b08e348c90669a88b5bf5dbf106bc02573b4cb0c34187bf85f18fb5f98c0f56c -SIZE (c4d4c941e773.patch) = 1418 -SHA256 (45535347c922.patch) = 4641571558a2178e432097e510eadc677019a63c5541cd863dfe3b105d255bf5 -SIZE (45535347c922.patch) = 933 +TIMESTAMP = 1570215237 +SHA256 (WayfireWM-wayfire-v0.2-145-g612d74a_GH0.tar.gz) = e73742de8f3b8dfa0373a7f7d5c49e11c8035f975e8aa10a4ac6ec2f8dcb4c2c +SIZE (WayfireWM-wayfire-v0.2-145-g612d74a_GH0.tar.gz) = 234914 diff --git a/x11-wm/wayfire/pkg-plist b/x11-wm/wayfire/pkg-plist index 94942594eeb7..dc26144dd449 100644 --- a/x11-wm/wayfire/pkg-plist +++ b/x11-wm/wayfire/pkg-plist @@ -19,6 +19,7 @@ include/wayfire/output.hpp include/wayfire/plugin.hpp include/wayfire/render-manager.hpp include/wayfire/signal-definitions.hpp +include/wayfire/singleton-plugin.hpp include/wayfire/surface.hpp include/wayfire/util.hpp include/wayfire/view-transform.hpp @@ -43,7 +44,9 @@ lib/wayfire/libmove.so lib/wayfire/liboswitch.so lib/wayfire/libplace.so lib/wayfire/libresize.so +lib/wayfire/libsimple-tile.so lib/wayfire/libswitcher.so +lib/wayfire/libvswipe.so lib/wayfire/libvswitch.so lib/wayfire/libwindow-rules.so lib/wayfire/libwobbly.so diff --git a/x11/wf-shell/Makefile b/x11/wf-shell/Makefile index edbe223dad56..fd8f4a88484e 100644 --- a/x11/wf-shell/Makefile +++ b/x11/wf-shell/Makefile @@ -2,8 +2,8 @@ PORTNAME= wf-shell DISTVERSIONPREFIX= v -DISTVERSION= 0.1-13 -DISTVERSIONSUFFIX= -gefe1fd4 +DISTVERSION= 0.1-44 +DISTVERSIONSUFFIX= -g513c22f CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -13,13 +13,17 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols -LIB_DEPENDS= libinotify.so:devel/libinotify \ +LIB_DEPENDS= libpulse.so:audio/pulseaudio \ + libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ - libwayland-client.so:graphics/wayland + libwayland-client.so:graphics/wayland \ + libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell -USES= compiler:c++11-lib meson pkgconfig +USES= compiler:c++14-lang meson pkgconfig USE_GITHUB= yes USE_GNOME= gtkmm30 GH_ACCOUNT= WayfireWM +GH_TUPLE= GNOME:libgnome-volume-control:468022b:gvc/subprojects/gvc +MESON_ARGS= -Dgvc:alsa=false .include diff --git a/x11/wf-shell/distinfo b/x11/wf-shell/distinfo index f398a65c258e..c45047623bfd 100644 --- a/x11/wf-shell/distinfo +++ b/x11/wf-shell/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1563441350 -SHA256 (WayfireWM-wf-shell-v0.1-13-gefe1fd4_GH0.tar.gz) = 64bd5975372a78c1832e44607bd080945760b18caecc857d388172d8d72d2f53 -SIZE (WayfireWM-wf-shell-v0.1-13-gefe1fd4_GH0.tar.gz) = 2969618 +TIMESTAMP = 1570045557 +SHA256 (WayfireWM-wf-shell-v0.1-44-g513c22f_GH0.tar.gz) = 9d900da59959c58e81f95a7a79c8073f7a2227678f5d7d7b33d180e409695911 +SIZE (WayfireWM-wf-shell-v0.1-44-g513c22f_GH0.tar.gz) = 2973207 +SHA256 (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 1c1d806ad1f57d7f644381b67ee87ef3e7e10f3a2da1432beef535ca50c0040f +SIZE (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 45503