Date: Tue, 27 Jan 2015 12:59:35 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378007 - in head/multimedia/baka-mplayer: . files Message-ID: <201501271259.t0RCxZxx028872@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Jan 27 12:59:34 2015 New Revision: 378007 URL: https://svnweb.freebsd.org/changeset/ports/378007 QAT: https://qat.redports.org/buildarchive/r378007/ Log: 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) Added: head/multimedia/baka-mplayer/files/patch-clang33 (contents, props changed) head/multimedia/baka-mplayer/files/patch-src_main.cpp (contents, props changed) Deleted: head/multimedia/baka-mplayer/files/patch-src_Baka-MPlayer.pro Modified: head/multimedia/baka-mplayer/Makefile head/multimedia/baka-mplayer/distinfo head/multimedia/baka-mplayer/pkg-plist Modified: head/multimedia/baka-mplayer/Makefile ============================================================================== --- head/multimedia/baka-mplayer/Makefile Tue Jan 27 12:49:31 2015 (r378006) +++ head/multimedia/baka-mplayer/Makefile Tue Jan 27 12:59:34 2015 (r378007) @@ -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 \ Modified: head/multimedia/baka-mplayer/distinfo ============================================================================== --- head/multimedia/baka-mplayer/distinfo Tue Jan 27 12:49:31 2015 (r378006) +++ head/multimedia/baka-mplayer/distinfo Tue Jan 27 12:59:34 2015 (r378007) @@ -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 Added: head/multimedia/baka-mplayer/files/patch-clang33 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/baka-mplayer/files/patch-clang33 Tue Jan 27 12:59:34 2015 (r378007) @@ -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; Added: head/multimedia/baka-mplayer/files/patch-src_main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/baka-mplayer/files/patch-src_main.cpp Tue Jan 27 12:59:34 2015 (r378007) @@ -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 Modified: head/multimedia/baka-mplayer/pkg-plist ============================================================================== --- head/multimedia/baka-mplayer/pkg-plist Tue Jan 27 12:49:31 2015 (r378006) +++ head/multimedia/baka-mplayer/pkg-plist Tue Jan 27 12:59:34 2015 (r378007) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501271259.t0RCxZxx028872>