diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,5 +1,4 @@ libc.so.6 libpci.so.3 librt.so.1 -libusb-0.1.so.4 libusb-1.0.so.0 diff --git a/files/0001-avoid-deprecated-libusb-functions.patch b/files/0001-avoid-deprecated-libusb-functions.patch deleted file mode 100644 --- a/files/0001-avoid-deprecated-libusb-functions.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 291764a70e6d8b212680e311bfb0825abf2b9a2f Mon Sep 17 00:00:00 2001 -From: Alex James -Date: Sat, 14 Apr 2018 22:59:57 -0500 -Subject: ch341a_spi: Avoid deprecated libusb functions - -libusb 1.0.22 marked libusb_set_debug as deprecated. For such versions -of libusb, use libusb_set_option instead. - -Change-Id: Ib71ebe812316eaf49136979a942a946ef9e4d487 -Signed-off-by: Alex James -Reviewed-on: https://review.coreboot.org/25681 -Tested-by: Nico Huber -Reviewed-by: David Hendricks ---- - ch341a_spi.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ch341a_spi.c b/ch341a_spi.c -index 95e9c957..ee18624e 100644 ---- a/ch341a_spi.c -+++ b/ch341a_spi.c -@@ -441,7 +441,12 @@ int ch341a_spi_init(void) - return -1; - } - -- libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only). -+ /* Enable information, warning, and error messages (only). */ -+#if LIBUSB_API_VERSION < 0x01000106 -+ libusb_set_debug(NULL, 3); -+#else -+ libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); -+#endif - - uint16_t vid = devs_ch341a_spi[0].vendor_id; - uint16_t pid = devs_ch341a_spi[0].device_id; --- -cgit v1.2.1 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : flashrom -version : 1.0.1 -release : 2 +version : 1.2 +release : 4 source : - - https://download.flashrom.org/releases/flashrom-v1.0.1.tar.bz2 : d579f8dda5b69eeab55a658d59ffbe185443e4e8477e751aaf38c36468cede44 + - https://download.flashrom.org/releases/flashrom-v1.2.tar.bz2 : e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b license : GPL-2.0-or-later component : system.utils summary : flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. @@ -11,8 +11,6 @@ builddeps : - pkgconfig(libpci) - pkgconfig(libusb) -setup : | - %patch -p1 < $pkgfiles/0001-avoid-deprecated-libusb-functions.patch build : | %make install : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -24,12 +24,12 @@ - - 2019-05-17 - 1.0.1 + + 2020-02-19 + 1.2 Packaging update Moriel Yitzhak Ever emoriel17@yahoo.com \ No newline at end of file