From 84483a2d18d7f1e9f2db04880dac2e180910ec0e Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 26 Jun 2021 12:45:33 +0200 Subject: [PATCH 1/3] media-plugins/alsa-sndio: Make it multilib Signed-off-by: Haelwenn (lanodan) Monnier --- .../alsa-sndio/alsa-sndio-0.2.ebuild | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/media-plugins/alsa-sndio/alsa-sndio-0.2.ebuild b/media-plugins/alsa-sndio/alsa-sndio-0.2.ebuild index 203199067e..1b5cb4eab6 100644 --- a/media-plugins/alsa-sndio/alsa-sndio-0.2.ebuild +++ b/media-plugins/alsa-sndio/alsa-sndio-0.2.ebuild @@ -1,8 +1,10 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit multilib-minimal + DESCRIPTION="ALSA PCM to play audio on sndio servers" HOMEPAGE="https://github.com/Duncaen/alsa-sndio" SRC_URI="https://github.com/Duncaen/alsa-sndio/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -11,22 +13,26 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - media-libs/alsa-lib - media-sound/sndio:= + media-libs/alsa-lib[${MULTILIB_USEDEP}] + media-sound/sndio:=[${MULTILIB_USEDEP}] " RDEPEND="${DEPEND}" src_prepare() { - default + fix_libdir() { + sed -i "s;/lib/alsa-lib/;/$(get_libdir)/alsa-lib/;" "${BUILD_DIR}/Makefile" || die "Failed changing libdir" + } - sed -i "s;/lib/alsa-lib/;/$(get_libdir)/alsa-lib/;" Makefile || die "Failed changing libdir" + default + multilib_copy_sources + multilib_foreach_abi fix_libdir } -src_compile() { +multilib_src_compile() { emake CC="${CC:-gcc}" } -src_install() { +multilib_src_install() { export PREFIX="/usr" default From d29844f811976a909a229d2229b9dcebd29aa19f Mon Sep 17 00:00:00 2001 From: Jian Lin Date: Sat, 26 Jun 2021 19:00:17 +0800 Subject: [PATCH 2/3] media-video/qliveplayer: bump to 3.22.3 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Jian Lin --- media-video/qliveplayer/Manifest | 1 + .../qliveplayer/qliveplayer-3.22.3.ebuild | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 media-video/qliveplayer/qliveplayer-3.22.3.ebuild diff --git a/media-video/qliveplayer/Manifest b/media-video/qliveplayer/Manifest index b812b3ce37..0028ee7bb1 100644 --- a/media-video/qliveplayer/Manifest +++ b/media-video/qliveplayer/Manifest @@ -1,2 +1,3 @@ DIST QLivePlayer-3.22.0.tar.gz 640034 BLAKE2B 2038a1b003140525dd03ec14fb357b36826c28d3744133781622b89aee1c973db94ba823c2c64697eb1a3bc77a633f37e6deec14b2678c632f34f853c4881104 SHA512 cd8f7255c101565dd1b90d9e9a7faedfff7b423d5a8d5f7cd0d35d0e991ce28f06b2631a90e9c4d8f787daa0ceb921004a206eaa1a25332a8c592f57c282ab11 DIST QLivePlayer-3.22.1.tar.gz 640838 BLAKE2B 8552eefa4b8510b602e65fa553ba257467aaf5bd73710e90f690bcb19ceabc25dd4ae4f00143233df624f166f8170bf083aafbbec2d42e7988bd705037a9308e SHA512 45ec1f3d4d698a52107d07a7a55d457215d634b8106ac4facb9250960974f1ea683c338cedeb6f66fef428e88e05ef4286b3e95e22d23ed576c4bc69c5c7c50a +DIST QLivePlayer-3.22.3.tar.gz 640956 BLAKE2B ed752d7321f90f70f68ab4366217116711b1f656eefc2f40b92572427dc11d168d2e9f88e6b0ba6c9e3024ede32922e06e04a208833858432e7ed923793b708d SHA512 c3ed5c8ffb4fa639132fdb0f42c20120a8e49c3e9135fe1234ec5eb6012e89a2e620ae4a3b669ecf995935c70f03fc154ca15833ff09ef6f83bba885e19e91a9 diff --git a/media-video/qliveplayer/qliveplayer-3.22.3.ebuild b/media-video/qliveplayer/qliveplayer-3.22.3.ebuild new file mode 100644 index 0000000000..ecc8b17527 --- /dev/null +++ b/media-video/qliveplayer/qliveplayer-3.22.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) + +inherit cmake optfeature python-single-r1 readme.gentoo-r1 xdg + +MY_P="QLivePlayer-${PV}" + +DESCRIPTION="A player and recorder for live streams and videos with danmaku support" +HOMEPAGE="https://github.com/IsoaSFlus/QLivePlayer" +SRC_URI="https://github.com/IsoaSFlus/QLivePlayer/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtnetwork-5.15:5 + >=dev-qt/qtwidgets-5.15:5 +" +RDEPEND=" + ${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/aiohttp[${PYTHON_USEDEP}] + ') + media-video/ffmpeg + media-video/mpv + net-misc/curl + >=dev-qt/qtquickcontrols-5.15:5 + >=dev-qt/qtquickcontrols2-5.15:5 + >=dev-qt/qtsvg-5.15:5 +" +DEPEND=" + ${COMMON_DEPEND} + kde-frameworks/extra-cmake-modules:5 +" + +src_prepare() { + xdg_environment_reset + cmake_src_prepare + # 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() { + cmake_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog + optfeature "twitch support" "net-misc/streamlink" + optfeature "youtube support" "dev-python/protobuf-python net-misc/streamlink" +} From 79471321abaf7d7790e63a718ec6621ef1a32332 Mon Sep 17 00:00:00 2001 From: Jian Lin Date: Sat, 26 Jun 2021 19:00:40 +0800 Subject: [PATCH 3/3] media-video/qliveplayer: drop old 3.22.0 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Jian Lin --- media-video/qliveplayer/Manifest | 1 - .../qliveplayer/qliveplayer-3.22.0.ebuild | 70 ------------------- 2 files changed, 71 deletions(-) delete mode 100644 media-video/qliveplayer/qliveplayer-3.22.0.ebuild diff --git a/media-video/qliveplayer/Manifest b/media-video/qliveplayer/Manifest index 0028ee7bb1..8119f4ddb2 100644 --- a/media-video/qliveplayer/Manifest +++ b/media-video/qliveplayer/Manifest @@ -1,3 +1,2 @@ -DIST QLivePlayer-3.22.0.tar.gz 640034 BLAKE2B 2038a1b003140525dd03ec14fb357b36826c28d3744133781622b89aee1c973db94ba823c2c64697eb1a3bc77a633f37e6deec14b2678c632f34f853c4881104 SHA512 cd8f7255c101565dd1b90d9e9a7faedfff7b423d5a8d5f7cd0d35d0e991ce28f06b2631a90e9c4d8f787daa0ceb921004a206eaa1a25332a8c592f57c282ab11 DIST QLivePlayer-3.22.1.tar.gz 640838 BLAKE2B 8552eefa4b8510b602e65fa553ba257467aaf5bd73710e90f690bcb19ceabc25dd4ae4f00143233df624f166f8170bf083aafbbec2d42e7988bd705037a9308e SHA512 45ec1f3d4d698a52107d07a7a55d457215d634b8106ac4facb9250960974f1ea683c338cedeb6f66fef428e88e05ef4286b3e95e22d23ed576c4bc69c5c7c50a DIST QLivePlayer-3.22.3.tar.gz 640956 BLAKE2B ed752d7321f90f70f68ab4366217116711b1f656eefc2f40b92572427dc11d168d2e9f88e6b0ba6c9e3024ede32922e06e04a208833858432e7ed923793b708d SHA512 c3ed5c8ffb4fa639132fdb0f42c20120a8e49c3e9135fe1234ec5eb6012e89a2e620ae4a3b669ecf995935c70f03fc154ca15833ff09ef6f83bba885e19e91a9 diff --git a/media-video/qliveplayer/qliveplayer-3.22.0.ebuild b/media-video/qliveplayer/qliveplayer-3.22.0.ebuild deleted file mode 100644 index 784351e8f3..0000000000 --- a/media-video/qliveplayer/qliveplayer-3.22.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit xdg cmake optfeature python-single-r1 readme.gentoo-r1 - -MY_P="QLivePlayer-${PV}" - -DESCRIPTION="A player and recorder for live streams and videos with danmaku support" -HOMEPAGE="https://github.com/IsoaSFlus/QLivePlayer" -SRC_URI="https://github.com/IsoaSFlus/QLivePlayer/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdeclarative-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtnetwork-5.15:5 - >=dev-qt/qtwidgets-5.15:5 -" -RDEPEND=" - ${COMMON_DEPEND} - $(python_gen_cond_dep ' - dev-python/aiohttp[${PYTHON_USEDEP}] - ') - media-video/ffmpeg - media-video/mpv - net-misc/curl - >=dev-qt/qtquickcontrols-5.15:5 - >=dev-qt/qtquickcontrols2-5.15:5 -" -DEPEND=" - ${COMMON_DEPEND} - kde-frameworks/extra-cmake-modules:5 -" - -src_prepare() { - xdg_environment_reset - cmake_src_prepare - # 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() { - cmake_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - readme.gentoo_print_elog - optfeature "twitch support" "net-misc/streamlink" - optfeature "youtube support" "dev-python/protobuf-python net-misc/streamlink" -}