New version for GNOME 2.24. Lots of small improvments, fullscreen mode, changed default storage directory to a more visible place, dbus interface... Clean up old revisions.

(Portage version: 2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

6 files changed, 25 insertions, 198 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index 7e2f93c94ad0..536be7cdbdd3 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,16 @@
 # 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.6 2008/08/10 12:35:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.7 2008/10/20 21:09:10 eva Exp $
+
+*cheese-2.24.1 (20 Oct 2008)
+
+  20 Oct 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,
+  -cheese-2.22.1.ebuild, -cheese-2.22.2.ebuild, +cheese-2.24.1.ebuild:
+  New version for GNOME 2.24. Lots of small improvments, fullscreen mode,
+  changed default storage directory to a more visible place, dbus
+  interface... Clean up old revisions.
 
   10 Aug 2008; Markus Meier <maekke@gentoo.org> cheese-2.22.3.ebuild:
   x86 stable, bug #229709
diff --git a/media-video/cheese/cheese-2.22.0.ebuild b/media-video/cheese/cheese-2.22.0.ebuild
deleted file mode 100644
index 890a45a36409..000000000000
--- a/media-video/cheese/cheese-2.22.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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/cheese-2.22.2.ebuild b/media-video/cheese/cheese-2.22.2.ebuild
deleted file mode 100644
index 3a8753940550..000000000000
--- a/media-video/cheese/cheese-2.22.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.2.ebuild,v 1.1 2008/05/31 12:04:29 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
-	app-text/gnome-doc-utils
-	x11-proto/xf86vidmodeproto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-}
diff --git a/media-video/cheese/cheese-2.22.1.ebuild b/media-video/cheese/cheese-2.24.1.ebuild
index c214f049ed69..00fc3a41f7e0 100644
--- a/media-video/cheese/cheese-2.22.1.ebuild
+++ b/media-video/cheese/cheese-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2008/04/07 23:15:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.24.1.ebuild,v 1.1 2008/10/20 21:09:10 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -15,36 +15,37 @@ KEYWORDS="~amd64 ~x86"
 IUSE="v4l"
 
 RDEPEND=">=dev-libs/dbus-glib-0.7
-	>=dev-libs/glib-2.15.5
+	>=dev-libs/glib-2.16.0
 	>=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-libs/gstreamer-0.10.16
+	>=media-libs/gst-plugins-base-0.10.16
 	>=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-ogg-0.10.16
+	>=media-plugins/gst-plugins-pango-0.10.16
+	>=media-plugins/gst-plugins-theora-0.10.16
 	>=media-plugins/gst-plugins-v4l2-0.10
-	>=media-plugins/gst-plugins-vorbis-0.10.15
+	>=media-plugins/gst-plugins-vorbis-0.10.16
 	>=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/cairo-1.4.0
+	>=x11-libs/gtk+-2.12
 	>=x11-libs/pango-1.18.0
 	v4l? ( >=media-plugins/gst-plugins-v4l-0.10 )"
 
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
+	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
+	app-text/scrollkeeper
 	app-text/gnome-doc-utils
 	x11-proto/xf86vidmodeproto"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
+	G2CONF="${G2CONF} --disable-scrollkeeper --disable-hildon"
 }
+
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
deleted file mode 100644
index ab8bda475c24..000000000000
--- a/media-video/cheese/files/cheese-2.22.0-strcmp-device-name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 15e9ef4cdeee..000000000000
--- a/media-video/cheese/files/cheese-2.22.0-webcam-caps.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- 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;
- }
-