diff --git a/x11-toolkits/libdecor/Makefile b/x11-toolkits/libdecor/Makefile index 4feb8f8045f1..84265654ff11 100644 --- a/x11-toolkits/libdecor/Makefile +++ b/x11-toolkits/libdecor/Makefile @@ -1,64 +1,49 @@ PORTNAME= libdecor DISTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MAINTAINER= jbeich@FreeBSD.org COMMENT= Client-side decorations library for Wayland client WWW= https://gitlab.freedesktop.org/libdecor/libdecor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.15:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland USES= meson pkgconfig USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org -OPTIONS_DEFINE= CAIRO DBUS EXAMPLES GTK3 +OPTIONS_DEFINE= EXAMPLES CAIRO DBUS GTK3 OPTIONS_DEFAULT=CAIRO DBUS GTK3 OPTIONS_SUB= yes -CAIRO_SUBPACKAGES= cairo CAIRO_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto -#USES.cairo= gnome -#USE_GNOME.cairo= cairo pango -LIB_DEPENDS.cairo= libgobject-2.0.so:devel/glib20 \ - libcairo.so:graphics/cairo \ - libpango-1.0.so:x11-toolkits/pango -SELF_DEPENDS.cairo= main +CAIRO_USES= gnome +CAIRO_USE= GNOME=cairo,pango # Unused by the main library -DBUS_LIB_DEPENDS.cairo= libdbus-1.so:devel/dbus -DBUS_LIB_DEPENDS.examples= libdbus-1.so:devel/dbus -DBUS_LIB_DEPENDS.gtk3= libdbus-1.so:devel/dbus +DBUS_LIB_DEPENDS= ${"${PORT_OPTIONS:NDBUS}":?libdbus-1.so\:devel/dbus:} DBUS_MESON_ENABLED= dbus -EXAMPLES_SUBPACKAGES= examples -EXAMPLES_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto -LIB_DEPENDS.examples+= libxkbcommon.so:x11/libxkbcommon -#USES.examples= gl -#USE_GL.examples= egl opengl -LIB_DEPENDS.examples+= libEGL.so:graphics/libglvnd -SELF_DEPENDS.examples= main EXAMPLES_MESON_TRUE= demo install_demo +EXAMPLES_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto +EXAMPLES_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon +EXAMPLES_USES= gl +EXAMPLES_USE= GL=egl,opengl -GTK3_SUBPACKAGES= gtk3 GTK3_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto -#USES.gtk3= gnome -#USE_GNOME.gtk3= cairo gtk30 -LIB_DEPENDS.gtk3+= libglib-2.0.so:devel/glib20 \ - libcairo.so:graphics/cairo \ - libgtk-3.so:x11-toolkits/gtk30 -SELF_DEPENDS.gtk3= main +GTK3_USES= gnome +GTK3_USE= GNOME=cairo,gtk30 GTK3_MESON_ENABLED= gtk post-patch-CAIRO-off: @${REINPLACE_CMD} '/cairo/d' ${WRKSRC}/src/plugins/meson.build @${REINPLACE_CMD} "s/'cairo'/&, required: false, disabler: true/" \ ${WRKSRC}/src/plugins/common/meson.build .include diff --git a/x11-toolkits/libdecor/pkg-descr.cairo b/x11-toolkits/libdecor/pkg-descr.cairo deleted file mode 100644 index 75509dde1412..000000000000 --- a/x11-toolkits/libdecor/pkg-descr.cairo +++ /dev/null @@ -1,5 +0,0 @@ -libdecor is a library that can help Wayland clients draw window -decorations for them. It aims to provide multiple backends that -implements the decoration drawing. - -This package provides Cairo-based decoration plugin. diff --git a/x11-toolkits/libdecor/pkg-descr.examples b/x11-toolkits/libdecor/pkg-descr.examples deleted file mode 100644 index 05d84930c209..000000000000 --- a/x11-toolkits/libdecor/pkg-descr.examples +++ /dev/null @@ -1,5 +0,0 @@ -libdecor is a library that can help Wayland clients draw window -decorations for them. It aims to provide multiple backends that -implements the decoration drawing. - -This package provides libdecor demo programs. diff --git a/x11-toolkits/libdecor/pkg-descr.gtk3 b/x11-toolkits/libdecor/pkg-descr.gtk3 deleted file mode 100644 index 73bd9d44c5bc..000000000000 --- a/x11-toolkits/libdecor/pkg-descr.gtk3 +++ /dev/null @@ -1,5 +0,0 @@ -libdecor is a library that can help Wayland clients draw window -decorations for them. It aims to provide multiple backends that -implements the decoration drawing. - -This package provides GTK3-based decoration plugin. diff --git a/x11-toolkits/libdecor/pkg-message b/x11-toolkits/libdecor/pkg-message deleted file mode 100644 index 06c1742a1bdb..000000000000 --- a/x11-toolkits/libdecor/pkg-message +++ /dev/null @@ -1,10 +0,0 @@ -[ -{ type: upgrade - maximum_version: "0.2.2" - message: <