public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/, media-video/smplayer/files/
@ 2016-03-31 13:10 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2016-03-31 13:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a3bfce2c72862a17c5cc40e703c610e0e5472baf
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 13:10:22 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/, media-video/smplayer/files/
@ 2017-03-04  7:22 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-03-04  7:22 UTC (permalink / raw
  To: gentoo-commits

commit:     f27f4ce9a1bdeb2d105411ad21014d5bd70c2e4e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 07:18:49 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 07:22:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27f4ce9

media-video/smplayer: remove old

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 media-video/smplayer/Manifest                      |   3 -
 .../smplayer/files/smplayer-14.9.0-zero-bidi.patch |  27 ----
 .../smplayer/files/smplayer-16.4.0-frames-0.patch  |  16 ---
 media-video/smplayer/smplayer-14.9.0-r1.ebuild     |  84 ------------
 media-video/smplayer/smplayer-16.4.0-r2.ebuild     | 147 --------------------
 media-video/smplayer/smplayer-16.9.0.ebuild        | 148 ---------------------
 6 files changed, 425 deletions(-)

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index cf3188b9710..73a33cad5fd 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,5 +1,2 @@
-DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c9412f52762e9d9a9c2245b7ddf13 SHA512 78cecdad7e5f18c221a2f08a0472da01eb14db6230733616b805b6fccf2929c3f5b4dd92fd037362890a308967fa6602b89318c5376c3ce3a38d0dd9a1a17e43 WHIRLPOOL d7e621cd9ebcee450ce7aa9beaf1240c3d2f91271d2a6f043688c8688d77e8ad4761777a05ae77230966d050d647e700aa5bc8d3b566adc3fb724eaf9e315399
 DIST smplayer-16.1.0.tar.bz2 3966243 SHA256 d25c9b62d36c5ee63fb360e9a45566601d49d707e1364294a54967b956bdd8c9 SHA512 2c240a6cc392b84c7d6f725a02af33788ce7dbfae9d765d309e3b958fa9e2475e45c56b260e056118362848f64e478aa0ef9c67478fc44d9e42c568b4892e6ed WHIRLPOOL 8a7c989e3c77e6e7a696a958f848e8649f49131be80f26139b2aef17f3534cc18ab778def5083fee5a12c1e8291891e6c9d90ae26395c13a04e889ab2e4f616e
 DIST smplayer-16.11.0.tar.bz2 4254170 SHA256 e53a5d8b4d66fb0b7eb73053ef0bfdd2d942b79a16f8cc8d3d0b0771c7c80b5a SHA512 13776ff134c4c91747fa9432080a4ea876d5d5a134b91dde48d0f0e75c280ef6d19067906e4e850da3b1b2287214914528743495cccf7cbda310bc51682b478c WHIRLPOOL eadbf8af0247892dcaa38fd278b2316457626d573f10319d986e77aa0a58ef42cdc783efa95feffe292a38ebbb4b65d7203cabbc57f0332be711f9683c161139
-DIST smplayer-16.4.0.tar.bz2 4020567 SHA256 de4169c7e3a1d8bf6f3c9a77fa0a8c24c1f63db3f2b8a325bc6761c0a9d2d2ec SHA512 a75b1ff935912a5193854a12d0777e0c5883d4513b09869acdae9149dbc022ea77b0b2106f6c820401090127e1dcd585c74b6beb9af3abb36a0abfb58165246a WHIRLPOOL 18709aa1abbec5811a0e60295af68e42700760ec74890b7c85a36eab91d21bbf82efdcd42af5083da174a486910a691d9b957c8fbea0cea13b62a23167e4680c
-DIST smplayer-16.9.0.tar.bz2 4205771 SHA256 692e49fbfbcedaecf9e41f40e3f49905ec4d967e0b99b2c8c5fec1b6810ccdbe SHA512 ec424b583372df599c4785ae63d33dccbf963e6dd560faaf2159ca2aa47891f8a7797c3f0091ede8802d039ed97c5fdf6b944085abc7d50580f10fc8218e1902 WHIRLPOOL 076dbd5eb61fe94999a51737e621d7a507519a84a705c264911bedee56c4a79038d4e227e1d6612f53b9b9ea8423dace80e46eb5fbfa0c51c975498d3a48ee39

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
deleted file mode 100644
index a484432f14a..00000000000
--- a/media-video/smplayer/files/smplayer-14.9.0-zero-bidi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/files/smplayer-16.4.0-frames-0.patch b/media-video/smplayer/files/smplayer-16.4.0-frames-0.patch
deleted file mode 100644
index a65d6ec47bc..00000000000
--- a/media-video/smplayer/files/smplayer-16.4.0-frames-0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-14.9.0-r1.ebuild b/media-video/smplayer/smplayer-14.9.0-r1.ebuild
deleted file mode 100644
index b8429fd5846..00000000000
--- a/media-video/smplayer/smplayer-14.9.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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://www.smplayer.eu/"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="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}]
-"
-
-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
-}

diff --git a/media-video/smplayer/smplayer-16.4.0-r2.ebuild b/media-video/smplayer/smplayer-16.4.0-r2.ebuild
deleted file mode 100644
index 7492ebd0a1b..00000000000
--- a/media-video/smplayer/smplayer-16.4.0-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-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 qt5 streaming"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!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]
-			dev-qt/qtscript:4
-		)
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsingleapplication[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.10.0[libass,X]
-			streaming? ( >=net-misc/youtube-dl-2014.11.26 )
-		)
-	)
-"
-
-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
-
-	# Upstream Makefile sucks
-	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)' \
-		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:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		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:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn off youtube support (which pulls in extra dependencies) if unwanted
-	if ! use streaming ; then
-		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	use qt5 && eqmake5 || eqmake4
-}
-
-gen_translation() {
-	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() {
-	default
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# 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
-
-	default
-}

diff --git a/media-video/smplayer/smplayer-16.9.0.ebuild b/media-video/smplayer/smplayer-16.9.0.ebuild
deleted file mode 100644
index 225ac94e8c5..00000000000
--- a/media-video/smplayer/smplayer-16.9.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-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 qt5 streaming"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!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]
-			dev-qt/qtscript:4
-		)
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsingleapplication[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.10.0[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:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		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:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		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:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn off youtube support (which pulls in extra dependencies) if unwanted
-	if ! use streaming ; then
-		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#&:' \
-			-i src/smplayer.pro || die
-		sed -e 's:^#define PLAYLIST_DOWNLOAD://&:' \
-			-i src/playlist.h || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	use qt5 && eqmake5 || eqmake4
-}
-
-gen_translation() {
-	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() {
-	default
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# 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
-
-	default
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/, media-video/smplayer/files/
@ 2018-05-07 12:19 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-05-07 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     e101ecc3740756d2b69c369791f6ecb4c264ae9d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon May  7 12:18:57 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon May  7 12:19:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e101ecc3

media-video/smplayer: drop -Werror to allow gcc-8, bug #654724

gcc-8 covers even more potential buffer overflow conditions.
This causes new build failure due to blanket -Werror in smplayer.

For more details see Gentoo's take on -Werror handling in devmanual:
https://devmanual.gentoo.org/ebuild-writing/common-mistakes/index.html

Reported-by: Mike Lothian
Closes: https://bugs.gentoo.org/654724
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-video/smplayer/files/smplayer-18.3.0-disable-werror.patch | 9 +++++++++
 media-video/smplayer/smplayer-18.3.0.ebuild                     | 1 +
 media-video/smplayer/smplayer-18.4.0.ebuild                     | 1 +
 3 files changed, 11 insertions(+)

diff --git a/media-video/smplayer/files/smplayer-18.3.0-disable-werror.patch b/media-video/smplayer/files/smplayer-18.3.0-disable-werror.patch
new file mode 100644
index 00000000000..7905a44619f
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-18.3.0-disable-werror.patch
@@ -0,0 +1,9 @@
+gcc-8 is smarter about possible overflow detection.
+
+Reported-by: Mike Lothian
+Bug: https://bugs.gentoo.org/654724
+--- a/webserver/Makefile
++++ b/webserver/Makefile
+@@ -5 +5 @@ SOURCES = main.c mongoose.c
+-CFLAGS = -O2 -W -Wall -Werror -Wno-unused-function $(CFLAGS_EXTRA) $(MODULE_CFLAGS)
++CFLAGS = -O2 -W -Wall -Wno-unused-function $(CFLAGS_EXTRA) $(MODULE_CFLAGS)

diff --git a/media-video/smplayer/smplayer-18.3.0.ebuild b/media-video/smplayer/smplayer-18.3.0.ebuild
index d8ae8f1fe3c..711f309f6be 100644
--- a/media-video/smplayer/smplayer-18.3.0.ebuild
+++ b/media-video/smplayer/smplayer-18.3.0.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
 	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
 	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
+	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
 )
 
 src_prepare() {

diff --git a/media-video/smplayer/smplayer-18.4.0.ebuild b/media-video/smplayer/smplayer-18.4.0.ebuild
index 27c383e46b9..8b62e36f20f 100644
--- a/media-video/smplayer/smplayer-18.4.0.ebuild
+++ b/media-video/smplayer/smplayer-18.4.0.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
 	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
 	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
+	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/, media-video/smplayer/files/
@ 2019-10-28 10:26 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2019-10-28 10:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b92f4c1468dd127fdf8424719f46e8a895e7eb96
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 10:13:39 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 10:26:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b92f4c14

media-video/smplayer: Revbump to fix control issue with mpv-0.30.0

Thanks-to: Mike Lothian <mike <AT> fireburn.co.uk>
Closes: https://bugs.gentoo.org/698738
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/smplayer-19.5.0-mpv-0.30.0.patch         |  22 ++++
 media-video/smplayer/smplayer-19.5.0-r1.ebuild     | 135 +++++++++++++++++++++
 2 files changed, 157 insertions(+)

diff --git a/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch b/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch
new file mode 100644
index 00000000000..fd2bdc8ed9c
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch
@@ -0,0 +1,22 @@
+Index: smplayer/src/mpvprocess.cpp
+===================================================================
+--- smplayer/src/mpvprocess.cpp	(revision 9231)
++++ smplayer/src/mpvprocess.cpp	(revision 9232)
+@@ -122,7 +122,7 @@
+ 
+ void MPVProcess::initializeRX() {
+ #ifdef CUSTOM_STATUS
+-	rx_av.setPattern("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
++	rx_av.setPattern("STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
+ #else
+ 	rx_av.setPattern("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56
+ #endif
+@@ -197,7 +197,7 @@
+ 	static double last_sec = -1;
+ 
+ 	// Parse A: V: line
+-	//qDebug("MPVProcess::parseLine: %s", line.toUtf8().data());
++	//qDebug() << "MPVProcess::parseLine:" << line;
+ 	if (rx_av.indexIn(line) > -1) {
+ 		#ifdef CUSTOM_STATUS
+ 		double sec = rx_av.cap(1).toDouble();

diff --git a/media-video/smplayer/smplayer-19.5.0-r1.ebuild b/media-video/smplayer/smplayer-19.5.0-r1.ebuild
new file mode 100644
index 00000000000..28b157da097
--- /dev/null
+++ b/media-video/smplayer/smplayer-19.5.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2007-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en 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_BR pt 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 toolchain-funcs xdg
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="https://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 ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	autoshutdown? ( dev-qt/qtdbus:5 )
+	mpris? ( dev-qt/qtdbus:5 )
+"
+RDEPEND="${DEPEND}
+	|| (
+		media-video/mpv[libass,X]
+		media-video/mplayer[bidi?,libass,png,X]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
+	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
+	"${FILESDIR}/${P}-mpv-0.30.0.patch" #698738
+)
+
+src_prepare() {
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+	default
+
+	# Upstream Makefile sucks
+	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)' \
+		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:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		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:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Commented out because it gives false positives
+	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+	cd src || die
+	eqmake5
+}
+
+gen_translation() {
+	local mydir="$(qt5_get_bindir)"
+
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# 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
+
+	default
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "If you want URL support with media-video/mpv, please install"
+	elog "net-misc/youtube-dl."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/, media-video/smplayer/files/
@ 2020-05-07 14:06 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2020-05-07 14:06 UTC (permalink / raw
  To: gentoo-commits

commit:     c48ca4aee388922139be1ab0b5768ac6d95098f1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May  7 13:01:44 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May  7 14:06:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48ca4ae

media-video/smplayer: Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-video/smplayer/Manifest                      |   1 -
 .../files/smplayer-19.5.0-mpv-0.30.0.patch         |  22 ----
 media-video/smplayer/smplayer-19.5.0-r1.ebuild     | 135 ---------------------
 media-video/smplayer/smplayer-19.5.0.ebuild        | 134 --------------------
 4 files changed, 292 deletions(-)

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 3079c5a5069..cff6cc9694b 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,4 +1,3 @@
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
 DIST smplayer-19.10.2.tar.bz2 5178186 BLAKE2B e87efa8e433a304d4579bd852590690d23eb3cc93a50bb4aa2bfb1a4c2cbc6db63d4c8cb996b44018fb5b155d3f98104c8842d604a626fd76b39fdfa89866e91 SHA512 46327a1f988cfe8fe4e04f456057c2395f5ad011513988c1ffecf5c91cf2fdedbe8095cfba15f0f61c3e1cabc7f34b78d676bce430a79fcf542d74e14a33ec62
-DIST smplayer-19.5.0.tar.bz2 5175017 BLAKE2B e7160ca7d404dd6a8d7c316df3c39b2e238410435960d714aec271d2034030f9e1b59997d11d758188e327117f0eb773cb8baccc1defc20cd071e40c87deb07c SHA512 ee19186b3f4eac94b06a1e389e42edb8c2b22f8182b679bdc40e3ae1569a6c69f168260abfee3b2827b71b10eb353e7a3821805798f37aae2600af3b73d25ca1
 DIST smplayer-20.4.2.tar.bz2 5197394 BLAKE2B fe5f3ce279be478f93a71c521070e2564df331c56c6ac9410e0707101b7e662a16cbe65b439a194d253d3c4f49ce8e735eb19ad9a195e0e1f5d42461d3162925 SHA512 03404c2e7ba00d257ab2db82fe837eb4ab314c2b32a262ad18e75b245d43f812533f7e4609a6fe335c5c2e370cfb5fac8f0b3b8917c33a22c5b84f0074039156

diff --git a/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch b/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch
deleted file mode 100644
index fd2bdc8ed9c..00000000000
--- a/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: smplayer/src/mpvprocess.cpp
-===================================================================
---- smplayer/src/mpvprocess.cpp	(revision 9231)
-+++ smplayer/src/mpvprocess.cpp	(revision 9232)
-@@ -122,7 +122,7 @@
- 
- void MPVProcess::initializeRX() {
- #ifdef CUSTOM_STATUS
--	rx_av.setPattern("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
-+	rx_av.setPattern("STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
- #else
- 	rx_av.setPattern("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56
- #endif
-@@ -197,7 +197,7 @@
- 	static double last_sec = -1;
- 
- 	// Parse A: V: line
--	//qDebug("MPVProcess::parseLine: %s", line.toUtf8().data());
-+	//qDebug() << "MPVProcess::parseLine:" << line;
- 	if (rx_av.indexIn(line) > -1) {
- 		#ifdef CUSTOM_STATUS
- 		double sec = rx_av.cap(1).toDouble();

diff --git a/media-video/smplayer/smplayer-19.5.0-r1.ebuild b/media-video/smplayer/smplayer-19.5.0-r1.ebuild
deleted file mode 100644
index 28b157da097..00000000000
--- a/media-video/smplayer/smplayer-19.5.0-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2007-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en 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_BR pt 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 toolchain-funcs xdg
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://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 ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/mpv[libass,X]
-		media-video/mplayer[bidi?,libass,png,X]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-	"${FILESDIR}/${P}-mpv-0.30.0.patch" #698738
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	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)' \
-		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:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		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:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# 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
-
-	default
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "If you want URL support with media-video/mpv, please install"
-	elog "net-misc/youtube-dl."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}

diff --git a/media-video/smplayer/smplayer-19.5.0.ebuild b/media-video/smplayer/smplayer-19.5.0.ebuild
deleted file mode 100644
index 1863a883169..00000000000
--- a/media-video/smplayer/smplayer-19.5.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2007-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en 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_BR pt 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 toolchain-funcs xdg
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://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 ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/mpv[libass,X]
-		media-video/mplayer[bidi?,libass,png,X]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	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)' \
-		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:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		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:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# 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
-
-	default
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "If you want URL support with media-video/mpv, please install"
-	elog "net-misc/youtube-dl."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-05-07 14:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-31 13:10 [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/, media-video/smplayer/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2017-03-04  7:22 Michael Palimaka
2018-05-07 12:19 Sergei Trofimovich
2019-10-28 10:26 Lars Wendler
2020-05-07 14:06 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox