[pkgsrc/trunk]: pkgsrc/graphics/cheese cheese: Update to 3.34.0

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dbd84197f283
branches:  trunk
changeset: 410292:dbd84197f283
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jan 20 02:22:59 2020 +0000

description:
cheese: Update to 3.34.0

Updated to GNOME 3 / gstreamer1 / gtk3 version

diffstat:

 graphics/cheese/Makefile         |   83 ++----
 graphics/cheese/PLIST            |  490 +++++++++++++++++++++++++++++++-------
 graphics/cheese/distinfo         |   14 +-
 graphics/cheese/options.mk       |   14 -
 graphics/cheese/patches/patch-aa |   68 -----
 graphics/cheese/patches/patch-ab |  200 ---------------
 graphics/cheese/patches/patch-ac |   13 -
 graphics/cheese/patches/patch-ad |   17 -
 8 files changed, 430 insertions(+), 469 deletions(-)

diffs (truncated from 1005 to 300 lines):

diff -r 1172b9f88995 -r dbd84197f283 graphics/cheese/Makefile
--- a/graphics/cheese/Makefile  Mon Jan 20 02:20:32 2020 +0000
+++ b/graphics/cheese/Makefile  Mon Jan 20 02:22:59 2020 +0000
@@ -1,67 +1,44 @@
-# $NetBSD: Makefile,v 1.84 2019/11/02 22:37:54 rillig Exp $
+# $NetBSD: Makefile,v 1.85 2020/01/20 02:22:59 nia Exp $
 
-DISTNAME=      cheese-2.26.3
-PKGREVISION=   66
-CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/cheese/2.26/}
+DISTNAME=      cheese-3.34.0
+CATEGORIES=    graphics gnome
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/cheese/3.34/}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.gnome.org/projects/cheese/
+HOMEPAGE=      https://wiki.gnome.org/Apps/Cheese
 COMMENT=       Use your webcam to take photos and videos
 LICENSE=       gnu-gpl-v2
 
-BUILD_DEPENDS+=        gettext-m4-[0-9]*:../../devel/gettext-m4
-DEPENDS+=      gst-plugins0.10-theora>=0.10.1:../../multimedia/gst-plugins0.10-theora
-DEPENDS+=      gst-plugins0.10-ogg>=0.10.1:../../multimedia/gst-plugins0.10-ogg
-DEPENDS+=      gst-plugins0.10-vorbis>=0.10.1:../../audio/gst-plugins0.10-vorbis
+USE_TOOLS+=    pkg-config msgfmt xgettext
 
-.include "../../mk/bsd.prefs.mk"
+MESON_ARGS+=   -Dgtk_doc=false
+MESON_ARGS+=   -Dman=false
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) || !empty(MACHINE_PLATFORM:MLinux)
-DEPENDS+=      gst-plugins0.10-v4l2>=0.10.10:../../multimedia/gst-plugins0.10-v4l2
-.endif
+PYTHON_FOR_BUILD_ONLY= tool
 
-GNU_CONFIGURE=         yes
-USE_TOOLS+=            pkg-config perl intltool gmake msgfmt
-USE_TOOLS+=            autoconf automake autoreconf
-USE_LIBTOOL=           yes
-USE_PKGLOCALEDIR=      yes
+# workaround for build failure
+# https://gitlab.gnome.org/GNOME/json-glib/issues/35
+MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/libcheese
 
-GCONF_SCHEMAS+=        cheese.schemas
-
-pre-configure:
-       cd ${WRKSRC} && autoreconf -vi # -f breaks it
-       cd ${WRKSRC} && autoheader -f
-
-.include "options.mk"
+# XXX msgfmt: unknown option -- desktop
+_TOOLS_USE_PKGSRC.msgfmt=      yes
 
-BUILDLINK_API_DEPENDS.GConf+=  GConf>=2.16.0
-.include "../../devel/GConf/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.16.0
-.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.pango+=          pango>=1.18.0
-.include "../../devel/pango/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cairo+=          cairo>=1.4.0
-.include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.librsvg+=                librsvg>=2.18.0
-.include "../../graphics/librsvg/buildlink3.mk"
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           output/meson-private/cheese.pc
+PKGCONFIG_OVERRIDE+=           output/meson-private/cheese-gtk.pc
+
+.include "../../devel/meson/build.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-BUILDLINK_API_DEPENDS.evolution-data-server+=  evolution-data-server>=1.12.0
-.include "../../mail/evolution-data-server/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gstreamer0.10+=  gstreamer0.10>=0.10.20
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-BUILDLINK_API_DEPENDS.dbus+=   dbus>=1.0
-.include "../../sysutils/dbus/buildlink3.mk"
-BUILDLINK_API_DEPENDS.dbus-glib+=      dbus-glib>=0.70
-.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../graphics/clutter-gtk/buildlink3.mk"
+.include "../../multimedia/clutter-gst/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
+.include "../../multimedia/gnome-video-effects/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.12.0
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
+.include "../../x11/gnome-desktop3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1172b9f88995 -r dbd84197f283 graphics/cheese/PLIST
--- a/graphics/cheese/PLIST     Mon Jan 20 02:20:32 2020 +0000
+++ b/graphics/cheese/PLIST     Mon Jan 20 02:22:59 2020 +0000
@@ -1,105 +1,400 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:59:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/01/20 02:22:59 nia Exp $
 bin/cheese
-libexec/cheese/cheese-bugreport.sh
-share/applications/cheese.desktop
-share/cheese/cheese-prefs.ui
-share/cheese/cheese-ui.xml
-share/cheese/cheese.ui
-share/cheese/effects/Hulk.png
-share/cheese/effects/Mauve.png
-share/cheese/effects/NoirBlanc.png
-share/cheese/effects/Saturation.png
-share/cheese/effects/dicetv.png
-share/cheese/effects/edgetv.png
-share/cheese/effects/identity.png
-share/cheese/effects/shagadelictv.png
-share/cheese/effects/vertigotv.png
-share/cheese/effects/videoflip_h.png
-share/cheese/effects/videoflip_v.png
-share/cheese/effects/warptv.png
-share/cheese/gtkrc
-share/cheese/icons/hicolor/16x16/actions/browse-webcam-effects.png
-share/cheese/icons/hicolor/22x22/actions/browse-webcam-effects.png
-share/cheese/icons/hicolor/24x24/actions/browse-webcam-effects.png
-share/cheese/icons/hicolor/32x32/actions/browse-webcam-effects.png
-share/cheese/icons/hicolor/48x48/actions/browse-webcam-effects.png
-share/cheese/icons/hicolor/scalable/actions/browse-webcam-effects.svg
-share/cheese/pixmaps/camera-icon.svg
-share/cheese/pixmaps/cheese-1.svg
-share/cheese/pixmaps/cheese-2.svg
-share/cheese/pixmaps/cheese-3.svg
-share/cheese/pixmaps/thumbnail-frame.png
-share/cheese/sounds/shutter0.ogg
-share/cheese/sounds/shutter1.ogg
-share/cheese/sounds/shutter2.ogg
-share/cheese/sounds/shutter3.ogg
-share/cheese/sounds/shutter4.ogg
+include/cheese/cheese-avatar-chooser.h
+include/cheese/cheese-avatar-widget.h
+include/cheese/cheese-camera-device-monitor.h
+include/cheese/cheese-camera-device.h
+include/cheese/cheese-camera.h
+include/cheese/cheese-effect.h
+include/cheese/cheese-gtk.h
+include/cheese/cheese-resource.h
+include/cheese/cheese-widget.h
+include/cheese/cheese.h
+lib/girepository-1.0/Cheese-3.0.typelib
+lib/libcheese-gtk.so
+lib/libcheese-gtk.so.25
+lib/libcheese-gtk.so.25.1.4
+lib/libcheese.so
+lib/libcheese.so.8
+lib/libcheese.so.8.0.14
+lib/pkgconfig/cheese-gtk.pc
+lib/pkgconfig/cheese.pc
+share/applications/org.gnome.Cheese.desktop
 share/dbus-1/services/org.gnome.Cheese.service
-share/gconf/schemas/cheese.schemas
-share/gnome/help/cheese/C/cheese.xml
-share/gnome/help/cheese/C/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/C/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/C/legal.xml
-share/gnome/help/cheese/ca/cheese.xml
-share/gnome/help/cheese/ca/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/ca/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/de/cheese.xml
-share/gnome/help/cheese/de/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/de/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/el/cheese.xml
-share/gnome/help/cheese/el/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/el/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/en_GB/cheese.xml
-share/gnome/help/cheese/en_GB/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/en_GB/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/es/cheese.xml
-share/gnome/help/cheese/es/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/es/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/fr/cheese.xml
-share/gnome/help/cheese/fr/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/fr/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/nl/cheese.xml
-share/gnome/help/cheese/nl/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/nl/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/oc/cheese.xml
-share/gnome/help/cheese/oc/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/oc/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/pt_BR/cheese.xml
-share/gnome/help/cheese/pt_BR/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/pt_BR/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/ru/cheese.xml
-share/gnome/help/cheese/ru/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/ru/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/sv/cheese.xml
-share/gnome/help/cheese/sv/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/sv/figures/cheese-screenshot.jpg
-share/gnome/help/cheese/th/cheese.xml
-share/gnome/help/cheese/th/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/th/figures/cheese-screenshot.jpg
-share/icons/hicolor/16x16/apps/cheese.png
-share/icons/hicolor/22x22/apps/cheese.png
-share/icons/hicolor/24x24/apps/cheese.png
-share/icons/hicolor/32x32/apps/cheese.png
-share/icons/hicolor/48x48/apps/cheese.png
-share/icons/hicolor/scalable/apps/cheese.svg
+share/gir-1.0/Cheese-3.0.gir
+share/glib-2.0/schemas/org.gnome.Cheese.gschema.xml
+share/help/C/cheese/burst-mode.page
+share/help/C/cheese/effects-apply.page
+share/help/C/cheese/figures/cheese.png
+share/help/C/cheese/figures/effects.png
+share/help/C/cheese/figures/image-properties.png
+share/help/C/cheese/index.page
+share/help/C/cheese/introduction.page
+share/help/C/cheese/legal.xml
+share/help/C/cheese/photo-delete.page
+share/help/C/cheese/photo-save.page
+share/help/C/cheese/photo-take.page
+share/help/C/cheese/photo-view.page
+share/help/C/cheese/pref-countdown.page
+share/help/C/cheese/pref-flash.page
+share/help/C/cheese/pref-fullscreen.page
+share/help/C/cheese/pref-image-properties.page
+share/help/C/cheese/pref-resolution.page
+share/help/C/cheese/video-record.page
+share/help/ca/cheese/burst-mode.page
+share/help/ca/cheese/effects-apply.page
+share/help/ca/cheese/figures/cheese.png
+share/help/ca/cheese/figures/effects.png
+share/help/ca/cheese/figures/image-properties.png
+share/help/ca/cheese/index.page
+share/help/ca/cheese/introduction.page
+share/help/ca/cheese/legal.xml
+share/help/ca/cheese/photo-delete.page
+share/help/ca/cheese/photo-save.page
+share/help/ca/cheese/photo-take.page
+share/help/ca/cheese/photo-view.page
+share/help/ca/cheese/pref-countdown.page
+share/help/ca/cheese/pref-flash.page
+share/help/ca/cheese/pref-fullscreen.page
+share/help/ca/cheese/pref-image-properties.page
+share/help/ca/cheese/pref-resolution.page
+share/help/ca/cheese/video-record.page
+share/help/cs/cheese/burst-mode.page
+share/help/cs/cheese/effects-apply.page
+share/help/cs/cheese/figures/cheese.png
+share/help/cs/cheese/figures/effects.png
+share/help/cs/cheese/figures/image-properties.png
+share/help/cs/cheese/index.page
+share/help/cs/cheese/introduction.page
+share/help/cs/cheese/legal.xml
+share/help/cs/cheese/photo-delete.page
+share/help/cs/cheese/photo-save.page
+share/help/cs/cheese/photo-take.page
+share/help/cs/cheese/photo-view.page
+share/help/cs/cheese/pref-countdown.page
+share/help/cs/cheese/pref-flash.page
+share/help/cs/cheese/pref-fullscreen.page
+share/help/cs/cheese/pref-image-properties.page
+share/help/cs/cheese/pref-resolution.page
+share/help/cs/cheese/video-record.page
+share/help/de/cheese/burst-mode.page
+share/help/de/cheese/effects-apply.page
+share/help/de/cheese/figures/cheese.png
+share/help/de/cheese/figures/effects.png
+share/help/de/cheese/figures/image-properties.png
+share/help/de/cheese/index.page
+share/help/de/cheese/introduction.page
+share/help/de/cheese/legal.xml
+share/help/de/cheese/photo-delete.page
+share/help/de/cheese/photo-save.page
+share/help/de/cheese/photo-take.page
+share/help/de/cheese/photo-view.page
+share/help/de/cheese/pref-countdown.page
+share/help/de/cheese/pref-flash.page
+share/help/de/cheese/pref-fullscreen.page
+share/help/de/cheese/pref-image-properties.page
+share/help/de/cheese/pref-resolution.page
+share/help/de/cheese/video-record.page
+share/help/el/cheese/burst-mode.page
+share/help/el/cheese/effects-apply.page
+share/help/el/cheese/figures/cheese.png
+share/help/el/cheese/figures/effects.png
+share/help/el/cheese/figures/image-properties.png
+share/help/el/cheese/index.page
+share/help/el/cheese/introduction.page
+share/help/el/cheese/legal.xml
+share/help/el/cheese/photo-delete.page
+share/help/el/cheese/photo-save.page
+share/help/el/cheese/photo-take.page
+share/help/el/cheese/photo-view.page
+share/help/el/cheese/pref-countdown.page
+share/help/el/cheese/pref-flash.page
+share/help/el/cheese/pref-fullscreen.page
+share/help/el/cheese/pref-image-properties.page