[arch-commits] Commit in avidemux/repos/extra-x86_64 (3 files)
Levente Polyak
anthraxx at archlinux.org
Wed Jun 6 19:47:13 UTC 2018
Date: Wednesday, June 6, 2018 @ 19:47:13
Author: anthraxx
Revision: 326064
archrelease: copy trunk to extra-x86_64
Added:
avidemux/repos/extra-x86_64/PKGBUILD
(from rev 326062, avidemux/trunk/PKGBUILD)
Deleted:
avidemux/repos/extra-x86_64/PKGBUILD
avidemux/repos/extra-x86_64/avidemux-qt5.11.patch
-----------------------+
PKGBUILD | 162 +++++++++++++++++++++++-------------------------
avidemux-qt5.11.patch | 23 ------
2 files changed, 79 insertions(+), 106 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-06 19:47:10 UTC (rev 326063)
+++ PKGBUILD 2018-06-06 19:47:13 UTC (rev 326064)
@@ -1,83 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-qt')
-pkgver=2.7.0
-pkgrel=6
-pkgdesc='Graphical tool to edit video (filter/re-encode/split)'
-url='http://fixounet.free.fr/avidemux/'
-arch=('x86_64')
-license=('GPL2')
-makedepends=('cmake' 'libxslt' 'qt5-base' 'jack' 'libvorbis' 'libxv' 'opus' 'desktop-file-utils'
- 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libx264' 'x265' 'libsamplerate'
- 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' 'intltool' 'sqlite'
- 'libvdpau' 'libdca' 'fribidi' 'glu' 'qt5-tools' 'twolame' 'libfdk-aac' 'libass')
-options=('!emptydirs')
-source=(https://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz avidemux-qt5.11.patch)
-sha256sums=('fe1d6b794c0d94922428ff84a931264a90c39a5ffe965e03ab7ae0ce71a2c4ad'
- '4b5a5b5e4a53afeaefa6c3213502a83f35e71787c66a6abc81c3487b97fc0ca3')
-sha512sums=('7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015'
- 'ae8aeadab04e2467a2a8d744a5fb7db70b03711f6f1d749214d46339c3261d653f1a6b4818c14dc3aec2e72764e90c6478b80bde337cd830845ebb913e953423')
-
-prepare() {
- cd ${pkgbase}_${pkgver}
- sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash
- sed -e 's|0.19|1.0|' -i avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
- cp avidemux2.desktop avidemux-qt.desktop
- sed -ri 's|(Name=).*|\1avidemux (Qt)|' avidemux-qt.desktop
- sed -ri 's|(Exec=).*|\1avidemux3_qt5|' avidemux-qt.desktop
-
- # https://sourceforge.net/p/avidemux/bugs/77/
- sed -e 's|pow10f|exp10f|g' -i avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
- # fix build with Qt 5.11
- patch -p1 -i ../avidemux-qt5.11.patch
-}
-
-build() {
- cd ${pkgbase}_${pkgver}
- bash bootStrap.bash --with-core --with-cli --with-plugins
-}
-
-package_avidemux-cli() {
- depends=('libxml2' 'fontconfig' 'sqlite' 'libvpx' 'libva' 'libvdpau')
- optdepends=('lame: for the corresponding audio encoder plugin'
- 'faac: for the corresponding audio encoder plugin'
- 'faad2: for the corresponding audio decoder plugin'
- 'opus: for the corresponding audio decoder plugin'
- 'opencore-amr: for the corresponding audio decoder plugin'
- 'jack: for the corresponding audio device plugin'
- 'libpulse: for the corresponding audio device plugin'
- 'x264: for the corresponding video encoder plugin'
- 'libx264: for the corresponding video encoder plugin'
- 'x265: for the corresponding video encoder plugin'
- 'xvidcore: for the corresponding video encoder plugin'
- 'qt5-base: for the QtScript scripting support'
- 'libdca: for the corresponding audio decoder plugin'
- 'libfdk-aac: for the corresponding audio decoder plugin'
- 'twolame: for the corresponding audio decoder plugin'
- 'libass: for the corresponding video filter plugin'
- 'fribidi: for the corresponding video filter plugin')
-
- cd ${pkgbase}_${pkgver}
- make -C buildCli DESTDIR="${pkgdir}" install
- make -C buildCore DESTDIR="${pkgdir}" install
- make -C buildPluginsCLI DESTDIR="${pkgdir}" install
- make -C buildPluginsCommon DESTDIR="${pkgdir}" install
-
- install -Dm 644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
- install -Dm 644 man/avidemux.1 -t "${pkgdir}/usr/share/man/man1"
-}
-
-package_avidemux-qt() {
- pkgdesc='Graphical tool to edit video (filter/re-encode/split) - Qt GUI'
- depends=("avidemux-cli=${pkgver}" 'qt5-base' 'x264' 'x265' 'libx264' 'glu' 'libxv' 'desktop-file-utils')
- replaces=('avidemux-gtk')
-
- cd ${pkgbase}_${pkgver}
- make -C buildQt5 DESTDIR="${pkgdir}" install
- make -C buildPluginsQt5 DESTDIR="${pkgdir}" install
- install -Dm 644 avidemux-qt.desktop -t "${pkgdir}/usr/share/applications"
-}
-
-# vim: ts=2 sw=2 et:
Copied: avidemux/repos/extra-x86_64/PKGBUILD (from rev 326062, avidemux/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-06 19:47:13 UTC (rev 326064)
@@ -0,0 +1,79 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=avidemux
+pkgname=('avidemux-cli' 'avidemux-qt')
+pkgver=2.7.1
+pkgrel=1
+pkgdesc='Graphical tool to edit video (filter/re-encode/split)'
+url='http://fixounet.free.fr/avidemux/'
+arch=('x86_64')
+license=('GPL2')
+makedepends=('cmake' 'libxslt' 'qt5-base' 'jack' 'libvorbis' 'libxv' 'opus' 'desktop-file-utils'
+ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libx264' 'x265' 'libsamplerate'
+ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' 'intltool' 'sqlite'
+ 'libvdpau' 'libdca' 'fribidi' 'glu' 'qt5-tools' 'twolame' 'libfdk-aac' 'libass')
+options=('!emptydirs')
+source=(https://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+sha256sums=('3ccd784a329c8957c6741923549fdfb70f3b96d087aeb514f3d52e1cd281e995')
+sha512sums=('85a690a36cad827f176818d6f566d897b4e46b2a272c8fb18bd64672d92f106d2706ac214b3e3ac3a836c5c98f81f7d5feca1229c3f3f2152ab715a3565008be')
+
+prepare() {
+ cd ${pkgbase}_${pkgver}
+ sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash
+ sed -e 's|0.19|1.0|' -i avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
+ cp avidemux2.desktop avidemux-qt.desktop
+ sed -ri 's|(Name=).*|\1avidemux (Qt)|' avidemux-qt.desktop
+ sed -ri 's|(Exec=).*|\1avidemux3_qt5|' avidemux-qt.desktop
+
+ # https://sourceforge.net/p/avidemux/bugs/77/
+ sed -e 's|pow10f|exp10f|g' -i avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
+}
+
+build() {
+ cd ${pkgbase}_${pkgver}
+ bash bootStrap.bash --with-core --with-cli --with-plugins
+}
+
+package_avidemux-cli() {
+ depends=('libxml2' 'fontconfig' 'sqlite' 'libvpx' 'libva' 'libvdpau')
+ optdepends=('lame: for the corresponding audio encoder plugin'
+ 'faac: for the corresponding audio encoder plugin'
+ 'faad2: for the corresponding audio decoder plugin'
+ 'opus: for the corresponding audio decoder plugin'
+ 'opencore-amr: for the corresponding audio decoder plugin'
+ 'jack: for the corresponding audio device plugin'
+ 'libpulse: for the corresponding audio device plugin'
+ 'x264: for the corresponding video encoder plugin'
+ 'libx264: for the corresponding video encoder plugin'
+ 'x265: for the corresponding video encoder plugin'
+ 'xvidcore: for the corresponding video encoder plugin'
+ 'qt5-base: for the QtScript scripting support'
+ 'libdca: for the corresponding audio decoder plugin'
+ 'libfdk-aac: for the corresponding audio decoder plugin'
+ 'twolame: for the corresponding audio decoder plugin'
+ 'libass: for the corresponding video filter plugin'
+ 'fribidi: for the corresponding video filter plugin')
+
+ cd ${pkgbase}_${pkgver}
+ make -C buildCli DESTDIR="${pkgdir}" install
+ make -C buildCore DESTDIR="${pkgdir}" install
+ make -C buildPluginsCLI DESTDIR="${pkgdir}" install
+ make -C buildPluginsCommon DESTDIR="${pkgdir}" install
+
+ install -Dm 644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+ install -Dm 644 man/avidemux.1 -t "${pkgdir}/usr/share/man/man1"
+}
+
+package_avidemux-qt() {
+ pkgdesc='Graphical tool to edit video (filter/re-encode/split) - Qt GUI'
+ depends=("avidemux-cli=${pkgver}" 'qt5-base' 'x264' 'x265' 'libx264' 'glu' 'libxv' 'desktop-file-utils')
+ replaces=('avidemux-gtk')
+
+ cd ${pkgbase}_${pkgver}
+ make -C buildQt5 DESTDIR="${pkgdir}" install
+ make -C buildPluginsQt5 DESTDIR="${pkgdir}" install
+ install -Dm 644 avidemux-qt.desktop -t "${pkgdir}/usr/share/applications"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: avidemux-qt5.11.patch
===================================================================
--- avidemux-qt5.11.patch 2018-06-06 19:47:10 UTC (rev 326063)
+++ avidemux-qt5.11.patch 2018-06-06 19:47:13 UTC (rev 326064)
@@ -1,23 +0,0 @@
-diff -ru avidemux_2.7.0.orig/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp avidemux_2.7.0/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
---- avidemux_2.7.0.orig/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp 2018-05-25 22:43:37.453349626 +0200
-+++ avidemux_2.7.0/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp 2018-05-25 22:45:04.903345751 +0200
-@@ -17,6 +17,7 @@
- #include "ADM_coreJobs.h"
- #include "DIA_coreToolkit.h"
- #include <QtCore/QDir>
-+#include <QAction>
-
-
- static QTableWidgetItem *fromText(const string &t,int id)
-diff -ru avidemux_2.7.0.orig/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp avidemux_2.7.0/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
---- avidemux_2.7.0.orig/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp 2018-05-25 22:43:37.413349627 +0200
-+++ avidemux_2.7.0/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp 2018-05-25 23:01:45.793301398 +0200
-@@ -17,6 +17,7 @@
- #include "Q_eq2.h"
- #include "ADM_toolkitQt.h"
- #include <QSignalMapper>
-+#include <QAction>
-
- //
- // Video is in YV12 Colorspace
-
More information about the arch-commits
mailing list