1 files changed, 111 insertions, 0 deletions
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
new file mode 100644
index 000000000000..bd24ce5f9123
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch
@@ -0,0 +1,111 @@
+--- SFML-1.6/src/SFML/Audio/Makefile
++++ SFML-1.6/src/SFML/Audio/Makefile
+@@ -25,7 +25,7 @@
+ 	$(CPP) -o $@ -c $< $(CFLAGS)
+ 
+ $(OBJVORBIS): %.o: %.c
+-	$(CC) -o $@ -c $< $(CFLAGSEXT)
++	$(CC) -o $@ -c $< $(CFLAGS)
+ 
+ .PHONY: clean mrproper
+ 
+--- SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp
++++ SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp
+@@ -30,7 +30,7 @@
+ ////////////////////////////////////////////////////////////
+ #include <SFML/Config.hpp>
+ #include <SFML/System/NonCopyable.hpp>
+-#include <SFML/Graphics/GLEW/glew.h>
++#include <GL/glew.h>
+ #include <iostream>
+ #include <string>
+ 
+--- SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
++++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
+@@ -28,11 +28,12 @@
+ #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 <SFML/Graphics/SOIL/SOIL.h>
++#include <png.h>
++#include <string.h>
+ #include <iostream>
+ 
+ 
+--- SFML-1.6/src/SFML/Graphics/Makefile
++++ SFML-1.6/src/SFML/Graphics/Makefile
+@@ -1,15 +1,7 @@
+ SRC     = $(wildcard *.cpp)
+-SRCGLEW = $(wildcard ./GLEW/*.c)
+-SRCJPEG = $(wildcard ./libjpeg/*.c)
+-SRCPNG  = $(wildcard ./libpng/*.c)
+ SRCSOIL = $(wildcard ./SOIL/*.c)
+-SRCZLIB = $(wildcard ./zlib/*.c)
+ OBJ     = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
+-OBJJPEG = $(SRCJPEG:.c=.o)
+-OBJPNG  = $(SRCPNG:.c=.o)
+ OBJSOIL = $(SRCSOIL:.c=.o)
+-OBJZLIB = $(SRCZLIB:.c=.o)
+ 
+ ifeq ($(STATIC), yes)
+     LIB     = libsfml-graphics-s.a
+@@ -23,22 +15,22 @@
+ 
+ all: $(LIB)
+ 
+-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+-	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++libsfml-graphics-s.a: $(OBJ) $(OBJSOIL)
++	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJSOIL)
+ 
+-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
++libsfml-graphics.so: $(OBJ) $(OBJSOIL)
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJSOIL) -lGLEW -ljpeg -lpng -lz -lfreetype -lX11 -lGL
+ 
+ $(OBJ): %.o: %.cpp
+ 	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
+ 
+-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
+-	$(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
++$(OBJSOIL): %.o: %.c
++	$(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
+ 
+ .PHONY: clean mrproper
+ 
+ clean:
+-	@rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++	@rm -rf $(OBJ) $(OBJSOIL)
+ 
+ mrproper: clean
+ 	@rm -rf $(LIBNAME)
+--- SFML-1.6/src/SFML/Makefile
++++ SFML-1.6/src/SFML/Makefile
+@@ -4,7 +4,7 @@
+ ifeq ($(DEBUGBUILD), yes)
+     DEBUGFLAGS = -g -DDEBUG
+ else
+-    DEBUGFLAGS = -O2 -DNDEBUG
++    DEBUGFLAGS = -DNDEBUG
+ endif
+ 
+ ifeq ($(STATIC), no)
+@@ -17,9 +17,8 @@
+ 
+ export CC         = gcc
+ export CPP        = g++
+-export CFLAGS     = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
+-export CFLAGSEXT  = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
+-export LDFLAGS    = $(LINKFLAGS)
++export CFLAGS     += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
++export LDFLAGS    += $(LINKFLAGS)
+ export LIBPATH    = ../../../lib
+ export VERSION    = 1.6
+ export CP         = cp