media-video/smplayer: USE=bidi (bug #507588)

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)

3 files changed, 121 insertions, 1 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 5e1a9ccbf321..8275d3af14ca 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.151 2014/10/04 04:50:06 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.152 2014/10/07 19:51:37 sping Exp $
+
+*smplayer-14.9.0-r1 (07 Oct 2014)
+
+  07 Oct 2014; Sebastian Pipping <sping@gentoo.org> +smplayer-14.9.0-r1.ebuild,
+  +files/smplayer-14.9.0-zero-bidi.patch:
+  Guard passing -noflip-hebrew to mplayer 1.x by USE=bidi (bug #507588)
 
   04 Oct 2014; Ben de Groot <yngwin@gentoo.org> metadata.xml,
   smplayer-14.9.0.ebuild:
diff --git a/media-video/smplayer/files/smplayer-14.9.0-zero-bidi.patch b/media-video/smplayer/files/smplayer-14.9.0-zero-bidi.patch
new file mode 100644
index 000000000000..a484432f14a2
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-14.9.0-zero-bidi.patch
@@ -0,0 +1,27 @@
+From 79a41ed3f12749df4a3a82f73e33aabeafa1a32f Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 7 Oct 2014 21:15:43 +0200
+Subject: [PATCH] Support mplayer 1.x without FriBiDi support
+
+---
+ src/core.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/core.cpp b/src/core.cpp
+index ef6f806..f5dfceb 100644
+--- a/src/core.cpp
++++ b/src/core.cpp
+@@ -1819,10 +1819,6 @@ void Core::startMplayer( QString file, double seek ) {
+ 		proc->addArgument( "-ass-font-scale");
+ 		proc->addArgument( QString::number(mset.sub_scale_ass) );
+ 
+-		if (!pref->mplayer_is_mplayer2) {
+-			proc->addArgument( "-noflip-hebrew" ); // It seems to be necessary to display arabic subtitles correctly when using -ass
+-		}
+-
+ 		if (!pref->force_ass_styles) {
+ 			// Load the styles.ass file
+ 			if (!QFile::exists(Paths::subtitleStyleFile())) {
+-- 
+2.1.1
+
diff --git a/media-video/smplayer/smplayer-14.9.0-r1.ebuild b/media-video/smplayer/smplayer-14.9.0-r1.ebuild
new file mode 100644
index 000000000000..a90be0c864f6
--- /dev/null
+++ b/media-video/smplayer/smplayer-14.9.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-14.9.0-r1.ebuild,v 1.1 2014/10/07 19:51:37 sping Exp $
+
+EAPI=5
+PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl he_IL hr hu it ja
+ka ko ku lt mk ms_MY nl pl pt pt_BR ro_RO ru_RU sk sl_SI sr sv th tr uk_UA vi_VN
+zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit eutils l10n qt4-r2
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="Great Qt4 GUI front-end for mplayer"
+HOMEPAGE="http://smplayer.sourceforge.net/"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug"
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	autoshutdown? ( dev-qt/qtdbus:4 )"
+COMMON_USE="libass,png,X"
+RDEPEND="${DEPEND}
+	|| (
+		media-video/mplayer[bidi?,${COMMON_USE}]
+		media-video/mplayer2[${COMMON_USE}]
+	)"
+
+src_prepare() {
+	use bidi || epatch "${FILESDIR}"/${P}-zero-bidi.patch
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/s:${EPREFIX}/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"
+
+	# 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"
+	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"
+	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"
+
+	# l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
+}
+
+src_configure() {
+	cd "${S}"/src
+	echo "#define SVN_REVISION \"SVN-${MY_PV} (Gentoo)\"" > svn_revision.h
+	eqmake4
+}
+
+gen_translation() {
+	ebegin "Generating $1 translation"
+	lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of licenses
+	rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
+	rm -r docs/{de,es,fr,nl,ro} || die
+
+	emake DESTDIR="${D}" install
+}