[directfb] Fix build with libpng 1.5 (patch from Gentoo).

Ville Skyttä scop at fedoraproject.org
Sat Jan 14 17:34:08 UTC 2012


commit 324de72830a022c2cbdbc61a6b8b0375b8aac273
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Jan 14 19:33:47 2012 +0200

    Fix build with libpng 1.5 (patch from Gentoo).

 .gitignore    |    9 ++-------
 directfb.spec |    7 ++++++-
 sources       |    1 +
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3831d80..aee3eef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,2 @@
-DirectFB-1.4.3.tar.gz
-/DirectFB-1.4.11.tar.gz
-/DirectFB-1.4.13.tar.gz
-/DirectFB-1.5.0.tar.gz
-/DirectFB-1.5.1.tar.gz
-/DirectFB-1.5.2.tar.gz
-/DirectFB-1.5.3.tar.gz
+/*.tar.*
+/DirectFB-1.4.9-libpng-1.5.patch
diff --git a/directfb.spec b/directfb.spec
index facce1b..9dd873f 100644
--- a/directfb.spec
+++ b/directfb.spec
@@ -4,11 +4,12 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
 Version: %{major_ver}%{minor_ver}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
 Source0: http://www.directfb.org/downloads/Core/DirectFB-%{major_ver}/DirectFB-%{version}.tar.gz
+Patch0: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch
 Patch1: DirectFB-1.2.8-tweak.patch
 Patch2: DirectFB-1.5.3-fix_v4l1.patch
 Patch3: DirectFB-1.5.3-lm.patch
@@ -67,6 +68,7 @@ Development files for DirectFB.
 
 %prep
 %setup -q -n DirectFB-%{version}
+%patch0 -p1 -b .libpng15
 %patch1 -p1 -b .tweak
 %patch2 -p1 -b .fix_v4l1
 %patch3 -p1 -b .lm
@@ -211,6 +213,9 @@ make check
 
 
 %changelog
+* Sat Jan 14 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.5.3-4
+- Fix build with libpng 1.5 (patch from Gentoo).
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 20bc546..3b923d8 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 54a9ec931c8e3c82adb924194e65120e  DirectFB-1.5.3.tar.gz
+84f3181e96692efc5ff68e5dac19541f  DirectFB-1.4.9-libpng-1.5.patch


More information about the scm-commits mailing list