commit: 9dd5ed38a1e7779b4c8b7b5ae1f339206722cda0
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 17:28:42 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 17:30:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd5ed38
media-video/smplayer: revision bump with several changes
o Apply patch by Navid Zamani <navid.zamani <AT> gmail.com> to prevent
smplayer
from hanging when adding an audio file to the playlist. Fixes bug 554986.
Patch already sent upstream and merged.
o Use only one USE flag to choose between qt4 and qt5, per Qt team policy.
o Various ebuild cleanups.
Package-Manager: portage-2.2.28
.../smplayer/files/smplayer-16.4.0-frames-0.patch | 16 ++++
...-16.4.0-r1.ebuild => smplayer-16.4.0-r2.ebuild} | 92 +++++++++++-----------
2 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/media-video/smplayer/files/smplayer-16.4.0-frames-0.patch
b/media-video/smplayer/files/smplayer-16.4.0-frames-0.patch
new file mode 100644
index 0000000..a65d6ec
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-16.4.0-frames-0.patch
@@ -0,0 +1,16 @@
+Index: src/infoprovider.cpp
+===================================================================
+diff --git a/src/infoprovider.cpp b/src/infoprovider.cpp
+--- a/src/infoprovider.cpp (revision 7728)
++++ b/src/infoprovider.cpp (revision 7729)
+@@ -35,7 +35,9 @@
+
+ proc->setExecutable(mplayer_bin);
+ proc->setFixedOptions();
+- proc->setOption("frames", "1");
++ QString nframes = "1";
++ if (proc->isMPlayer()) nframes = "0";
++ proc->setOption("frames", nframes);
+ proc->setOption("vo", "null");
+ proc->setOption("ao", "null");
+ #ifdef Q_OS_WIN
diff --git a/media-video/smplayer/smplayer-16.4.0-r1.ebuild
b/media-video/smplayer/smplayer-16.4.0-r2.ebuild
similarity index 52%
rename from media-video/smplayer/smplayer-16.4.0-r1.ebuild
rename to media-video/smplayer/smplayer-16.4.0-r2.ebuild
index f658ecc..acb68c0 100644
--- a/media-video/smplayer/smplayer-16.4.0-r1.ebuild
+++ b/media-video/smplayer/smplayer-16.4.0-r2.ebuild
@@ -4,10 +4,11 @@
EAPI=6
-PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr
-hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU sk sl_SI
sq_AL
-sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALES="am ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
PLOCALE_BACKUP="en_US"
+
inherit l10n qmake-utils
DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
@@ -17,25 +18,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
+IUSE="autoshutdown bidi debug mpris qt5 streaming"
COMMON_DEPEND="
sys-libs/zlib
- qt4? (
+ !qt5? (
dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtsingleapplication[X,qt4]
autoshutdown? ( dev-qt/qtdbus:4 )
mpris? ( dev-qt/qtdbus:4 )
- streaming? ( dev-qt/qtcore:4[ssl] )
+ streaming? (
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtscript:4
+ )
)
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+ dev-qt/qtsingleapplication[X,qt5]
dev-qt/qtwidgets:5
dev-qt/qtxml:5
autoshutdown? ( dev-qt/qtdbus:5 )
@@ -61,86 +63,86 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" #
bug 487544
+ "${FILESDIR}/${PN}-16.4.0-frames-0.patch" # bug 554986
)
src_prepare() {
default
- use bidi || eapply "${FILESDIR}/${PN}-16.4.0-zero-bidi.patch"
+ use bidi || eapply "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch
# Upstream Makefile sucks
- sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
- -e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
+ sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+ -e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-e '/\.\/get_svn_revision\.sh/,+2c\
cd src && $(DEFS) $(MAKE)' \
- "${S}"/Makefile || die "sed failed"
+ Makefile || die
+
+ # Turn off online update checker, bug #479902
+ sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+ -e 's:DEFINES += CHECK_UPGRADED:#&:' \
+ -i src/smplayer.pro || die
+
+ # Turn off intrusive share widget
+ sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+ -i src/smplayer.pro || die
# Toggle autoshutdown option which pulls in dbus, bug #524392
if ! use autoshutdown ; then
- sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES +=
AUTO_SHUTDOWN_PC:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
+ sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+ -i src/smplayer.pro || die
fi
# Turn debug message flooding off
if ! use debug ; then
- sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
- "${S}"/src/smplayer.pro || die "sed failed"
+ sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+ -i src/smplayer.pro || die
fi
# MPRIS2 pulls in dbus, bug #553710
if ! use mpris ; then
- sed -e 's:DEFINES += MPRIS2:#DEFINES += MPRIS2:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
+ sed -e 's:DEFINES += MPRIS2:#&:' \
+ -i src/smplayer.pro || die
fi
- # Turn off online update checker, bug #479902
- sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
- -e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
-
- # Turn off intrusive share widget
- sed -e 's:DEFINES += SHARE_WIDGET:#DEFINES += SHARE_WIDGET:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
-
# Turn off youtube support (which pulls in extra dependencies) if
unwanted
if ! use streaming ; then
- sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES +=
YOUTUBE_SUPPORT:' \
- -i "${S}"/src/smplayer.pro || die "sed failed"
+ sed -e 's:DEFINES += YOUTUBE_SUPPORT:#&:' \
+ -i src/smplayer.pro || die
fi
- l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
+ # Commented out because it gives false positives
+ #l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
}
src_configure() {
- pushd src > /dev/null || die
- use qt4 && eqmake4
- use qt5 && eqmake5
- popd > /dev/null || die
+ cd src || die
+ use qt5 && eqmake5 || eqmake4
}
gen_translation() {
- local mydir
- if use qt4; then
- mydir="$(qt4_get_bindir)"
- elif use qt5; then
+ local mydir="$(qt4_get_bindir)"
+ if use qt5; then
mydir="$(qt5_get_bindir)"
fi
+
ebegin "Generating $1 translation"
"${mydir}"/lrelease ${PN}_${1}.ts
eend $? || die "failed to generate $1 translation"
}
src_compile() {
- emake
+ default
- cd "${S}"/src/translations
+ cd src/translations || die
l10n_for_each_locale_do gen_translation
}
src_install() {
- # remove unneeded copies of licenses
- rm Copying* docs/*/gpl.html || die
- rm -r docs/{de,es,fr,nl,ro} || die
+ # remove unneeded copies of the GPL
+ rm -f Copying* docs/*/gpl.html || die
+ # don't install empty dirs
+ rmdir --ignore-fail-on-non-empty docs/* || die
- emake DESTDIR="${D}" install
+ default
}
