소스 검색

package/libsigrokdecode: bump to v0.5.3

Remove the patch that's now upstream.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
[Peter: drop _AUTORECONF]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Bartosz Golaszewski 5 년 전
부모
커밋
c9b7c85623

+ 0 - 41
package/libsigrokdecode/0001-configure-ac-Add-support-for-Python-3-8.patch

@@ -1,41 +0,0 @@
-From afae4fa61ffd8dee62667e60f931e371061c7d7d Mon Sep 17 00:00:00 2001
-From: Uwe Hermann <uwe@hermann-uwe.de>
-Date: Tue, 12 Nov 2019 21:58:23 +0100
-Subject: [PATCH] configure.ac: Add support for Python 3.8.
-
-This fixes bug #1438.
-[Retrieved from:
-https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=afae4fa61ffd8dee62667e60f931e371061c7d7d]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- configure.ac | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 772b984..d59e0be 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,15 +89,18 @@ SRD_PKGLIBS_TESTS=
- SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary])
- 
- # Python 3 is always needed.
-+# Starting with Python 3.8 we need to check for "python-3.8-embed"
-+# first, since usually only that variant will add "-lpython3.8".
-+# https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
- SR_PKG_CHECK([python3], [SRD_PKGLIBS],
--	[python3 >= 3.2], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2])
-+	[python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
- AS_IF([test "x$sr_have_python3" = xno],
- 	[AC_MSG_ERROR([Cannot find Python 3 development headers.])])
- 
- # We also need to find the name of the python3 executable (for 'make install').
- # Some OSes call this python3, some call it python3.2, etc. etc.
- AC_ARG_VAR([PYTHON3], [Python 3 interpreter])
--AC_CHECK_PROGS([PYTHON3], [python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3])
-+AC_CHECK_PROGS([PYTHON3], [python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3])
- AS_IF([test "x$PYTHON3" = x],
- 	[AC_MSG_ERROR([Cannot find Python 3 interpreter.])])
- 
--- 
-2.24.0.rc2
-

+ 1 - 1
package/libsigrokdecode/libsigrokdecode.hash

@@ -1,3 +1,3 @@
 # Locally computed
-sha256	e08d9e797c54eccf3144da631b6e5f1498ac531e51520428df537a1da82583f0  libsigrokdecode-0.5.2.tar.gz
+sha256	c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0  libsigrokdecode-0.5.3.tar.gz
 sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING

+ 1 - 3
package/libsigrokdecode/libsigrokdecode.mk

@@ -4,13 +4,11 @@
 #
 ################################################################################
 
-LIBSIGROKDECODE_VERSION = 0.5.2
+LIBSIGROKDECODE_VERSION = 0.5.3
 LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode
 LIBSIGROKDECODE_LICENSE = GPL-3.0+
 LIBSIGROKDECODE_LICENSE_FILES = COPYING
 LIBSIGROKDECODE_INSTALL_STAGING = YES
 LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3
-# We're patching configure.ac
-LIBSIGROKDECODE_AUTORECONF = YES
 
 $(eval $(autotools-package))