- updated to 1.3.3

- updated meson patch

diff --git a/dssim-meson.patch b/dssim-meson.patch
index 67c099c48cc9d2d90d6e2bd9a7ad8eacdf683eb9..5a78a6885ecc38518c0ef379c33882930374207e 100644 (file)
--- a/dssim-meson.patch
+++ b/dssim-meson.patch
@@ -1,34 +1,10 @@
---- dssim-1.3.2/meson.build.orig       2016-05-05 14:02:11.000000000 +0200
-+++ dssim-1.3.2/meson.build    2017-07-28 20:57:02.888208491 +0200
-@@ -5,18 +5,17 @@
- dssim_sources = ['src/main.c',
-                'src/rwpng.c']
- 
-+cc = meson.get_compiler('c')
+--- dssim-1.3.3/meson.build.orig       2020-03-29 16:35:39.091980028 +0200
++++ dssim-1.3.3/meson.build    2020-03-29 16:49:20.514196669 +0200
+@@ -10,7 +10,6 @@
  c_args = ['-DNDEBUG',
--        '-O3',
-         '-fstrict-aliasing',
-         '-ffast-math',
--        '-funroll-loops',
-         '-fomit-frame-pointer',
-         '-ffinite-math-only',
-         '-Wall',
-         '-std=c99']
- 
--mathlib = find_library('m', required : true)
--zlib = find_library('z', required : true)
-+mathlib = cc.find_library('m', required : true)
-+zlib = cc.find_library('z', required : true)
- 
- libdssim = shared_library('dssim-lib',
-                         dssim_lib_sources,
-@@ -27,7 +26,8 @@
- 
- h = install_headers ('src/dssim.h')
- 
--pkgconfig_gen(libraries : libdssim,
-+pkg = import('pkgconfig')
-+pkg.generate( libraries : libdssim,
-             subdirs : '.',
-             name : 'libdssim',
-             filebase : 'dssim',
+       '-fstrict-aliasing',
+       '-ffast-math',
+-      '-funroll-loops',
+       '-fomit-frame-pointer',
+       '-ffinite-math-only',
+       '-Wall',

diff --git a/dssim.spec b/dssim.spec
index 0de2aa5797a5bf59f7b36d8d0b6f4ec66c2096e9..a762b7eca79c8b1bcf7c6ce854afa50de49ae979 100644 (file)
--- a/dssim.spec
+++ b/dssim.spec
@@ -2,18 +2,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:          dssim
-Version:       1.3.2
+Version:       1.3.3
 Release:       1
 License:       AGPL v3+
 Group:         Applications/Graphics
 #Source0Download: https://github.com/pornel/dssim/releases
 Source0:       https://github.com/pornel/dssim/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 20072b430c94edb8c665ba87be00af3e
+# Source0-md5: 4bd83d9c553f6855da581ea6e0c41e03
 Patch0:                %{name}-meson.patch
 URL:           https://kornel.ski/dssim
 BuildRequires: libpng-devel
-BuildRequires: meson
-BuildRequires: ninja
+BuildRequires: meson >= 0.35.0
+BuildRequires: ninja >= 1.5
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,21 +63,14 @@ Plik nagłówkowy biblioteki DSSIM.
 %patch0 -p1
 
 %build
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags} %{rpmcppflags}" \
-LDFLAGS="%{rpmldflags}" \
-meson build \
-       --buildtype=plain \
-       --prefix=%{_prefix} \
-       --libdir=%{_libdir}
+%meson build
 
-ninja -C build -v
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-DESTDIR=$RPM_BUILD_ROOT \
-ninja -C build -v install
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT