[tvtime/f17] fix ftbfs, build against libpng15

Tom Callaway spot at fedoraproject.org
Mon Mar 5 19:54:48 UTC 2012


commit 560945ab1fa1533cec4051f2f13cc03d3b465257
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Mar 5 14:54:34 2012 -0500

    fix ftbfs, build against libpng15

 tvtime-1.0.2-png15.patch |   11 +++++++++++
 tvtime.spec              |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/tvtime-1.0.2-png15.patch b/tvtime-1.0.2-png15.patch
new file mode 100644
index 0000000..a3cb3be
--- /dev/null
+++ b/tvtime-1.0.2-png15.patch
@@ -0,0 +1,11 @@
+diff -up tvtime-1.0.2/src/pngoutput.c.png15 tvtime-1.0.2/src/pngoutput.c
+--- tvtime-1.0.2/src/pngoutput.c.png15	2012-03-05 14:51:38.832067205 -0500
++++ tvtime-1.0.2/src/pngoutput.c	2012-03-05 14:51:48.717958869 -0500
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <png.h>
++#include <zlib.h>
+ #include "pngoutput.h"
+ 
+ struct pngoutput_s
diff --git a/tvtime.spec b/tvtime.spec
index 7112b96..aa77ba0 100644
--- a/tvtime.spec
+++ b/tvtime.spec
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer
 Name: tvtime
 Version: 1.0.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -15,6 +15,7 @@ Patch4: tvtime-1.0.2-localedef.patch
 Patch5: tvtime-1.0.2-alsamixer2.patch
 Patch6: tvtime-1.0.2-xss.patch
 Patch7: tvtime-1.0.2-videoinput.patch
+Patch8: tvtime-1.0.2-png15.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +61,7 @@ videophiles.
 %patch5 -p1 -b .alsamixer2
 %patch6 -p1 -b .xss
 %patch7 -p1 -b .vidioc
+%patch8 -p1 -b .png15
 
 for i in AUTHORS docs/man/{de,es}/*.?; do
 	iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -125,6 +127,9 @@ rm -rf %{buildroot}
 %{_bindir}/tvtime
 
 %changelog
+* Mon Mar  5 2012 Tom Callaway <spot at fedoraproject.org> - 1.0.2-20
+- fix code to build properly against libpng 1.5
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list