Update to upstream version 2.0.2

Changes:	https://github.com/u8sand/Baka-MPlayer/releases/tag/v2.0.2
Differential Revision:	https://reviews.freebsd.org/D1686
Approved by:	bapt (mentor)
This commit is contained in:
Jan Beich 2015-01-27 12:59:34 +00:00
parent 122d3732a8
commit 48b980c061
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=378007
6 changed files with 60 additions and 58 deletions

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= baka-mplayer
DISTVERSION= 2.0.1
DISTVERSION= 2.0.2
CATEGORIES= multimedia audio
MAINTAINER= jbeich@FreeBSD.org
@ -15,7 +15,7 @@ USE_GITHUB= yes
GH_ACCOUNT= u8sand
GH_PROJECT= Baka-MPlayer
GH_TAGNAME= v${DISTVERSION}
GH_COMMIT= a76ef8d
GH_COMMIT= ba6dc76
USES= compiler:c++11-lib pkgconfig qmake
USE_QT5= qmake_build buildtools_build gui network svg widgets x11extras
@ -40,9 +40,6 @@ post-patch:
${WRKSRC}/src/Baka-MPlayer.pro
post-install:
# XXX vendor install_man is too broken
${INSTALL_MAN} ${WRKSRC}/etc/doc/${PORTNAME}.man \
${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
@(cd ${WRKSRC}/etc/logo && for f in *.png; do \
${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%.*}/apps; \
${INSTALL_DATA} -v $$f \

View file

@ -1,2 +1,2 @@
SHA256 (baka-mplayer-2.0.1.tar.gz) = 0007ede896d3721d6fc7296e1b0b15f21386ddcc539cd72f3b63f922178f74bd
SIZE (baka-mplayer-2.0.1.tar.gz) = 439926
SHA256 (baka-mplayer-2.0.2.tar.gz) = 84375339f6abd5e46557e848ecab691943e8c3f1b10b8d9acfc1220299028764
SIZE (baka-mplayer-2.0.2.tar.gz) = 462754

View file

@ -0,0 +1,36 @@
Workaround Clang 3.3 failing to build with:
In file included from build/moc/moc_keydialog.cpp:9:
build/moc/../../src/ui/keydialog.h:18:150: error: expected ')'
QPair<QString, QPair<QString, QString>> SelectKey(bool add, QPair<QString, QPair<QString, QString>> init = QPair<QString, QPair<QString, QString>>());
^
build/moc/../../src/ui/keydialog.h:18:54: note: to match this '('
QPair<QString, QPair<QString, QString>> SelectKey(bool add, QPair<QString, QPair<QString, QString>> init = QPair<QString, QPair<QString, QString>>());
^
build/moc/../../src/ui/keydialog.h:18:125: error: expected '>'
QPair<QString, QPair<QString, QString>> SelectKey(bool add, QPair<QString, QPair<QString, QString>> init = QPair<QString, QPair<QString, QString>>());
^
2 errors generated.
--- src/ui/keydialog.h~
+++ src/ui/keydialog.h
@@ -15,7 +15,7 @@ public:
explicit KeyDialog(QWidget *parent = 0);
~KeyDialog();
- QPair<QString, QPair<QString, QString>> SelectKey(bool add, QPair<QString, QPair<QString, QString>> init = QPair<QString, QPair<QString, QString>>());
+ QPair<QString, QPair<QString, QString>> SelectKey(bool add, QPair<QString, QPair<QString, QString>> init = (QPair<QString, QPair<QString, QString>>()));
protected:
void SetButtons();
--- src/ui/preferencesdialog.h~
+++ src/ui/preferencesdialog.h
@@ -27,7 +27,7 @@ protected:
void AddRow(QString first, QString second, QString third);
void ModifyRow(int row, QString first, QString second, QString third);
void RemoveRow(int row);
- void SelectKey(bool add, QPair<QString, QPair<QString, QString>> init = QPair<QString, QPair<QString, QString>>());
+ void SelectKey(bool add, QPair<QString, QPair<QString, QString>> init = (QPair<QString, QPair<QString, QString>>()));
private:
Ui::PreferencesDialog *ui;

View file

@ -1,50 +0,0 @@
commit 12cacc9
Author: Daniel Clarke <u8sand@gmail.com>
Date: Sun Dec 28 23:00:42 2014 -0500
.pro adjustment to deal with INSTROOT
---
src/Baka-MPlayer.pro | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git src/Baka-MPlayer.pro src/Baka-MPlayer.pro
index 22c5901..8508447 100644
--- src/Baka-MPlayer.pro
+++ src/Baka-MPlayer.pro
@@ -38,21 +38,21 @@ win32 {
}
# INSTROOT is the installation root directory, leave empty if not using a package management system
-isEmpty(BINDIR):BINDIR=$$INSTROOT/usr/bin
-isEmpty(MEDIADIR):MEDIADIR=$$INSTROOT/usr/share/pixmaps
-isEmpty(APPDIR):APPDIR=$$INSTROOT/usr/share/applications
-isEmpty(DOCDIR):DOCDIR=$$INSTROOT/usr/share/doc
-isEmpty(MANDIR):MANDIR=$$INSTROOT/usr/share/man
-isEmpty(LICENSEDIR):LICENSEDIR=$$INSTROOT/usr/share/licenses
-isEmpty(BAKADIR):BAKADIR=$$INSTROOT/usr/share/baka-mplayer
-
-target.path = $$BINDIR
-logo.path = $$MEDIADIR
-desktop.path = $$APPDIR
-manual.path = $$DOCDIR/baka-mplayer
-man.path = $$MANDIR/man1
-license.path = $$LICENSEDIR/baka-mplayer
-translations.path = $$BAKADIR/translations
+isEmpty(BINDIR):BINDIR=/usr/bin
+isEmpty(MEDIADIR):MEDIADIR=/usr/share/pixmaps
+isEmpty(APPDIR):APPDIR=/usr/share/applications
+isEmpty(DOCDIR):DOCDIR=/usr/share/doc
+isEmpty(MANDIR):MANDIR=/usr/share/man
+isEmpty(LICENSEDIR):LICENSEDIR=/usr/share/licenses
+isEmpty(BAKADIR):BAKADIR=/usr/share/baka-mplayer
+
+target.path = $$INSTROOT$$BINDIR
+logo.path = $$INSTROOT$$MEDIADIR
+desktop.path = $$INSTROOT$$APPDIR
+manual.path = $$INSTROOT$$DOCDIR/baka-mplayer
+man.path = $$INSTROOT$$MANDIR/man1
+license.path = $$INSTROOT$$LICENSEDIR/baka-mplayer
+translations.path = $$INSTROOT$$BAKADIR/translations
logo.files = ../etc/logo/baka-mplayer.svg
desktop.files = ../etc/baka-mplayer.desktop

View file

@ -0,0 +1,18 @@
libc++ (unlike libstdc++) doesn't bootleg <locale.h> via <string>:
src/main.cpp:17:15: error: use of undeclared identifier 'LC_NUMERIC'
setlocale(LC_NUMERIC, "C"); // for mpv
^
1 error generated.
--- src/main.cpp~
+++ src/main.cpp
@@ -4,6 +4,8 @@
#include <QLocale>
#include <QString>
+#include <locale.h>
+
#if defined(Q_OS_WIN)
#include <windows.h>
#endif

View file

@ -1,10 +1,11 @@
bin/baka-mplayer
man/man1/baka-mplayer.1.gz
share/applications/baka-mplayer.desktop
%%NLS%%%%DATADIR%%/translations/baka-mplayer_it.qm
%%NLS%%%%DATADIR%%/translations/baka-mplayer_ko.qm
%%NLS%%%%DATADIR%%/translations/baka-mplayer_pt.qm
%%NLS%%%%DATADIR%%/translations/baka-mplayer_ru.qm
%%NLS%%%%DATADIR%%/translations/baka-mplayer_zh.qm
%%NLS%%%%DATADIR%%/translations/baka-mplayer_zh_CN.qm
%%PORTDOCS%%%%DOCSDIR%%/baka-mplayer.md
share/icons/hicolor/128x128/apps/baka-mplayer.png
share/icons/hicolor/16x16/apps/baka-mplayer.png