summaryrefslogtreecommitdiff
path: root/sci-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-12 00:08:13 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-12 00:08:13 +0100
commitf0ddcad13515f66d2f3bf827d33c277bdba7e1dd (patch)
tree3e1da8fa4626163bda62e9e8b6129867de5be46d /sci-libs
parent65ff3cc3bd9c3f8e718a67dfecf1f8215bf5d1d4 (diff)
gentoo auto-resync : 12:06:2024 - 00:08:13
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/Manifest.gzbin44347 -> 44353 bytes
-rw-r--r--sci-libs/libsigrok/Manifest8
-rw-r--r--sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch46
-rw-r--r--sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild2
-rw-r--r--sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild4
-rw-r--r--sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild158
-rw-r--r--sci-libs/libsigrok/libsigrok-9999.ebuild4
-rw-r--r--sci-libs/libsigrokdecode/Manifest6
-rw-r--r--sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch37
-rw-r--r--sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild4
-rw-r--r--sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild58
-rw-r--r--sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild6
12 files changed, 318 insertions, 15 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 177dfc2f8a36..34d6d0622e3a 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
Binary files differ
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 78cb63184426..2c8d121e0136 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,8 +1,10 @@
AUX libsigrok-0.5.2-check-0.15.patch 917 BLAKE2B 39d042e99dc5a71fa79def033f7a30621967294ed8198b00ca9e7a21caf7ee77f07e3f6d1e27c3a4d2629539835ec1b4e7bc3fdfe2ce1e98d7e97b4a897131ce SHA512 1729653f153ebdec08c0b987a0cf15a50ed6ce8948805b2a9ddf122ba591426e830329bfb47527ef253c19f9b8e98693ab0258e9ac19906473d3605d61c8983d
+AUX libsigrok-0.5.2-py313.patch 1897 BLAKE2B b4221654e1a056e9e2bcf04b79685f231204984eb40e31eecd09d04774956fc6e9fd474c0070255a130dbd67e9b191b013da8fc6568b3673bae759ca7e6d253d SHA512 081674a2d92b4562efadf812b70fece9d9a2373ff31c34e42189ea3ba5a9f49ce10f4bed70a24efdee77834f0a105fa3f54231669ff7ba8216e8761472150fe7
AUX libsigrok-0.5.2-swig-4.1.patch 377 BLAKE2B f795f46bce213e9444ea3d8b362a4d82d3e34676a9aae49f45764679effa388afcc15bc04e14fdc89cb25fbd700ca3bf80234b291c3607b0454ecf997d20997d SHA512 0334cbb95fbba961d9f16b18978dd15dbf68b80b897af54d25660dd0bcb049d21ea681f39bae3884c4869ecce4efd2601bce7825fbd41160ddddbe92ad678740
AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
-EBUILD libsigrok-0.5.2-r3.ebuild 3399 BLAKE2B 28c2f788f114df5ba7eeb189bb6f345fed1f84dd2ff0122db2bb13a312a4326240b37c2e9e3172213bd9629081b2ed67322d5be44ff3f0c0232198ce9d6dd7fa SHA512 f988f4a6b9041fb7d5f866f44f689ad2aff7aedcbe6f182042818655086e1060986ab702eccb8a90885347c8d6f251e105778fc2f15091948780a6b3327503f6
-EBUILD libsigrok-0.5.2-r4.ebuild 3476 BLAKE2B b044ce688c9479e703a26ce2956394236948937928c68f994668deb617cb939b42c19b1b5a84152eb47095b6a5be9ee87189f4ef9cc0401e02ca7a4d1bb0cb4f SHA512 12799cd8d6b92e02642c2c1e93ba1d8a32ad15f370f7da51293148c45ba1b70906248a54727ca34068134ec805c23735ac56e9bec976d561883eb0d010a0b980
-EBUILD libsigrok-9999.ebuild 3316 BLAKE2B 56cecb6f1d0ea38d498d001e2ec4eaa4778728b20ea5c79d2fd688b73459958bf43a9eae385570bd6b772178d844b3ce4ab0275595e86ae2fddb9ff1f8abad8c SHA512 873ca668744a83832287e61f3f6558a46d34b0023f6fa7f9a25465230de294bdf5bd1d34df90acfa3f0a82d88591064b141591d2ca705fda901e0976cd832143
+EBUILD libsigrok-0.5.2-r3.ebuild 3400 BLAKE2B a9da2492c2a4ba0a39f61f00b372d225571de52be6d5cd7106be6bcce11ed07653118986767454409d4c5a2cf6eb09d83d7d11dfbb029ffa03510ea538684d58 SHA512 e7c37b9cfb92cdd3d06daa95304edd00cee9153acac135065d6fc99bf7f10be3232aa221a2391785c7e6af4a354c9667c4ccc3020ecf5fa536a23a0090ce404f
+EBUILD libsigrok-0.5.2-r4.ebuild 3476 BLAKE2B a6dae62ddd641e772e831c3cf54356c081ea47afb834916f0c3fe10a576885c7fd8876663fcbce82005e306c4970e9f714389545f12d512c80b997b436f81797 SHA512 ecf01edaab3add793eb4f84bc3dac223dd85e5b182350535d088e6e32395a1c62f9b93dd650557064cc489d847eb96742deb2398f54bd0ce8dcef02b90798cbd
+EBUILD libsigrok-0.5.2-r5.ebuild 3510 BLAKE2B 36f4e13576b4a3f92f7b2dbd5be8fcea98002b519274a17a829c8cdb1faa3bdc3f52a101f438431150ca3e421dea688e4213df35ef385a30b8b73d36c9b1090a SHA512 b736cc0b942209b0c19f339a367304d2bc1d240798d4b3f0d90e23d882cdc0deb5c5de53a39bd46564c0a3d9ee526b669791f6dc6709c19d90d8c98cafa341a3
+EBUILD libsigrok-9999.ebuild 3329 BLAKE2B 4f3a222ed15a2a2b057b7fa65114b2a44bc3741e3d7e9b01d44d517421954a972be2b0eb9790913124d7a53d3fba7595e5d599f3114484a02ceb0a2b08c0d137 SHA512 e10bab831369b9fbf2ad20366fc59eec2dacb77787ec2cbe3d4b249de4a0dae3004a18f1597d19d97d7ba914996c1c2f8aa5c880953844b5db070200a86703da
MISC metadata.xml 886 BLAKE2B cb7cece1f79a4affb612e55f147eb93895a805e43aed6bbabfed2e3b925b0714d64651c00294da2742f8c09ce9984a58888b89025d73712400c8bd026296b2cb SHA512 79c9697b3fe6954108cb60ae79c06cee280ef6d73bcd9e35ab148750a4fa55c8e5118c21cdb4e3ae009d4c160a26c98132448476ef90ac6d7a19a79138c3b2f6
diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch
new file mode 100644
index 000000000000..a4c1be8de96a
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch
@@ -0,0 +1,46 @@
+http://sigrok.org/gitweb/?p=libsigrok.git;a=commit;h=5bc8174531df86991ba8aa6d12942923925d9e72
+
+From: Gerhard Sittig <redacted>
+Date: Mon, 2 Oct 2023 16:33:08 +0000 (+0200)
+Subject: bindings/python: rephrase for Python 3.9 deprecation (call API)
+X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=5bc8174531df86991ba8aa6d12942923925d9e72;hp=1711287ee9e5e4d37cab1cf9fcda5c98f732a137
+
+bindings/python: rephrase for Python 3.9 deprecation (call API)
+
+The PyEval_CallObject() routine was deprecated in Python 3.9, use
+PyObject_CallObject() instead which has existed since at least 3.0.
+
+There are also PyEval_InitThreads() deprecation warnings, but these
+originate from SWIG generated code and are outside of our control.
+Requires SWIG version 4.1 to silence these.
+
+Tested-By: Sascha Silbe <redacted>
+--- a/bindings/python/sigrok/core/classes.i
++++ b/bindings/python/sigrok/core/classes.i
+@@ -134,7 +134,7 @@ typedef guint pyg_flags_type;
+
+ auto arglist = Py_BuildValue("(OO)", log_obj, string_obj);
+
+- auto result = PyEval_CallObject($input, arglist);
++ auto result = PyObject_CallObject($input, arglist);
+
+ Py_XDECREF(arglist);
+ Py_XDECREF(log_obj);
+@@ -177,7 +177,7 @@ typedef guint pyg_flags_type;
+ $1 = [=] () {
+ const auto gstate = PyGILState_Ensure();
+
+- const auto result = PyEval_CallObject($input, nullptr);
++ const auto result = PyObject_CallObject($input, nullptr);
+ const bool completed = !PyErr_Occurred();
+ const bool valid_result = (completed && result == Py_None);
+
+@@ -221,7 +221,7 @@ typedef guint pyg_flags_type;
+
+ auto arglist = Py_BuildValue("(OO)", device_obj, packet_obj);
+
+- auto result = PyEval_CallObject($input, arglist);
++ auto result = PyObject_CallObject($input, arglist);
+
+ Py_XDECREF(arglist);
+ Py_XDECREF(device_obj);
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 53a03db1cb71..42e7e0714558 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild
index 6c0b94824276..b1536e1afd6e 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild
new file mode 100644
index 000000000000..ea6a56fc8bb3
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://sigrok.org/${PN}"
+ inherit git-r3
+else
+ SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb"
+REQUIRED_USE="java? ( cxx )
+ python? ( cxx ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND="
+ >=dev-libs/glib-2.32.0[static-libs(+)]
+ >=dev-libs/libzip-0.8:=[static-libs(+)]
+ bluetooth? ( >=net-wireless/bluez-4.0:= )
+ cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+ ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
+ hidapi? ( >=dev-libs/hidapi-0.8.0 )
+ parport? ( sys-libs/libieee1284[static-libs(+)] )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+ )
+ serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+ usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+ java? ( >=virtual/jre-1.8:* )
+ !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ static-libs? ( ${LIB_DEPEND} )
+"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+ cxx? ( app-text/doxygen )
+ java? (
+ >=dev-lang/swig-3.0.6
+ >=virtual/jdk-1.8:*
+ )
+ python? (
+ >=dev-lang/swig-3.0.6
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ test? ( >=dev-libs/check-0.9.4 )
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+ # https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+ "${FILESDIR}/${P}-swig-4.patch"
+ # https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+ "${FILESDIR}/${P}-check-0.15.patch"
+ # https://bugs.gentoo.org/878395
+ "${FILESDIR}/${PN}-0.5.2-swig-4.1.patch"
+
+ "${FILESDIR}/${P}-py313.patch"
+)
+
+pkg_setup() {
+ use python && python_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+ [[ ${PV} == *9999* ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
+ eautoreconf
+}
+
+src_prepare() {
+ default
+ sigrok_src_prepare
+ use python && python_copy_sources
+}
+
+sigrok_src_configure() {
+ econf \
+ $(use_with bluetooth libbluez) \
+ $(use_with ftdi libftdi) \
+ $(use_with hidapi libhidapi) \
+ $(use_with parport libieee1284) \
+ $(use_with serial libserialport) \
+ $(use_with usb libusb) \
+ $(use_enable cxx) \
+ $(use_enable java) \
+ $(use_enable static-libs static) \
+ "${@}"
+}
+
+each_python_configure() {
+ cd "${BUILD_DIR}"
+ sigrok_src_configure --disable-ruby --enable-python
+}
+
+src_configure() {
+ sigrok_src_configure --disable-ruby --disable-python
+ use python && python_foreach_impl each_python_configure
+}
+
+each_python_compile() {
+ cd "${BUILD_DIR}"
+ emake python-build
+}
+
+src_compile() {
+ default
+ use python && python_foreach_impl each_python_compile
+}
+
+src_test() {
+ emake check
+}
+
+each_python_install() {
+ cd "${BUILD_DIR}"
+ emake python-install DESTDIR="${D}"
+ python_optimize
+}
+
+src_install() {
+ default
+ use python && python_foreach_impl each_python_install
+ use udev && udev_dorules contrib/*.rules
+ find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ udev_reload
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ udev_reload
+}
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index f2bb661e3a94..951d87e75bb6 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit python-r1 java-pkg-opt-2 udev xdg-utils
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3 autotools
else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index 7f08ceba2b56..36b2d914940c 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -1,4 +1,6 @@
+AUX libsigrokdecode-0.5.3-py3.13.patch 1214 BLAKE2B e102818a60fa3a8c773c3e6770d6e485e27f04040a99dd64b3449555ba5885e1ebc00e2f1c3b1fed8fac29fa95ec969c672ee1f32bfe9da7115a97a63302a4d7 SHA512 9c8f347b6a582c1fed2f3e21d830c2457fb85a1dee8498a0b863a7ca96f0a24b3b2d1ae631f8282e7c080a03031c250e3eb7bfae301df219a3ac56efc20550ee
DIST libsigrokdecode-0.5.3.tar.gz 892783 BLAKE2B 45bae2488e4872be3bb891813083ed540617ac88558bb6c2d971fbb0c05585d3fcb74192fc83ce7d67ee466bc04c61fbccf6f475e549b80c86fe5f0cc191c7c1 SHA512 23393504b68135ed4ae8e8a654df024620af02e84fa3955956c61899388812229108155b4ae8d946e61f33dc8a8807db090d608350548a7a717d966442b07b9e
-EBUILD libsigrokdecode-0.5.3-r2.ebuild 1096 BLAKE2B c19aec64543d9be8f3163cde60db0eead9f67da219dec7851386c7e0230c12e046541a0c393a65b6c3ee2077e4cf5e415f7e0ee1b488a1e67b6d55117dab2b05 SHA512 4a38dd9476b55d6ae16e407c4ca9241b820be7d2cfaca5c6774ede4bec6c64e9481403f23b7663834b916bf11c1c236f82891e5139dfe0849a0e2833361cf6f7
-EBUILD libsigrokdecode-9999.ebuild 1099 BLAKE2B b63f0c5489d6e8b91a6c7f55c7430e2aad9b641c7289d8335f8b99c25edba8192dbd19556e71297e8c4e93165703258fcf70bd321c846b4212c4163e64feeafd SHA512 1a7d3265095348ddbb80d03a2bcf3d52f24191c492e672735f243f2974ff9c325b7ba7078f33adf966b53e4ee1bc77efb8ff5f307a42201de2c95f9a57f5a6a0
+EBUILD libsigrokdecode-0.5.3-r2.ebuild 1097 BLAKE2B b0cd034c3158805f27ef2b62d9f9308eade00e9526c80f214924c9dd22d9065faefe1ed98f45c54e306c7e1d12c51455b9cbb4c2e039d4c1f535d6d4e07d68e7 SHA512 93679a8094c05130d095ef66d9b6a5bd1b33f25a1cbb31885224e46513605a56c3db6a2a48e5e8cdddf5ffbe2c05a76325bd3f15a35bfcc30aae59d99693170d
+EBUILD libsigrokdecode-0.5.3-r3.ebuild 1143 BLAKE2B fd2795591b6d92a2ca458df64af72c12318aab57235682c52e711905c18c20e00375dd172a57d221691cc04b08eb09380d7d84766550659693a210fa5a671943 SHA512 1a07d677d90257750bdf5a99dcce81631b7871bebdfbf5460ba1d4ad375e2b2a8b9abf4a10206970af1f3359df4a77023554fe5066638f24a68494ed2009e515
+EBUILD libsigrokdecode-9999.ebuild 1097 BLAKE2B 6d3401361aa9c05208b440185e03991d9621a6dcc46b36eb36843bbedb8415aabb5ca6e7b5acaad515d3f4e9d1732a3ac7bd2b4da999998f1ea8ab185046afbe SHA512 3f29b010eba26ff4145031dfb03146933be668f72e4a3c0e53849a8d7a4fc97fba23e2b2cd5747158a29a9af323217212ed203d287c49423c36d995f9f031bd1
MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch
new file mode 100644
index 000000000000..89078b3ba70e
--- /dev/null
+++ b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch
@@ -0,0 +1,37 @@
+http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff;h=0c35c5c5845d05e5f624c99d58af992d2f004446
+
+From: Sascha Silbe <redacted>
+Date: Mon, 23 Oct 2023 20:21:38 +0000 (+0200)
+Subject: srd: drop deprecated PyEval_InitThreads() on Python 3.9+
+X-Git-Url: http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=0c35c5c5845d05e5f624c99d58af992d2f004446
+
+srd: drop deprecated PyEval_InitThreads() on Python 3.9+
+
+`PyEval_InitThreads()` is called implicitly during `Py_InitializeEx()`
+since Python 3.7. It has been deprecated since 3.9 and dropped in
+3.13.
+
+[ gsi: touch up comment style ]
+---
+
+diff --git a/srd.c b/srd.c
+index 35ec5f2..10dfaf6 100644
+--- a/srd.c
++++ b/srd.c
+@@ -302,8 +302,14 @@ SRD_API int srd_init(const char *path)
+ g_strfreev(dir_list);
+ }
+
+- /* Initialize the Python GIL (this also happens to acquire it). */
++#if PY_VERSION_HEX < 0x03090000
++ /*
++ * Initialize and acquire the Python GIL. In Python 3.7+ this
++ * will be done implicitly as part of the Py_InitializeEx()
++ * call above. PyEval_InitThreads() was deprecated in 3.9.
++ */
+ PyEval_InitThreads();
++#endif
+
+ /* Release the GIL (ignore return value, we don't need it here). */
+ (void)PyEval_SaveThread();
+
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
index 617e1edb0d21..72015cba5833 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit autotools python-single-r1
if [[ ${PV} == *9999* ]]; then
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild
new file mode 100644
index 000000000000..0e58fddc4fb2
--- /dev/null
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools python-single-r1
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://sigrok.org/${PN}"
+ inherit git-r3
+else
+ SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Provide (streaming) protocol decoding functionality"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.34.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-py3.13.patch
+)
+
+src_prepare() {
+ default
+
+ # bug #794592
+ sed -i -e "s/\[SRD_PKGLIBS\],\$/& [python-${EPYTHON#python}-embed], [python-${EPYTHON#python}],/" configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static) PYTHON3="${PYTHON}"
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ default
+ python_optimize "${D}"/usr/share/libsigrokdecode/decoders
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index 8f04c30aebba..193ac833026d 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit autotools python-single-r1
if [[ ${PV} == *9999* ]]; then
@@ -18,7 +18,7 @@ DESCRIPTION="Provide (streaming) protocol decoding functionality"
HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
LICENSE="GPL-3"
-SLOT="0/9999"
+SLOT="0/4"
IUSE="static-libs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"