bomi build from git + patch

bomi/PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=bomi
-pkgver=0.9.11
+pkgver=0.9.11.r25.g90f18ff
-pkgrel=2
+pkgrel=1
 pkgdesc="Powerful and easy-to-use multimedia player"
 arch=('x86_64')
 url="http://bomi-player.github.io"
@@ -20,25 +20,35 @@ optdepends=('libaacs: AACS decryption for Blu-ray support'
 provides=('cmplayer')
 replace=('cmplayer')
 conflicts=('cmplayer' 'bomi-git')
-source=(https://github.com/xylosper/bomi/archive/v$pkgver.tar.gz
+source=(git+https://github.com/xylosper/${pkgname}.git
-            'ffmpeg2.8.patch')
+            'ffmpeg3.patch'
-md5sums=('543c592f588c68d6f0c3cf254c288f58'
+            'qt5.6.patch')
-         '7bb39aea99bb5c0f6607cda44edc11ae')
+md5sums=('SKIP'
+         '2c005f32510aa504d1eb65f8c83323b3'
+         '44b2f48f40bffe6aa8070642031e5d35')
 
+pkgver() {
+    cd "$srcdir/$pkgname"
+    echo $(git describe --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g' | cut -c2-)
+}
 
 prepare() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname"
  
- patch -Np0 -i "$srcdir/ffmpeg2.8.patch"
+ # https://github.com/d-s-x/bomi/commit/944c3e196229f144e97f285f69355ddfc3f7b579
+ patch -Np1 -i "$srcdir/ffmpeg3.patch" 
+ # https://github.com/d-s-x/bomi/commit/39ee4c372ffb98a4485b61a11726d39060bb2994
+ patch -Np1 -i "$srcdir/qt5.6.patch"
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr \
+        --defaultskin=Breeze
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   make DEST_DIR=$pkgdir install
 }

bomi/ffmpeg3.patch

@@ -0,0 +1,48 @@
+From 944c3e196229f144e97f285f69355ddfc3f7b579 Mon Sep 17 00:00:00 2001
+From: Kagami Hiiragi <kagami@genshiken.org>
+Date: Mon, 17 Oct 2016 04:07:01 +0300
+Subject: [PATCH] Fix compilation for FFmpeg 3+
+
+Upstream fix: https://github.com/mpv-player/mpv/commit/dd5c87e1d7cc11be76c56ad89317194816e4344b
+---
+ src/mpv/audio/filter/af_lavcac3enc.c   | 1 -
+ src/mpv/audio/filter/af_lavrresample.c | 1 -
+ src/mpv/audio/out/ao_lavc.c            | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/src/mpv/audio/filter/af_lavcac3enc.c b/src/mpv/audio/filter/af_lavcac3enc.c
+index 5695bfd..4d2abca 100644
+--- a/src/mpv/audio/filter/af_lavcac3enc.c
++++ b/src/mpv/audio/filter/af_lavcac3enc.c
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+diff --git a/src/mpv/audio/filter/af_lavrresample.c b/src/mpv/audio/filter/af_lavrresample.c
+index 265fa4b..83b5505 100644
+--- a/src/mpv/audio/filter/af_lavrresample.c
++++ b/src/mpv/audio/filter/af_lavrresample.c
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982..16ff8c1 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h" 

bomi/qt5.6.patch

@@ -0,0 +1,81 @@
+From 39ee4c372ffb98a4485b61a11726d39060bb2994 Mon Sep 17 00:00:00 2001
+From: Kagami Hiiragi <kagami@genshiken.org>
+Date: Mon, 17 Oct 2016 04:04:34 +0300
+Subject: [PATCH] Fix compilation for Qt 5.6
+
+See: #458
+---
+ src/bomi/dialog/encoderdialog.cpp   | 2 +-
+ src/bomi/misc/filenamegenerator.cpp | 4 ++--
+ src/bomi/misc/filenamegenerator.hpp | 2 +-
+ src/bomi/player/mainwindow_p.cpp    | 2 +-
+ src/bomi/player/mainwindow_p.hpp    | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/bomi/dialog/encoderdialog.cpp b/src/bomi/dialog/encoderdialog.cpp
+index 970bf7a..f6024cd 100644
+--- a/src/bomi/dialog/encoderdialog.cpp
++++ b/src/bomi/dialog/encoderdialog.cpp
+@@ -255,7 +255,7 @@ auto EncoderDialog::run() -> QString
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g.unix_ = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
+diff --git a/src/bomi/misc/filenamegenerator.cpp b/src/bomi/misc/filenamegenerator.cpp
+index 3ae0d78..aae2eb4 100644
+--- a/src/bomi/misc/filenamegenerator.cpp
++++ b/src/bomi/misc/filenamegenerator.cpp
+@@ -51,8 +51,8 @@ auto get(const FileNameGenerator *g, const QString &ph) -> QString
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix_ / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix_); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+diff --git a/src/bomi/misc/filenamegenerator.hpp b/src/bomi/misc/filenamegenerator.hpp
+index dad8601..c527f4e 100644
+--- a/src/bomi/misc/filenamegenerator.hpp
++++ b/src/bomi/misc/filenamegenerator.hpp
+@@ -11,7 +11,7 @@ struct FileNameGenerator {
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 unix_ = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+diff --git a/src/bomi/player/mainwindow_p.cpp b/src/bomi/player/mainwindow_p.cpp
+index 7c2aa8a..75cc9be 100644
+--- a/src/bomi/player/mainwindow_p.cpp
++++ b/src/bomi/player/mainwindow_p.cpp
+@@ -910,7 +910,7 @@ auto MainWindow::Data::fileNameGenerator(const QTime &end) const -> FileNameGene
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g.unix_ = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+diff --git a/src/bomi/player/mainwindow_p.hpp b/src/bomi/player/mainwindow_p.hpp
+index 7f72589..8311e69 100644
+--- a/src/bomi/player/mainwindow_p.hpp
++++ b/src/bomi/player/mainwindow_p.hpp
+@@ -101,7 +101,7 @@ struct MainWindow::Data {
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 unix_ = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;