media-video/cheese: Version bump

svn path=/sunrise/; revision=4665

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index 86dee109be268786bc050f157e3348a52eebe2f0..b81639690149b777594e8ba9d758b12e428b0479 100644 (file)
--- 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: $
 
+  15 Sep 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -files/cheese-0.2.3-video-v4l.patch, -cheese-0.2.3.ebuild,
+  +cheese-0.2.4.ebuild:
+  Version bump
+
   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:

diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 4efa2099fffe122c0406161f40c421b64bd1da64..26fafe8708e8282621a5cd0821402864fdff98bd 100644 (file)
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,4 @@
-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 1515 RMD160 52a3377ba9523bd638fee0fd8013a6ef09646394 SHA1 1671493e22a0cc735c4788a2be1d9ff554944d04 SHA256 b6cde0598cf0b3dd765ca236643191a9c11fc10bafe6676a74a375378606d7c1
-MISC ChangeLog 923 RMD160 d5b6121abc07e2a75aa949b03303a09b21608533 SHA1 deca0897410797a7b3a5e87f52dd6fcb83a9dc51 SHA256 ae8c815218f14483d79f1ebcbb3a256a5dafe81800b316fe256a5167f55851cf
+DIST Releases?action=AttachFile&do=get&target=cheese-0.2.4.tar.gz 748821 RMD160 7b14337ee0c804746a35d35f944cf6fe4570ba3a SHA1 c45f55a8a11de12be7af766a7ac3b0d874d18eba SHA256 4302ed9e7a771a7d167e05741e77dda664fafbfb8f858a71909727cc0426109a
+EBUILD cheese-0.2.4.ebuild 1468 RMD160 6e0de63ee5f3beda3f3b5aea7db0e61d8f04e931 SHA1 84d2dd8cfc133801ebab8715ed98509bf57e401c SHA256 faaf5b2705b0886078ce7766180de8f5af072f3567fff512bcaaf063b103225a
+MISC ChangeLog 1094 RMD160 61fd624a6bd165ebae16c215d9ab618eafd9b5b4 SHA1 381683c0216a52a3d7e3c3d6a186e7ecc63c0d96 SHA256 0822f1e9790aa2a14bd35270fcb829fdad937c7e23fcb9bbe68ef3bf9f1b43fa
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/media-video/cheese/cheese-0.2.3.ebuild b/media-video/cheese/cheese-0.2.4.ebuild
similarity index 93%
rename from media-video/cheese/cheese-0.2.3.ebuild
rename to media-video/cheese/cheese-0.2.4.ebuild
index 59f3c3550a9c9ee1a1753190d2212da168973084..f7c9edd9f26ee30ef22a73923a81ec9332fc5adc 100644 (file)
--- a/media-video/cheese/cheese-0.2.3.ebuild
+++ b/media-video/cheese/cheese-0.2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
 HOMEPAGE="http://live.gnome.org/Cheese"
@@ -29,7 +29,7 @@ RDEPEND="dev-libs/dbus-glib
        >=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-pango-0.10.12
        >=media-plugins/gst-plugins-theora-0.10
        >=media-plugins/gst-plugins-v4l-0.10
        >=media-plugins/gst-plugins-v4l2-0.10
@@ -47,7 +47,6 @@ 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

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
deleted file mode 100644 (file)
index fe7bb02..0000000
--- a/media-video/cheese/files/cheese-0.2.3-video-v4l.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- 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);
- }
-