cheese: Update to 3.34.0
Updated to GNOME 3 / gstreamer1 / gtk3 version
This commit is contained in:
nia
parent
02623b9179
commit
30cde00725
8 changed files with 429 additions and 468 deletions
|
|
@ -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
|
||||
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
|
||||
# XXX msgfmt: unknown option -- desktop
|
||||
_TOOLS_USE_PKGSRC.msgfmt= yes
|
||||
|
||||
pre-configure:
|
||||
cd ${WRKSRC} && autoreconf -vi # -f breaks it
|
||||
cd ${WRKSRC} && autoheader -f
|
||||
PKGCONFIG_OVERRIDE_STAGE= pre-install
|
||||
PKGCONFIG_OVERRIDE+= output/meson-private/cheese.pc
|
||||
PKGCONFIG_OVERRIDE+= output/meson-private/cheese-gtk.pc
|
||||
|
||||
.include "options.mk"
|
||||
|
||||
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"
|
||||
.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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
share/help/el/cheese/pref-resolution.page
|
||||
share/help/el/cheese/video-record.page
|
||||
share/help/es/cheese/burst-mode.page
|
||||
share/help/es/cheese/effects-apply.page
|
||||
share/help/es/cheese/figures/cheese.png
|
||||
share/help/es/cheese/figures/effects.png
|
||||
share/help/es/cheese/figures/image-properties.png
|
||||
share/help/es/cheese/index.page
|
||||
share/help/es/cheese/introduction.page
|
||||
share/help/es/cheese/legal.xml
|
||||
share/help/es/cheese/photo-delete.page
|
||||
share/help/es/cheese/photo-save.page
|
||||
share/help/es/cheese/photo-take.page
|
||||
share/help/es/cheese/photo-view.page
|
||||
share/help/es/cheese/pref-countdown.page
|
||||
share/help/es/cheese/pref-flash.page
|
||||
share/help/es/cheese/pref-fullscreen.page
|
||||
share/help/es/cheese/pref-image-properties.page
|
||||
share/help/es/cheese/pref-resolution.page
|
||||
share/help/es/cheese/video-record.page
|
||||
share/help/fi/cheese/burst-mode.page
|
||||
share/help/fi/cheese/effects-apply.page
|
||||
share/help/fi/cheese/figures/cheese.png
|
||||
share/help/fi/cheese/figures/effects.png
|
||||
share/help/fi/cheese/figures/image-properties.png
|
||||
share/help/fi/cheese/index.page
|
||||
share/help/fi/cheese/introduction.page
|
||||
share/help/fi/cheese/legal.xml
|
||||
share/help/fi/cheese/photo-delete.page
|
||||
share/help/fi/cheese/photo-save.page
|
||||
share/help/fi/cheese/photo-take.page
|
||||
share/help/fi/cheese/photo-view.page
|
||||
share/help/fi/cheese/pref-countdown.page
|
||||
share/help/fi/cheese/pref-flash.page
|
||||
share/help/fi/cheese/pref-fullscreen.page
|
||||
share/help/fi/cheese/pref-image-properties.page
|
||||
share/help/fi/cheese/pref-resolution.page
|
||||
share/help/fi/cheese/video-record.page
|
||||
share/help/fr/cheese/burst-mode.page
|
||||
share/help/fr/cheese/effects-apply.page
|
||||
share/help/fr/cheese/figures/cheese.png
|
||||
share/help/fr/cheese/figures/effects.png
|
||||
share/help/fr/cheese/figures/image-properties.png
|
||||
share/help/fr/cheese/index.page
|
||||
share/help/fr/cheese/introduction.page
|
||||
share/help/fr/cheese/legal.xml
|
||||
share/help/fr/cheese/photo-delete.page
|
||||
share/help/fr/cheese/photo-save.page
|
||||
share/help/fr/cheese/photo-take.page
|
||||
share/help/fr/cheese/photo-view.page
|
||||
share/help/fr/cheese/pref-countdown.page
|
||||
share/help/fr/cheese/pref-flash.page
|
||||
share/help/fr/cheese/pref-fullscreen.page
|
||||
share/help/fr/cheese/pref-image-properties.page
|
||||
share/help/fr/cheese/pref-resolution.page
|
||||
share/help/fr/cheese/video-record.page
|
||||
share/help/gl/cheese/burst-mode.page
|
||||
share/help/gl/cheese/effects-apply.page
|
||||
share/help/gl/cheese/figures/cheese.png
|
||||
share/help/gl/cheese/figures/effects.png
|
||||
share/help/gl/cheese/figures/image-properties.png
|
||||
share/help/gl/cheese/index.page
|
||||
share/help/gl/cheese/introduction.page
|
||||
share/help/gl/cheese/legal.xml
|
||||
share/help/gl/cheese/photo-delete.page
|
||||
share/help/gl/cheese/photo-save.page
|
||||
share/help/gl/cheese/photo-take.page
|
||||
share/help/gl/cheese/photo-view.page
|
||||
share/help/gl/cheese/pref-countdown.page
|
||||
share/help/gl/cheese/pref-flash.page
|
||||
share/help/gl/cheese/pref-fullscreen.page
|
||||
share/help/gl/cheese/pref-image-properties.page
|
||||
share/help/gl/cheese/pref-resolution.page
|
||||
share/help/gl/cheese/video-record.page
|
||||
share/help/hu/cheese/burst-mode.page
|
||||
share/help/hu/cheese/effects-apply.page
|
||||
share/help/hu/cheese/figures/cheese.png
|
||||
share/help/hu/cheese/figures/effects.png
|
||||
share/help/hu/cheese/figures/image-properties.png
|
||||
share/help/hu/cheese/index.page
|
||||
share/help/hu/cheese/introduction.page
|
||||
share/help/hu/cheese/legal.xml
|
||||
share/help/hu/cheese/photo-delete.page
|
||||
share/help/hu/cheese/photo-save.page
|
||||
share/help/hu/cheese/photo-take.page
|
||||
share/help/hu/cheese/photo-view.page
|
||||
share/help/hu/cheese/pref-countdown.page
|
||||
share/help/hu/cheese/pref-flash.page
|
||||
share/help/hu/cheese/pref-fullscreen.page
|
||||
share/help/hu/cheese/pref-image-properties.page
|
||||
share/help/hu/cheese/pref-resolution.page
|
||||
share/help/hu/cheese/video-record.page
|
||||
share/help/id/cheese/burst-mode.page
|
||||
share/help/id/cheese/effects-apply.page
|
||||
share/help/id/cheese/figures/cheese.png
|
||||
share/help/id/cheese/figures/effects.png
|
||||
share/help/id/cheese/figures/image-properties.png
|
||||
share/help/id/cheese/index.page
|
||||
share/help/id/cheese/introduction.page
|
||||
share/help/id/cheese/legal.xml
|
||||
share/help/id/cheese/photo-delete.page
|
||||
share/help/id/cheese/photo-save.page
|
||||
share/help/id/cheese/photo-take.page
|
||||
share/help/id/cheese/photo-view.page
|
||||
share/help/id/cheese/pref-countdown.page
|
||||
share/help/id/cheese/pref-flash.page
|
||||
share/help/id/cheese/pref-fullscreen.page
|
||||
share/help/id/cheese/pref-image-properties.page
|
||||
share/help/id/cheese/pref-resolution.page
|
||||
share/help/id/cheese/video-record.page
|
||||
share/help/ko/cheese/burst-mode.page
|
||||
share/help/ko/cheese/effects-apply.page
|
||||
share/help/ko/cheese/figures/cheese.png
|
||||
share/help/ko/cheese/figures/effects.png
|
||||
share/help/ko/cheese/figures/image-properties.png
|
||||
share/help/ko/cheese/index.page
|
||||
share/help/ko/cheese/introduction.page
|
||||
share/help/ko/cheese/legal.xml
|
||||
share/help/ko/cheese/photo-delete.page
|
||||
share/help/ko/cheese/photo-save.page
|
||||
share/help/ko/cheese/photo-take.page
|
||||
share/help/ko/cheese/photo-view.page
|
||||
share/help/ko/cheese/pref-countdown.page
|
||||
share/help/ko/cheese/pref-flash.page
|
||||
share/help/ko/cheese/pref-fullscreen.page
|
||||
share/help/ko/cheese/pref-image-properties.page
|
||||
share/help/ko/cheese/pref-resolution.page
|
||||
share/help/ko/cheese/video-record.page
|
||||
share/help/nl/cheese/burst-mode.page
|
||||
share/help/nl/cheese/effects-apply.page
|
||||
share/help/nl/cheese/figures/cheese.png
|
||||
share/help/nl/cheese/figures/effects.png
|
||||
share/help/nl/cheese/figures/image-properties.png
|
||||
share/help/nl/cheese/index.page
|
||||
share/help/nl/cheese/introduction.page
|
||||
share/help/nl/cheese/legal.xml
|
||||
share/help/nl/cheese/photo-delete.page
|
||||
share/help/nl/cheese/photo-save.page
|
||||
share/help/nl/cheese/photo-take.page
|
||||
share/help/nl/cheese/photo-view.page
|
||||
share/help/nl/cheese/pref-countdown.page
|
||||
share/help/nl/cheese/pref-flash.page
|
||||
share/help/nl/cheese/pref-fullscreen.page
|
||||
share/help/nl/cheese/pref-image-properties.page
|
||||
share/help/nl/cheese/pref-resolution.page
|
||||
share/help/nl/cheese/video-record.page
|
||||
share/help/pl/cheese/burst-mode.page
|
||||
share/help/pl/cheese/effects-apply.page
|
||||
share/help/pl/cheese/figures/cheese.png
|
||||
share/help/pl/cheese/figures/effects.png
|
||||
share/help/pl/cheese/figures/image-properties.png
|
||||
share/help/pl/cheese/index.page
|
||||
share/help/pl/cheese/introduction.page
|
||||
share/help/pl/cheese/legal.xml
|
||||
share/help/pl/cheese/photo-delete.page
|
||||
share/help/pl/cheese/photo-save.page
|
||||
share/help/pl/cheese/photo-take.page
|
||||
share/help/pl/cheese/photo-view.page
|
||||
share/help/pl/cheese/pref-countdown.page
|
||||
share/help/pl/cheese/pref-flash.page
|
||||
share/help/pl/cheese/pref-fullscreen.page
|
||||
share/help/pl/cheese/pref-image-properties.page
|
||||
share/help/pl/cheese/pref-resolution.page
|
||||
share/help/pl/cheese/video-record.page
|
||||
share/help/pt_BR/cheese/burst-mode.page
|
||||
share/help/pt_BR/cheese/effects-apply.page
|
||||
share/help/pt_BR/cheese/figures/cheese.png
|
||||
share/help/pt_BR/cheese/figures/effects.png
|
||||
share/help/pt_BR/cheese/figures/image-properties.png
|
||||
share/help/pt_BR/cheese/index.page
|
||||
share/help/pt_BR/cheese/introduction.page
|
||||
share/help/pt_BR/cheese/legal.xml
|
||||
share/help/pt_BR/cheese/photo-delete.page
|
||||
share/help/pt_BR/cheese/photo-save.page
|
||||
share/help/pt_BR/cheese/photo-take.page
|
||||
share/help/pt_BR/cheese/photo-view.page
|
||||
share/help/pt_BR/cheese/pref-countdown.page
|
||||
share/help/pt_BR/cheese/pref-flash.page
|
||||
share/help/pt_BR/cheese/pref-fullscreen.page
|
||||
share/help/pt_BR/cheese/pref-image-properties.page
|
||||
share/help/pt_BR/cheese/pref-resolution.page
|
||||
share/help/pt_BR/cheese/video-record.page
|
||||
share/help/ru/cheese/burst-mode.page
|
||||
share/help/ru/cheese/effects-apply.page
|
||||
share/help/ru/cheese/figures/cheese.png
|
||||
share/help/ru/cheese/figures/effects.png
|
||||
share/help/ru/cheese/figures/image-properties.png
|
||||
share/help/ru/cheese/index.page
|
||||
share/help/ru/cheese/introduction.page
|
||||
share/help/ru/cheese/legal.xml
|
||||
share/help/ru/cheese/photo-delete.page
|
||||
share/help/ru/cheese/photo-save.page
|
||||
share/help/ru/cheese/photo-take.page
|
||||
share/help/ru/cheese/photo-view.page
|
||||
share/help/ru/cheese/pref-countdown.page
|
||||
share/help/ru/cheese/pref-flash.page
|
||||
share/help/ru/cheese/pref-fullscreen.page
|
||||
share/help/ru/cheese/pref-image-properties.page
|
||||
share/help/ru/cheese/pref-resolution.page
|
||||
share/help/ru/cheese/video-record.page
|
||||
share/help/sl/cheese/burst-mode.page
|
||||
share/help/sl/cheese/effects-apply.page
|
||||
share/help/sl/cheese/figures/cheese.png
|
||||
share/help/sl/cheese/figures/effects.png
|
||||
share/help/sl/cheese/figures/image-properties.png
|
||||
share/help/sl/cheese/index.page
|
||||
share/help/sl/cheese/introduction.page
|
||||
share/help/sl/cheese/legal.xml
|
||||
share/help/sl/cheese/photo-delete.page
|
||||
share/help/sl/cheese/photo-save.page
|
||||
share/help/sl/cheese/photo-take.page
|
||||
share/help/sl/cheese/photo-view.page
|
||||
share/help/sl/cheese/pref-countdown.page
|
||||
share/help/sl/cheese/pref-flash.page
|
||||
share/help/sl/cheese/pref-fullscreen.page
|
||||
share/help/sl/cheese/pref-image-properties.page
|
||||
share/help/sl/cheese/pref-resolution.page
|
||||
share/help/sl/cheese/video-record.page
|
||||
share/help/sv/cheese/burst-mode.page
|
||||
share/help/sv/cheese/effects-apply.page
|
||||
share/help/sv/cheese/figures/cheese.png
|
||||
share/help/sv/cheese/figures/effects.png
|
||||
share/help/sv/cheese/figures/image-properties.png
|
||||
share/help/sv/cheese/index.page
|
||||
share/help/sv/cheese/introduction.page
|
||||
share/help/sv/cheese/legal.xml
|
||||
share/help/sv/cheese/photo-delete.page
|
||||
share/help/sv/cheese/photo-save.page
|
||||
share/help/sv/cheese/photo-take.page
|
||||
share/help/sv/cheese/photo-view.page
|
||||
share/help/sv/cheese/pref-countdown.page
|
||||
share/help/sv/cheese/pref-flash.page
|
||||
share/help/sv/cheese/pref-fullscreen.page
|
||||
share/help/sv/cheese/pref-image-properties.page
|
||||
share/help/sv/cheese/pref-resolution.page
|
||||
share/help/sv/cheese/video-record.page
|
||||
share/help/zh_CN/cheese/burst-mode.page
|
||||
share/help/zh_CN/cheese/effects-apply.page
|
||||
share/help/zh_CN/cheese/figures/cheese.png
|
||||
share/help/zh_CN/cheese/figures/effects.png
|
||||
share/help/zh_CN/cheese/figures/image-properties.png
|
||||
share/help/zh_CN/cheese/index.page
|
||||
share/help/zh_CN/cheese/introduction.page
|
||||
share/help/zh_CN/cheese/legal.xml
|
||||
share/help/zh_CN/cheese/photo-delete.page
|
||||
share/help/zh_CN/cheese/photo-save.page
|
||||
share/help/zh_CN/cheese/photo-take.page
|
||||
share/help/zh_CN/cheese/photo-view.page
|
||||
share/help/zh_CN/cheese/pref-countdown.page
|
||||
share/help/zh_CN/cheese/pref-flash.page
|
||||
share/help/zh_CN/cheese/pref-fullscreen.page
|
||||
share/help/zh_CN/cheese/pref-image-properties.page
|
||||
share/help/zh_CN/cheese/pref-resolution.page
|
||||
share/help/zh_CN/cheese/video-record.page
|
||||
share/icons/hicolor/scalable/apps/org.gnome.Cheese.svg
|
||||
share/icons/hicolor/symbolic/apps/org.gnome.Cheese-symbolic.svg
|
||||
share/locale/af/LC_MESSAGES/cheese.mo
|
||||
share/locale/an/LC_MESSAGES/cheese.mo
|
||||
share/locale/ar/LC_MESSAGES/cheese.mo
|
||||
share/locale/as/LC_MESSAGES/cheese.mo
|
||||
share/locale/ast/LC_MESSAGES/cheese.mo
|
||||
share/locale/be/LC_MESSAGES/cheese.mo
|
||||
share/locale/be@latin/LC_MESSAGES/cheese.mo
|
||||
share/locale/bg/LC_MESSAGES/cheese.mo
|
||||
share/locale/bn/LC_MESSAGES/cheese.mo
|
||||
share/locale/bn_IN/LC_MESSAGES/cheese.mo
|
||||
share/locale/bs/LC_MESSAGES/cheese.mo
|
||||
share/locale/ca/LC_MESSAGES/cheese.mo
|
||||
share/locale/ca@valencia/LC_MESSAGES/cheese.mo
|
||||
share/locale/cs/LC_MESSAGES/cheese.mo
|
||||
share/locale/da/LC_MESSAGES/cheese.mo
|
||||
share/locale/de/LC_MESSAGES/cheese.mo
|
||||
share/locale/dz/LC_MESSAGES/cheese.mo
|
||||
share/locale/el/LC_MESSAGES/cheese.mo
|
||||
share/locale/en@shaw/LC_MESSAGES/cheese.mo
|
||||
share/locale/en_GB/LC_MESSAGES/cheese.mo
|
||||
share/locale/eo/LC_MESSAGES/cheese.mo
|
||||
share/locale/es/LC_MESSAGES/cheese.mo
|
||||
share/locale/et/LC_MESSAGES/cheese.mo
|
||||
share/locale/eu/LC_MESSAGES/cheese.mo
|
||||
share/locale/fa/LC_MESSAGES/cheese.mo
|
||||
share/locale/fi/LC_MESSAGES/cheese.mo
|
||||
share/locale/fr/LC_MESSAGES/cheese.mo
|
||||
share/locale/fur/LC_MESSAGES/cheese.mo
|
||||
share/locale/ga/LC_MESSAGES/cheese.mo
|
||||
share/locale/gl/LC_MESSAGES/cheese.mo
|
||||
share/locale/gu/LC_MESSAGES/cheese.mo
|
||||
|
|
@ -107,17 +402,29 @@ share/locale/he/LC_MESSAGES/cheese.mo
|
|||
share/locale/hi/LC_MESSAGES/cheese.mo
|
||||
share/locale/hr/LC_MESSAGES/cheese.mo
|
||||
share/locale/hu/LC_MESSAGES/cheese.mo
|
||||
share/locale/id/LC_MESSAGES/cheese.mo
|
||||
share/locale/is/LC_MESSAGES/cheese.mo
|
||||
share/locale/it/LC_MESSAGES/cheese.mo
|
||||
share/locale/ja/LC_MESSAGES/cheese.mo
|
||||
share/locale/ka/LC_MESSAGES/cheese.mo
|
||||
share/locale/kk/LC_MESSAGES/cheese.mo
|
||||
share/locale/km/LC_MESSAGES/cheese.mo
|
||||
share/locale/kn/LC_MESSAGES/cheese.mo
|
||||
share/locale/ko/LC_MESSAGES/cheese.mo
|
||||
share/locale/ku/LC_MESSAGES/cheese.mo
|
||||
share/locale/ky/LC_MESSAGES/cheese.mo
|
||||
share/locale/lo/LC_MESSAGES/cheese.mo
|
||||
share/locale/lt/LC_MESSAGES/cheese.mo
|
||||
share/locale/lv/LC_MESSAGES/cheese.mo
|
||||
share/locale/mai/LC_MESSAGES/cheese.mo
|
||||
share/locale/mjw/LC_MESSAGES/cheese.mo
|
||||
share/locale/mk/LC_MESSAGES/cheese.mo
|
||||
share/locale/ml/LC_MESSAGES/cheese.mo
|
||||
share/locale/mr/LC_MESSAGES/cheese.mo
|
||||
share/locale/ms/LC_MESSAGES/cheese.mo
|
||||
share/locale/nb/LC_MESSAGES/cheese.mo
|
||||
share/locale/nds/LC_MESSAGES/cheese.mo
|
||||
share/locale/ne/LC_MESSAGES/cheese.mo
|
||||
share/locale/nl/LC_MESSAGES/cheese.mo
|
||||
share/locale/nn/LC_MESSAGES/cheese.mo
|
||||
share/locale/oc/LC_MESSAGES/cheese.mo
|
||||
|
|
@ -129,6 +436,7 @@ share/locale/pt/LC_MESSAGES/cheese.mo
|
|||
share/locale/pt_BR/LC_MESSAGES/cheese.mo
|
||||
share/locale/ro/LC_MESSAGES/cheese.mo
|
||||
share/locale/ru/LC_MESSAGES/cheese.mo
|
||||
share/locale/sk/LC_MESSAGES/cheese.mo
|
||||
share/locale/sl/LC_MESSAGES/cheese.mo
|
||||
share/locale/sq/LC_MESSAGES/cheese.mo
|
||||
share/locale/sr/LC_MESSAGES/cheese.mo
|
||||
|
|
@ -136,23 +444,15 @@ share/locale/sr@latin/LC_MESSAGES/cheese.mo
|
|||
share/locale/sv/LC_MESSAGES/cheese.mo
|
||||
share/locale/ta/LC_MESSAGES/cheese.mo
|
||||
share/locale/te/LC_MESSAGES/cheese.mo
|
||||
share/locale/tg/LC_MESSAGES/cheese.mo
|
||||
share/locale/th/LC_MESSAGES/cheese.mo
|
||||
share/locale/tr/LC_MESSAGES/cheese.mo
|
||||
share/locale/ug/LC_MESSAGES/cheese.mo
|
||||
share/locale/uk/LC_MESSAGES/cheese.mo
|
||||
share/locale/vi/LC_MESSAGES/cheese.mo
|
||||
share/locale/xh/LC_MESSAGES/cheese.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/cheese.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/cheese.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/cheese.mo
|
||||
share/omf/cheese/cheese-C.omf
|
||||
share/omf/cheese/cheese-ca.omf
|
||||
share/omf/cheese/cheese-de.omf
|
||||
share/omf/cheese/cheese-el.omf
|
||||
share/omf/cheese/cheese-en_GB.omf
|
||||
share/omf/cheese/cheese-es.omf
|
||||
share/omf/cheese/cheese-fr.omf
|
||||
share/omf/cheese/cheese-nl.omf
|
||||
share/omf/cheese/cheese-oc.omf
|
||||
share/omf/cheese/cheese-pt_BR.omf
|
||||
share/omf/cheese/cheese-ru.omf
|
||||
share/omf/cheese/cheese-sv.omf
|
||||
share/omf/cheese/cheese-th.omf
|
||||
share/locale/zu/LC_MESSAGES/cheese.mo
|
||||
share/metainfo/org.gnome.Cheese.appdata.xml
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.15 2015/11/03 21:33:53 agc Exp $
|
||||
$NetBSD: distinfo,v 1.16 2020/01/20 02:22:59 nia Exp $
|
||||
|
||||
SHA1 (cheese-2.26.3.tar.gz) = 357e0e94c19a1c00472c4275c7ec77ac54b3e850
|
||||
RMD160 (cheese-2.26.3.tar.gz) = 590a04548c11da2ac95f0f37360582c4c8e2c5aa
|
||||
SHA512 (cheese-2.26.3.tar.gz) = 7d4b92ebed5941f5e2169b2d70177301de26de25303036b6538c596ab141fd0c76b3d678e17cdd5c1d0117bf8df8a07c76ce84e5bb6b1c02e1eeb8bafebb888e
|
||||
Size (cheese-2.26.3.tar.gz) = 3364424 bytes
|
||||
SHA1 (patch-aa) = c725d82329e181e7c138e7fdb40eab331faac5aa
|
||||
SHA1 (patch-ab) = ed77fa4abf5cd6439b5d406f322dfa932969a062
|
||||
SHA1 (patch-ac) = 4db9fc3c6288ba6eb20ad98aca8875326952dfd8
|
||||
SHA1 (patch-ad) = d42217a180956e5cd1aba9cf8c781d7f533063b3
|
||||
SHA1 (cheese-3.34.0.tar.xz) = 1626d2568f0cc5bda904595a6693be02b909991f
|
||||
RMD160 (cheese-3.34.0.tar.xz) = 6dcea825424c3ecc44fa8a9c88c6ce4a9bb8733c
|
||||
SHA512 (cheese-3.34.0.tar.xz) = 093b4e5f7f15fd0c445fffd254d4a5035a4e3e91bacccdeeda64a4a7182901646daea5c8596c954a67896f9aaf37dab2309c21e8f026583f59d787a2c1e4c200
|
||||
Size (cheese-3.34.0.tar.xz) = 1077052 bytes
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
# $NetBSD: options.mk,v 1.2 2008/11/28 14:29:31 jmcneill Exp $
|
||||
#
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.cheese
|
||||
PKG_SUPPORTED_OPTIONS= hal
|
||||
PKG_SUGGESTED_OPTIONS= hal
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mhal)
|
||||
CONFIGURE_ARGS+= --enable-hal
|
||||
.include "../../sysutils/hal/buildlink3.mk"
|
||||
.else
|
||||
CONFIGURE_ARGS+= --enable-hal=no
|
||||
.endif
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
$NetBSD: patch-aa,v 1.6 2013/01/23 17:27:13 wiz Exp $
|
||||
|
||||
First and second chunk: automake-1.13 compat.
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=583469
|
||||
|
||||
--- configure.ac.orig 2009-06-29 20:32:01.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -3,7 +3,7 @@
|
||||
AC_INIT(cheese, 2.26.3)
|
||||
|
||||
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
|
||||
-AM_CONFIG_HEADER(cheese-config.h)
|
||||
+AC_CONFIG_HEADERS(cheese-config.h)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
|
||||
@@ -11,14 +11,14 @@ AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FL
|
||||
|
||||
AC_ISC_POSIX
|
||||
AC_PROG_CC
|
||||
-AM_PROG_CC_STDC
|
||||
AC_HEADER_STDC
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
CFLAGS="${CFLAGS} -Wall"
|
||||
|
||||
-GNOME_MAINTAINER_MODE_DEFINES
|
||||
-GNOME_COMPILE_WARNINGS
|
||||
+dnl If you can find where these come from, use them! ;)
|
||||
+dnl GNOME_MAINTAINER_MODE_DEFINES
|
||||
+dnl GNOME_COMPILE_WARNINGS
|
||||
|
||||
#*******************************************************************************
|
||||
# Expanded dirs
|
||||
@@ -86,7 +86,6 @@ PKG_CHECK_MODULES(CHEESE, \
|
||||
cairo >= $CAIRO_REQUIRED \
|
||||
dbus-1 >= $DBUS_REQUIRED \
|
||||
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
|
||||
- hal >= $HAL_REQUIRED \
|
||||
pangocairo >= $PANGOCAIRO_REQUIRED \
|
||||
librsvg-2.0 >= $LIBRSVG_REQUIRED)
|
||||
AC_SUBST(CHEESE_CFLAGS)
|
||||
@@ -105,6 +104,25 @@ fi
|
||||
|
||||
AM_CONDITIONAL(WITH_HILDON, test "x$enable_hildon" = "xyes")
|
||||
|
||||
+AC_ARG_ENABLE(hal, AS_HELP_STRING([--enable-hal], [Use the HAL library (default=no)]),, enable_hal=no)
|
||||
+
|
||||
+if test "x$enable_hal" = "xyes"; then
|
||||
+ PKG_CHECK_MODULES([HAL], hal >= $HAL_REQUIRED, ac_have_hal=yes, ac_have_hal=no)
|
||||
+ AC_SUBST(CHEESE_CFLAGS)
|
||||
+else
|
||||
+ enable_hal=no
|
||||
+fi
|
||||
+
|
||||
+if test "x$ac_have_hal" = "xyes"; then
|
||||
+ AC_DEFINE(HAVE_HAL, 1, define to 1 if HAL is used)
|
||||
+else
|
||||
+ AC_DEFINE(HAVE_HAL, 0, define to 1 if HAL is used)
|
||||
+fi
|
||||
+
|
||||
+AC_CHECK_HEADER([sys/videoio.h],
|
||||
+ [AC_DEFINE(USE_SYS_VIDEOIO_H, 1, define to 1 if sys/videoio.h is present)],
|
||||
+ [AC_DEFINE(USE_SYS_VIDEOIO_H, 0, define to 1 if sys/videoio.h is present)], [])
|
||||
+
|
||||
AC_PATH_PROG(GCONFTOOL, gconftool-2)
|
||||
AM_GCONF_SOURCE_2
|
||||
|
||||
|
|
@ -1,200 +0,0 @@
|
|||
$NetBSD: patch-ab,v 1.9 2009/05/21 16:11:25 wiz Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=583469
|
||||
|
||||
--- src/cheese-webcam.c.orig 2009-05-18 20:46:03.000000000 +0000
|
||||
+++ src/cheese-webcam.c
|
||||
@@ -31,13 +31,26 @@
|
||||
#include <gst/gst.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
#include <X11/Xlib.h>
|
||||
+
|
||||
+#if HAVE_HAL
|
||||
#include <libhal.h>
|
||||
+#endif
|
||||
|
||||
-/* for ioctl query */
|
||||
+#include <sys/ioctl.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
-#include <sys/ioctl.h>
|
||||
+
|
||||
+#if USE_SYS_VIDEOIO_H > 0
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/videoio.h>
|
||||
+#elif defined(__sun)
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/videodev2.h>
|
||||
+#elif defined(__linux__)
|
||||
#include <linux/videodev.h>
|
||||
+#else
|
||||
+#define NO_VIDEO_SUPPORT
|
||||
+#endif
|
||||
|
||||
#include "cheese-webcam.h"
|
||||
|
||||
@@ -241,6 +254,7 @@ cheese_webcam_bus_message_cb (GstBus *bu
|
||||
}
|
||||
}
|
||||
|
||||
+#if HAVE_HAL
|
||||
static void
|
||||
cheese_webcam_get_video_devices_from_hal (CheeseWebcam *webcam)
|
||||
{
|
||||
@@ -302,8 +316,12 @@ cheese_webcam_get_video_devices_from_hal
|
||||
char *parent_udi = NULL;
|
||||
char *subsystem = NULL;
|
||||
char *gstreamer_src, *product_name;
|
||||
+#ifndef NO_VIDEO_SUPPORT
|
||||
struct v4l2_capability v2cap;
|
||||
+#endif
|
||||
+#ifdef VIDIOCGCAP
|
||||
struct video_capability v1cap;
|
||||
+#endif
|
||||
gint vendor_id = 0;
|
||||
gint product_id = 0;
|
||||
gchar *property_name = NULL;
|
||||
@@ -317,15 +335,17 @@ cheese_webcam_get_video_devices_from_hal
|
||||
|
||||
if (parent_udi != NULL) {
|
||||
subsystem = libhal_device_get_property_string (hal_ctx, parent_udi, "info.subsystem", NULL);
|
||||
- if (subsystem == NULL) continue;
|
||||
- property_name = g_strjoin (".", subsystem, "vendor_id", NULL);
|
||||
- vendor_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name , &error);
|
||||
- if (dbus_error_is_set (&error)) {
|
||||
- g_warning ("error getting vendor id: %s: %s", error.name, error.message);
|
||||
- dbus_error_free (&error);
|
||||
+ if (subsystem == NULL) {
|
||||
+ vendor_id = g_strdup("{No vendor ID}");
|
||||
+ } else {
|
||||
+ property_name = g_strjoin (".", subsystem, "vendor_id", NULL);
|
||||
+ vendor_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name , &error);
|
||||
+ if (dbus_error_is_set (&error)) {
|
||||
+ g_warning ("error getting vendor id: %s: %s", error.name, error.message);
|
||||
+ dbus_error_free (&error);
|
||||
+ }
|
||||
+ g_free (property_name);
|
||||
}
|
||||
- g_free (property_name);
|
||||
-
|
||||
property_name = g_strjoin (".", subsystem, "product_id", NULL);
|
||||
product_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name, &error);
|
||||
if (dbus_error_is_set (&error)) {
|
||||
@@ -362,9 +382,14 @@ cheese_webcam_get_video_devices_from_hal
|
||||
libhal_free_string (device);
|
||||
continue;
|
||||
}
|
||||
+#ifdef VIDIOC_QUERYCAP
|
||||
ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
|
||||
+#else
|
||||
+ ok = -1;
|
||||
+#endif
|
||||
if (ok < 0)
|
||||
{
|
||||
+#ifdef VIDIOCGCAP
|
||||
ok = ioctl (fd, VIDIOCGCAP, &v1cap);
|
||||
if (ok < 0)
|
||||
{
|
||||
@@ -378,14 +403,22 @@ cheese_webcam_get_video_devices_from_hal
|
||||
g_print ("Device type: %d\n", v1cap.type);
|
||||
gstreamer_src = "v4lsrc";
|
||||
product_name = v1cap.name;
|
||||
+#else
|
||||
+ g_error ("Error while probing v4l2 capabilities for %s: %s\n",
|
||||
+ device, strerror (errno));
|
||||
+ libhal_free_string (device);
|
||||
+ close (fd);
|
||||
+ continue;
|
||||
+#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
+#ifndef NO_VIDEO_SUPPORT
|
||||
guint cap = v2cap.capabilities;
|
||||
g_print ("Detected v4l2 device: %s\n", v2cap.card);
|
||||
g_print ("Driver: %s, version: %d\n", v2cap.driver, v2cap.version);
|
||||
/* g_print ("Bus info: %s\n", v2cap.bus_info); */ /* Doesn't seem anything useful */
|
||||
- g_print ("Capabilities: 0x%08X\n", v2cap.capabilities);
|
||||
+ g_print ("Capabilities: 0x%08X\n", v2cap.capabilities);
|
||||
if (!(cap & V4L2_CAP_VIDEO_CAPTURE))
|
||||
{
|
||||
g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n"
|
||||
@@ -396,6 +429,10 @@ cheese_webcam_get_video_devices_from_hal
|
||||
}
|
||||
gstreamer_src = "v4l2src";
|
||||
product_name = (char *) v2cap.card;
|
||||
+#else /* NO_VIDEO_SUPPORT */
|
||||
+ gstreamer_src = "v4l2src";
|
||||
+ product_name = "Webcam";
|
||||
+#endif
|
||||
}
|
||||
|
||||
g_print ("\n");
|
||||
@@ -431,6 +468,55 @@ fallback:
|
||||
priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice");
|
||||
}
|
||||
}
|
||||
+#else
|
||||
+static void
|
||||
+cheese_webcam_get_video_devices_from_probe (CheeseWebcam *webcam)
|
||||
+{
|
||||
+ CheeseWebcamPrivate* priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
|
||||
+ struct v4l2_capability caps;
|
||||
+ gchar videodev[] = "/dev/video?";
|
||||
+ guint16 cammask = 0;
|
||||
+ int i, ncams = 0, fd, ret, cur = 0;
|
||||
+
|
||||
+ for (i = 0; i < 9; i++)
|
||||
+ {
|
||||
+ videodev[strlen(videodev) - 1] = '0' + i;
|
||||
+ fd = open(videodev, O_RDONLY);
|
||||
+ if (fd == -1)
|
||||
+ continue;
|
||||
+ ret = ioctl(fd, VIDIOC_QUERYCAP, &caps);
|
||||
+ close(fd);
|
||||
+ if (ret)
|
||||
+ {
|
||||
+ continue;
|
||||
+ }
|
||||
+ g_message("Found video device: %s\n", caps.card);
|
||||
+ cammask |= (1 << i);
|
||||
+ ++ncams;
|
||||
+ }
|
||||
+
|
||||
+ priv->num_webcam_devices = ncams;
|
||||
+ if (ncams == 0)
|
||||
+ return;
|
||||
+ priv->webcam_devices = g_new0 (CheeseWebcamDevice, ncams);
|
||||
+ for (i = 0; i < ncams; i++)
|
||||
+ {
|
||||
+ priv->webcam_devices[i].num_video_formats = 0;
|
||||
+ priv->webcam_devices[i].video_formats = g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
|
||||
+ }
|
||||
+
|
||||
+ for (i = 0; i < 9; i++)
|
||||
+ {
|
||||
+ if (cammask & (1 << i))
|
||||
+ {
|
||||
+ videodev[strlen(videodev) - 1] = '0' + i;
|
||||
+ priv->webcam_devices[i].video_device = g_strdup (videodev);
|
||||
+ ++cur;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+#endif /* !HAVE_HAL */
|
||||
+
|
||||
|
||||
static void
|
||||
cheese_webcam_get_supported_framerates (CheeseVideoFormat *video_format, GstStructure *structure)
|
||||
@@ -736,7 +822,11 @@ cheese_webcam_detect_webcam_devices (Che
|
||||
|
||||
int i;
|
||||
|
||||
+#if HAVE_HAL
|
||||
cheese_webcam_get_video_devices_from_hal (webcam);
|
||||
+#else
|
||||
+ cheese_webcam_get_video_devices_from_probe (webcam);
|
||||
+#endif
|
||||
|
||||
g_print ("Probing supported video formats...\n");
|
||||
for (i = 0; i < priv->num_webcam_devices; i++)
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.2 2008/11/28 14:29:31 jmcneill Exp $
|
||||
|
||||
--- data/Makefile.am.orig 2008-10-20 12:01:52.000000000 -0400
|
||||
+++ data/Makefile.am
|
||||
@@ -6,7 +6,7 @@ desktop_in_files = cheese.desktop.in
|
||||
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
@INTLTOOL_SCHEMAS_RULE@
|
||||
-schemadir = $(sysconfdir)/gconf/schemas
|
||||
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
|
||||
schema_in_files = cheese.schemas.in
|
||||
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.2 2009/05/21 16:11:25 wiz Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=583469
|
||||
|
||||
--- src/Makefile.am.orig 2008-10-20 12:01:47.000000000 -0400
|
||||
+++ src/Makefile.am
|
||||
@@ -62,6 +62,10 @@ if WITH_HILDON
|
||||
cheese_LDADD += $(HILDON_LIBS)
|
||||
endif
|
||||
|
||||
+# hal
|
||||
+INCLUDES += $(HAL_CFLAGS)
|
||||
+cheese_LDADD += $(HAL_LIBS)
|
||||
+
|
||||
#dbus
|
||||
BUILT_SOURCES = cheese-dbus-infos.h
|
||||
# We don't want to install this header
|
||||
Loading…
Reference in a new issue