4 files changed, 22 insertions, 61 deletions
diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README
index 54d87cd041..c42dcc5692 100644
--- a/multimedia/avidemux/README
+++ b/multimedia/avidemux/README
@@ -3,5 +3,4 @@ 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.
 
-This requires lame, faad2, faac, a52dec, libdca, xvidcore, and x264.
 Optional dependencies are aften, amrnb, and jack-audio-connection-kit.
diff --git a/multimedia/avidemux/avidemux-2.5.1-i18n.patch b/multimedia/avidemux/avidemux-2.5.1-i18n.patch
deleted file mode 100644
index 956bbd1921..0000000000
--- a/multimedia/avidemux/avidemux-2.5.1-i18n.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-index 4cce636..b875528 100644
---- a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-+++ b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-@@ -73,7 +73,7 @@ void loadTranslator(void)
- #ifdef __APPLE__
- 	QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
- #else
--	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
-+	QString appdir = "/usr/share/avidemux/i18n/";
- #endif
- 
- 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
-@@ -164,4 +164,4 @@ const char* getNativeRendererDesc(void)
- 	}
- 
- 	return "Qt";
--}
-\ No newline at end of file
-+}
-diff --git a/cmake/Ts.cmake b/cmake/Ts.cmake
-index 15eb89b..e40f078 100644
---- a/cmake/Ts.cmake
-+++ b/cmake/Ts.cmake
-@@ -64,7 +64,7 @@ MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdir _sources)
-                 
-             SET(qm_files ${qm_files} ${_outXml} ${_out})
- 
--			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
-+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
-         ENDFOREACH(ts_input ${ts_files})
- 
-         SET(${_sources} ${${_sources}} ${qm_files})
-@@ -95,7 +95,7 @@ MACRO(COMPILE_QT_TS_FILES ts_subdir _sources)
-                 
-             SET(qm_files ${qm_files} ${_out})
- 
--			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
-+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
-         ENDFOREACH(ts_input ${ts_files})
- 
-         SET(${_sources} ${${_sources}} ${qm_files})
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index 7b1f78efaa..85614c0952 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -26,7 +26,7 @@
 # project will use in the future.   No additional license terms added
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.5.2}
+VERSION=${VERSION:-2.5.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,9 +71,6 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
-#Patch that installs i18n in the correct place even if we compile with qt4 support
-cat $CWD/avidemux-2.5.1-i18n.patch | patch -p1 --verbose --backup --suffix=.orig
-
 if [ "$ARCH" = "x86_64" ]; then
   # Some paths are incorrectly hardcoded to "lib":
   sed -i -e "s/Dir=\"lib\"/Dir=\"lib${LIBDIRSUFFIX}\"/" $(grep -lr 'Dir="lib"' .)
@@ -148,13 +145,23 @@ 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-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_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/share/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
+# If the qt4 binary was built, we prefer to use that over the gtk version:
+if [ -x $PKG/usr/bin/avidemux2_qt4 ]; then
+  cat avidemux2.desktop | sed -e 's/_gtk/_qt4/' \
+    > $PKG/usr/share/applications/avidemux2.desktop
+else
+  install -m644 avidemux2.desktop $PKG/usr/share/applications/avidemux2.desktop
+fi
+install -m644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png 
+install -m644 avidemux_icon.png \
+  ${PKG}/usr/share/icons/hicolor/64x64/apps/avidemux.png
+convert avidemux_icon.png -resize 16x16 \
+  ${PKG}/usr/share/icons/hicolor/16x16/apps/avidemux.png
+convert avidemux_icon.png -resize 32x32 \
+  ${PKG}/usr/share/icons/hicolor/32x32/apps/avidemux.png
+convert avidemux_icon.png -resize 48x48 \
+  ${PKG}/usr/share/icons/hicolor/48x48/apps/avidemux.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README TODO \
@@ -168,6 +175,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/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index 71ea73ec9f..9ef614bbc0 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,10 +1,10 @@
 PRGNAM="avidemux"
-VERSION="2.5.2"
+VERSION="2.5.6"
 HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.2.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.6.tar.gz"
+MD5SUM="00e479dd806b94a98d3f0f40639e88a9"
 DOWNLOAD_x86_64=""
-MD5SUM="9027e1324c06e833e6c3c22298503cc7"
 MD5SUM_x86_64=""
-REQUIRES="a52dec aften amrnb faac faad2 jack-audio-connection-kit lame libdca x264 xvidcore"
+REQUIRES="a52dec faac faad2 lame libdca x264 xvidcore"
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="Nille.kungen[AT]gmail.com"