[Pkg-cli-apps-commits] [banshee] 07/13: Refresh patches
Chow Loong Jin
hyperair at debian.org
Sun Nov 24 17:45:38 UTC 2013
This is an automated email from the git hooks/post-receive script.
hyperair pushed a commit to branch experimental
in repository banshee.
commit 4b4c1192e721071dea3456d2babe222d13c59a6f
Author: Chow Loong Jin <hyperair at debian.org>
Date: Mon Oct 21 22:11:04 2013 +0800
Refresh patches
---
debian/patches/Initial-port-to-GStreamer-1.0.patch | 20 +++++++++---------
...build-time-enable-gapless-playback-option.patch | 24 +++++++++++-----------
...Fix-certificate-validation-with-libsoup-2.patch | 2 +-
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/debian/patches/Initial-port-to-GStreamer-1.0.patch b/debian/patches/Initial-port-to-GStreamer-1.0.patch
index 7475bcb..e3dcf19 100644
--- a/debian/patches/Initial-port-to-GStreamer-1.0.patch
+++ b/debian/patches/Initial-port-to-GStreamer-1.0.patch
@@ -205,7 +205,7 @@ index a496ada..0cbb3b7 100644
band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i);
g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL);
diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
-index 20804c4..30118c5 100644
+index 825c8ef..392137a 100644
--- a/libbanshee/banshee-player-missing-elements.c
+++ b/libbanshee/banshee-player-missing-elements.c
@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
@@ -218,7 +218,7 @@ index 20804c4..30118c5 100644
if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) {
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index ed845f3..6c2af35 100644
+index 4dae104..018bcd2 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player)
@@ -290,7 +290,7 @@ index ed845f3..6c2af35 100644
});
}
bp_debug ("Audiosink has volume: %s",
-@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player)
+@@ -386,7 +385,7 @@ _bp_pipeline_construct (BansheePlayer *player)
}
// Ghost pad the audio bin so audio is passed from the bin into the tee
@@ -299,7 +299,7 @@ index ed845f3..6c2af35 100644
gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad));
gst_object_unref (teepad);
-@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player)
+@@ -414,8 +413,8 @@ _bp_pipeline_construct (BansheePlayer *player)
gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
// Link the first tee pad to the primary audio sink queue
@@ -816,10 +816,10 @@ index 5787c87..7e7dc78 100644
player->vis_enabled = cb != NULL;
}
diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
-index c655a72..b8f98b8 100644
+index 673a81d..8f2d176 100644
--- a/libbanshee/banshee-player.c
+++ b/libbanshee/banshee-player.c
-@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms)
+@@ -255,12 +255,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms, gboolean accurate_seek)
P_INVOKE guint64
bp_get_position (BansheePlayer *player)
{
@@ -833,7 +833,7 @@ index c655a72..b8f98b8 100644
return position / GST_MSECOND;
}
-@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player)
+@@ -270,12 +269,11 @@ bp_get_position (BansheePlayer *player)
P_INVOKE guint64
bp_get_duration (BansheePlayer *player)
{
@@ -847,7 +847,7 @@ index c655a72..b8f98b8 100644
return duration / GST_MSECOND;
}
-@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+@@ -451,7 +449,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
g_return_if_fail (IS_BANSHEE_PLAYER (player));
gint64 pos = -1;
GstState state;
@@ -855,7 +855,7 @@ index c655a72..b8f98b8 100644
gboolean paused = FALSE;
// Gstreamer playbin do not support to set suburi during playback
-@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+@@ -459,7 +456,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
gst_element_get_state (player->playbin, &state, NULL, 0);
paused = (state == GST_STATE_PAUSED);
if (state >= GST_STATE_PAUSED) {
@@ -864,7 +864,7 @@ index c655a72..b8f98b8 100644
gst_element_set_state (player->playbin, GST_STATE_READY);
// Force to wait asynch operation
gst_element_get_state (player->playbin, &state, NULL, -1);
-@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+@@ -472,7 +469,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
gst_element_get_state (player->playbin, &state, NULL, -1);
if (pos != -1) {
diff --git a/debian/patches/Remove-build-time-enable-gapless-playback-option.patch b/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
index c6d4f51..f9a6f71 100644
--- a/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
+++ b/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
@@ -16,12 +16,12 @@ the conditionals.
7 files changed, 10 insertions(+), 63 deletions(-)
diff --git a/configure.ac b/configure.ac
-index f36063e..f698ccd 100644
+index 6c91fb9..02cb201 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -171,21 +171,6 @@ BANSHEE_CHECK_SOUNDMENU
- dnl Ubuntu One Music Store (optional)
- BANSHEE_CHECK_UBUNTUONE
+@@ -170,21 +170,6 @@ BANSHEE_CHECK_UBUNTUONE
+ dnl Boo (optional)
+ BANSHEE_CHECK_BOO
-dnl Gapless, if we have a new-enough playbin2
-ENABLE_GAPLESS="no"
@@ -57,7 +57,7 @@ index 6ed369a..a05c492 100644
bansheelib_LTLIBRARIES = libbanshee.la
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index 6c2af35..d4977e1 100644
+index 018bcd2..28bae33 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -239,7 +239,6 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
@@ -90,10 +90,10 @@ index 6c2af35..d4977e1 100644
g_return_val_if_fail (player->playbin != NULL, FALSE);
diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
-index b8f98b8..08c4f94 100644
+index 8f2d176..aa9aa74 100644
--- a/libbanshee/banshee-player.c
+++ b/libbanshee/banshee-player.c
-@@ -303,16 +303,6 @@ bp_can_seek (BansheePlayer *player)
+@@ -308,16 +308,6 @@ bp_can_seek (BansheePlayer *player)
}
P_INVOKE gboolean
@@ -111,10 +111,10 @@ index b8f98b8..08c4f94 100644
{
g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE);
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
-index 278ff51..05b1905 100644
+index b60e155..dbcbe9d 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
-@@ -747,16 +747,11 @@ namespace Banshee.GStreamer
+@@ -750,16 +750,11 @@ namespace Banshee.GStreamer
get { return gapless_enabled; }
set
{
@@ -135,7 +135,7 @@ index 278ff51..05b1905 100644
}
}
}
-@@ -881,13 +876,11 @@ namespace Banshee.GStreamer
+@@ -884,13 +879,11 @@ namespace Banshee.GStreamer
Catalog.GetString ("For tracks that have ReplayGain data, automatically scale (normalize) playback volume"),
delegate { ReplayGainEnabled = ReplayGainEnabledSchema.Get (); }
));
@@ -154,7 +154,7 @@ index 278ff51..05b1905 100644
}
private void UninstallPreferences ()
-@@ -898,9 +891,7 @@ namespace Banshee.GStreamer
+@@ -901,9 +894,7 @@ namespace Banshee.GStreamer
}
service["general"]["misc"].Remove (replaygain_preference);
@@ -165,7 +165,7 @@ index 278ff51..05b1905 100644
replaygain_preference = null;
gapless_preference = null;
}
-@@ -969,9 +960,6 @@ namespace Banshee.GStreamer
+@@ -972,9 +963,6 @@ namespace Banshee.GStreamer
BansheePlayerAboutToFinishCallback cb);
[DllImport ("libbanshee.dll")]
diff --git a/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch b/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
index 4d84eb4..f7b8596 100644
--- a/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
+++ b/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
@@ -13,7 +13,7 @@ Origin: commit:a5c94f2efee425320847d10748410fe9c3ff9311
2 files changed, 13 insertions(+)
diff --git a/build/m4/banshee/libwebkit.m4 b/build/m4/banshee/libwebkit.m4
-index d1f81c8..9a6f7f5 100644
+index b5f0637..7590345 100644
--- a/build/m4/banshee/libwebkit.m4
+++ b/build/m4/banshee/libwebkit.m4
@@ -23,6 +23,13 @@ AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git
More information about the Pkg-cli-apps-commits
mailing list