4 files changed, 70 insertions, 5 deletions
diff --git a/audio/mp3splt-gtk/README b/audio/mp3splt-gtk/README
index 4e7d88e197f2d..26d2043e9f517 100644
--- a/audio/mp3splt-gtk/README
+++ b/audio/mp3splt-gtk/README
@@ -11,3 +11,9 @@ Mp3splt-project is divided in 3 parts (all available from SlackBuilds.org):
  - libmp3splt, a library (created from mp3splt version 2.1c)
  - mp3splt, a command line program
  - mp3splt-gtk, a GTK2 gui
+
+Although gstreamer1 is listed as a requirement in the .info file, it is
+possible to build mp3splt-gtk without it. This will disable the built-in
+player, so you'll have to use a separate player (such as audacious or
+mplayer) to find the split-points. To do this, set GSTREAMER=no in the
+script's environment.
diff --git a/audio/mp3splt-gtk/default_player.diff b/audio/mp3splt-gtk/default_player.diff
new file mode 100644
index 0000000000000..123bc08a73965
--- /dev/null
+++ b/audio/mp3splt-gtk/default_player.diff
@@ -0,0 +1,44 @@
+diff -Naur mp3splt-gtk-0.9.2/src/preferences_manager.c mp3splt-gtk-0.9.2.patched/src/preferences_manager.c
+--- mp3splt-gtk-0.9.2/src/preferences_manager.c	2014-05-28 18:43:53.000000000 -0400
++++ mp3splt-gtk-0.9.2.patched/src/preferences_manager.c	2015-01-08 17:25:36.000000000 -0500
+@@ -42,6 +42,16 @@
+ 
+ #include "preferences_manager.h"
+ 
++#ifdef NO_GSTREAMER
++  #ifdef NO_AUDACIOUS
++    #define DEFAULT_PLAYER PLAYER_SNACKAMP
++  #else
++    #define DEFAULT_PLAYER PLAYER_AUDACIOUS
++  #endif
++#else
++  #define DEFAULT_PLAYER PLAYER_GSTREAMER
++#endif
++
+ static void check_pref_file_and_write_default(ui_state *ui);
+ static void pm_free_spinner_int_preferences(GArray *spinner_int_preferences);
+ static void pm_free_range_preferences(GArray *range_preferences);
+@@ -771,7 +781,7 @@
+   if (!g_key_file_has_key(my_key_file, "player", "default_player",NULL))
+   {
+     g_key_file_set_integer(my_key_file, "player", "default_player",
+-        PLAYER_GSTREAMER);
++        DEFAULT_PLAYER);
+     g_key_file_set_comment (my_key_file, "player", "default_player",
+         "\n 1 = PLAYER_AUDACIOUS, 2 = PLAYER_SNACKAMP, 3 = PLAYER_GSTREAMER",
+         NULL);
+@@ -784,7 +794,13 @@
+     if (the_player == PLAYER_AUDACIOUS)
+     {
+ #ifdef NO_AUDACIOUS
+-      g_key_file_set_integer(my_key_file, "player", "default_player", PLAYER_SNACKAMP);
++      g_key_file_set_integer(my_key_file, "player", "default_player", DEFAULT_PLAYER);
++#endif
++    }
++    if (the_player == PLAYER_GSTREAMER)
++    {
++#ifdef NO_GSTREAMER
++      g_key_file_set_integer(my_key_file, "player", "default_player", DEFAULT_PLAYER);
+ #endif
+     }
+     //if the value do not make sense
diff --git a/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild b/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild
index fe45e226cfc25..2057ac085f120 100644
--- a/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild
+++ b/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild
@@ -24,12 +24,18 @@
 
 # 20140819 bkw:
 # - Updated for v0.9.1a
-# - Use make isntall-strip instead of find/xargs/strip
+# - Use make install-strip instead of find/xargs/strip
 # - Get rid of redundant/empty TODO and INSTALL from /usr/doc
 # - Don't waste time building doxygen docs, since we don't install them
 
+# 20150107 bkw:
+# - Updated for v0.9.2
+# - Added GSTREAMER=no option, as requested by Arthur Fontolan.
+# - Added default_player.diff: if GSTREAMER=no, the default player
+#   will be audacious. Sent patch to upstream too.
+
 PRGNAM=mp3splt-gtk
-VERSION=${VERSION:-0.9.1a}
+VERSION=${VERSION:-0.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,6 +81,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/default_player.diff
+
+if [ "${GSTREAMER:-yes}" = "yes" ]; then
+  GSTOPT="enable"
+else
+  GSTOPT="disable"
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -82,6 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --${GSTOPT}-gstreamer \
   --disable-gnome \
   --disable-scrollkeeper \
   --disable-doxygen_doc \
diff --git a/audio/mp3splt-gtk/mp3splt-gtk.info b/audio/mp3splt-gtk/mp3splt-gtk.info
index 1917815bf1a22..585eb72eeef01 100644
--- a/audio/mp3splt-gtk/mp3splt-gtk.info
+++ b/audio/mp3splt-gtk/mp3splt-gtk.info
@@ -1,8 +1,8 @@
 PRGNAM="mp3splt-gtk"
-VERSION="0.9.1a"
+VERSION="0.9.2"
 HOMEPAGE="http://mp3splt.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/mp3splt/mp3splt-gtk-0.9.1a.tar.gz"
-MD5SUM="438a293234c9b741eedcf71b78e04c5b"
+DOWNLOAD="http://downloads.sourceforge.net/mp3splt/mp3splt-gtk-0.9.2.tar.gz"
+MD5SUM="17cd1445a13e127a03c13b740e1945fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmp3splt gstreamer1"