[packages/FreeImage] - updated to 3.18.0 - removed obsolete libwebp-cpp patch
qboosh
qboosh at pld-linux.org
Wed Dec 30 20:00:37 CET 2020
commit 06ec3913d7fa6818359f0b71a88125288e729637
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Dec 30 20:00:30 2020 +0100
- updated to 3.18.0
- removed obsolete libwebp-cpp patch
FreeImage-libwebp-cpp.patch | 42 --------------------------------------
FreeImage.spec | 49 +++++++++++++++++++++++++++++----------------
2 files changed, 32 insertions(+), 59 deletions(-)
---
diff --git a/FreeImage.spec b/FreeImage.spec
index 0e4acd9..53bbc17 100644
--- a/FreeImage.spec
+++ b/FreeImage.spec
@@ -1,28 +1,28 @@
# TODO: use system libraries (if possible):
-# libjpeg 9a
-# libpng 1.6.16
-# libtiff 4.0.4+CVS
-# libraw 0.17-alpha1
+# libjpeg 9c
+# libpng 1.6.35
+# libtiff 4.0.9+git
+# libraw 0.19
# openjpeg 2.1.0+svn
-# zlib 1.2.8
-# libwebp 0.4.2+git
+# zlib 1.2.11
+# libwebp 1.0.0+git
# LibJXR 1.1+git
-# OpenEXR 2.2.0
+# OpenEXR 2.2.1
%define fver %(echo %{version} | tr -d .)
Summary: Library for handling different graphics files formats
Summary(pl.UTF-8): Biblioteka do manipulacji różnymi formatami plików graficznych
Name: FreeImage
-Version: 3.17.0
-Release: 2
+Version: 3.18.0
+Release: 1
License: GPL and FIPL v1.0 (see the license-fi.txt)
Group: Libraries
Source0: http://downloads.sourceforge.net/freeimage/%{name}%{fver}.zip
-# Source0-md5: 459e15f0ec75d6efa3c7bd63277ead86
+# Source0-md5: f8ba138a3be233a3eed9c456e42e2578
Source1: http://downloads.sourceforge.net/freeimage/%{name}%{fver}.pdf
-# Source1-md5: 9d7e12d5062b51082407a6d69aa7d020
-Patch0: %{name}-libwebp-cpp.patch
+# Source1-md5: 01d2b93728273caec87f19949fcc4981
URL: http://freeimage.sourceforge.net/index.html
BuildRequires: libstdc++-devel
+BuildRequires: rpmbuild(macros) >= 1.752
BuildRequires: unzip
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,6 +43,7 @@ Summary: Header files for FreeImage library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki FreeImage
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: libstdc++-devel
%description devel
Header files for FreeImage library.
@@ -62,9 +63,20 @@ Static FreeImage library.
%description static -l pl.UTF-8
Statyczna biblioteka FreeImage.
+%package apidocs
+Summary: Documentation for FreeImage library
+Summary(pl.UTF-8): Dokumentacja do biblioteki FreeImage
+Group: Documentation
+%{?noarchpackage}
+
+%description apidocs
+Documentation for FreeImage library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja do biblioteki FreeImage.
+
%prep
%setup -q -n %{name}
-%patch0 -p1
%build
CFLAGS="%{rpmcflags} -fPIC -fvisibility=hidden" \
@@ -104,15 +116,14 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README.linux Whatsnew.txt license-fi.txt
-%attr(755,root,root) %{_libdir}/libfreeimage-*.*.*.so
+%doc README.linux README.md Whatsnew.txt license-fi.txt
+%attr(755,root,root) %{_libdir}/libfreeimage-%{version}.so
%attr(755,root,root) %ghost %{_libdir}/libfreeimage.so.3
-%attr(755,root,root) %{_libdir}/libfreeimageplus-*.*.*.so
+%attr(755,root,root) %{_libdir}/libfreeimageplus-%{version}.so
%attr(755,root,root) %ghost %{_libdir}/libfreeimageplus.so.3
%files devel
%defattr(644,root,root,755)
-%doc FreeImage%{fver}.pdf
%attr(755,root,root) %{_libdir}/libfreeimage.so
%attr(755,root,root) %{_libdir}/libfreeimageplus.so
%{_includedir}/FreeImage.h
@@ -123,3 +134,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libfreeimage.a
%{_libdir}/libfreeimageplus.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc FreeImage%{fver}.pdf
diff --git a/FreeImage-libwebp-cpp.patch b/FreeImage-libwebp-cpp.patch
deleted file mode 100644
index 1c17869..0000000
--- a/FreeImage-libwebp-cpp.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- FreeImage/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c.orig 2015-02-20 03:34:36.000000000 +0100
-+++ FreeImage/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c 2016-05-23 15:13:46.386879788 +0200
-@@ -34,15 +34,15 @@
- G = G - t2 + kGCst; \
- B = B + kBCst; \
- __asm__ volatile ( \
-- "shll_s.w %["#R"], %["#R"], 9 \n\t" \
-- "shll_s.w %["#G"], %["#G"], 9 \n\t" \
-- "shll_s.w %["#B"], %["#B"], 9 \n\t" \
-- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \
-- "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \
-- "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \
-- "srl %["#R"], %["#R"], 24 \n\t" \
-- "srl %["#G"], %["#G"], 24 \n\t" \
-- "srl %["#B"], %["#B"], 24 \n\t" \
-+ "shll_s.w %[" #R "], %[" #R "], 9 \n\t" \
-+ "shll_s.w %[" #G "], %[" #G "], 9 \n\t" \
-+ "shll_s.w %[" #B "], %[" #B "], 9 \n\t" \
-+ "precrqu_s.qb.ph %[" #R "], %[" #R "], $zero \n\t" \
-+ "precrqu_s.qb.ph %[" #G "], %[" #G "], $zero \n\t" \
-+ "precrqu_s.qb.ph %[" #B "], %[" #B "], $zero \n\t" \
-+ "srl %[" #R "], %[" #R "], 24 \n\t" \
-+ "srl %[" #G "], %[" #G "], 24 \n\t" \
-+ "srl %[" #B "], %[" #B "], 24 \n\t" \
- : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \
- : \
- ); \
---- FreeImage/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c.orig 2015-02-20 03:34:38.000000000 +0100
-+++ FreeImage/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c 2016-05-23 15:15:34.452490572 +0200
-@@ -54,9 +54,9 @@
- "srl %[temp5], %[temp5], 24 \n\t" \
- "srl %[temp6], %[temp6], 24 \n\t" \
- "srl %[temp7], %[temp7], 24 \n\t" \
-- "sb %[temp5], "#R"(%[dst]) \n\t" \
-- "sb %[temp6], "#G"(%[dst]) \n\t" \
-- "sb %[temp7], "#B"(%[dst]) \n\t" \
-+ "sb %[temp5], " #R "(%[dst]) \n\t" \
-+ "sb %[temp6], " #G "(%[dst]) \n\t" \
-+ "sb %[temp7], " #B "(%[dst]) \n\t" \
-
- #define ASM_CLOBBER_LIST() \
- : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/FreeImage.git/commitdiff/06ec3913d7fa6818359f0b71a88125288e729637
More information about the pld-cvs-commit
mailing list