public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Theo Anderson" <telans@posteo.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-video/qliveplayer/
Date: Tue, 16 Feb 2021 21:10:53 +0000 (UTC)	[thread overview]
Message-ID: <1613498070.8df595c6b6a2c3aade2e3bfe6f3903dfd06e52f4.telans@gentoo> (raw)

commit:     8df595c6b6a2c3aade2e3bfe6f3903dfd06e52f4
Author:     Jian Lin <jlin.gentoo <AT> outlook <DOT> com>
AuthorDate: Tue Feb 16 17:53:58 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Tue Feb 16 17:54:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8df595c6

media-video/qliveplayer: add check for sed

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jian Lin <jlin.gentoo <AT> outlook.com>

 media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild | 16 +++++++++-------
 media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild b/media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild
index 27026270..407d6797 100644
--- a/media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild
+++ b/media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild
@@ -47,13 +47,15 @@ src_prepare()
 {
 	xdg_environment_reset
 	cmake_src_prepare
-	# fix python version
-	sed -i "s/python3/${EPYTHON}/" src/qlphelper/bilivideo.cpp \
-		|| die "Sed failed to set python version!"
-	sed -i "s/python3/${EPYTHON}/" src/qlphelper/danmakulauncher.cpp \
-		|| die "Sed failed to set python version!"
-	sed -i "s/python3/${EPYTHON}/" src/qlphelper/streamfinder.cpp \
-		|| die "Sed failed to set python version!"
+	# respect PYTHON_SINGLE_TARGET
+	grep 'p.start("python3", args);' src/qlphelper/bilivideo.cpp >/dev/null || die
+	sed -i "s/python3/${EPYTHON}/" src/qlphelper/bilivideo.cpp || die
+	grep 'dmcPyProcess->start("python3", dmcPy);' \
+		src/qlphelper/danmakulauncher.cpp >/dev/null || die
+	sed -i "s/python3/${EPYTHON}/" src/qlphelper/danmakulauncher.cpp || die
+	grep 'proc->start("python3", args);' \
+		src/qlphelper/streamfinder.cpp >/dev/null || die
+	sed -i "s/python3/${EPYTHON}/" src/qlphelper/streamfinder.cpp || die
 }
 
 src_install()

diff --git a/media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild b/media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild
index d581231d..532060f9 100644
--- a/media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild
+++ b/media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild
@@ -47,13 +47,15 @@ src_prepare()
 {
 	xdg_environment_reset
 	cmake_src_prepare
-	# fix python version
-	sed -i "s/python3/${EPYTHON}/" src/qlphelper/bilivideo.cpp \
-		|| die "Sed failed to set python version!"
-	sed -i "s/python3/${EPYTHON}/" src/qlphelper/danmakulauncher.cpp \
-		|| die "Sed failed to set python version!"
-	sed -i "s/python3/${EPYTHON}/" src/qlphelper/streamfinder.cpp \
-		|| die "Sed failed to set python version!"
+	# respect PYTHON_SINGLE_TARGET
+	grep 'p.start("python3", args);' src/qlphelper/bilivideo.cpp >/dev/null || die
+	sed -i "s/python3/${EPYTHON}/" src/qlphelper/bilivideo.cpp || die
+	grep 'dmcPyProcess->start("python3", dmcPy);' \
+		src/qlphelper/danmakulauncher.cpp >/dev/null || die
+	sed -i "s/python3/${EPYTHON}/" src/qlphelper/danmakulauncher.cpp || die
+	grep 'proc->start("python3", args);' \
+		src/qlphelper/streamfinder.cpp >/dev/null || die
+	sed -i "s/python3/${EPYTHON}/" src/qlphelper/streamfinder.cpp || die
 }
 
 src_install()


             reply	other threads:[~2021-02-16 21:11 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-16 21:10 Theo Anderson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-13 22:12 [gentoo-commits] repo/proj/guru:master commit in: media-video/qliveplayer/ Haelwenn Monnier
2021-10-13 22:12 Haelwenn Monnier
2021-09-10 16:40 Jian Lin
2021-09-10 16:25 [gentoo-commits] repo/proj/guru:dev " Jian Lin
2021-09-10 16:40 ` [gentoo-commits] repo/proj/guru:master " Jian Lin
2021-08-16 19:04 Jian Lin
2021-07-09  2:13 [gentoo-commits] repo/proj/guru:dev " Jian Lin
2021-07-09  2:20 ` [gentoo-commits] repo/proj/guru:master " Jian Lin
2021-07-09  2:13 [gentoo-commits] repo/proj/guru:dev " Jian Lin
2021-07-09  2:20 ` [gentoo-commits] repo/proj/guru:master " Jian Lin
2021-06-26 11:05 Jian Lin
2021-06-26 11:05 Jian Lin
2021-05-25 23:07 Haelwenn Monnier
2021-05-25 23:07 Haelwenn Monnier
2021-03-02  9:02 Theo Anderson
2021-03-02  9:02 Theo Anderson
2021-03-02  9:02 Theo Anderson
2021-02-16 21:10 Theo Anderson
2021-02-16 21:10 Theo Anderson
2021-02-15  7:11 Andrew Ammerlaan
2021-02-15  7:11 Andrew Ammerlaan
2021-02-15  7:11 Andrew Ammerlaan
2021-02-15  7:11 Andrew Ammerlaan
2021-02-02  6:41 Andrew Ammerlaan
2021-02-02  6:41 Andrew Ammerlaan
2021-02-02  6:41 Andrew Ammerlaan
2021-02-02  6:41 Andrew Ammerlaan
2021-01-03 12:09 Michał Górny
2021-01-03 12:09 Michał Górny
2021-01-02 12:13 Andrew Ammerlaan
2021-01-02 12:13 Andrew Ammerlaan
2020-12-27 12:48 Andrew Ammerlaan
2020-12-27 12:48 Andrew Ammerlaan
2020-12-06 18:44 Andrew Ammerlaan
2020-12-03 11:36 Andrew Ammerlaan
2020-11-29 10:34 Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1613498070.8df595c6b6a2c3aade2e3bfe6f3903dfd06e52f4.telans@gentoo \
    --to=telans@posteo.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox