summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-03-23 23:45:22 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-03-23 23:45:22 +0000
commit76a12dec5b84838c3f1e9d78e23d652d88274145 (patch)
treec07a9b9b50a3b67b0650b90e2995de5f1235b3b0 /media-video/cheese
parentppc stable, bug #214077 (diff)
downloadgentoo-2-76a12dec5b84838c3f1e9d78e23d652d88274145.tar.gz
gentoo-2-76a12dec5b84838c3f1e9d78e23d652d88274145.tar.bz2
gentoo-2-76a12dec5b84838c3f1e9d78e23d652d88274145.zip
Initial ebuild for cheese. Thanks to Mikel Olasagasti for ebuild submission and guys on bug #184115.
Include fixes from bug #213221. (Portage version: 2.1.4.4)
Diffstat (limited to 'media-video/cheese')
-rw-r--r--media-video/cheese/ChangeLog14
-rw-r--r--media-video/cheese/Manifest6
-rw-r--r--media-video/cheese/cheese-2.22.0.ebuild55
-rw-r--r--media-video/cheese/files/cheese-2.22.0-strcmp-device-name.patch12
-rw-r--r--media-video/cheese/files/cheese-2.22.0-webcam-caps.patch67
-rw-r--r--media-video/cheese/metadata.xml10
6 files changed, 164 insertions, 0 deletions
diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
new file mode 100644
index 000000000000..44d34c494777
--- /dev/null
+++ b/media-video/cheese/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for media-video/cheese
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.1 2008/03/23 23:45:22 eva Exp $
+
+*cheese-2.22.0 (23 Mar 2008)
+
+ 23 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+ +files/cheese-2.22.0-strcmp-device-name.patch,
+ +files/cheese-2.22.0-webcam-caps.patch,
+ +cheese-2.22.0.ebuild:
+ Initial ebuild for cheese. Thanks to Mikel Olasagasti for ebuild
+ submission and guys on bug #184115.
+ Include fixes from bug #213221.
+
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
new file mode 100644
index 000000000000..b59f84fd68b8
--- /dev/null
+++ b/media-video/cheese/Manifest
@@ -0,0 +1,6 @@
+AUX cheese-2.22.0-strcmp-device-name.patch 622 RMD160 7be52f08989d28da090402259d9b43584bce6c96 SHA1 fd0de0bc5a54a5efa57c6dce824714c79941ddff SHA256 f2067d7292c9d245a9275e82cf4e252cb1bb27f9a5a7816e73215df1fefd5f7f
+AUX cheese-2.22.0-webcam-caps.patch 1968 RMD160 b1134e7850ae93c5c8750bcaa48beffb713de9e2 SHA1 1cd351ff7f042f8cc75b55e99ee898d5c179b7d8 SHA256 042b475fc003b478b0496bfc7297ab900a8bfaecca83114af50f7af64c0a4e2d
+DIST cheese-2.22.0.tar.bz2 1520881 RMD160 8a54e311110334b9ad0ea2b44e27bc5643cfec1e SHA1 2b2d237ae1923a67e60ccd3e6837060f63c29601 SHA256 a406feaf742f42c8318a3442a25d6d4a6dc04bcbb6f3c20120417f4b43025223
+EBUILD cheese-2.22.0.ebuild 1428 RMD160 704f7c3b57be3b8858b64b8f0f65ba63f27395ed SHA1 974cf7388416a7539d1bef3bc0c33488e034e1d2 SHA256 21834236afff40f8c2810b3982782146318aa955dc08f9b54f8233cec0443bb8
+MISC ChangeLog 459 RMD160 4cc86ff903a8fa0277fd99be0cc98ec837ad19f3 SHA1 f38f0882018584422bdbdbc60ed7e1b020bb12c1 SHA256 77d1f6e11852e0899888ab4101c883a9dd9c4566b2f83e1e23233965e47c24a1
+MISC metadata.xml 327 RMD160 268d592c31ba814f607002d14ce24e23c5a57e79 SHA1 c14a18cd951d749c88ad9d6b09bfd942e3eb0a35 SHA256 d01ed77f4fec70b249e7df85f015d7f8e4afd11ed5e77de4e98565ff230cb091
diff --git a/media-video/cheese/cheese-2.22.0.ebuild b/media-video/cheese/cheese-2.22.0.ebuild
new file mode 100644
index 000000000000..890a45a36409
--- /dev/null
+++ b/media-video/cheese/cheese-2.22.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.22.0.ebuild,v 1.1 2008/03/23 23:45:22 eva Exp $
+
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="http://www.gnome.org/projects/cheese/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="v4l"
+
+RDEPEND=">=dev-libs/dbus-glib-0.7
+ >=dev-libs/glib-2.15.5
+ >=gnome-base/gconf-2.16.0
+ >=gnome-base/gnome-vfs-2.18
+ >=gnome-base/libgnomeui-2.14.0
+ >=gnome-base/librsvg-2.18.0
+ >=gnome-extra/evolution-data-server-1.12
+ >=media-libs/gstreamer-0.10.15
+ >=media-libs/gst-plugins-base-0.10.15
+ >=media-plugins/gst-plugins-gconf-0.10
+ >=media-plugins/gst-plugins-ogg-0.10.15
+ >=media-plugins/gst-plugins-pango-0.10.15
+ >=media-plugins/gst-plugins-theora-0.10.15
+ >=media-plugins/gst-plugins-v4l2-0.10
+ >=media-plugins/gst-plugins-vorbis-0.10.15
+ >=sys-apps/dbus-1
+ >=sys-apps/hal-0.5.9
+ >=x11-libs/cairo-1.2.4
+ >=x11-libs/gtk+-2.10
+ x11-libs/libXxf86vm
+ >=x11-libs/pango-1.18.0
+ v4l? ( >=media-plugins/gst-plugins-v4l-0.10 )"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35
+ dev-util/pkgconfig
+ x11-proto/xf86vidmodeproto"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+ gnome2_src_unpack
+
+ # fix gnome bug #522197, gentoo bug #213221
+ epatch "${FILESDIR}/${P}-webcam-caps.patch"
+
+ # fix gnome bug #522143, gentoo bug #213221
+ epatch "${FILESDIR}/${P}-strcmp-device-name.patch"
+}
diff --git a/media-video/cheese/files/cheese-2.22.0-strcmp-device-name.patch b/media-video/cheese/files/cheese-2.22.0-strcmp-device-name.patch
new file mode 100644
index 000000000000..ab8bda475c24
--- /dev/null
+++ b/media-video/cheese/files/cheese-2.22.0-strcmp-device-name.patch
@@ -0,0 +1,12 @@
+diff -ru cheese-2.22.0.orig/src/cheese-webcam.c cheese-2.22.0/src/cheese-webcam.c
+--- cheese-2.22.0.orig/src/cheese-webcam.c 2008-03-10 13:36:59.000000000 -0400
++++ cheese-2.22.0/src/cheese-webcam.c 2008-03-12 21:10:54.012657588 -0400
+@@ -579,7 +579,7 @@
+ selected_device = 0;
+ for (i = 1; i < priv->num_webcam_devices ; i++)
+ {
+- if (strcmp (priv->webcam_devices[i].video_device, priv->device_name) == 0)
++ if (g_strcmp0 (priv->webcam_devices[i].video_device, priv->device_name) == 0)
+ selected_device = i;
+ }
+ CheeseWebcamDevice *selected_webcam = &(priv->webcam_devices[selected_device]);
diff --git a/media-video/cheese/files/cheese-2.22.0-webcam-caps.patch b/media-video/cheese/files/cheese-2.22.0-webcam-caps.patch
new file mode 100644
index 000000000000..15e9ef4cdeee
--- /dev/null
+++ b/media-video/cheese/files/cheese-2.22.0-webcam-caps.patch
@@ -0,0 +1,67 @@
+--- trunk/src/cheese-webcam.c 2008/03/13 12:32:22 592
++++ trunk/src/cheese-webcam.c 2008/03/13 12:37:16 594
+@@ -562,11 +562,10 @@
+ CheeseWebcamPrivate* priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
+ GError *err = NULL;
+ char *webcam_input;
+-
++
+ if (priv->num_webcam_devices == 0)
+ {
+- priv->webcam_source_bin = gst_parse_bin_from_description ("videotestsrc name=video_source",
+- TRUE, &err);
++ goto fallback;
+ }
+ else
+ {
+@@ -588,12 +587,16 @@
+ format = &(g_array_index (selected_webcam->video_formats, CheeseVideoFormat, 0));
+ for (i = 1; i < selected_webcam->num_video_formats; i++)
+ {
+-
++
+ if (g_array_index (selected_webcam->video_formats, CheeseVideoFormat, i).width > format->width)
+ {
+ format = &(g_array_index (selected_webcam->video_formats, CheeseVideoFormat, i));
+ }
+ }
++
++ if (format == NULL)
++ goto fallback;
++
+ /* Select the highest framerate up to 30 Hz*/
+ framerate_numerator = 1;
+ framerate_denominator = 1;
+@@ -620,15 +623,29 @@
+
+ priv->webcam_source_bin = gst_parse_bin_from_description (webcam_input,
+ TRUE, &err);
+- g_free (webcam_input);
++ g_free (webcam_input);
++
++ if ( priv->webcam_source_bin == NULL)
++ goto fallback;
+ }
++
++ priv->video_source = gst_bin_get_by_name (GST_BIN (priv->webcam_source_bin), "video_source");
++ return TRUE;
++
++fallback:
+ if (err != NULL)
+ {
+ g_error_free (err);
+- return FALSE;
++ err = NULL;
+ }
+
+- priv->video_source = gst_bin_get_by_name (GST_BIN (priv->webcam_source_bin), "video_source");
++ priv->webcam_source_bin = gst_parse_bin_from_description ("videotestsrc name=video_source",
++ TRUE, &err);
++ if (err != NULL)
++ {
++ g_error_free (err);
++ return FALSE;
++ }
+ return TRUE;
+ }
+
diff --git a/media-video/cheese/metadata.xml b/media-video/cheese/metadata.xml
new file mode 100644
index 000000000000..13e2a7036daf
--- /dev/null
+++ b/media-video/cheese/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<longdescription lang="en">
+Cheese uses your webcam to take photos and videos, applies fancy special effects
+and lets you share the fun with others.
+</longdescription>
+</pkgmetadata>
+