| 1 |
commit: c231fe9f0abe6bda9bb385052ca0289d8655b9a4 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 26 19:27:52 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 26 19:28:24 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c231fe9f |
| 7 |
|
| 8 |
media-video/baka-mplayer: backport patch from upstream to resolve build failure with GCC 5 |
| 9 |
|
| 10 |
Gentoo-bug: 591270 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.2 |
| 13 |
|
| 14 |
media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild | 4 ++- |
| 15 |
.../files/baka-mplayer-2.0.4-gcc5.patch | 32 ++++++++++++++++++++++ |
| 16 |
2 files changed, 35 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild |
| 19 |
index ee266ad..1579da0 100644 |
| 20 |
--- a/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild |
| 21 |
+++ b/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild |
| 22 |
@@ -3,7 +3,7 @@ |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
EAPI=5 |
| 26 |
-inherit qmake-utils |
| 27 |
+inherit eutils qmake-utils |
| 28 |
|
| 29 |
DESCRIPTION="Cross-platform libmpv-based multimedia player with uncluttered design" |
| 30 |
HOMEPAGE="http://bakamplayer.u8sand.net/" |
| 31 |
@@ -32,6 +32,8 @@ src_prepare() { |
| 32 |
sed -e '/^INSTALLS/s:license::' -i src/Baka-MPlayer.pro || die |
| 33 |
# put manual in our docdir |
| 34 |
sed -e '/^manual.path/s:'${PN}':'${PF}':' -i src/Baka-MPlayer.pro || die |
| 35 |
+ |
| 36 |
+ epatch "${FILESDIR}/${P}-gcc5.patch" |
| 37 |
} |
| 38 |
|
| 39 |
src_configure() { |
| 40 |
|
| 41 |
diff --git a/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch |
| 42 |
new file mode 100644 |
| 43 |
index 00000000..97ff525 |
| 44 |
--- /dev/null |
| 45 |
+++ b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch |
| 46 |
@@ -0,0 +1,32 @@ |
| 47 |
+From 640cac8bab18cffca8258645c2b13b4defc01a8e Mon Sep 17 00:00:00 2001 |
| 48 |
+From: Jan Beich <jbeich@×××××××.org> |
| 49 |
+Date: Wed, 2 Dec 2015 02:38:44 +0000 |
| 50 |
+Subject: [PATCH] Explicitly use <cmath> to unbreak build with libc++ |
| 51 |
+ |
| 52 |
+src/ui/mainwindow.cpp:996:53: error: use of undeclared identifier 'ceil' |
| 53 |
+ playlistRect.setLeft(playlistRect.right() - ceil(playlistRect.width()/7.0)) |
| 54 |
+--- |
| 55 |
+ src/ui/mainwindow.cpp | 3 ++- |
| 56 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
| 57 |
+ |
| 58 |
+diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp |
| 59 |
+index 4f051ad..c3f5f92 100644 |
| 60 |
+--- a/src/ui/mainwindow.cpp |
| 61 |
++++ b/src/ui/mainwindow.cpp |
| 62 |
+@@ -1,6 +1,7 @@ |
| 63 |
+ #include "mainwindow.h" |
| 64 |
+ #include "ui_mainwindow.h" |
| 65 |
+ |
| 66 |
++#include <cmath> |
| 67 |
+ #include <QLibraryInfo> |
| 68 |
+ #include <QMimeData> |
| 69 |
+ #include <QDesktopWidget> |
| 70 |
+@@ -993,7 +994,7 @@ void MainWindow::mouseMoveEvent(QMouseEvent *event) |
| 71 |
+ ui->seekBar->setVisible(showPlayback || ui->outputTextEdit->isVisible()); |
| 72 |
+ |
| 73 |
+ QRect playlistRect = geometry(); |
| 74 |
+- playlistRect.setLeft(playlistRect.right() - ceil(playlistRect.width()/7.0)); |
| 75 |
++ playlistRect.setLeft(playlistRect.right() - std::ceil(playlistRect.width()/7.0)); |
| 76 |
+ bool showPlaylist = playlistRect.contains(event->globalPos()); |
| 77 |
+ ShowPlaylist(showPlaylist); |
| 78 |
+ |
Archives