snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

bomi: fix build with ffmpeg>=3.0 + c++14 issues

This commit is contained in:
Juergen Buchmueller 2016-09-22 20:59:13 +02:00
parent cd1b3f01e7
commit dc09f552ec
3 changed files with 101 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
srcpkgs/bomi/patches/ffmpeg3.x.patch Normal file
View File

@ -0,0 +1,32 @@
libavutil/audioconvert.h is gone in ffmpeg3.x
--- src/mpv/audio/filter/af_lavcac3enc.c 2015-05-20 11:31:58.000000000 +0200
+++ src/mpv/audio/filter/af_lavcac3enc.c 2016-09-22 19:52:47.730132367 +0200
@@ -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>
--- src/mpv/audio/out/ao_lavc.c 2015-05-20 11:31:58.000000000 +0200
+++ src/mpv/audio/out/ao_lavc.c 2016-09-22 19:54:50.291163189 +0200
@@ -25,7 +25,6 @@
#include <limits.h>
#include <libavutil/common.h>
-#include <libavutil/audioconvert.h>
#include "config.h"
#include "options/options.h"
--- src/mpv/audio/filter/af_lavrresample.c 2015-05-20 11:31:58.000000000 +0200
+++ src/mpv/audio/filter/af_lavrresample.c 2016-09-22 19:57:13.539200765 +0200
@@ -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>

67
srcpkgs/bomi/patches/fix-cxx14.patch Normal file
View File

@ -0,0 +1,67 @@
--- src/bomi/bomi.pro 2015-05-20 11:31:58.000000000 +0200
+++ src/bomi/bomi.pro 2016-09-22 20:03:57.452315214 +0200
@@ -19,6 +19,7 @@
}
QMAKE_CXXFLAGS_CXX11 = -std=c++1y
+CONFIG += c++14
contains(QMAKE_CXX, clang++) {
QMAKE_CXXFLAGS += -Wno-missing-braces
--- src/bomi/misc/filenamegenerator.cpp 2015-05-20 11:31:58.000000000 +0200
+++ src/bomi/misc/filenamegenerator.cpp 2016-09-22 20:06:10.523355518 +0200
@@ -51,8 +51,8 @@
};
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);
--- src/bomi/misc/filenamegenerator.hpp 2015-05-20 11:31:58.000000000 +0200
+++ src/bomi/misc/filenamegenerator.hpp 2016-09-22 20:07:13.762375106 +0200
@@ -11,7 +11,7 @@
QTime start, end;
QString mediaName;
Mrl mrl;
- quint64 unix = 0;
+ quint64 _unix = 0;
};
#endif // FILENAMEGENERATOR_HPP
--- src/bomi/player/mainwindow_p.cpp 2015-05-20 11:31:58.000000000 +0200
+++ src/bomi/player/mainwindow_p.cpp 2016-09-22 20:08:20.590396090 +0200
@@ -910,7 +910,7 @@
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;
--- src/bomi/player/mainwindow_p.hpp 2015-05-20 11:31:58.000000000 +0200
+++ src/bomi/player/mainwindow_p.hpp 2016-09-22 20:09:18.003414361 +0200
@@ -101,7 +101,7 @@
struct {
QDate date; QTime time, position;
- quint64 unix = 0;
+ quint64 _unix = 0;
QMap<QString, std::function<QString(void)>> get;
} ph;
QTimer waiter, hider, dialogWorkaround;
--- src/bomi/dialog/encoderdialog.cpp 2015-05-20 11:31:58.000000000 +0200
+++ src/bomi/dialog/encoderdialog.cpp 2016-09-22 20:05:18.684339670 +0200
@@ -255,7 +255,7 @@
{
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();

4
srcpkgs/bomi/template
View File

@ -1,5 +1,3 @@
broken="https://build.voidlinux.eu/builders/i686_builder/builds/25783/steps/shell_3/logs/stdio"
# Template file for 'bomi'
pkgname=bomi
version=0.9.11
@ -20,6 +18,8 @@ depends="qt5-quickcontrols"
configure_args="--disable-systemd --release --prefix=/usr"
distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
checksum="c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e"
# Couldn't get PIE to work
nopie=yes
pre_configure() {
case "$XBPS_TARGET_MACHINE" in