summaryrefslogtreecommitdiff
path: root/media-sound
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/Manifest.gzbin57256 -> 57253 bytes
-rw-r--r--media-sound/ardour/Manifest4
-rw-r--r--media-sound/ardour/ardour-8.10-r3.ebuild (renamed from media-sound/ardour/ardour-8.10-r2.ebuild)2
-rw-r--r--media-sound/ardour/files/ardour-9.0.0-fix-unlikely-buffer-overflow.patch19
-rw-r--r--media-sound/ardour/files/ardour-9.0.0-properly-check-for-syscall.patch16
-rw-r--r--media-sound/gpodder/Manifest4
-rw-r--r--media-sound/gpodder/files/gpodder-3.11.4-make-build.patch16
-rw-r--r--media-sound/gpodder/gpodder-3.11.4-r1.ebuild (renamed from media-sound/gpodder/gpodder-3.11.3.ebuild)43
8 files changed, 88 insertions, 16 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7f6c5e44cdb6..ceddf35dae4c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
Binary files differ
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 92033f8550a7..b17a93828acb 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,9 +1,11 @@
AUX ardour-6.8-boost-1.85.patch 750 BLAKE2B 9a86275431cb735b32b36a570450d4b5c035f1360c89e69d7d688171e299aea15128057f01dd905335c4fca68035a146cc54cd62b0aa163ec56ae06e545ca8ad SHA512 ad4888bbda5da5ba3e49ca751bdec34159fde01355e8dac3e23c968a8eeba4bce3228f43ef87977ee619c70063ef16e2383c6b7126213d88125222431f79574d
AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c
AUX ardour-9.0.0-fix-clang-crash.patch 4511 BLAKE2B ad67f040fbb51f18f7feca562c6a741aad1d2e559820319e8eefb998198a78a59df61ef3ff2643be1f52f21c7e04570056af546229f395d1967f3de1d5a0fc0e SHA512 e98f83676b9c063e3a1abcd554f14e83dcfb2ff35525917dbf2e301947902ed51613826a08334df8e7a00847ff454bfdec3828176fba351075d85c28a7355319
+AUX ardour-9.0.0-fix-unlikely-buffer-overflow.patch 877 BLAKE2B 0bfe3d663bbf9d70b2616984913b3772a1adf168a1579a78f3e4fc6ac2ac27ab8b70dde7092ed4d250b9c7d65ff2771b19f14d4fc7d490ebde7e994aa4decf95 SHA512 7e03399a63ca95577a32f644406573145e8c88c7b39fe26b2aa106b5bc180dccc815252d3c9c2a623544e96b0046e18b38a5ea7fe3c6fe7edaa0dd9a5cb643eb
+AUX ardour-9.0.0-properly-check-for-syscall.patch 709 BLAKE2B 628af149268643b0f46628367296bc28bdd80b59ffabcfe6584dfb811ab931a01d2b0207821ab0277a04170a2eb3728ef21e830a822ec02ce45a157b497b2906 SHA512 15afc522495ef7ce3678de4955091500dd7bc7ef87ffda02afc58235083e55cef058a54847fd7aac89d1217e2216c951dc31a1e50b829ee4e8f6ecc6cf4793fe
DIST Ardour-8.10.0.tar.bz2 17811275 BLAKE2B 5a0edc68c707ae1659b080cf543a4a3dc3397c91366e5c5e3084fe0095d983ba1170acc1fde49dbd6abd1b05325e2117b79fcf96c1d5c84b24d5ecc76a39cd64 SHA512 744e4bc73e35a758fce46c0035a11b430b70aa77503446a0118aba62b86b62fb293be1418ec8cfc0e1495a3a005bb71445f48661d9302a3b5bacc1a7f6c2874b
DIST Ardour-8.7.0.tar.bz2 17807972 BLAKE2B 9bbe4ed5c3ad62d643518881a45b71642f5ce41c8620eb4c82befcb9df1053b08b60d3683961d78825f99e3a74222404c511073491972f138edaaaea445c6961 SHA512 cd2cdc1360b01d23cd3df62ee949ecab9d5d8da5112636438c2ef8a88d188503bcd7f09f2a5d8e07460dacbc35cecd96e8edbc748adccc50b5a90375f2f742d0
-EBUILD ardour-8.10-r2.ebuild 5197 BLAKE2B b751cab598b8160904d6e8089288f875d0ccec378690e8080e37a90fb45e305874325455f8cd6d1a8143571dd8c5c85365a0b493c39b57ea1340bf9242b4638a SHA512 cf0f3573274340d0d0a597e43066bfd2dfde85bc40899448c8fb7e9579cd36b4488ce0c41724baf8235ed4a7801a2fa01865fc1a8a69ec7965502d5b1feb77a2
+EBUILD ardour-8.10-r3.ebuild 5319 BLAKE2B d6a6789d1c1deea0a862f2dccaabbf7d4363b82450c6650a04897a2e87e9a951453dd58ff152ab8382a3dccd649f1d7128316b58e23256741558dbb31cc0badb SHA512 f4ea813eca03e947f355695708499bd7458d3009888ea4f533fae13eddbb58a0a13edc7c4827fc8fcfd3649b685a776dd077c09bd4ed4a5a1b721650c1db5ff2
EBUILD ardour-8.10.ebuild 5216 BLAKE2B 76147b3a790cccf26e6c7cb11305d2f50271f93abab3eb83d25c98559aced9ea0719e80240986d1adb0e6bf5adbf337b6422443babf2388f533aeb98a99dc188 SHA512 941298dfb89c7c86b100a4d127f8aa775b084f8c98cac7bba8d1e5a10a6922d8cb7828a5d16afd9896635e11b09bce653f3bc07bb8bb870953c1d142192a1ea1
EBUILD ardour-8.7.ebuild 5257 BLAKE2B 48899bdee879dd24d9530e2eadb4c89a03241a1c793e87bd8ff5df3cdd25e598bc73ae2cb4dae131bfd6607957e77b42ddf0d33e996949e10887a0b8cbd6047d SHA512 d37fb303db968c36017d1e6a4a296e534bfd6280bd25ef841f5fb556ebda5b87e6bbf3d8e4b47517c28d0f99573d6d6852a5c6801960a5309a2107be2e8b4552
EBUILD ardour-9999.ebuild 5150 BLAKE2B dc3d456ef39ed244244ceeafea10a6e6c841638f3c1b8a8608990f69d6e96fe10d822a3e59edb00d743090471d4c78461250189bac4838ac8144862a977090a9 SHA512 aed242f55912801b1ded17e06fd1c2666d11d2254c1d142bb8d8fd861742176922e391b095d063701fc26e0a76315d42913656832fa4a3e91d844625f786a1e5
diff --git a/media-sound/ardour/ardour-8.10-r2.ebuild b/media-sound/ardour/ardour-8.10-r3.ebuild
index bb6ece851b94..cba0bc79c8e1 100644
--- a/media-sound/ardour/ardour-8.10-r2.ebuild
+++ b/media-sound/ardour/ardour-8.10-r3.ebuild
@@ -72,6 +72,8 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-6.8-metadata.patch"
"${FILESDIR}/${PN}-9.0.0-fix-clang-crash.patch"
+ "${FILESDIR}/${PN}-9.0.0-properly-check-for-syscall.patch"
+ "${FILESDIR}/${PN}-9.0.0-fix-unlikely-buffer-overflow.patch"
)
pkg_pretend() {
diff --git a/media-sound/ardour/files/ardour-9.0.0-fix-unlikely-buffer-overflow.patch b/media-sound/ardour/files/ardour-9.0.0-fix-unlikely-buffer-overflow.patch
new file mode 100644
index 000000000000..fd698f67bdd3
--- /dev/null
+++ b/media-sound/ardour/files/ardour-9.0.0-fix-unlikely-buffer-overflow.patch
@@ -0,0 +1,19 @@
+From 02fde5f1aa3997d880f185c2083707e8715cfa59 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Wed, 6 Nov 2024 04:07:01 +0100
+Subject: [PATCH] Fix unlikely buffer overflow #9845
+
+> warning: 'sscanf' may overflow; destination buffer in argument 6
+> has size 32, but the corresponding specifier may require size 33
+> [-Wfortify-source]
+--- a/gtk2_ardour/transcode_ffmpeg.cc
++++ b/gtk2_ardour/transcode_ffmpeg.cc
+@@ -192,7 +192,7 @@ TranscodeFfmpeg::probe ()
+ PARSE_FRACTIONAL_FPS (timebase)
+ } else if (key == X_("timecode") && m_duration == 0 && m_fps > 0) {
+ int h, m, s;
+- char f[32];
++ char f[33];
+ if (sscanf (i->at (16).c_str (), "%d:%d:%d:%32s", &h, &m, &s, f) == 4) {
+ m_duration = (ARDOUR::samplecnt_t)floor (m_fps * (h * 3600.0 + m * 60.0 + s * 1.0 + atoi (f) / pow ((double)10, (int)strlen (f))));
+ }
diff --git a/media-sound/ardour/files/ardour-9.0.0-properly-check-for-syscall.patch b/media-sound/ardour/files/ardour-9.0.0-properly-check-for-syscall.patch
new file mode 100644
index 000000000000..12f677c3828c
--- /dev/null
+++ b/media-sound/ardour/files/ardour-9.0.0-properly-check-for-syscall.patch
@@ -0,0 +1,16 @@
+From ba4d9709c6e442ee57329fd592d48fc98ea0b937 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Wed, 6 Nov 2024 04:07:25 +0100
+Subject: [PATCH] Properly check for syscall (#9845)
+
+--- a/libs/ardour/wscript
++++ b/libs/ardour/wscript
+@@ -355,7 +355,7 @@ def configure(conf):
+ features = 'c',
+ mandatory = False,
+ execute = False,
+- fragment = "#include <sys/syscall.h>\nint main () { syscall(SYS_ioprio_set, 1, 0, 8192); return 0; }")
++ fragment = "#include <unistd.h>\n#include <sys/syscall.h>\nint main () { syscall(SYS_ioprio_set, 1, 0, 8192); return 0; }")
+
+ if have_sys_ioprio:
+ conf.define('HAVE_IOPRIO', 1)
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 9bb491169d0c..b664fccf6277 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,5 +1,5 @@
-DIST gpodder-3.11.3.tar.gz 1183434 BLAKE2B 553642b17beaadc686c2a2b01971436ca44e84029269f776423905bbac1c2448878d4fb8f3d9f8a1776da5c0417b5df425a884bb2b4d2a80c19e952ceb922a92 SHA512 643097fe209cc69a7674fd265a64099c9b34cc9b2dcee4cc09004113559334822db1dea5359f302956e15b74d3f9c5e1ce8727b89e02f067e7ee6b8261c53ca6
+AUX gpodder-3.11.4-make-build.patch 552 BLAKE2B 788fbcc1f280640d7625e8e65461edbb0bacdec7de36c4eda0f4f1a95de8bbad1a53b55470fce69ca6c106b968a7bf3b19d1a7cd6afabebb3a5e0b7cf85f6cb0 SHA512 163bf1ae6fe1f7d8fc5647cb724dd8af119754987782e47fc0110212222cff4f6aee303c3c7f8ce9e9c8efc9d4399ade48924c350fdf5133dd28e31e5777d607
DIST gpodder-3.11.4.tar.gz 1183463 BLAKE2B ec16bd8dbe531869dd68b062e12013adeb4010a1423b274e52e5cf765828ddffccbfe021a3936e1a6985c2a00f9d1aaf63b80f89beace968501b2e55d284d53d SHA512 f60e2e04abec7d9713d169f9eccb431325bcfe40303e14d0cb42c3b5b4696d7435b86eb1c69b430ef99f81a6b71f89dffafec84d1f1c51118af59e57dcfa0d2d
-EBUILD gpodder-3.11.3.ebuild 2119 BLAKE2B e383de02cb4211b2b0ae1c6ba6365dc634a255082f69e703cda33fc9a3799ecbbc75ca8a65c6a6c01a32345ce7a358b0bf4269d24a38b397a6c5e6538d8a0bf3 SHA512 e1c488309668e0fd14bcc9dce93d5c950e940b5db442e6b1d2dc1fe13fdd00934d49b7c1204f46f072b8fe9bdf18324757815972978feee279b2e30a4a362dff
+EBUILD gpodder-3.11.4-r1.ebuild 2171 BLAKE2B bc40d7561d88792f3f24316b9ff037cf96d2b3e8b6de012acd1a57bbf00ee18e4fa912d62ab836a87077fd1092295d77d8db5a5b346aa8b2cfcca3e9d9ae8aa1 SHA512 8d8c57fa0f2108ecdbe1a471f47bfdd73e11c1b50b38a948c7470c4a32141ced6171950037875ff7c633bc2b30b5c8b6b6da8fc58d25c16511e8899504a85d2f
EBUILD gpodder-3.11.4.ebuild 2119 BLAKE2B e383de02cb4211b2b0ae1c6ba6365dc634a255082f69e703cda33fc9a3799ecbbc75ca8a65c6a6c01a32345ce7a358b0bf4269d24a38b397a6c5e6538d8a0bf3 SHA512 e1c488309668e0fd14bcc9dce93d5c950e940b5db442e6b1d2dc1fe13fdd00934d49b7c1204f46f072b8fe9bdf18324757815972978feee279b2e30a4a362dff
MISC metadata.xml 358 BLAKE2B 272a71d2d7d519dca74a2d1dbbd25d0c48b55b265eca16962967f57dc29edfeca9d454100a84a7dd505f5bab7778778ff45b89f2ddaca152b562733e8c0dcce8 SHA512 31b12848c3f24a103f2bfa39bec4b2c4e3251ed70de194d569acfbe2b7df3f8ea28dd5ba274b4add0fbc1b55d998cf13f5b8f7bf89bb4a95fd1e60e988bce6f6
diff --git a/media-sound/gpodder/files/gpodder-3.11.4-make-build.patch b/media-sound/gpodder/files/gpodder-3.11.4-make-build.patch
new file mode 100644
index 000000000000..c9f2d323b52e
--- /dev/null
+++ b/media-sound/gpodder/files/gpodder-3.11.4-make-build.patch
@@ -0,0 +1,16 @@
+From: Brand Huntsman <bgo-7187AEA9-brand@qzx.com>
+Bug: https://bugs.gentoo.org/909991#c6
+
+--- a/makefile
++++ b/makefile
+@@ -93,7 +93,9 @@ $(GPODDER_SERVICE_FILE): $(GPODDER_SERVICE_FILE_IN)
+ %.desktop.in.h: %.desktop.in
+ intltool-extract --quiet --type=gettext/ini $<
+
+-install: messages $(GPODDER_SERVICE_FILE) $(DESKTOP_FILES)
++build: messages $(GPODDER_SERVICE_FILE) $(DESKTOP_FILES)
++
++install: build
+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --optimize=1
+
+ install-win: messages $(GPODDER_SERVICE_FILE) $(DESKTOP_FILES)
diff --git a/media-sound/gpodder/gpodder-3.11.3.ebuild b/media-sound/gpodder/gpodder-3.11.4-r1.ebuild
index 08280b1bfa58..4f73c0e097bc 100644
--- a/media-sound/gpodder/gpodder-3.11.3.ebuild
+++ b/media-sound/gpodder/gpodder-3.11.4-r1.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+DISTUTILS_USE_PEP517=setuptools
DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{11..13} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1 optfeature xdg
DESCRIPTION="A free cross-platform podcast aggregator"
HOMEPAGE="https://gpodder.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+ https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="+dbus bluetooth mtp"
RDEPEND="
@@ -45,30 +47,45 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${P}-make-build.patch"
+)
+
distutils_enable_tests pytest
src_prepare() {
default
- sed -i -e 's:--cov=gpodder::' makefile || die
+ sed -e 's:--cov=gpodder::' -i makefile || die
+
+ emake PYTHON="${EPYTHON}" build
}
python_test() {
# These are pulled out from the Makefile to give us more control
# See bug #795165
# Previously, we used 'emake releasetest' in src_test
- LC_ALL=C epytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py \
- -p no:localserver
- LC_ALL=C epytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient \
- -p no:localserver
+
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+ local -x EPYTEST_IGNORE=(
+ src/gpodder/utilwin32ctypes.py
+ )
+
+ epytest \
+ --ignore=tests \
+ --doctest-modules src/gpodder/util.py \
+ src/gpodder/jsonconfig.py
+
+ epytest tests \
+ --ignore=src/mygpoclient \
+ -p pytest_httpserver
}
src_install() {
- emake PYTHON="${EPYTHON}" DESTDIR="${D}" install
-
distutils-r1_src_install
- touch "${ED}"/usr/share/gpodder/no-update-check || die
+ touch "${ED}/usr/share/gpodder/no-update-check" || die
}
pkg_postinst() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 04:46:23 +0000