rpms/sound-juicer/devel playpause.patch, NONE, 1.1 sound-juicer.spec, 1.129, 1.130

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13745

Modified Files:
	sound-juicer.spec 
Added Files:
	playpause.patch 
Log Message:
try again


playpause.patch:
 sj-play.c |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

--- NEW FILE playpause.patch ---
>From 0adaffaea1028f5ef90f6aff675b9c81fbfb6a54 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz at gnome.org>
Date: Thu, 27 May 2010 10:36:56 +0000
Subject: Rename play/pause/stop functions to avoid clash with unistd.h

---
diff --git a/src/sj-play.c b/src/sj-play.c
index 25aeba0..a0e19f3 100644
--- a/src/sj-play.c
+++ b/src/sj-play.c
@@ -84,7 +84,7 @@ select_track (void)
  * Start playing.
  */
 static void
-play (void)
+_play (void)
 {
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
   
@@ -96,7 +96,7 @@ play (void)
  * Pause
  */
 static void
-pause (void)
+_pause (void)
 {
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 }
@@ -105,7 +105,7 @@ pause (void)
  * Stop and reset UI.
  */
 static void
-stop (void)
+_stop (void)
 {
   if (pipeline != NULL)
     gst_element_set_state (pipeline, GST_STATE_NULL);
@@ -173,7 +173,7 @@ cb_hop_track (GstBus *bus, GstMessage *message, gpointer user_data)
   }
 
   if (next_track >= tracks) {
-    stop ();
+    _stop ();
     seek_to_track = 0;
   } else {
     seek_to_track = next_track;
@@ -200,7 +200,7 @@ cb_error (GstBus *bus, GstMessage *message, gpointer user_data)
   /* There may be other (more generic) error messages on the bus; set pipeline
    * to NULL state so these messages are flushed from the bus and we don't get
    * called again for those */
-  stop ();
+  _stop ();
 }
 
 static gchar *
@@ -427,7 +427,7 @@ setup (GError **err)
 void
 stop_playback (void)
 {
-  stop ();
+  _stop ();
 }
 
 /*
@@ -440,12 +440,12 @@ on_play_activate (GtkWidget *button, gpointer user_data)
   GError *err = NULL;
 
   if (is_playing ()) {
-    pause ();
+    _pause ();
     gtk_list_store_set (track_store, &current_iter,
                         COLUMN_STATE, STATE_PAUSED, -1);
  } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED && 
              current_track == seek_to_track) {
-    play ();
+    _play ();
     gtk_list_store_set (track_store, &current_iter,
                         COLUMN_STATE, STATE_PLAYING, -1);
   } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED &&
@@ -528,7 +528,7 @@ on_previous_track_activate(GtkWidget *button, gpointer data)
   }
 
   if (prev_track < 0) {
-    stop ();
+    _stop ();
     seek_to_track = 0;
   } else {
     seek_to_track = prev_track;
@@ -550,10 +550,10 @@ set_gst_ui_and_play (void)
         &current_iter, COLUMN_TITLE, &title, -1);
     sj_main_set_title (title);
     g_free (title);
-    play ();
+    _play ();
   } else {
     g_warning (G_STRLOC ": failed to select track");
-    stop ();
+    _stop ();
   }
 }
 
--
cgit v0.8.3.1



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- sound-juicer.spec	11 Jun 2010 12:10:55 -0000	1.129
+++ sound-juicer.spec	12 Jun 2010 19:15:30 -0000	1.130
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.28.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 #VCS: git:git://git.gnome.org/sound-juicer
@@ -41,12 +41,15 @@ BuildRequires:  desktop-file-utils
 
 ExcludeArch: s390 s390x
 
+# upstream fix
+Patch0: playpause.patch
 
 %description
 GStreamer-based CD ripping tool. Saves audio CDs to Ogg/vorbis.
 
 %prep
 %setup -q
+%patch0 -p1 -b .playpause
 
 %build
 # work around a gstreamer problem where it
@@ -126,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_mandir}/man1/*
 
 %changelog
+* Say Jun 12 2010 Matthias Clasen <mclasen at redhat.com> 2.28.2-4
+- Fix build
+
 * Fri Jun 11 2010 Matthias Clasen <mclasen at redhat.com> 2.28.2-3
 - Rebuild against newer brasero