3 files changed, 18 insertions, 16 deletions
diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README
index b4365ffa16..9f4ba8dc81 100644
--- a/multimedia/avidemux/README
+++ b/multimedia/avidemux/README
@@ -3,11 +3,8 @@ encoding tasks. It supports many file types, including AVI, DVD compatible
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated 
 using projects, job queue and powerful scripting capabilities.
 
-If you use qt4 run the script as 'QT4=yes ./avidemux.SlackBuild' 
-It will put the qt4 version in the desktop entry.
-
 Requirements (all available at SlackBuilds.org):
   lame, faad2, faac, a52dec, libdca, xvidcore, and x264
 
 Optional Dependencies (also available at SlackBuilds.org):
-  qt4, aften, amrnb, jack-audio-connection-kit, libsamplerate
+  aften, amrnb, jack-audio-connection-kit, libsamplerate
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index 274a03f802..3794e37d57 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -22,7 +22,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Niklas "Nille" Åkerström to use cmake since thats what the 
+# Modified by Niklas "Nille" Åkerström to use cmake since thats what the
 # project will use in the future.   No additional license terms added
 
 PRGNAM=avidemux
@@ -35,19 +35,21 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-QT4=${QT4:-no}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
 
-rm -rf $PKG 
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
@@ -57,7 +59,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
-#Patch that installs i18n in the correct place evan if we compile with qt4 support
+#Patch that installs i18n in the correct place even if we compile with qt4 support
 zcat $CWD/avidemux-2.4.3-i18n.patch.gz | patch -p1 --verbose --backup --suffix=.orig
 
 CFLAGS="$SLKCFLAGS" \
@@ -67,13 +69,13 @@ cmake . \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \
-
+  -DLIB_SUFFIX:STRING="$LIBDIRSUFFIX"
 
 # Here are some valid options for cmake to build or not build against a dep
 # (for those who aren't very familiar with cmake)
 # Note that none of them should be needed though, as cmake automatically
 # detects what is and isn't on the system.
-# They're all boolean values, so it uses TRUE 1 YES or FALSE 0 NO 
+# They're all boolean values, so it uses TRUE 1 YES or FALSE 0 NO
 # (TRUE, 1, and YES all mean the same thing and you should only use one of them)
 #	alsa || -DNO_ALSA:BOOL=
 #	oss || -DNO_OSS:BOOL=
@@ -108,12 +110,13 @@ cat man/avidemux.1 | gzip -9c > $PKG/usr/man/man1/avidemux.1.gz
 
 cd $TMP/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat avidemux2.desktop > $PKG/usr/share/applications/avidemux2.desktop
+cat avidemux2-gtk.desktop > $PKG/usr/share/applications/avidemux2-gtk.desktop
+cat avidemux2-gtk.desktop > $PKG/usr/share/applications/avidemux2-qt.desktop
 cat avidemux_icon.png > $PKG/usr/share/pixmaps/avidemux.png
-#patch avidemux2.desktop to exec avidemux2_qt4 instead of avidemux2_gtk
-if [ $QT4 != no ];then
-  sed -i 's/avidemux2_gtk/avidemux2_qt4/' $PKG/usr/share/applications/avidemux2.desktop
-fi
+#patch avidemux2_qt.desktop to exec avidemux2_qt4 instead of avidemux2_gtk
+sed -i 's/avidemux2_gtk/avidemux2_qt4/' $PKG/usr/share/applications/avidemux2-qt.desktop
+sed -i 's/GTK+/Qt/g' $PKG/usr/share/applications/avidemux2-qt.desktop
+sed -i 's/GTK/Qt/' $PKG/usr/share/applications/avidemux2-qt.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING History INSTALL README TODO \
@@ -125,7 +128,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
 
 if [ "$1" = "--cleanup" ]; then
 	 rm -rf $PKG $TMP/$PRGNAM-$VERSION
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index ef02b76fee..3cf0467b8a 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -2,7 +2,9 @@ PRGNAM="avidemux"
 VERSION="2.4.4"
 HOMEPAGE="http://avidemux.org"
 DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.4.4.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="503dfd25842ef81be7c769811e7bc54e"
+MD5SUM_x86_64=""
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="Nille.kungen[AT]gmail.com"
 APPROVED="michiel"