public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/files/, media-video/smplayer/
@ 2016-04-25 17:30 Davide Pesavento
  0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2016-04-25 17:30 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/files/, media-video/smplayer/
@ 2017-10-06 13:47 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2017-10-06 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     28306987b459dbb068bb794fc6b45963838def96
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  6 13:46:52 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct  6 13:47:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28306987

media-video/smplayer: Bump to version 17.10.0 (bug #614888).

Removed qt4 dependency.

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-video/smplayer/Manifest                      |   1 +
 .../files/smplayer-17.1.0-advertisement_crap.patch |  85 ++++++++++++++
 media-video/smplayer/smplayer-17.10.0.ebuild       | 122 +++++++++++++++++++++
 3 files changed, 208 insertions(+)

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 73a33cad5fd..99ae84a1f35 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,2 +1,3 @@
 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-17.10.0.tar.bz2 5050760 SHA256 3d40a999343c647cc758a8d5026be9d355dcc84317700128578e51db9f982375 SHA512 c06f8e6043a870291cc29eba57b8bb5034fbceb19b24987751467e874a00d4e95f57933708d71375fdc38fdc32de68d77a7d9180c3eee1f9011eb1cfa421bbb0 WHIRLPOOL b4738ce430fadf60c743a05dcf1e491ec37d88a4ff83db75ac238f479a6031efe8bfd1a70af389cf2bd22cfd5236adb4e22e7c7a23321a53966e9a1f738d0db2

diff --git a/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch b/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch
new file mode 100644
index 00000000000..2792d189b09
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch
@@ -0,0 +1,85 @@
+--- smplayer-17.1.0/src/basegui.cpp
++++ smplayer-17.1.0/src/basegui.cpp
+@@ -906,9 +906,11 @@
+ 	connect( showConfigAct, SIGNAL(triggered()),
+              this, SLOT(helpShowConfig()) );
+ 
++#ifdef DONATE_REMINDER
+ 	donateAct = new MyAction( this, "donate" );
+ 	connect( donateAct, SIGNAL(triggered()),
+              this, SLOT(helpDonate()) );
++#endif
+ 
+ 	aboutThisAct = new MyAction( this, "about_smplayer" );
+ 	connect( aboutThisAct, SIGNAL(triggered()),
+@@ -1846,8 +1848,10 @@
+ #ifdef SHARE_ACTIONS
+ 	donateAct->change( Images::icon("donate"), tr("&Donate / Share with your friends") );
+ #else
++#ifdef DONATE_REMINDER
+ 	donateAct->change( Images::icon("donate"), tr("&Donate") );
+ #endif
++#endif
+ 	aboutThisAct->change( Images::icon("logo"), tr("About &SMPlayer") );
+ 
+ #ifdef SHARE_MENU
+@@ -2993,8 +2997,10 @@
+ 		helpMenu->addAction(showConfigAct);
+ 		helpMenu->addSeparator();
+ 	}
++	#ifdef DONATE_REMINDER
+ 	helpMenu->addAction(donateAct);
+ 	helpMenu->addSeparator();
++	#endif
+ 	helpMenu->addAction(aboutThisAct);
+ 
+ 	// Access menu
+@@ -4489,6 +4495,7 @@
+ 	}
+ }
+ #else
++#ifdef DONATE_REMINDER
+ void BaseGui::helpDonate() {
+ 	qDebug("BaseGui::helpDonate");
+ 
+@@ -4530,6 +4537,7 @@
+ 	if (accepted != 0) *accepted = result;
+ }
+ #endif
++#endif
+ 
+ void BaseGui::helpAbout() {
+ 	About d(this);
+--- smplayer-17.1.0/src/basegui.h
++++ smplayer-17.1.0/src/basegui.h
+@@ -73,10 +73,6 @@
+ class ShareWidget;
+ #endif
+ 
+-#ifndef SHARE_WIDGET
+-#define DONATE_REMINDER
+-#endif
+-
+ class BaseGui : public QMainWindow
+ {
+ 	Q_OBJECT
+@@ -129,8 +125,8 @@
+ 	virtual void helpFAQ();
+ 	virtual void helpCLOptions();
+ 	virtual void helpCheckUpdates();
++#ifdef DONATE_REMINDER
+ 	virtual void helpDonate();
+-#ifndef SHARE_ACTIONS
+ 	void showHelpDonateDialog(bool * accepted = 0);
+ #endif
+ 	virtual void helpShowConfig();
+@@ -574,7 +570,9 @@
+ 	MyAction * updateYTAct;
+ #endif
+ 	MyAction * showConfigAct;
++#ifdef DONATE_REMINDER
+ 	MyAction * donateAct;
++#endif
+ 	MyAction * aboutThisAct;
+ 
+ #ifdef SHARE_MENU

diff --git a/media-video/smplayer/smplayer-17.10.0.ebuild b/media-video/smplayer/smplayer-17.10.0.ebuild
new file mode 100644
index 00000000000..af78153a643
--- /dev/null
+++ b/media-video/smplayer/smplayer-17.10.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+
+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"
+
+COMMON_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 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.10.0[libass,X]
+			>=net-misc/youtube-dl-2014.11.26
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.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() {
+	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/files/, media-video/smplayer/
@ 2018-02-10 11:48 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2018-02-10 11:48 UTC (permalink / raw
  To: gentoo-commits

commit:     b996d9d8a14696f6e90b4764afa7ee35a484468d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 11:48:08 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 11:48:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b996d9d8

media-video/smplayer: fix make jobserver unavailable

Closes: https://bugs.gentoo.org/645742
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../smplayer/files/smplayer-18.2.0-jobserver.patch     | 18 ++++++++++++++++++
 media-video/smplayer/smplayer-18.2.0.ebuild            |  1 +
 2 files changed, 19 insertions(+)

diff --git a/media-video/smplayer/files/smplayer-18.2.0-jobserver.patch b/media-video/smplayer/files/smplayer-18.2.0-jobserver.patch
new file mode 100644
index 00000000000..7bd6c75145c
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-18.2.0-jobserver.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/645742
+
+--- a/Makefile
++++ b/Makefile
+@@ -25,11 +25,11 @@
+ 
+ src/smplayer:
+ 	./get_svn_revision.sh
+-	+cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make
++	+cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) $(MAKE)
+ 	cd src && $(LRELEASE) smplayer.pro
+ 
+ webserver/simple_web_server:
+-	cd webserver && make
++	cd webserver && $(MAKE)
+ 
+ clean:
+ 	if [ -f src/Makefile ]; then cd src && make distclean; fi

diff --git a/media-video/smplayer/smplayer-18.2.0.ebuild b/media-video/smplayer/smplayer-18.2.0.ebuild
index 9b618aad364..7c9ad23ef75 100644
--- a/media-video/smplayer/smplayer-18.2.0.ebuild
+++ b/media-video/smplayer/smplayer-18.2.0.ebuild
@@ -47,6 +47,7 @@ RDEPEND="${COMMON_DEPEND}
 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"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/files/, media-video/smplayer/
@ 2024-09-20  1:07 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-09-20  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     25883d8cf7426772b76441b8087c1ed8f821ef3e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 01:06:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 01:07:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25883d8c

media-video/smplayer: fix resume w/ mpv-0.37.0

Closes: https://bugs.gentoo.org/919917
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/smplayer-23.6.0-mpv-0.37-resume.patch    |  15 +++
 media-video/smplayer/smplayer-23.6.0-r1.ebuild     | 126 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/media-video/smplayer/files/smplayer-23.6.0-mpv-0.37-resume.patch b/media-video/smplayer/files/smplayer-23.6.0-mpv-0.37-resume.patch
new file mode 100644
index 000000000000..d2ff738e76d8
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-23.6.0-mpv-0.37-resume.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/919917#c2
+https://github.com/smplayer-dev/smplayer/issues/837
+--- a/src/mpvoptions.cpp
++++ b/src/mpvoptions.cpp
+@@ -848,6 +848,10 @@ void MPVProcess::mute(bool b) {
+ 
+ void MPVProcess::setPause(bool b) {
+ 	sendCommand(QString("set pause %1").arg(b ? "yes" : "no"));
++
++	// Workaround for mpv 0.37, playback not resuming after pause
++	// It seems mpv reports the pause state in the status line with some delay
++	if (b) sendCommand("no-osd seek 0 relative exact");
+ }
+ 
+ void MPVProcess::frameStep() {

diff --git a/media-video/smplayer/smplayer-23.6.0-r1.ebuild b/media-video/smplayer/smplayer-23.6.0-r1.ebuild
new file mode 100644
index 000000000000..ad67691a7c59
--- /dev/null
+++ b/media-video/smplayer/smplayer-23.6.0-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2007-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 plocale qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="https://www.smplayer.info/"
+SRC_URI="https://github.com/smplayer-dev/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="bidi debug"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	|| (
+		media-video/mpv[libass(+),X]
+		media-video/mplayer[bidi?,libass,png,X]
+	)
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+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.37-resume.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
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Commented out because it gives false positives
+	#plocale_find_changes "${S}"/src/translations ${PN}_ .ts
+
+	# Do not default compress man page
+	sed '/gzip -9.*\.1$/d' -i Makefile || die
+	sed 's@\.gz$@@' -i smplayer.spec || die
+}
+
+src_configure() {
+	cd src || die
+	eqmake5 QT_MAJOR_VERSION=5
+}
+
+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
+	plocale_for_each_locale gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of the GPL
+	rm 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/yt-dlp."
+}
+
+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/files/, media-video/smplayer/
@ 2024-12-31  9:08 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-12-31  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     4bd71fa4ad1485b531572749de8e883b7ab2012a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 14:53:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 09:07:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd71fa4

media-video/smplayer: drop 23.6.0, 23.6.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/smplayer/Manifest                      |   1 -
 .../files/smplayer-23.6.0-mpv-0.37-resume.patch    |  15 ---
 media-video/smplayer/smplayer-23.6.0-r1.ebuild     | 126 ---------------------
 media-video/smplayer/smplayer-23.6.0.ebuild        | 125 --------------------
 4 files changed, 267 deletions(-)

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index d468036d934a..da56855a9b78 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,2 +1 @@
-DIST smplayer-23.6.0.tar.bz2 5164535 BLAKE2B 27200ad658a2acfc3c93c48ed59fca2333b5935d5b7e955cb12dd0c33566aaf0288c68081a68578904076e467bb3b39f9a5bb702d7ad8be0474aa400e40ce6e0 SHA512 097085ffae11b0d065f0822e36466f3e934d4484de29146deba66de14bfd4abcaa8dfd91aa5890921f336a99c3392650e932102812bf401a843d7a86dfc4996d
 DIST smplayer-24.5.0.tar.bz2 5221961 BLAKE2B 6c088b87508ada09fb8712610da76403fbcc9f0d3f2ce1908d99560400aac8351b08453c77f2cf64f13625b09e4d748a7f0a64458e6429aeb29ce1ae49ebcaad SHA512 0de968babbb99a92ef2721d8b30d336433bb99745212da0d7dadec9ec389da0be6cdc5b461960662b4342f80ee6407a814bc6abc3372c07a75ee6804e705851e

diff --git a/media-video/smplayer/files/smplayer-23.6.0-mpv-0.37-resume.patch b/media-video/smplayer/files/smplayer-23.6.0-mpv-0.37-resume.patch
deleted file mode 100644
index d2ff738e76d8..000000000000
--- a/media-video/smplayer/files/smplayer-23.6.0-mpv-0.37-resume.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/919917#c2
-https://github.com/smplayer-dev/smplayer/issues/837
---- a/src/mpvoptions.cpp
-+++ b/src/mpvoptions.cpp
-@@ -848,6 +848,10 @@ void MPVProcess::mute(bool b) {
- 
- void MPVProcess::setPause(bool b) {
- 	sendCommand(QString("set pause %1").arg(b ? "yes" : "no"));
-+
-+	// Workaround for mpv 0.37, playback not resuming after pause
-+	// It seems mpv reports the pause state in the status line with some delay
-+	if (b) sendCommand("no-osd seek 0 relative exact");
- }
- 
- void MPVProcess::frameStep() {

diff --git a/media-video/smplayer/smplayer-23.6.0-r1.ebuild b/media-video/smplayer/smplayer-23.6.0-r1.ebuild
deleted file mode 100644
index b0f6f1eccfd3..000000000000
--- a/media-video/smplayer/smplayer-23.6.0-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2007-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 plocale qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.info/"
-SRC_URI="https://github.com/smplayer-dev/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="bidi debug"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/mpv[libass(+),X]
-		media-video/mplayer[bidi?,libass,png,X]
-	)
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-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.37-resume.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
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#plocale_find_changes "${S}"/src/translations ${PN}_ .ts
-
-	# Do not default compress man page
-	sed '/gzip -9.*\.1$/d' -i Makefile || die
-	sed 's@\.gz$@@' -i smplayer.spec || die
-}
-
-src_configure() {
-	cd src || die
-	eqmake5 QT_MAJOR_VERSION=5
-}
-
-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
-	plocale_for_each_locale gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm 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/yt-dlp."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}

diff --git a/media-video/smplayer/smplayer-23.6.0.ebuild b/media-video/smplayer/smplayer-23.6.0.ebuild
deleted file mode 100644
index 0e610c410625..000000000000
--- a/media-video/smplayer/smplayer-23.6.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2007-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 plocale qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.info/"
-SRC_URI="https://github.com/smplayer-dev/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="bidi debug"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/mpv[libass(+),X]
-		media-video/mplayer[bidi?,libass,png,X]
-	)
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-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
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#plocale_find_changes "${S}"/src/translations ${PN}_ .ts
-
-	# Do not default compress man page
-	sed '/gzip -9.*\.1$/d' -i Makefile || die
-	sed 's@\.gz$@@' -i smplayer.spec || die
-}
-
-src_configure() {
-	cd src || die
-	eqmake5 QT_MAJOR_VERSION=5
-}
-
-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
-	plocale_for_each_locale gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm 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/yt-dlp."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-12-31  9:08 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-25 17:30 [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/files/, media-video/smplayer/ Davide Pesavento
  -- strict thread matches above, loose matches on Subject: below --
2017-10-06 13:47 Lars Wendler
2018-02-10 11:48 Michael Palimaka
2024-09-20  1:07 Sam James
2024-12-31  9:08 Andreas Sturmlechner

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