sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (f39bfa2996f836d4a9e243961b9afa552b10ab0f)
- From: Ladislav Hagara <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (f39bfa2996f836d4a9e243961b9afa552b10ab0f)
- Date: Sun, 24 Oct 2010 06:53:54 -0500
GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara <hgr AT vabo.cz>:
audio-players/sound-juicer/DEPENDS | 2
audio-players/sound-juicer/HISTORY | 4 +
audio-players/sound-juicer/PRE_BUILD | 5 -
audio-players/sound-juicer/play.patch | 98
----------------------------------
4 files changed, 5 insertions(+), 104 deletions(-)
New commits:
commit f39bfa2996f836d4a9e243961b9afa552b10ab0f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
sound-juicer needs not libmusicbrainz but libmusicbrainz3 now
commit d53e904434e34ada6fd9075f76e7a6c77219b719
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
sound-juicer: removed upstream included patch
diff --git a/audio-players/sound-juicer/DEPENDS
b/audio-players/sound-juicer/DEPENDS
index 6b46285..41ea774 100755
--- a/audio-players/sound-juicer/DEPENDS
+++ b/audio-players/sound-juicer/DEPENDS
@@ -1,5 +1,5 @@
depends gst-plugins-good &&
-depends libmusicbrainz &&
+depends libmusicbrainz3 &&
depends gnome-media2 &&
depends brasero &&
diff --git a/audio-players/sound-juicer/HISTORY
b/audio-players/sound-juicer/HISTORY
index 6a303aa..4de3075 100644
--- a/audio-players/sound-juicer/HISTORY
+++ b/audio-players/sound-juicer/HISTORY
@@ -1,3 +1,7 @@
+2010-10-24 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD, play.patch: removed patch, included upstream
+ * DEPENDS: libmusicbrainz -> libmusicbrainz3
+
2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply play.patch
* play.patch: Fix duplicate entry from unistd.h
diff --git a/audio-players/sound-juicer/PRE_BUILD
b/audio-players/sound-juicer/PRE_BUILD
deleted file mode 100755
index 9d22739..0000000
--- a/audio-players/sound-juicer/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-message "${MESSAGE_COLOR}Applying duplicate play() from unistd.h
patch...${DEFAULT_COLOR}" &&
-patch "$SOURCE_DIRECTORY"/src/sj-play.c \
- "$SPELL_DIRECTORY"/play.patch
diff --git a/audio-players/sound-juicer/play.patch
b/audio-players/sound-juicer/play.patch
deleted file mode 100644
index c3f3b61..0000000
--- a/audio-players/sound-juicer/play.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# From
http://git.gnome.org/browse/sound-juicer/commit/?id=0adaffaea1028f5ef90f6aff675b9c81fbfb6a54
-#
-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, ¤t_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, ¤t_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)
- ¤t_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 ();
- }
- }
-
- [SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (f39bfa2996f836d4a9e243961b9afa552b10ab0f), Ladislav Hagara, 10/24/2010
Archive powered by MHonArc 2.6.24.