Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-02-03 04:47:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bomi: try to fix it

Browse Source
This commit is contained in:
Jeff Huang 2018-01-08 09:08:12 +00:00
parent e7919f50dd
commit 6a4285c12d
4 changed files with 90 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bomi/PKGBUILD
View File

@ -1,6 +1,6 @@
pkgname=bomi
pkgver=0.9.11.r25.g90f18ff5
pkgrel=2
pkgver=0.9.11.r37.g2d2a3515
pkgrel=1
pkgdesc="Powerful and easy-to-use multimedia player"
arch=('x86_64')
url="http://bomi-player.github.io"
@ -20,31 +20,26 @@ optdepends=('libaacs: AACS decryption for Blu-ray support'
provides=('cmplayer')
replace=('cmplayer')
conflicts=('cmplayer' 'bomi-git')
source=(git+https://github.com/xylosper/${pkgname}.git
'ffmpeg3.patch'
'qt5.6.patch')
source=(git+https://github.com/d-s-x/${pkgname}.git
qml_internal_types.patch)
md5sums=('SKIP'
'2c005f32510aa504d1eb65f8c83323b3'
'44b2f48f40bffe6aa8070642031e5d35')
'119bfa72cf4700c16c11c2b3ec8d8865')
pkgver() {
cd "$srcdir/$pkgname"
echo $(git describe --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g' | cut -c2-)
}
prepare() {
cd "$srcdir/$pkgname"
# 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"
./configure --prefix=/usr \
--defaultskin=Breeze
# Temporary fix until the upstream is fixed.
if ! grep PlayInfoText ./src/bomi/imports/bomi/qmldir; then
patch -p1 -i "$srcdir/qml_internal_types.patch"
fi
make
}

48
bomi/ffmpeg3.patch
View File

@ -1,48 +0,0 @@
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"

79
bomi/qml_internal_types.patch Normal file
View File

@ -0,0 +1,79 @@
<!DOCTYPE html>
<html lang='en'>
<head>
<title>qml_internal_types.patch - aur.git - AUR Package Repositories</title>
<meta name='generator' content='cgit '/>
<meta name='robots' content='index, nofollow'/>
<link rel='stylesheet' type='text/css' href='/css/cgit.css'/>
<link rel='shortcut icon' href='/images/favicon.ico'/>
<link rel='alternate' title='Atom feed' href='https://aur.archlinux.org/cgit/aur.git/atom/qml_internal_types.patch?h=bomi-git' type='application/atom+xml'/>
<link rel='vcs-git' href='https://aur.archlinux.org/bomi-git.git/' title='aur.git Git repository'/>
</head>
<body>
<div id="archnavbar" class="anb-aur">
<div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux User Repository</a></h1></div>
<div id="archnavbarmenu">
<ul id="archnavbarlist">
<li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>
<li id="anb-packages"><a href="https://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
<li id="anb-security"><a href="https://security.archlinux.org/" title="Arch Linux Security Tracker">Security</a></li>
<li id="anb-aur"><a href="/" title="Arch Linux User Repository">AUR</a></li>
<li id="anb-download"><a href="https://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
</ul>
</div>
</div><!-- #archnavbar -->
<div id='cgit'><table id='header'>
<tr>
<td class='main'>AUR : bomi-git.git</td></tr>
<tr><td class='sub'>AUR Package Repositories | click <a href='/pkgbase/bomi-git/'>here</a> to return to the package base details page</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/aur.git/?h=bomi-git'>summary</a><a href='/cgit/aur.git/log/qml_internal_types.patch?h=bomi-git'>log</a><a class='active' href='/cgit/aur.git/tree/qml_internal_types.patch?h=bomi-git'>tree</a><a href='/cgit/aur.git/commit/qml_internal_types.patch?h=bomi-git'>commit</a><a href='/cgit/aur.git/diff/qml_internal_types.patch?h=bomi-git'>diff</a><a href='/cgit/aur.git/stats/qml_internal_types.patch?h=bomi-git'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/aur.git/log/qml_internal_types.patch'>
<input type='hidden' name='h' value='bomi-git'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='text' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/aur.git/tree/?h=bomi-git'>root</a>/<a href='/cgit/aur.git/tree/qml_internal_types.patch?h=bomi-git'>qml_internal_types.patch</a></div><div class='content'>blob: ab1d55c69efa50fc609351a88aa9f68d052e3f1f (<a href='/cgit/aur.git/plain/qml_internal_types.patch?h=bomi-git'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
</pre></td>
<td class='lines'><pre><code>diff --git a/src/bomi/imports/bomi/qmldir b/src/bomi/imports/bomi/qmldir
index 307cc33c..79d3e8b5 100644
<span class="hl kwb">--- a/src/bomi/imports/bomi/qmldir</span>
<span class="hl kwa">+++ b/src/bomi/imports/bomi/qmldir</span>
&#64;&#64; -35,3 +35,6 &#64;&#64; SimpleBlur 1.0 SimpleBlur.qml
ToolPlaneStyle 1.0 ToolPlaneStyle.qml
BarVisualizer 1.0 BarVisualizer.qml
StateButton 1.0 StateButton.qml
<span class="hl kwa">+internal Osd Osd.qml</span>
<span class="hl kwa">+internal PlayInfoText PlayInfoText.qml</span>
<span class="hl kwa">+internal PlayInfoTrack PlayInfoTrack.qml</span>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div id="footer">
<p>
Copyright &copy; 2004-2014 aurweb Development Team &ndash;
<strong>AUR packages are user produced content. Any use of the provided files is at your own risk.</strong>
</p>
</div>
</div> <!-- id=cgit -->
</body>
</html>

81
bomi/qt5.6.patch
View File

@ -1,81 +0,0 @@
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;