4 files changed, 38 insertions, 18 deletions
diff --git a/multimedia/gnome-mplayer/README b/multimedia/gnome-mplayer/README
index 418f6b765e647..8c994def6bcd1 100644
--- a/multimedia/gnome-mplayer/README
+++ b/multimedia/gnome-mplayer/README
@@ -1,18 +1,21 @@
-A GTK2 interface to MPlayer. The power of MPlayer combined with a 
-friendly interface for your desktop; You can play all your multimedia 
-(audio, video, CD, DVDs, and VCDs, streams etc.), organize, sort and 
-create playlists, take screenshots while playing videos, be notified 
-about media changes. Full DVD and MKV chapter support, when supported by 
-Mplayer. Subtitle support with the ability to specify preferred audio 
-and subtitle languages if the media supports it. Support for cover art 
-retrieval from Amazon.com for audio media files with artist and/or album 
+A GTK2 interface to MPlayer. The power of MPlayer combined with a
+friendly interface for your desktop; You can play all your multimedia
+(audio, video, CD, DVDs, and VCDs, streams etc.), organize, sort and
+create playlists, take screenshots while playing videos, be notified
+about media changes. Full DVD and MKV chapter support, when supported by
+Mplayer. Subtitle support with the ability to specify preferred audio
+and subtitle languages if the media supports it. Support for cover art
+retrieval from Amazon.com for audio media files with artist and/or album
 information contained in the file.
 
-Gnome MPlayer has a rich API that is exposed via DBus. Using DBus you 
-can control a single or multiple instances of GNOME MPlayer from a 
+Gnome MPlayer has a rich API that is exposed via DBus. Using DBus you
+can control a single or multiple instances of GNOME MPlayer from a
 single command.
 
-Gnome MPlayer is not dependent on any Gnome libraries.  However, the look 
+Gnome MPlayer is not dependent on any Gnome libraries.  However, the look
 and feel of the application is based on the Gnome HIG.
 
-libmusicbrainz3 is an optional dependency.
+Either dconf or gconf is required for the program to save settings.  They
+are no longer stored in a .conf file.  If you plan to use gconf pass
+	GCONF=YES
+to the script.  libmusicbrainz3 is an optional dependency.
diff --git a/multimedia/gnome-mplayer/doinst.sh b/multimedia/gnome-mplayer/doinst.sh
index 1f8ff67dedb29..f0ccbc1987830 100644
--- a/multimedia/gnome-mplayer/doinst.sh
+++ b/multimedia/gnome-mplayer/doinst.sh
@@ -2,9 +2,16 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
 
+if [ -x /usr/bin/glib-compile-schemas ]; then
+  /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas/ >/dev/null 2>&1
+fi
diff --git a/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild b/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild
index 7442f44d13fb8..a56ba6049e958 100644
--- a/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild
+++ b/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Phillip Warner <pc_warner@yahoo.com>
 
 PRGNAM=gnome-mplayer
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -21,6 +21,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Assume we're using dconf unless otherwise specified
+GCONF=${GCONF:-NO}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -50,6 +53,13 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
+# If GCONF=YES above, then enable gconf; otherwise, disable it.
+if [ "$GCONF" = "YES" ]; then
+    do_gconf="with"
+  else
+    do_gconf="without"
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -57,7 +67,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-nautilus \
-  --without-gconf \
+  --${do_gconf}-gconf \
   --disable-schemas-install \
   --build=$ARCH-slackware-linux
 
diff --git a/multimedia/gnome-mplayer/gnome-mplayer.info b/multimedia/gnome-mplayer/gnome-mplayer.info
index 87db95ba9b5ab..3373aba337c45 100644
--- a/multimedia/gnome-mplayer/gnome-mplayer.info
+++ b/multimedia/gnome-mplayer/gnome-mplayer.info
@@ -1,10 +1,10 @@
 PRGNAM="gnome-mplayer"
-VERSION="1.0.0"
+VERSION="1.0.4"
 HOMEPAGE="http://sites.google.com/site/kdekorte2/gnomemplayer"
-DOWNLOAD="http://gnome-mplayer.googlecode.com/files/gnome-mplayer-1.0.0.tar.gz"
-MD5SUM="2c8c7e679fa02e524face3fdb504b39d"
+DOWNLOAD="http://gnome-mplayer.googlecode.com/files/gnome-mplayer-1.0.4.tar.gz"
+MD5SUM="c97dcf12d6a6b5543d701944f95e850e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Phillip Warner"
 EMAIL="pc_warner@yahoo.com"
-APPROVED="rworkman"
+APPROVED="dsomero"