[packages/libwebp] - updated to 1.1.0 - added link patch (put local libs first to fix build with older libwebp installe

qboosh qboosh at pld-linux.org
Wed Jan 15 19:47:38 CET 2020


commit 1d6d2eb34a1f8163c5c3c17d59fd7ccabbe40a49
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 15 19:47:40 2020 +0100

    - updated to 1.1.0
    - added link patch (put local libs first to fix build with older libwebp installed)

 libwebp-link.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 libwebp.spec       |  6 ++++--
 2 files changed, 56 insertions(+), 2 deletions(-)
---
diff --git a/libwebp.spec b/libwebp.spec
index 79e1b53..c6fc626 100644
--- a/libwebp.spec
+++ b/libwebp.spec
@@ -5,13 +5,14 @@
 Summary:	WebP image codec libraries
 Summary(pl.UTF-8):	Biblioteki do kodeka obrazów WebP
 Name:		libwebp
-Version:	1.0.3
+Version:	1.1.0
 Release:	1
 License:	BSD
 Group:		Libraries
 #Source0Download: http://downloads.webmproject.org/releases/webp/index.html
 Source0:	http://downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz
-# Source0-md5:	906ad85daaaa2eac97c8aa2dec9e8b77
+# Source0-md5:	7e047f2cbaf584dff7a8a7e0f8572f18
+Patch0:		%{name}-link.patch
 URL:		https://developers.google.com/speed/webp/
 %{?with_opengl:BuildRequires:	OpenGL-devel}
 %{?with_opengl:BuildRequires:	OpenGL-glut-devel}
@@ -68,6 +69,7 @@ Narzędzia do kodeka obrazów WebP.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/libwebp-link.patch b/libwebp-link.patch
new file mode 100644
index 0000000..abe4c6f
--- /dev/null
+++ b/libwebp-link.patch
@@ -0,0 +1,52 @@
+--- libwebp-1.1.0/examples/Makefile.am.orig	2019-12-21 14:37:43.000000000 +0100
++++ libwebp-1.1.0/examples/Makefile.am	2020-01-15 05:32:27.958820989 +0100
+@@ -34,6 +34,11 @@
+ anim_diff_LDADD += ../src/demux/libwebpdemux.la
+ anim_diff_LDADD += libexample_util.la
+ anim_diff_LDADD += ../imageio/libimageio_util.la
++if BUILD_LIBWEBPDECODER
++  anim_diff_LDADD += ../src/libwebpdecoder.la
++else
++  anim_diff_LDADD += ../src/libwebp.la
++endif
+ anim_diff_LDADD += $(GIF_LIBS) -lm
+ 
+ anim_dump_SOURCES = anim_dump.c anim_util.c anim_util.h gifdec.c gifdec.h
+@@ -44,6 +49,11 @@
+ anim_dump_LDADD += libexample_util.la
+ anim_dump_LDADD += ../imageio/libimageio_util.la
+ anim_dump_LDADD += ../imageio/libimageenc.la
++if BUILD_LIBWEBPDECODER
++  anim_dump_LDADD += ../src/libwebpdecoder.la
++else
++  anim_dump_LDADD += ../src/libwebp.la
++endif
+ anim_dump_LDADD += $(PNG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) -lm
+ 
+ cwebp_SOURCES  = cwebp.c stopwatch.h
+@@ -81,6 +91,11 @@
+ vwebp_LDADD += libexample_util.la
+ vwebp_LDADD += ../imageio/libimageio_util.la
+ vwebp_LDADD += ../src/demux/libwebpdemux.la
++if BUILD_LIBWEBPDECODER
++  vwebp_LDADD += ../src/libwebpdecoder.la
++else
++  vwebp_LDADD += ../src/libwebp.la
++endif
+ vwebp_LDADD += $(GL_LIBS)
+ 
+ webpmux_SOURCES = webpmux.c
+@@ -107,13 +122,3 @@
+ webpinfo_LDADD += libexample_util.la
+ webpinfo_LDADD += ../imageio/libimageio_util.la
+ webpinfo_LDADD += ../src/libwebp.la
+-
+-if BUILD_LIBWEBPDECODER
+-  anim_diff_LDADD += ../src/libwebpdecoder.la
+-  anim_dump_LDADD += ../src/libwebpdecoder.la
+-  vwebp_LDADD += ../src/libwebpdecoder.la
+-else
+-  anim_diff_LDADD += ../src/libwebp.la
+-  anim_dump_LDADD += ../src/libwebp.la
+-  vwebp_LDADD += ../src/libwebp.la
+-endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libwebp.git/commitdiff/1d6d2eb34a1f8163c5c3c17d59fd7ccabbe40a49



More information about the pld-cvs-commit mailing list