diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2013-04-11 18:23:35 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2013-04-11 18:23:35 +0000 |
| commit | 441571e9228d2128bc7de706e244cb366a0aa1f6 (patch) | |
| tree | abcf8cbe34319191174a673e25d8347f13b14aed /media-libs/libsfml | |
| parent | Fix LICENSE, "free for non-comercial use" according to README file. (diff) | |
| download | gentoo-2-441571e9228d2128bc7de706e244cb366a0aa1f6.tar.gz gentoo-2-441571e9228d2128bc7de706e244cb366a0aa1f6.tar.bz2 gentoo-2-441571e9228d2128bc7de706e244cb366a0aa1f6.zip | |
Update patch to fix build with >=libpng-1.6.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'media-libs/libsfml')
| -rw-r--r-- | media-libs/libsfml/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch | 16 |
2 files changed, 15 insertions, 9 deletions
diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog index f0e99a16e2ff..41111a5f438c 100644 --- a/media-libs/libsfml/ChangeLog +++ b/media-libs/libsfml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsfml -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.10 2012/12/03 21:35:25 radhermit Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.11 2013/04/11 18:23:35 radhermit Exp $ + + 11 Apr 2013; Tim Harder <radhermit@gentoo.org> + files/libsfml-1.6-deps-and-flags.patch: + Update patch to fix build with >=libpng-1.6. 03 Dec 2012; Tim Harder <radhermit@gentoo.org> libsfml-1.6-r1.ebuild, libsfml-2.0_pre20121126.ebuild: diff --git a/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch b/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch index 8dcbff56bf83..bd24ce5f9123 100644 --- a/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch +++ b/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch @@ -1,4 +1,4 @@ ---- SFML-1.6.orig/src/SFML/Audio/Makefile +--- SFML-1.6/src/SFML/Audio/Makefile +++ SFML-1.6/src/SFML/Audio/Makefile @@ -25,7 +25,7 @@ $(CPP) -o $@ -c $< $(CFLAGS)
@@ -9,7 +9,7 @@ .PHONY: clean mrproper
---- SFML-1.6.orig/src/SFML/Graphics/GraphicsContext.hpp +--- SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp +++ SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp @@ -30,7 +30,7 @@ ////////////////////////////////////////////////////////////
@@ -20,9 +20,9 @@ #include <iostream>
#include <string>
---- SFML-1.6.orig/src/SFML/Graphics/ImageLoader.cpp +--- SFML-1.6/src/SFML/Graphics/ImageLoader.cpp +++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp -@@ -28,10 +28,10 @@ +@@ -28,11 +28,12 @@ #include <SFML/Graphics/ImageLoader.hpp>
extern "C"
{
@@ -32,11 +32,13 @@ + #include <jerror.h>
}
-#include <SFML/Graphics/libpng/png.h>
-+#include <png.h>
#include <SFML/Graphics/SOIL/SOIL.h>
++#include <png.h>
++#include <string.h>
#include <iostream>
---- SFML-1.6.orig/src/SFML/Graphics/Makefile +
+--- SFML-1.6/src/SFML/Graphics/Makefile +++ SFML-1.6/src/SFML/Graphics/Makefile @@ -1,15 +1,7 @@ SRC = $(wildcard *.cpp)
@@ -84,7 +86,7 @@ mrproper: clean
@rm -rf $(LIBNAME)
---- SFML-1.6.orig/src/SFML/Makefile +--- SFML-1.6/src/SFML/Makefile +++ SFML-1.6/src/SFML/Makefile @@ -4,7 +4,7 @@ ifeq ($(DEBUGBUILD), yes)
|