[arch-commits] Commit in avidemux/trunk (PKGBUILD avidemux-qt5.11.patch)

[Antonio Rojas]

    Date: Friday, May 25, 2018 @ 21:08:08
  Author: arojas
Revision: 324988

x265 rebuild

Added:
  avidemux/trunk/avidemux-qt5.11.patch
Modified:
  avidemux/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   15 +++++++++++----
 avidemux-qt5.11.patch |   23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-25 17:42:40 UTC (rev 324987)
+++ PKGBUILD	2018-05-25 21:08:08 UTC (rev 324988)
@@ -4,7 +4,7 @@
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-qt')
 pkgver=2.7.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Graphical tool to edit video (filter/re-encode/split)'
 url='http://fixounet.free.fr/avidemux/'
 arch=('x86_64')
@@ -14,9 +14,11 @@
              '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=('fe1d6b794c0d94922428ff84a931264a90c39a5ffe965e03ab7ae0ce71a2c4ad')
-sha512sums=('7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015')
+source=(https://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz avidemux-qt5.11.patch)
+sha256sums=('fe1d6b794c0d94922428ff84a931264a90c39a5ffe965e03ab7ae0ce71a2c4ad'
+            '4b5a5b5e4a53afeaefa6c3213502a83f35e71787c66a6abc81c3487b97fc0ca3')
+sha512sums=('7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015'
+            'ae8aeadab04e2467a2a8d744a5fb7db70b03711f6f1d749214d46339c3261d653f1a6b4818c14dc3aec2e72764e90c6478b80bde337cd830845ebb913e953423')
 
 prepare() {
   cd ${pkgbase}_${pkgver}
@@ -25,6 +27,11 @@
   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() {

Added: avidemux-qt5.11.patch
===================================================================
--- avidemux-qt5.11.patch	                        (rev 0)
+++ avidemux-qt5.11.patch	2018-05-25 21:08:08 UTC (rev 324988)
@@ -0,0 +1,23 @@
+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
+