CVS commit: pkgsrc/x11/gtk4

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Oct 19 18:00:02 UTC 2022

Modified Files:
        pkgsrc/x11/gtk4: Makefile PLIST

Log Message:
gtk4: fix finding of ffmpeg

Fix finding of ffmpeg in gtk4
The ffmpeg media backend is
experimental and is set to
disabled by default instead of
auto or enabled. Set it to
enabled so that it tries to
find it.
Bump pkgrevision.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/gtk4/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/gtk4/Makefile
diff -u pkgsrc/x11/gtk4/Makefile:1.17 pkgsrc/x11/gtk4/Makefile:1.18
--- pkgsrc/x11/gtk4/Makefile:1.17       Mon Sep 26 17:26:57 2022
+++ pkgsrc/x11/gtk4/Makefile    Wed Oct 19 18:00:02 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2022/09/26 17:26:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/10/19 18:00:02 nros Exp $
 
 DISTNAME=      gtk-4.8.1
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -26,6 +27,8 @@ USE_LANGUAGES=                c c++
 MESON_ARGS+=           -Dgtk_doc=false
 # needs gstreamer-gl
 MESON_ARGS+=           -Dmedia-gstreamer=disabled
+# ffmpeg backend is disabled by default
+MESON_ARGS+=           -Dmedia-ffmpeg=enabled
 
 PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4.pc
 PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4-x11.pc
@@ -59,9 +62,7 @@ BUILDLINK_API_DEPENDS.pango+= pango>=1.4
 # librsvg is required by a demo only.
 #.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
-# not detected even when added
-# TODO: fix
-#.include "../../multimedia/ffmpeg5/buildlink3.mk"
+.include "../../multimedia/ffmpeg5/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../lang/python/tool.mk"

Index: pkgsrc/x11/gtk4/PLIST
diff -u pkgsrc/x11/gtk4/PLIST:1.5 pkgsrc/x11/gtk4/PLIST:1.6
--- pkgsrc/x11/gtk4/PLIST:1.5   Mon Sep 26 17:26:57 2022
+++ pkgsrc/x11/gtk4/PLIST       Wed Oct 19 18:00:02 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/09/26 17:26:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/10/19 18:00:02 nros Exp $
 bin/gtk4-builder-tool
 bin/gtk4-demo
 bin/gtk4-demo-application
@@ -371,6 +371,7 @@ lib/girepository-1.0/Gdk-4.0.typelib
 ${PLIST.x11}lib/girepository-1.0/GdkX11-4.0.typelib
 lib/girepository-1.0/Gsk-4.0.typelib
 lib/girepository-1.0/Gtk-4.0.typelib
+lib/gtk-4.0/4.0.0/media/libmedia-ffmpeg.so
 ${PLIST.cups}lib/gtk-4.0/4.0.0/printbackends/libprintbackend-cups.so
 lib/gtk-4.0/4.0.0/printbackends/libprintbackend-file.so
 ${PLIST.lpr}lib/gtk-4.0/4.0.0/printbackends/libprintbackend-lpr.so