diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/avidemux/avidemux-2.4.3-i18n.patch.gz | bin | 589 -> 0 bytes | |||
-rw-r--r-- | multimedia/avidemux/avidemux-2.5.1-i18n.patch | 42 | ||||
-rw-r--r-- | multimedia/avidemux/avidemux.SlackBuild | 30 | ||||
-rw-r--r-- | multimedia/avidemux/avidemux.info | 6 |
4 files changed, 62 insertions, 16 deletions
diff --git a/multimedia/avidemux/avidemux-2.4.3-i18n.patch.gz b/multimedia/avidemux/avidemux-2.4.3-i18n.patch.gz Binary files differdeleted file mode 100644 index 9c62e85d42..0000000000 --- a/multimedia/avidemux/avidemux-2.4.3-i18n.patch.gz +++ /dev/null diff --git a/multimedia/avidemux/avidemux-2.5.1-i18n.patch b/multimedia/avidemux/avidemux-2.5.1-i18n.patch new file mode 100644 index 0000000000..956bbd1921 --- /dev/null +++ b/multimedia/avidemux/avidemux-2.5.1-i18n.patch @@ -0,0 +1,42 @@ +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 3794e37d57..c9856ac30b 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.4.4} +VERSION=${VERSION:-2.5.2} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,16 +60,19 @@ 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 -zcat $CWD/avidemux-2.4.3-i18n.patch.gz | patch -p1 --verbose --backup --suffix=.orig +cat $CWD/avidemux-2.5.1-i18n.patch | patch -p1 --verbose --backup --suffix=.orig -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -cmake . \ - -DCMAKE_INSTALL_PREFIX:STRING="/usr" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \ - -DLIB_SUFFIX:STRING="$LIBDIRSUFFIX" +mkdir build +cd build + + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + cmake . \ + -DCMAKE_INSTALL_PREFIX:STRING="/usr" \ + -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) @@ -102,8 +105,9 @@ cmake . \ # gtk || -DNO_GTK:BOOL= # qt4 || -DNO_QT4:BOOL= -make -make DESTDIR=$PKG install/strip + make + make DESTDIR=$PKG install/strip +cd .. mkdir -p $PKG/usr/man/man1 cat man/avidemux.1 | gzip -9c > $PKG/usr/man/man1/avidemux.1.gz @@ -119,7 +123,7 @@ 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 \ +cp -a AUTHORS COPYING README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 1e43c0356e..4ed98917e2 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,9 +1,9 @@ PRGNAM="avidemux" -VERSION="2.4.4" +VERSION="2.5.2" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.4.4.tar.gz" -MD5SUM="503dfd25842ef81be7c769811e7bc54e" +DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.2.tar.gz" DOWNLOAD_x86_64="" +MD5SUM="22467c9ea5476d94cbd505685b4c11e7" MD5SUM_x86_64="" MAINTAINER="Niklas 'Nille' �kerstr�m" EMAIL="Nille.kungen[AT]gmail.com" |