[packages/dssim2] - updated to 3.2.0 - nasm-rs-x32 patch seems obsolete

qboosh qboosh at pld-linux.org
Tue Mar 1 21:03:55 CET 2022


commit 69a95dc3cdb00c2e8e0688bde911b146f22c2df1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Mar 1 21:05:51 2022 +0100

    - updated to 3.2.0
    - nasm-rs-x32 patch seems obsolete

 dssim2.spec       | 10 ++++------
 nasm-rs-x32.patch | 24 ------------------------
 2 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/dssim2.spec b/dssim2.spec
index 365c303..355b3ad 100644
--- a/dssim2.spec
+++ b/dssim2.spec
@@ -1,20 +1,19 @@
 Summary:	Tool to compute (dis)similarity between two or more images
 Summary(pl.UTF-8):	Narzędzie do obliczania (nie)podobieństwa dwóch lub większej liczby obrazów
 Name:		dssim2
-Version:	3.0.2
-Release:	2
+Version:	3.2.0
+Release:	1
 License:	AGPL v3+ or commercial
 Group:		Applications/Graphics
 #Source0Download: https://github.com/pornel/dssim/releases
 Source0:	https://github.com/pornel/dssim/archive/%{version}/dssim-%{version}.tar.gz
-# Source0-md5:	fdeb8d78e83789252c0e1284e318b303
+# Source0-md5:	64e777cdd859a9a556526a2ec69aef9b
 # cd dssim-%{version}
 # cargo vendor
 # cd ..
 # tar cJf dssim-vendor-%{version}.tar.xz dssim-%{version}/{vendor,Cargo.lock}
 Source1:	dssim-vendor-%{version}.tar.xz
-# Source1-md5:	09823b55783fe6efa146550ba92030a5
-Patch0:		nasm-rs-x32.patch
+# Source1-md5:	96943aeffac9afe4f4ab4198d04f3e0b
 URL:		https://kornel.ski/dssim
 BuildRequires:	cargo
 %ifarch %{ix86} %{x8664} x32
@@ -44,7 +43,6 @@ rozdzielczościami.
 
 %prep
 %setup -q -n dssim-%{version} -b1
-%patch0 -p1
 
 # use our offline registry
 export CARGO_HOME="$(pwd)/.cargo"
diff --git a/nasm-rs-x32.patch b/nasm-rs-x32.patch
deleted file mode 100644
index 45be53e..0000000
--- a/nasm-rs-x32.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- dssim-3.0.2/vendor/nasm-rs/src/lib.rs.orig	2021-12-28 19:48:17.000000000 +0100
-+++ dssim-3.0.2/vendor/nasm-rs/src/lib.rs	2022-01-24 11:37:55.316183333 +0100
-@@ -38,7 +38,13 @@
-     }
- 
-     match parts[0] {
--        "x86_64" => x86_64_triple(parts[2]),
-+        "x86_64" => {
-+            if parts.len() == 4 && parts[3] == "gnux32" {
-+                ("-felfx32", "-gdwarf")
-+            } else {
-+                x86_64_triple(parts[2])
-+            }
-+        },
-         "x86" | "i386" | "i586" | "i686" => x86_triple(parts[2]),
-         _ => ("", "-g"),
-     }
---- dssim-3.0.2/vendor/nasm-rs/.cargo-checksum.json.orig	2021-12-28 19:48:17.000000000 +0100
-+++ dssim-3.0.2/vendor/nasm-rs/.cargo-checksum.json	2022-01-24 11:48:41.842588064 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"53fc8cb5fa63d5c4187cacbeab0101393e3e794a197c0479542415cdd3e2126e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.markdown":"b895ae35bab26ae62fcc9db7023980479f31a36bb91ba2ca31ed723db2b32006","src/lib.rs":"f2841bd463deb38bd169d561a67813b83144fe81c91ce26ccf521e8f0ee7f24f"},"package":"a76f43faa0d13f9c89f72e1972446d558f003cfffb80eb16bb444231de1becd1"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"53fc8cb5fa63d5c4187cacbeab0101393e3e794a197c0479542415cdd3e2126e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.markdown":"b895ae35bab26ae62fcc9db7023980479f31a36bb91ba2ca31ed723db2b32006","src/lib.rs":"ffb5aecf20ed537463e5db3f146885aee83528985c292d67a30953fb7263b9d7"},"package":"a76f43faa0d13f9c89f72e1972446d558f003cfffb80eb16bb444231de1becd1"}
-\ No newline at end of file
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dssim2.git/commitdiff/69a95dc3cdb00c2e8e0688bde911b146f22c2df1



More information about the pld-cvs-commit mailing list