5 files changed, 58 insertions, 18 deletions
diff --git a/libraries/libmirage/README b/libraries/libmirage/README
index 7a0c64a2a515d..01fefdfdeb6d4 100644
--- a/libraries/libmirage/README
+++ b/libraries/libmirage/README
@@ -7,4 +7,4 @@ Experimental image parsers b6t, c2d, cdi, cif, daa.
 
 libmirage is part of the userspace-cdemu suite
 
-This requires libsndfile, which is also available at SlackBuilds.org.
+This requires libsndfile.
diff --git a/libraries/libmirage/doinst.sh b/libraries/libmirage/doinst.sh
index 575cd251e69a5..3a3d7b6dc6a85 100644
--- a/libraries/libmirage/doinst.sh
+++ b/libraries/libmirage/doinst.sh
@@ -2,4 +2,3 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
-
diff --git a/libraries/libmirage/libmirage.SlackBuild b/libraries/libmirage/libmirage.SlackBuild
index 4bdf0b2434321..ee4d0f7aa3eb1 100644
--- a/libraries/libmirage/libmirage.SlackBuild
+++ b/libraries/libmirage/libmirage.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for libmirage
 #
-# Copyright 2008  Niklas "Nille" ï¿½kerstrï¿½m
+# Copyright 2008  Niklas "Nille" Ã…kerstrÃ¶m
+# Copyright 2010  Niels Horn
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,17 +23,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Maintained as of version 1.3.0 by Niels Horn <niels.horn@gmail.com>
+# Revision date: 2010/11/20
+
 PRGNAM=libmirage
-VERSION=1.1.1
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -62,11 +64,15 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
 
+# Patch the parsers for three mime-types that conflict with the freedesktop
+#   standard included in Slackware
+patch -p1 < $CWD/mimetypes.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -79,10 +85,16 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+# Remove some mime-types to avoid duplicates with freedesktop standards
+for ext in cue iso toc; do
+  rm $PKG/usr/share/mime/packages/libmirage-image-$ext.xml
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp AUTHORS ChangeLog COPYING INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -sf /usr/share/gtk-doc/html/$PRGNAM html )
+ln -sf ../../share/gtk-doc/html/$PRGNAM \
+  $PKG/usr/doc/$PRGNAM-$VERSION/html
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -92,7 +104,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-if [ "$1" = "--cleanup" ]; then
-	 rm -rf $PKG $TMP/$PRGNAM-$VERSION
- fi
diff --git a/libraries/libmirage/libmirage.info b/libraries/libmirage/libmirage.info
index 99c7ffbfe41a1..0fa9d31216504 100644
--- a/libraries/libmirage/libmirage.info
+++ b/libraries/libmirage/libmirage.info
@@ -1,10 +1,10 @@
 PRGNAM="libmirage"
-VERSION="1.1.1"
+VERSION="1.3.0"
 HOMEPAGE="http://cdemu.sourceforge.net/pkg_libmirage.php"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/libmirage-1.1.1.tar.bz2"
-MD5SUM="4aaa6791553daebd3d80d627b0e57a99"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/libmirage-1.3.0.tar.gz"
+MD5SUM="a223f9fd648e194c72f3809fbb0de63d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Niklas 'Nille' Åkerström"
-EMAIL="nille.kungen[AT]gmail.com"
-APPROVED="rworkman"
+MAINTAINER="Niels Horn"
+EMAIL="niels.horn@gmail.com"
+APPROVED="pprkut"
diff --git a/libraries/libmirage/mimetypes.patch b/libraries/libmirage/mimetypes.patch
new file mode 100644
index 0000000000000..aba7c5607addf
--- /dev/null
+++ b/libraries/libmirage/mimetypes.patch
@@ -0,0 +1,33 @@
+--- libmirage-1.3.0_orig/src/parsers/image-iso/image-iso-parser.c	2010-05-28 14:43:59.000000000 -0300
++++ libmirage-1.3.0/src/parsers/image-iso/image-iso-parser.c	2010-10-31 09:36:45.000000000 -0200
+@@ -312,7 +312,7 @@
+         "PARSER-ISO",
+         "ISO Image Parser",
+         "ISO images",
+-        "application/libmirage-iso"
++        "application/x-cd-image"
+     );
+     
+     return;
+--- libmirage-1.3.0_orig/src/parsers/image-toc/image-toc-parser.c	2010-05-28 14:43:58.000000000 -0300
++++ libmirage-1.3.0/src/parsers/image-toc/image-toc-parser.c	2010-10-31 09:56:38.000000000 -0200
+@@ -1337,7 +1337,7 @@
+         "PARSER-TOC",
+         "TOC Image Parser",
+         "Cdrdao TOC files",
+-        "application/libmirage-toc"
++        "application/x-cdrdao-toc"
+     );
+     
+     __mirage_parser_toc_init_regex_parser(MIRAGE_PARSER(instance));
+--- libmirage-1.3.0_orig/src/parsers/image-cue/image-cue-parser.c	2010-05-28 14:43:55.000000000 -0300
++++ libmirage-1.3.0/src/parsers/image-cue/image-cue-parser.c	2010-10-31 09:58:34.000000000 -0200
+@@ -1030,7 +1030,7 @@
+         "PARSER-CUE",
+         "CUE Image Parser",
+         "CUE images",
+-        "application/libmirage-cue"
++        "application/x-cue"
+     );
+     
+     __mirage_parser_cue_init_regex_parser(MIRAGE_PARSER(instance));