git » sfml.git » commit 692f201

diff --git a/PKGBUILD b/PKGBUILD
index 82c1c1b..29b3e6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sfml
 pkgver=1.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple, fast, cross-platform and object-oriented multimedia API."
 arch=('i686' 'x86_64')
 url="http://www.sfml-dev.org"
@@ -14,13 +14,13 @@ install=sfml.install
 source=(http://downloads.sourceforge.net/${pkgname}/SFML-${pkgver}-sdk-linux-64.tar.gz
         use-system-libs.patch)
 md5sums=('7a9b3a1ef6d14cd25090e440ccdbb3a8'
-         '97f26f224ac1a443d91046358002385e')
+         '505ea908fb6e4b9359061d8d55373963')
 
 build() {
   cd "${srcdir}/SFML-${pkgver}"
 
   # apply patch to use system libs in favor of included ones (fixes many problems)
-  patch -Np0 < ../use-system-libs.patch
+  patch -Np1 < ../use-system-libs.patch
 
   # compile sfml
   make
diff --git a/use-system-libs.patch b/use-system-libs.patch
index 0e550da..5d32002 100644
--- a/use-system-libs.patch
+++ b/use-system-libs.patch
@@ -1,7 +1,28 @@
-Index: src/SFML/Graphics/Makefile
-===================================================================
---- src/SFML/Graphics/Makefile	(revision 1495)
-+++ src/SFML/Graphics/Makefile	(working copy)
+Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6
+Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ
+Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ
+Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ
+diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
+--- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp	2010-01-27 15:00:05.000000000 +0100
++++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp	2010-08-16 12:27:33.983627625 +0200
+@@ -28,10 +28,10 @@
+ #include <SFML/Graphics/ImageLoader.hpp>
+ extern "C"
+ {
+-    #include <SFML/Graphics/libjpeg/jpeglib.h>
+-    #include <SFML/Graphics/libjpeg/jerror.h>
++    #include <jpeglib.h>
++    #include <jerror.h>
+ }
+-#include <SFML/Graphics/libpng/png.h>
++#include <png.h>
+ #include <SFML/Graphics/SOIL/SOIL.h>
+ #include <iostream>
+ 
+Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej
+diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile
+--- SFML-1.6-old/src/SFML/Graphics/Makefile	2010-01-27 15:00:05.000000000 +0100
++++ SFML-1.6/src/SFML/Graphics/Makefile	2010-08-16 12:25:13.663501212 +0200
 @@ -1,15 +1,5 @@
  SRC     = $(wildcard *.cpp)
 -SRCGLEW = $(wildcard ./GLEW/*.c)
@@ -46,3 +67,4 @@ Index: src/SFML/Graphics/Makefile
  
  mrproper: clean
  	@rm -rf $(LIBNAME)
+Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej