x11-toolkits/gtk-layer-shell: simplify and update

Mk/Uses/gl.mk

@@ -12,14 +12,16 @@
 # 
 # MAINTAINER:	x11@FreeBSD.org
 
+MESA_LIBS_PORT?=graphics/mesa-libs
+
 .if !defined(_INCLUDE_USES_GL_MK)
 _INCLUDE_USES_GL_MK=yes
 
-_GL_egl_LIB_DEPENDS=		libEGL.so:graphics/mesa-libs
-_GL_gbm_LIB_DEPENDS=		libgbm.so:graphics/mesa-libs
-_GL_gl_LIB_DEPENDS=		libGL.so:graphics/mesa-libs
+_GL_egl_LIB_DEPENDS=		libEGL.so:${MESA_LIBS_PORT}
+_GL_gbm_LIB_DEPENDS=		libgbm.so:${MESA_LIBS_PORT}
+_GL_gl_LIB_DEPENDS=		libGL.so:${MESA_LIBS_PORT}
 _GL_gl_USE_XORG=		xorgproto
-_GL_glesv2_LIB_DEPENDS=		libGLESv2.so:graphics/mesa-libs
+_GL_glesv2_LIB_DEPENDS=		libGLESv2.so:${MESA_LIBS_PORT}
 _GL_glew_LIB_DEPENDS=		libGLEW.so:graphics/glew
 _GL_glu_LIB_DEPENDS=		libGLU.so:graphics/libGLU
 _GL_glu_USE_XORG=		xorgproto

Mk/Uses/gnome.mk

@@ -92,7 +92,7 @@ _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
 		pygobject3 vte3
 
 # C++ bindings
-_USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm20 gtkmm24 \
+_USE_GNOME_ALL+=atkmm cairomm cairomm116 gconfmm26 glibmm gtkmm20 gtkmm24 \
 		gtkmm30 gtksourceviewmm3 libgdamm5 \
 		libgtksourceviewmm libxml++26 libsigc++12 libsigc++20 \
 		pangomm
@@ -129,6 +129,8 @@ cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
 cairomm_LIB_DEPENDS=	libcairomm-1.0.so:graphics/cairomm
 cairomm_USE_GNOME_IMPL=	cairo libxml++26
 
+cairomm116_LIB_DEPENDS=	libcairomm-1.16.so:graphics/cairomm116
+
 gconfmm26_LIB_DEPENDS=		libgconfmm-2.6.so:devel/gconfmm26
 gconfmm26_USE_GNOME_IMPL=	glibmm gconf2
 

Mk/bsd.port.mk

@@ -2572,7 +2572,7 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
 	tcl textproc tk \
 	ukrainian vietnamese windowmaker wayland www \
 	x11 x11-clocks x11-drivers x11-fm x11-fonts x11-servers x11-themes \
-	x11-toolkits x11-wm xfce zope base
+	x11-toolkits x11-wm xfce zope base dummy
 
 check-categories:
 .for cat in ${CATEGORIES}

README.md

@@ -0,0 +1,48 @@
+# freebsd-ports-dank
+
+![dank meme pic](https://unrelentingtech.s3.dualstack.eu-west-1.amazonaws.com/dankbsd.jpg?1)
+
+Welcome!
+
+This fork of the FreeBSD Ports Collection adds more bleeding edge desktop-related patches.
+
+**NOTE**: this is the new `lite` branch, which is always rebased on top of `master` and has some cherry-picks from `ports-gnome`.
+
+## Usage
+
+- Clone this repo into `/usr/ports` (if it's already managed by git, add this repo as a remote, fetch and checkout/merge)
+- Build any ports you want :)
+
+## Highlights
+
+- `devel/llvm80`: OpenMP and Sanitizers on aarch64 (read the patch files)
+- `devel/consolekit2`: drm/evdev support [D18754](https://reviews.freebsd.org/D18754)
+- `graphics/mesa-dev`: alternative mesa port! Development version ([little fork](https://github.com/myfreeweb/mesa) with my BSD patches), everything built together, using Meson! Always includes GL, GLES, Vulkan (RADV, ANV), Gallium Nine, OpenCL (Clover), VDPAU, VAAPI.
+	- to install and keep pkg happy without rebuilding everything, ~~just `pkg add -f` over existing `mesa-libs/dri`~~ install dummy replacements from `dummy/` (there's also a dummy for using `graphics/librsvg2-rust`)
+	- but if you want to do it properly, define `MESA_DRI_PORT=graphics/mesa-dev` and `MESA_LIBS_PORT=graphics/mesa-dev` in `make.conf` and rebuild dependent ports
+		- [synth](https://github.com/jrmarino/synth) is the recommended port upgrade tool, it does try to fetch binary packages when a rebuild is not necessary
+- `x11/libinput`: fix [touchpad dropping out](https://blog.grem.de/pages/t470s.html)
+- `devel/libudev-devd`: my patches applied: [connector hotplug](https://github.com/FreeBSDDesktop/libudev-devd/pull/7) and [device enumeration w/o `/dev/input/*` access rights](https://github.com/FreeBSDDesktop/libudev-devd/pull/8) (both landed, everything this needs is landed in kms-drm and base as well)
+- `audio/jack`: jack2 [jack2/pull/400](https://github.com/jackaudio/jack2/pull/400)
+- `lang/luajit`: 2.1.0-beta3 (works on aarch64) [225342](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225342)
+- `devel/libgusb`: GObject libusb wrapper (w/ [PR #10](https://github.com/hughsie/libgusb/pull/10))
+- `graphics/simple-scan`: GNOME scanning app (requires `libgusb`)
+- `multimedia/gstreamer1-plugins`: backport xdg-shell support (prevents GL sink crash on Wayland compositors w/o wl-shell, i.e. prevents Pitivi crash on wlroots based compositors)
+- `graphics/mypaint` and `graphics/libmypaint`: 2.0.0alpha, works on Wayland natively [235805](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235805)
+- `graphics/inkscape`: 1.0alpha
+- `graphics/rawtherapee`: workaround for OpenMP idle threads' CPU consumption [#5105](https://github.com/Beep6581/RawTherapee/issues/5105), disable mmap (to make performance over NFS not terrible), enable LTO
+- `accessibility/redshift-wlr`: fork of redshift with wlr-gamma-control based Wayland backend
+
+For all changes, just look at the commits :)
+
+## Other FreeBSD desktop resources
+
+- [My dotfiles](https://github.com/myfreeweb/dotfiles)
+- [kb/FirefoxSettings](https://unrelenting.technology/kb/FirefoxSettings)
+- [kb/FreeBSDDesktop](https://unrelenting.technology/kb/FreeBSDDesktop)
+- [A FreeBSD 11 Desktop How-to](https://cooltrainer.org/a-freebsd-desktop-howto/), not up to date with modern GPU stuff but very good for general desktop setup (printing, networking, etc.)
+- [FreeBSD on the ThinkPad X240](https://unrelenting.technology/articles/freebsd-on-the-thinkpad-x240), my post that's mostly updated but still contains old stuff
+
+## Other resources
+
+- [1.5 Hour Spicy SUPER EUROBEAT Mix](https://www.youtube.com/watch?v=6ftCIfHwqtg)

accessibility/Makefile

@@ -25,6 +25,7 @@
     SUBDIR += py-speech-dispatcher
     SUBDIR += qt5-speech
     SUBDIR += redshift
+    SUBDIR += redshift-wlr
     SUBDIR += rubygem-atk
     SUBDIR += sct
     SUBDIR += speech-dispatcher

accessibility/atkmm/Makefile

@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	atkmm
-PORTVERSION=	2.24.2
-PORTREVISION=	4
+PORTVERSION=	2.28.0
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for ATK API library
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c++11-lang gmake localbase libtool pathfix \
+USES=		compiler:c++17-lang gmake gnome localbase libtool \
 		pkgconfig tar:xz
 USE_GNOME=	atk glibmm
 USE_LDCONFIG=	yes

accessibility/atkmm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1491079690
-SHA256 (atkmm-2.24.2.tar.xz) = ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd
-SIZE (atkmm-2.24.2.tar.xz) = 849784
+TIMESTAMP = 1552826022
+SHA256 (gnome/atkmm-2.28.0.tar.xz) = 4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a
+SIZE (gnome/atkmm-2.28.0.tar.xz) = 891904

accessibility/redshift-wlr/Makefile

@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-wlr
+
+COMMENT=	Adjusts the color temperature of your Wayland screen (using wlr protocol)
+
+MASTERDIR=	${.CURDIR}/../redshift
+PATCHDIR=	${.CURDIR}/files
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+LIB_DEPENDS+=	libwayland-client.so:graphics/wayland
+
+GH_ACCOUNT=	minus7
+GH_TAGNAME=	a2177ed9942
+
+.include "${MASTERDIR}/Makefile"
+
+PORTVERSION=	1.12.20180901

accessibility/redshift-wlr/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1541088811
+SHA256 (jonls-redshift-v1.12-a2177ed9942_GH0.tar.gz) = c3afe2273f531afa430785576416a0b27d79aaa41fc6b1ee0493a2ebd5981f00
+SIZE (jonls-redshift-v1.12-a2177ed9942_GH0.tar.gz) = 658831

accessibility/redshift-wlr/files/patch-src_gamma-wl.c

@@ -0,0 +1,10 @@
+--- src/gamma-wl.c.orig	2018-11-01 16:17:26 UTC
++++ src/gamma-wl.c
+@@ -21,7 +21,6 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <string.h>
+-#include <alloca.h>
+ #include <sys/mman.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>

audio/jack/Makefile

@@ -12,67 +12,56 @@ COMMENT=	Low latency audio server
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BROKEN_mips=		fails to link: undefined reference to '__sync_add_and_fetch_4'
-BROKEN_mips64=		fails to link: undefined reference to '__sync_add_and_fetch_4'
-
 LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libsamplerate.so:audio/libsamplerate \
 		libcelt0.so:audio/celt
 
-USES=		autoreconf compiler:c11 gmake pathfix pkgconfig libtool localbase bdb
+USES=		waf compiler:c11 pkgconfig shebangfix python:3.4+,build
 USE_GITHUB=	yes
-
-GH_ACCOUNT=	jackaudio
-GH_PROJECT=	jack1
-GH_TAGNAME=	90f9dd3
-GH_TUPLE=	jackaudio:headers:07f1ecf:h/jack
-GH_TUPLE+=	jackaudio:tools:8d13c31:t/tools
-GH_TUPLE+=	jackaudio:example-clients:7fa0890:e/example-clients
+GH_ACCOUNT=	myfreeweb
+GH_PROJECT=	jack2
+GH_TAGNAME=	ed5436d
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USE_RC_SUBR=	jackd
-
-CONFIGURE_ARGS=	--disable-portaudio \
-		--enable-optimize \
-		--enable-force-install \
-		--with-default-tmpdir=/tmp
-
-CFLAGS+=		-I${BDB_INCLUDE_DIR}
-LIBS+=			-L${BDB_LIB_DIR}
-INSTALL_TARGET=		install-strip
-
-OPTIONS_DEFINE=		ALSA DOXYGEN READLINE SNDIO COOKEDMODE
-OPTIONS_DEFINE_i386=	DYNSIMD
-OPTIONS_DEFINE_amd64=	DYNSIMD
-OPTIONS_DEFAULT=	READLINE COOKEDMODE
-OPTIONS_DEFAULT_i386=	DYNSIMD
-OPTIONS_DEFAULT_amd64=	DYNSIMD
-OPTIONS_SUB=		yes
-COOKEDMODE_DESC=	Use OSS COOKEDMODE (OSS driver is broken without it)
-DYNSIMD_DESC=		Use dynamic SIMD selection (only i386/amd64)
 
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_CONFIGURE_ENABLE=	alsa
+CFLAGS+=	-fPIC
+CXXFLAGS+=	-fPIC
 
-READLINE_USES=		readline
+SHEBANG_FILES=	example-clients/jack_control
+SHEBANG_LANG=	python3
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
-DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_HAVE_DOXYGEN="false"
+CONFIGURE_ARGS+=	--celt=yes --sndfile=yes --samplerate=yes
 
-READLINE_CONFIGURE_ENV_OFF=	ac_cv_lib_readline_readline=no \
-		ac_cv_header_readline_chardefs_h=no
+OPTIONS_DEFINE=		ALSA READLINE OPUS DBUS
+OPTIONS_DEFAULT=	READLINE OPUS DBUS
+OPTIONS_SUB=		yes
+
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_CONFIGURE_OFF=	--alsa=no
+ALSA_CONFIGURE_ON=	--alsa=yes
 
-SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
-SNDIO_CONFIGURE_ENABLE=	sndio
+DBUS_CONFIGURE_ON=	--dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+			libsysinfo.so:devel/libsysinfo \
+			libexpat.so:textproc/expat2
+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
+
+READLINE_USES=		readline
+READLINE_CONFIGURE_ON=	--readline=yes
+READLINE_CONFIGURE_OFF=	--readline=no
 
-COOKEDMODE_CFLAGS=	-DOPTION_COOKEDMODE
+OPUS_LIB_DEPENDS=	 libopus.so:audio/opus
+OPUS_CONFIGURE_ON=	--opus=yes
+OPUS_CONFIGURE_OFF=	--opus=no
 
-DYNSIMD_CONFIGURE_ENABLE=dynsimd
+.include <bsd.port.pre.mk>
 
-post-patch:
-	@${RM} ${WRKSRC}/doc/reference/html/*
+.if ${PORT_OPTIONS:MDBUS}
+PLIST_SUB+=	CLASSIC="@comment "
+.else
+PLIST_SUB+=	CLASSIC=""
+.endif
 
-post-build:
-	@${RM} ${WRKSRC}/doc/reference/html/dir__2F*
+post-extract:
+	echo '#define SVN_VERSION "${GH_TAGNAME}"' > ${WRKSRC}/svnversion.h
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

audio/jack/distinfo

@@ -1,9 +1,3 @@
-TIMESTAMP = 1500250305
-SHA256 (jackaudio-jack1-0.125.0-90f9dd3_GH0.tar.gz) = e0ba7dcf58fa934af51329cd329f466fe8d2bc180d07e4ab8be21ed80c60aa8a
-SIZE (jackaudio-jack1-0.125.0-90f9dd3_GH0.tar.gz) = 392822
-SHA256 (jackaudio-headers-07f1ecf_GH0.tar.gz) = 04a3bb87d278923985ba44045b7a27439c90776cc5d4a6016d062fc7a6aa5023
-SIZE (jackaudio-headers-07f1ecf_GH0.tar.gz) = 36704
-SHA256 (jackaudio-tools-8d13c31_GH0.tar.gz) = 23e6bc60c8cef4283677206f2687a408367203a725c091c923f48554ae6e8cc8
-SIZE (jackaudio-tools-8d13c31_GH0.tar.gz) = 45544
-SHA256 (jackaudio-example-clients-7fa0890_GH0.tar.gz) = 79e2ac1d38d7d77b1afb71aa97414c339e8c00613a5d9b725861232b5c995223
-SIZE (jackaudio-example-clients-7fa0890_GH0.tar.gz) = 16174
+TIMESTAMP = 1555161103
+SHA256 (myfreeweb-jack2-0.125.0-ed5436d_GH0.tar.gz) = 3dae04a2cb494772b311e7aaf20e7a73e4778d632fda55d35e468ca2684d7227
+SIZE (myfreeweb-jack2-0.125.0-ed5436d_GH0.tar.gz) = 6514164