From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 31E3159CAB for ; Thu, 31 Mar 2016 13:10:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6729B21C00F; Thu, 31 Mar 2016 13:10:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E59BB21C00F for ; Thu, 31 Mar 2016 13:10:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E34C340C35 for ; Thu, 31 Mar 2016 13:10:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D857B20E for ; Thu, 31 Mar 2016 13:10:52 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1459429848.a3bfce2c72862a17c5cc40e703c610e0e5472baf.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/, media-video/smplayer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/smplayer/Manifest media-video/smplayer/files/smplayer-16.4.0-zero-bidi.patch media-video/smplayer/smplayer-16.4.0.ebuild X-VCS-Directories: media-video/smplayer/ media-video/smplayer/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a3bfce2c72862a17c5cc40e703c610e0e5472baf X-VCS-Branch: master Date: Thu, 31 Mar 2016 13:10:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 695a0f4f-d13e-4cff-829c-d50fe9b599c0 X-Archives-Hash: cb17bc7a40411f98cee53e3e0ced76d5 commit: a3bfce2c72862a17c5cc40e703c610e0e5472baf Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 31 13:10:22 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Mar 31 13:10:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3bfce2c media-video/smplayer: Bump to version 16.4.0 Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> media-video/smplayer/Manifest | 1 + .../smplayer/files/smplayer-16.4.0-zero-bidi.patch | 16 +++ media-video/smplayer/smplayer-16.4.0.ebuild | 146 +++++++++++++++++++++ 3 files changed, 163 insertions(+) diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 63577fa..23f8cf0 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -1,3 +1,4 @@ DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c9412f52762e9d9a9c2245b7ddf13 SHA512 78cecdad7e5f18c221a2f08a0472da01eb14db6230733616b805b6fccf2929c3f5b4dd92fd037362890a308967fa6602b89318c5376c3ce3a38d0dd9a1a17e43 WHIRLPOOL d7e621cd9ebcee450ce7aa9beaf1240c3d2f91271d2a6f043688c8688d77e8ad4761777a05ae77230966d050d647e700aa5bc8d3b566adc3fb724eaf9e315399 DIST smplayer-15.11.0.tar.bz2 3933281 SHA256 968901fa2c86c13934c5228a8ae8a74188cdb27e49ecc05546e71eac642f19c1 SHA512 a8354a4fbb886654c654e5413e9281a38396e46dd5128fd05192b17cf1b55c6888cdb300dcaabcfaecc26581e09f1fe57c1304afa70f93b35692d418589e5cea WHIRLPOOL 201411d950a3ac841e3059640180f8ed0f7c0d06f332e33c08edc01ba3ca7ee5c55ab659f0ab6a923971cda273b343ef8a76ab930fb00adc348c7564a6d698eb DIST smplayer-16.1.0.tar.bz2 3966243 SHA256 d25c9b62d36c5ee63fb360e9a45566601d49d707e1364294a54967b956bdd8c9 SHA512 2c240a6cc392b84c7d6f725a02af33788ce7dbfae9d765d309e3b958fa9e2475e45c56b260e056118362848f64e478aa0ef9c67478fc44d9e42c568b4892e6ed WHIRLPOOL 8a7c989e3c77e6e7a696a958f848e8649f49131be80f26139b2aef17f3534cc18ab778def5083fee5a12c1e8291891e6c9d90ae26395c13a04e889ab2e4f616e +DIST smplayer-16.4.0.tar.bz2 4020567 SHA256 de4169c7e3a1d8bf6f3c9a77fa0a8c24c1f63db3f2b8a325bc6761c0a9d2d2ec SHA512 a75b1ff935912a5193854a12d0777e0c5883d4513b09869acdae9149dbc022ea77b0b2106f6c820401090127e1dcd585c74b6beb9af3abb36a0abfb58165246a WHIRLPOOL 18709aa1abbec5811a0e60295af68e42700760ec74890b7c85a36eab91d21bbf82efdcd42af5083da174a486910a691d9b957c8fbea0cea13b62a23167e4680c diff --git a/media-video/smplayer/files/smplayer-16.4.0-zero-bidi.patch b/media-video/smplayer/files/smplayer-16.4.0-zero-bidi.patch new file mode 100644 index 0000000..d36f072 --- /dev/null +++ b/media-video/smplayer/files/smplayer-16.4.0-zero-bidi.patch @@ -0,0 +1,16 @@ +--- smplayer-16.4.0/src/core.cpp ++++ smplayer-16.4.0/src/core.cpp +@@ -1832,13 +1832,6 @@ + + proc->setOption("ass-font-scale", QString::number(mset.sub_scale_ass)); + +- #ifdef MPLAYER2_SUPPORT +- if (!pref->mplayer_is_mplayer2) +- #endif +- { +- proc->setOption("flip-hebrew",false); // It seems to be necessary to display arabic subtitles correctly when using -ass +- } +- + if (pref->enable_ass_styles) { + QString ass_force_style; + if (!pref->user_forced_ass_style.isEmpty()) { diff --git a/media-video/smplayer/smplayer-16.4.0.ebuild b/media-video/smplayer/smplayer-16.4.0.ebuild new file mode 100644 index 0000000..aaebd9c --- /dev/null +++ b/media-video/smplayer/smplayer-16.4.0.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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" +PLOCALE_BACKUP="en_US" +inherit l10n qmake-utils + +DESCRIPTION="Great Qt GUI front-end for mplayer/mpv" +HOMEPAGE="http://www.smplayer.eu/" +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 )" + +COMMON_DEPEND=" + sys-libs/zlib + qt4? ( + 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] ) + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + autoshutdown? ( dev-qt/qtdbus:5 ) + mpris? ( dev-qt/qtdbus:5 ) + streaming? ( + dev-qt/qtnetwork:5[ssl] + dev-qt/qtscript:5 + ) + ) +" +DEPEND="${COMMON_DEPEND} + qt5? ( dev-qt/linguist-tools:5 ) +" +RDEPEND="${COMMON_DEPEND} + || ( + media-video/mplayer[bidi?,libass,png,X] + ( + >=media-video/mpv-0.6.2[libass,X] + streaming? ( >=net-misc/youtube-dl-2014.11.26 ) + ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544 +) + +src_prepare() { + default + + 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}:" \ + -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 + + # 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" + 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 nasty share widget + sed -e 's:DEFINES += SHAREWIDGET:#DEFINES += SHAREWIDGET:' \ + -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" + fi + + 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 +} + +gen_translation() { + local mydir + if use qt4; then + mydir="$(qt4_get_bindir)" + elif 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 + + cd "${S}"/src/translations + 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 + + emake DESTDIR="${D}" install +}