media-video/cheese: Version bump; thanks to Colin Macdonald <cbm@sfu.ca> from bug 184115

svn path=/sunrise/; revision=4543

5 files changed, 186 insertions, 51 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index 8b835b625..86dee109b 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Sep 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  +files/cheese-0.2.3-video-v4l.patch, -cheese-0.1.3.ebuild,
+  +cheese-0.2.3.ebuild:
+  Version bump; thanks to Colin Macdonald <cbm@sfu.ca> from bug 184115
+
   04 Jul 2007; Jakub Moc <jakub@gentoo.org> cheese-0.1.3.ebuild:
   Add an ugly hack to honor LINGUAS
 
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index aae4c9191..c816a812e 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,4 +1,5 @@
-DIST cheese-0.1.3.tar.gz 727848 RMD160 87d71dece017f3b7ec0fe45cff8caee5550eb834 SHA1 3fc7ed5f3d3d69190ddcef9f684ac002eb50f836 SHA256 0272a8082f02ebb252b06cd12ffd213c217bf7fb74253735342bc0643bb70854
-EBUILD cheese-0.1.3.ebuild 1161 RMD160 d93bbd6d455804a2449c1c88fa9890afc8d715a1 SHA1 1129db9212a987d09323c455d9027c826e300a70 SHA256 4a9477e965d00f58717ae69d2092330cf8e86952cdccb0a310d7bd4b24e231fe
-MISC ChangeLog 696 RMD160 7ec323484443ef9fc51cd92241b5f354dd8c52d9 SHA1 d10963c6fe1e25b6f5ca2db5ebbd740eea9d8531 SHA256 e6512ef2962e835b8491f677a70c449c7f33a02cb84874d2048a3f6eccd0b4e3
+AUX cheese-0.2.3-video-v4l.patch 4881 RMD160 09a046e2725b261350225299c1464e78f87f28de SHA1 9efaad12d46e5e60caa31ab995a68d15091692e3 SHA256 d9db0630a24f74e1e105568ab6632a02d549b7f8f5773a86fe9bcffc4836e9e7
+DIST Releases?action=AttachFile&do=get&target=cheese-0.2.3.tar.gz 748627 RMD160 8f2b52aea9169bd59f47b5cc6b986ac8d7ab3758 SHA1 bbd5048c442793bd15be4a550c799948636744fc SHA256 986ce7647f90a4bdeee0336193137874da83e31825c90faf37f0473c13fda696
+EBUILD cheese-0.2.3.ebuild 1487 RMD160 d770e9a1436ff1f2d526aaf1c60d4cc65290bcdc SHA1 811d172c3282012d9880b909dd3bacf443f66766 SHA256 ee0c6238e10127d5b2ac5540a55e8cd2366d2185a1078b120921bde79489cdce
+MISC ChangeLog 923 RMD160 d5b6121abc07e2a75aa949b03303a09b21608533 SHA1 deca0897410797a7b3a5e87f52dd6fcb83a9dc51 SHA256 ae8c815218f14483d79f1ebcbb3a256a5dafe81800b316fe256a5167f55851cf
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-video/cheese/cheese-0.1.3.ebuild b/media-video/cheese/cheese-0.1.3.ebuild
deleted file mode 100644
index 11df2a2a9..000000000
--- a/media-video/cheese/cheese-0.1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnome2
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="http://live.gnome.org/Cheese"
-
-# mirror this manually due to retarded SRC_URI
-# SRC_URI="http://live.gnome.org/Cheese/Releases?action=AttachFile&do=get&target=${P}.tar.gz"
-SRC_URI="http://dev.gentooexperimental.org/~jakub/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="nls"
-
-LANGS="cs de es fr gl it nl pt"
-for x in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${x}"
-done
-
-RDEPEND=">=dev-libs/glib-2.12
-	dev-libs/dbus-glib
-	dev-python/pygobject
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libglade-2.0.0
-	>=media-libs/gst-plugins-base-0.10.12
-	>=x11-libs/gtk+-2.10.0
-	x11-libs/cairo"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-	if ! use nls ; then
-		sed -i -e "s/src po data/src data/" Makefile || die "sed failed"
-	else
-		for x in ${LANGS} ; do
-			use linguas_${x} || sed -i -e "/^LANGS/s:${x}::" po/Makefile
-		done
-	fi
-}
diff --git a/media-video/cheese/cheese-0.2.3.ebuild b/media-video/cheese/cheese-0.2.3.ebuild
new file mode 100644
index 000000000..e5c0eeb22
--- /dev/null
+++ b/media-video/cheese/cheese-0.2.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils gnome2
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="http://live.gnome.org/Cheese"
+
+SRC_URI="http://live.gnome.org/Cheese/Releases?action=AttachFile&do=get&target=${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+LANGS="cs da de es fr gl it ja nl pl pt"
+for x in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+RDEPEND="dev-libs/dbus-glib
+	>=dev-libs/glib-2.12
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2.0.0
+	>=gnome-base/libgnomeui-2
+	>=gnome-extra/evolution-data-server-1.10
+	>=media-libs/gstreamer-0.10.12
+	>=media-libs/gst-plugins-base-0.10.12
+	>=media-plugins/gst-plugins-gconf-0.10
+	>=media-plugins/gst-plugins-ogg-0.10
+	>=media-plugins/gst-plugins-pango-0.10
+	>=media-plugins/gst-plugins-theora-0.10
+	>=media-plugins/gst-plugins-v4l-0.10
+	>=media-plugins/gst-plugins-v4l2-0.10
+	>=media-plugins/gst-plugins-vorbis-0.10
+	>=sys-apps/dbus-1
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.10
+	x11-libs/libXxf86vm"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${P}-video-v4l.patch"
+	if ! use nls ; then
+		sed -i -e "s/src po data/src data/" Makefile || die "sed failed"
+	else
+		for x in ${LANGS} ; do
+			use linguas_${x} || sed -i -e "/^LANGS/s:${x}::" po/Makefile || die "sed failed"
+		done
+	fi
+}
diff --git a/media-video/cheese/files/cheese-0.2.3-video-v4l.patch b/media-video/cheese/files/cheese-0.2.3-video-v4l.patch
new file mode 100644
index 000000000..fe7bb0206
--- /dev/null
+++ b/media-video/cheese/files/cheese-0.2.3-video-v4l.patch
@@ -0,0 +1,120 @@
+--- cheese-0.2.3/src/cheese-pipeline.c	2007-08-19 15:37:22.000000000 +0200
++++ cheese-0.2.3-new/src/cheese-pipeline.c	2007-09-05 13:10:37.307026338 +0200
+@@ -39,7 +39,8 @@
+   PipelineVideo *VideoPipeline;
+ 
+   gboolean pipeline_is_photo;
+-  gchar *source_pipeline;
++  gchar *source_photo_pipeline;
++  gchar *source_video_pipeline;
+   GstElement *gst_test_pipeline;
+ };
+ 
+@@ -147,7 +148,7 @@
+ 
+     cheese_pipeline.pipeline_is_photo = FALSE;
+     cheese_pipeline.VideoPipeline = PIPELINE_VIDEO (cheese_pipeline_video_new ());
+-    cheese_pipeline_video_create (cheese_pipeline.source_pipeline, cheese_pipeline.VideoPipeline);
++    cheese_pipeline_video_create (cheese_pipeline.source_video_pipeline, cheese_pipeline.VideoPipeline);
+     cheese_pipeline_set_play ();
+   }
+   else
+@@ -159,7 +160,7 @@
+ 
+     cheese_pipeline.pipeline_is_photo = TRUE;
+     cheese_pipeline.PhotoPipeline = PIPELINE_PHOTO (cheese_pipeline_photo_new ());
+-    cheese_pipeline_photo_create (cheese_pipeline.source_pipeline, cheese_pipeline.PhotoPipeline);
++    cheese_pipeline_photo_create (cheese_pipeline.source_photo_pipeline, cheese_pipeline.PhotoPipeline);
+     cheese_pipeline_set_play ();
+   }
+ }
+@@ -179,42 +180,46 @@
+ {
+ 
+   g_message ("Probing the webcam, please ignore the following, not applicabable tries");
++  cheese_pipeline.source_video_pipeline = NULL;
+   if (cheese_pipeline_test ("v4l2src ! fakesink"))
+   {
+-    cheese_pipeline.source_pipeline = "v4l2src";
++    cheese_pipeline.source_photo_pipeline = "v4l2src";
++    cheese_pipeline.source_video_pipeline = "v4l2src";
+   }
+   else if (cheese_pipeline_test ("v4lsrc ! video/x-raw-rgb,width=640,height=480 ! fakesink"))
+   {
+-    cheese_pipeline.source_pipeline = "v4lsrc ! video/x-raw-rgb,width=640,height=480 ! ffmpegcolorspace";
++    cheese_pipeline.source_photo_pipeline = "v4lsrc ! video/x-raw-rgb,width=640,height=480 ! ffmpegcolorspace";
+   }
+   else if (cheese_pipeline_test ("v4lsrc ! video/x-raw-yuv,width=640,height=480 ! fakesink"))
+   {
+-    cheese_pipeline.source_pipeline =
++    cheese_pipeline.source_photo_pipeline =
+       "v4lsrc ! video/x-raw-yuv,width=640,height=480 ! ffmpegcolorspace";
+   }
+   else if (cheese_pipeline_test ("v4lsrc ! video/x-raw-rgb,width=320,height=240 ! fakesink"))
+   {
+-    cheese_pipeline.source_pipeline =
++    cheese_pipeline.source_photo_pipeline =
++      "v4lsrc ! video/x-raw-rgb,width=320,height=240 ! ffmpegcolorspace";
++    cheese_pipeline.source_video_pipeline =
+       "v4lsrc ! video/x-raw-rgb,width=320,height=240 ! ffmpegcolorspace";
+   }
+   else if (cheese_pipeline_test ("v4lsrc ! video/x-raw-rgb,width=1280,height=960 ! fakesink"))
+   {
+-    cheese_pipeline.source_pipeline =
++    cheese_pipeline.source_photo_pipeline =
+       "v4lsrc ! video/x-raw-rgb,width=1280,height=960 ! ffmpegcolorspace";
+   }
+   else if (cheese_pipeline_test ("v4lsrc ! video/x-raw-rgb,width=174,height=144 ! fakesink"))
+   {
+-    cheese_pipeline.source_pipeline =
++    cheese_pipeline.source_photo_pipeline =
+       "v4lsrc ! video/x-raw-rgb,width=174,height=144 ! ffmpegcolorspace";
+   }
+   else if (cheese_pipeline_test ("v4lsrc ! video/x-raw-rgb,width=160,height=120 ! fakesink"))
+   {
+-    cheese_pipeline.source_pipeline =
++    cheese_pipeline.source_photo_pipeline =
+       "v4lsrc ! video/x-raw-rgb,width=160,height=120 ! ffmpegcolorspace";
+   }
+   else if (cheese_pipeline_test ("v4lsrc ! fakesink"))
+   {
+-    cheese_pipeline.source_pipeline = "v4lsrc";
++    cheese_pipeline.source_photo_pipeline = "v4lsrc";
+   }
+   else
+   {
+@@ -227,12 +232,31 @@
+ 
+     gtk_dialog_run (GTK_DIALOG (dialog));
+     gtk_widget_destroy (dialog);
+-    cheese_pipeline.source_pipeline = "videotestsrc";
++    cheese_pipeline.source_photo_pipeline = "videotestsrc";
++  }
++
++  /* Not v4l2 and not using 320x240 for photos - probe for video */
++  if (!cheese_pipeline.source_video_pipeline)
++  {
++    if (cheese_pipeline_test ("v4lsrc ! video/x-raw-yuv,width=320,height=240 ! fakesink"))
++    {
++      cheese_pipeline.source_video_pipeline = "v4lsrc ! video/x-raw-yuv,width=320,height=240 ! ffmpegcolorspace";
++    }
++    else if (cheese_pipeline_test ("v4lsrc ! video/x-raw-rgb,width=320,height=240 ! fakesink"))
++    {
++      cheese_pipeline.source_video_pipeline =
++        "v4lsrc ! video/x-raw-rgb,width=320,height=240 ! ffmpegcolorspace";
++    }
++    else if (cheese_pipeline_test ("v4lsrc ! fakesink"))
++    {
++      cheese_pipeline.source_video_pipeline = "v4lsrc ! videoscale";
++    }
+   }
+ 
+-  g_print ("using source: %s\n", cheese_pipeline.source_pipeline);
++  g_print ("using photo source: %s\n", cheese_pipeline.source_photo_pipeline);
++  g_print ("using video source: %s\n", cheese_pipeline.source_video_pipeline);
+ 
+-  cheese_pipeline_photo_create (cheese_pipeline.source_pipeline,
++  cheese_pipeline_photo_create (cheese_pipeline.source_photo_pipeline,
+       cheese_pipeline.PhotoPipeline);
+ }
+