rpms
/
freeimage
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix under-linked library

This commit is contained in:
Sandro Mani 2015-10-01 00:42:35 +02:00
parent cff9c9b392
commit 381ce41302
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FreeImage-3.17.0_unbundle.patch
View File

@ -88,8 +88,8 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
-# LibJXR
-CXXFLAGS += -D__ANSI__
-CXXFLAGS += $(INCLUDE)
+override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp zlib)
+override LDFLAGS += -ljpeg -ljpegxr $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp zlib)
+override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
+override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
- CFLAGS += -fPIC

5
freeimage.spec
View File

@ -3,7 +3,7 @@
Name: freeimage
Version: 3.17.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Multi-format image decoder library
# freeimage is tripple-licensed, see
@ -141,6 +141,9 @@ ldconfig -n %{buildroot}%{_libdir}
%changelog
* Wed Sep 30 2015 Sandro Mani <manisandro@gmail.com> - 3.17.0-2
- Fix under-linked library
* Thu Sep 17 2015 Sandro Mani <manisandro@gmail.com> - 3.17.0-1
- Update to 3.17.0
- Add fix for CVE-2015-0852 (#1257859)