[arch-commits] Commit in avidemux/trunk (PKGBUILD avidemux-2.5-i18n.patch)
Ionut Biru
ibiru at archlinux.org
Fri Jul 23 20:47:31 UTC 2010
Date: Friday, July 23, 2010 @ 16:47:30
Author: ibiru
Revision: 85997
upgpkg: avidemux 2.5.3-3
x264 20100722 rebuild
Modified:
avidemux/trunk/PKGBUILD
Deleted:
avidemux/trunk/avidemux-2.5-i18n.patch
-------------------------+
PKGBUILD | 34 +++++++++++++++++-----------------
avidemux-2.5-i18n.patch | 40 ----------------------------------------
2 files changed, 17 insertions(+), 57 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-23 20:47:25 UTC (rev 85996)
+++ PKGBUILD 2010-07-23 20:47:30 UTC (rev 85997)
@@ -5,7 +5,7 @@
pkgbase=avidemux
pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
pkgver=2.5.3
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
@@ -18,25 +18,25 @@
build() {
cd "${srcdir}/${pkgbase}_${pkgver}"
- patch -Np1 -i "${srcdir}/2.5.3_field_asm_fix.diff" || return 1
+ patch -Np1 -i "${srcdir}/2.5.3_field_asm_fix.diff"
mkdir build
cd build
- cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. || return 1
- make || return 1
+ cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
+ make
# plugin build expects libraries to be already installed; we fake a prefix
# in build/ by symlinking all libraries to build/lib/
mkdir -p lib
cd lib
- find ../avidemux -name '*.so*' | xargs ln -sft . || return 1
+ find ../avidemux -name '*.so*' | xargs ln -sft .
cd ../../plugins
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=${srcdir}/avidemux_${pkgver} \
-D AVIDEMUX_CORECONFIG_DIR=${srcdir}/avidemux_${pkgver}/build/config \
-D AVIDEMUX_INSTALL_PREFIX=${srcdir}/avidemux_${pkgver}/build \
- -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. || return 1
- make || return 1
+ -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
+ make
}
package_avidemux-cli() {
@@ -56,10 +56,10 @@
replaces=('avidemux')
cd "${srcdir}/${pkgbase}_${pkgver}/build"
- make DESTDIR="${pkgdir}" install || return 1
+ make DESTDIR="${pkgdir}" install
cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
- make DESTDIR="${pkgdir}" install || return 1
+ make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}"/usr/share/avidemux
rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
@@ -70,8 +70,8 @@
ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
- install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" || return 1
- install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" || return 1
+ install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+ install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
}
package_avidemux-gtk() {
@@ -89,8 +89,8 @@
install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
- install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" || return 1
- sed -i 's/Name=avidemux2/Name=avidemux (GTK)/' "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" || return 1
+ install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+ sed -i 's/Name=avidemux2/Name=avidemux (GTK)/' "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
}
package_avidemux-qt() {
@@ -98,7 +98,7 @@
depends=('avidemux-cli' 'qt')
cd "${srcdir}/${pkgbase}_${pkgver}"
- install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" || return 1
+ install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
@@ -110,7 +110,7 @@
install -d "${pkgdir}/usr/share/avidemux/i18n"
install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
- install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" || return 1
- sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" || return 1
- sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" || return 1
+ install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
}
Deleted: avidemux-2.5-i18n.patch
===================================================================
--- avidemux-2.5-i18n.patch 2010-07-23 20:47:25 UTC (rev 85996)
+++ avidemux-2.5-i18n.patch 2010-07-23 20:47:30 UTC (rev 85997)
@@ -1,40 +0,0 @@
-diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
---- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-11 21:12:49.000000000 -0400
-+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-11 21:14:03.000000000 -0400
-@@ -73,7 +73,7 @@
- #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 @@
- }
-
- return "Qt";
--}
-\ No newline at end of file
-+}
-diff -Naur avidemux_2.5.0.orig/cmake/Ts.cmake avidemux_2.5.0/cmake/Ts.cmake
---- avidemux_2.5.0.orig/cmake/Ts.cmake 2009-07-11 21:12:51.000000000 -0400
-+++ avidemux_2.5.0/cmake/Ts.cmake 2009-07-11 21:22:34.000000000 -0400
-@@ -64,7 +64,7 @@
-
- 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 @@
-
- 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})
More information about the arch-commits
mailing list