diff options
| -rw-r--r-- | graphics/cheese/Makefile | 3 | ||||
| -rw-r--r-- | graphics/cheese/distinfo | 9 | ||||
| -rw-r--r-- | graphics/cheese/options.mk | 6 | ||||
| -rw-r--r-- | graphics/cheese/patches/patch-aa | 7 | ||||
| -rw-r--r-- | graphics/cheese/patches/patch-ab | 66 | ||||
| -rw-r--r-- | graphics/cheese/patches/patch-ac | 4 | ||||
| -rw-r--r-- | graphics/cheese/patches/patch-ad | 15 |
7 files changed, 78 insertions, 32 deletions
diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile index 6e93c737a80..7b14bdb955f 100644 --- a/graphics/cheese/Makefile +++ b/graphics/cheese/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2008/11/24 12:49:39 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2008/11/28 14:29:31 jmcneill Exp $ DISTNAME= cheese-2.24.1 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cheese/2.24/} diff --git a/graphics/cheese/distinfo b/graphics/cheese/distinfo index 44a4254aaf4..5a22e1e1551 100644 --- a/graphics/cheese/distinfo +++ b/graphics/cheese/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.3 2008/11/14 11:25:28 wiz Exp $ +$NetBSD: distinfo,v 1.4 2008/11/28 14:29:31 jmcneill Exp $ SHA1 (cheese-2.24.1.tar.gz) = 87bde5fba2e956f05f3849b5501ce6490bd6bae2 RMD160 (cheese-2.24.1.tar.gz) = 1501a43d3af6565a39e16a9a0378223c6a687e3d Size (cheese-2.24.1.tar.gz) = 2874336 bytes -SHA1 (patch-aa) = d1faae8a7d73ea37475bdf86f7c0f25734c7f1df -SHA1 (patch-ab) = 277bdbe91a0fba237d58f338ffe66b2152f66da0 -SHA1 (patch-ac) = fac70960d67bf5ed793d3348dfe3198796230972 +SHA1 (patch-aa) = 6be8e2b429a3033202cc20aad329ca3979489427 +SHA1 (patch-ab) = 1f273bc49e6d4cd76dad0bc9e60db7ed395d6d83 +SHA1 (patch-ac) = 4db9fc3c6288ba6eb20ad98aca8875326952dfd8 +SHA1 (patch-ad) = 37711efbf09f320359026f677b208aaea7da00c5 diff --git a/graphics/cheese/options.mk b/graphics/cheese/options.mk index 36d184c22ea..f63c31c345a 100644 --- a/graphics/cheese/options.mk +++ b/graphics/cheese/options.mk @@ -1,14 +1,14 @@ -# $NetBSD: options.mk,v 1.1.1.1 2008/09/07 22:43:00 jmcneill Exp $ +# $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 -# XXX FIXME -#. include "../../sysutils/hal/buildlink3.mk" +.include "../../sysutils/hal/buildlink3.mk" .else CONFIGURE_ARGS+= --enable-hal=no .endif diff --git a/graphics/cheese/patches/patch-aa b/graphics/cheese/patches/patch-aa index 8736a529e88..6188caf0518 100644 --- a/graphics/cheese/patches/patch-aa +++ b/graphics/cheese/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2008/11/14 11:25:28 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2008/11/28 14:29:31 jmcneill Exp $ ---- configure.ac.orig 2008-10-20 16:01:53.000000000 +0000 +--- configure.ac.orig 2008-10-20 12:01:53.000000000 -0400 +++ configure.ac @@ -17,8 +17,9 @@ AM_PROG_LIBTOOL @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2008/11/14 11:25:28 wiz Exp $ pangocairo >= $PANGOCAIRO_REQUIRED \ librsvg-2.0 >= $LIBRSVG_REQUIRED) AC_SUBST(CHEESE_CFLAGS) -@@ -107,6 +107,20 @@ fi +@@ -107,6 +107,21 @@ fi AM_CONDITIONAL(WITH_HILDON, test "x$enable_hildon" = "xyes") @@ -30,6 +30,7 @@ $NetBSD: patch-aa,v 1.2 2008/11/14 11:25:28 wiz Exp $ + +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 diff --git a/graphics/cheese/patches/patch-ab b/graphics/cheese/patches/patch-ab index 5b97ddf36d9..8dcfb9dec68 100644 --- a/graphics/cheese/patches/patch-ab +++ b/graphics/cheese/patches/patch-ab @@ -1,39 +1,35 @@ -$NetBSD: patch-ab,v 1.2 2008/11/14 11:25:28 wiz Exp $ +$NetBSD: patch-ab,v 1.3 2008/11/28 14:29:31 jmcneill Exp $ ---- src/cheese-webcam.c.orig 2008-10-20 16:01:47.000000000 +0000 +--- src/cheese-webcam.c.orig 2008-10-20 12:01:47.000000000 -0400 +++ src/cheese-webcam.c -@@ -32,13 +32,30 @@ +@@ -32,13 +32,24 @@ #include <gst/gst.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <X11/Xlib.h> + +#if HAVE_HAL #include <libhal.h> -+#else ++#endif + +-/* for ioctl query */ +#include <sys/ioctl.h> -+#include <fcntl.h> -+#include <unistd.h> + #include <fcntl.h> + #include <unistd.h> +-#include <sys/ioctl.h> ++ +#if defined(__NetBSD__) || defined(__OpenBSD__) +#include <sys/types.h> +#include <sys/videoio.h> +#elif defined(__sun) +#include <sys/types.h> +#include <sys/videodev2.h> -+#endif -+#endif -+ - - /* for ioctl query */ - #include <fcntl.h> - #include <unistd.h> - #include <sys/ioctl.h> -+#ifdef __linux__ ++#elif defined(__linux__) #include <linux/videodev.h> +#endif #include "cheese-webcam.h" #include "cheese-flash.h" -@@ -234,7 +251,6 @@ cheese_webcam_bus_message_cb (GstBus *bu +@@ -234,7 +245,6 @@ cheese_webcam_bus_message_cb (GstBus *bu g_print ("Received EOS message\n"); g_source_remove (priv->eos_timeout_id); @@ -41,7 +37,7 @@ $NetBSD: patch-ab,v 1.2 2008/11/14 11:25:28 wiz Exp $ g_signal_emit (webcam, webcam_signals[VIDEO_SAVED], 0); cheese_webcam_change_sink (webcam, priv->video_display_bin, -@@ -244,6 +260,7 @@ cheese_webcam_bus_message_cb (GstBus *bu +@@ -244,6 +254,7 @@ cheese_webcam_bus_message_cb (GstBus *bu } } @@ -49,7 +45,39 @@ $NetBSD: patch-ab,v 1.2 2008/11/14 11:25:28 wiz Exp $ static void cheese_webcam_get_video_devices_from_hal (CheeseWebcam *webcam) { -@@ -394,6 +411,55 @@ fallback: +@@ -302,7 +313,9 @@ cheese_webcam_get_video_devices_from_hal + char *device; + char *gstreamer_src, *product_name; + struct v4l2_capability v2cap; ++#ifdef VIDIOCGCAP + struct video_capability v1cap; ++#endif + + device = libhal_device_get_property_string (hal_ctx, udis[i], "video4linux.device", &error); + if (dbus_error_is_set (&error)) +@@ -330,6 +343,7 @@ cheese_webcam_get_video_devices_from_hal + ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap); + if (ok < 0) + { ++#ifdef VIDIOCGCAP + ok = ioctl (fd, VIDIOCGCAP, &v1cap); + if (ok < 0) + { +@@ -343,6 +357,13 @@ 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 + { +@@ -394,6 +415,55 @@ fallback: priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice"); } } @@ -105,7 +133,7 @@ $NetBSD: patch-ab,v 1.2 2008/11/14 11:25:28 wiz Exp $ static void cheese_webcam_get_supported_framerates (CheeseVideoFormat *video_format, GstStructure *structure) -@@ -698,7 +764,11 @@ cheese_webcam_detect_webcam_devices (Che +@@ -698,7 +768,11 @@ cheese_webcam_detect_webcam_devices (Che int i; diff --git a/graphics/cheese/patches/patch-ac b/graphics/cheese/patches/patch-ac index 2ad1ed55156..476de3b2e8b 100644 --- a/graphics/cheese/patches/patch-ac +++ b/graphics/cheese/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.1 2008/09/14 13:25:07 drochner Exp $ +$NetBSD: patch-ac,v 1.2 2008/11/28 14:29:31 jmcneill Exp $ ---- data/Makefile.am.orig 2008-09-13 12:39:37.000000000 +0200 +--- 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) diff --git a/graphics/cheese/patches/patch-ad b/graphics/cheese/patches/patch-ad new file mode 100644 index 00000000000..8a4c977edc9 --- /dev/null +++ b/graphics/cheese/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2008/11/28 14:29:31 jmcneill Exp $ + +--- 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 |