diff options
Diffstat (limited to 'media-libs/libsfml/files')
| -rw-r--r-- | media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch | 111 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-1.6-destdir.patch | 112 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-1.6-gcc46.patch | 11 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-1.6-gcc47.patch | 11 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-1.6-libpng15.patch | 20 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-2.2-no-docs.patch | 15 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-2.2-shared-glew.patch | 12 |
7 files changed, 292 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
diff --git a/media-libs/libsfml/files/libsfml-1.6-destdir.patch b/media-libs/libsfml/files/libsfml-1.6-destdir.patch new file mode 100644 index 000000000000..33a6f91bb6b6 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-1.6-destdir.patch @@ -0,0 +1,112 @@ +--- SFML-1.6.orig/src/SFML/Audio/Makefile ++++ SFML-1.6/src/SFML/Audio/Makefile +@@ -10,7 +10,7 @@ + else
+ LIB = libsfml-audio.so
+ LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
+ endif
+
+ all: $(LIB)
+@@ -36,4 +36,4 @@ + @rm -rf $(LIBNAME)
+
+ install:
+- @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
++ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
+--- SFML-1.6.orig/src/SFML/Graphics/Makefile ++++ SFML-1.6/src/SFML/Graphics/Makefile +@@ -18,7 +18,7 @@ + else
+ LIB = libsfml-graphics.so
+ LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
+ endif
+
+ all: $(LIB)
+@@ -44,4 +44,4 @@ + @rm -rf $(LIBNAME)
+
+ install:
+- @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
++ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
+--- SFML-1.6.orig/src/SFML/Makefile ++++ SFML-1.6/src/SFML/Makefile +@@ -28,8 +28,11 @@ + export AR = ar
+ export ARFLAGS = rcs
+-export DESTDIR = /usr/local
+-export DESTLIBDIR = $(DESTDIR)/lib
+-export DESTINCDIR = $(DESTDIR)/include
++export DESTDIR =
++ifeq ($(origin prefix), undefined)
++ export prefix = /usr/local
++endif
++export libdir = $(prefix)/lib
++export includedir = $(prefix)/include
+
+ all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
+
+@@ -62,6 +66,6 @@ + @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
+
+ install:
+- @(mkdir -p $(DESTLIBDIR))
+- @(mkdir -p $(DESTINCDIR))
+- @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR)/)
++ @(mkdir -p $(DESTDIR)/$(libdir))
++ @(mkdir -p $(DESTDIR)/$(includedir))
++ @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/$(includedir)/)
+--- SFML-1.6.orig/src/SFML/Network/Makefile ++++ SFML-1.6/src/SFML/Network/Makefile +@@ -8,7 +8,7 @@ + else
+ LIB = libsfml-network.so
+ LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
+ endif
+
+ all: $(LIB)
+@@ -31,4 +31,4 @@ + @rm -rf $(LIBNAME)
+
+ install:
+- @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
++ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
+--- SFML-1.6.orig/src/SFML/System/Makefile ++++ SFML-1.6/src/SFML/System/Makefile +@@ -8,7 +8,7 @@ + else
+ LIB = libsfml-system.so
+ LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
+ endif
+
+ all: $(LIB)
+@@ -31,4 +31,4 @@ + @rm -rf $(LIBNAME)
+
+ install:
+- @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
++ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
+--- SFML-1.6.orig/src/SFML/Window/Makefile ++++ SFML-1.6/src/SFML/Window/Makefile +@@ -9,7 +9,7 @@ + else
+ LIB = libsfml-window.so
+ LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
+ endif
+
+ all: $(LIB)
+@@ -32,4 +32,4 @@ + @rm -rf $(LIBNAME)
+
+ install:
+- @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
++ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))
diff --git a/media-libs/libsfml/files/libsfml-1.6-gcc46.patch b/media-libs/libsfml/files/libsfml-1.6-gcc46.patch new file mode 100644 index 000000000000..9b31d1b0e409 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-1.6-gcc46.patch @@ -0,0 +1,11 @@ +--- SFML-1.6.old/include/SFML/System/Resource.hpp ++++ SFML-1.6/include/SFML/System/Resource.hpp +@@ -29,7 +29,7 @@ + // Headers
+ ////////////////////////////////////////////////////////////
+ #include <set>
+-
++#include <cstddef>
+
+ namespace sf
+ {
diff --git a/media-libs/libsfml/files/libsfml-1.6-gcc47.patch b/media-libs/libsfml/files/libsfml-1.6-gcc47.patch new file mode 100644 index 000000000000..8608cf538d56 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-1.6-gcc47.patch @@ -0,0 +1,11 @@ +--- SFML-1.6/src/SFML/Window/Linux/Joystick.cpp ++++ SFML-1.6/src/SFML/Window/Linux/Joystick.cpp +@@ -27,7 +27,7 @@ + ////////////////////////////////////////////////////////////
+ #include <SFML/Window/Joystick.hpp>
+ #include <sstream>
+-
++#include <unistd.h>
+
+ namespace sf
+ {
diff --git a/media-libs/libsfml/files/libsfml-1.6-libpng15.patch b/media-libs/libsfml/files/libsfml-1.6-libpng15.patch new file mode 100644 index 000000000000..46be00ebd0e0 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-1.6-libpng15.patch @@ -0,0 +1,20 @@ +--- src/SFML/Graphics/ImageLoader.cpp ++++ src/SFML/Graphics/ImageLoader.cpp +@@ -44,7 +44,7 @@ + void PngErrorHandler(png_structp Png, png_const_charp Message)
+ {
+ std::cerr << "Failed to write PNG image. Reason : " << Message << std::endl;
+- longjmp(Png->jmpbuf, 1);
++ longjmp(png_jmpbuf(Png), 1);
+ }
+ }
+
+@@ -289,7 +289,7 @@ + }
+
+ // For proper error handling...
+- if (setjmp(Png->jmpbuf))
++ if (setjmp(png_jmpbuf(Png)))
+ {
+ png_destroy_write_struct(&Png, &PngInfo);
+ return false;
diff --git a/media-libs/libsfml/files/libsfml-2.2-no-docs.patch b/media-libs/libsfml/files/libsfml-2.2-no-docs.patch new file mode 100644 index 000000000000..ef69107c56f4 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-2.2-no-docs.patch @@ -0,0 +1,15 @@ +--- SFML-2.2/CMakeLists.txt ++++ SFML-2.2/CMakeLists.txt +@@ -239,12 +239,6 @@ + COMPONENT devel) + endif() + +-install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR}) +-install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR}) +-if(NOT SFML_OS_ANDROID) +- install(FILES cmake/Modules/FindSFML.cmake DESTINATION ${INSTALL_MISC_DIR}/cmake/Modules) +-endif() +- + # install 3rd-party libraries and tools + if(SFML_OS_WINDOWS) + diff --git a/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch b/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch new file mode 100644 index 000000000000..42c701e751cb --- /dev/null +++ b/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch @@ -0,0 +1,12 @@ +--- SFML-2.2/src/SFML/Graphics/CMakeLists.txt ++++ SFML-2.2/src/SFML/Graphics/CMakeLists.txt +@@ -150,9 +150,6 @@ + list(APPEND GRAPHICS_EXT_LIBS ${FREETYPE_LIBRARY} ${JPEG_LIBRARY}) + + # add preprocessor symbols +-if(NOT SFML_OPENGL_ES) +- add_definitions(-DGLEW_STATIC) +-endif() + add_definitions(-DSTBI_FAILURE_USERMSG) + + # ImageLoader.cpp must be compiled with the -fno-strict-aliasing |