[arch-commits] Commit in mkvtoolnix/trunk (3 files)
Maxime Gauduin
alucryd at archlinux.org
Sun Oct 11 14:14:38 UTC 2015
Date: Sunday, October 11, 2015 @ 16:14:38
Author: alucryd
Revision: 248891
upgpkg: mkvtoolnix 8.4.0-2
Build the new Qt GUI and ditch the mkvinfo GUI
Added:
mkvtoolnix/trunk/mkvtoolnix-gui.install
Modified:
mkvtoolnix/trunk/PKGBUILD
Deleted:
mkvtoolnix/trunk/mkvtoolnix.install
------------------------+
PKGBUILD | 105 ++++++++++++++---------------------------------
mkvtoolnix-gui.install | 15 ++++++
mkvtoolnix.install | 15 ------
3 files changed, 47 insertions(+), 88 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-11 12:45:12 UTC (rev 248890)
+++ PKGBUILD 2015-10-11 14:14:38 UTC (rev 248891)
@@ -1,102 +1,61 @@
# $Id$
# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
# Contributor: xduugu <xduugu at gmx.com>
pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gui')
pkgver=8.4.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
+url='https://www.bunkus.org/videotools/mkvtoolnix/'
license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
- 'boost-libs' 'lzo' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
+makedepends=('boost' 'boost-libs' 'file' 'flac' 'libebml' 'libmatroska'
+ 'libogg' 'libvorbis' 'qt5-base' 'ruby' 'zlib')
+source=("http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-${pkgver}.tar.xz")
md5sums=('773eb42b7887bd20c4ce65cdf667976b')
-prepare() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # Disable automagic curl dep used for online update checking
- #sed -i -e '/curl/d' configure.in
- export CURL_CFLAGS="" CURL_LIBS=""
-
- export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
- export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
- # Sets number of threads for a parallel build
- export DRAKETHREADS=4
-
- autoreconf -vfi
-}
-
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd mkvtoolnix-${pkgver}
- # XXX: Temporary define to build against boost 1.58
- # https://github.com/mbunkus/mkvtoolnix/issues/1172
- CXXFLAGS+=' -DBOOST_CODECVT_DO_LENGTH_CONST=const'
-
- ./configure --prefix=/usr \
- --with-boost-libdir=/usr/lib \
+ ./configure --prefix='/usr' \
--without-curl \
- --disable-gui
- ./drake
-
+ --disable-qt
+ ./drake apps:mkvinfo $MAKEFLAGS
mv src/mkvinfo{,-cli}
- ./configure --prefix=/usr \
- --with-boost-libdir=/usr/lib \
+ ./configure --prefix='/usr' \
--without-curl
-
- ./drake
+ ./drake $MAKEFLAGS
}
package_mkvtoolnix-cli() {
- pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
- depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo')
- provides=('mkvtoolnix')
- conflicts=('mkvtoolnix')
- replaces=('mkvtoolnix')
+ pkgdesc='Set of tools to create, edit and inspect Matroska files - CLI'
+ depends=('boost-libs' 'file' 'flac' 'libebml' 'libmatroska' 'libogg'
+ 'libvorbis' 'zlib')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd mkvtoolnix-${pkgver}
./drake DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/bin/mkvinfo
- install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
- rm -rf "${pkgdir}"/usr/bin/mmg
- rm -rf "${pkgdir}"/usr/share/man/de/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/es/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/applications
- rm -rf "${pkgdir}"/usr/share/icons
- rm -rf "${pkgdir}"/usr/share/mime
+ install -m 755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
+ rm -rf "${pkgdir}"/usr/share/{applications,icons,mime}
+ find "${pkgdir}" -name mkvtoolnix-gui* -delete
}
-package_mkvtoolnix-gtk() {
- pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
- depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils' 'desktop-file-utils')
- install=mkvtoolnix.install
+package_mkvtoolnix-gui() {
+ pkgdesc='Set of tools to create, edit and inspect Matroska files - GUI'
+ depends=('desktop-file-utils' 'hicolor-icon-theme' 'mkvtoolnix-cli'
+ 'qt5-base' 'shared-mime-info' 'xdg-utils')
+ replaces=('mkvtoolnix-gtk')
+ install='mkvtoolnix-gui.install'
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd mkvtoolnix-${pkgver}
./drake DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/bin/mkv*
- install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
- #sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
- rm -rf "${pkgdir}"/usr/share/doc
rm -rf "${pkgdir}"/usr/share/locale
- rm -rf "${pkgdir}"/usr/share/man/de/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/es/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
+ for t in mkv{extract,info,merge,propedit}; do
+ find "${pkgdir}" -name $t* -delete
+ done
}
+
+# vim: ts=2 sw=2 et:
Added: mkvtoolnix-gui.install
===================================================================
--- mkvtoolnix-gui.install (rev 0)
+++ mkvtoolnix-gui.install 2015-10-11 14:14:38 UTC (rev 248891)
@@ -0,0 +1,15 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database /usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Property changes on: mkvtoolnix/trunk/mkvtoolnix-gui.install
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: mkvtoolnix.install
===================================================================
--- mkvtoolnix.install 2015-10-11 12:45:12 UTC (rev 248890)
+++ mkvtoolnix.install 2015-10-11 14:14:38 UTC (rev 248891)
@@ -1,15 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- if [ -f usr/bin/update-mime-database ]; then
- update-mime-database usr/share/mime &> /dev/null
- fi
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- post_install
-}
More information about the arch-commits
mailing list