diff options
Diffstat (limited to 'devel/sfml1/files')
-rw-r--r-- | devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl | 10 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Audio__Makefile | 30 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Graphics__Makefile | 30 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Makefile | 40 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Network__Makefile | 26 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__System__Makefile | 26 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Window__Makefile | 26 |
7 files changed, 0 insertions, 188 deletions
diff --git a/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl b/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl deleted file mode 100644 index e2923b8c4917..000000000000 --- a/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl +++ /dev/null @@ -1,10 +0,0 @@ ---- include/SFML/System/ResourcePtr.inl.orig 2010-01-27 16:53:54.000000000 +0300 -+++ include/SFML/System/ResourcePtr.inl 2015-03-27 15:46:53.809250000 +0300 -@@ -22,6 +22,7 @@ - // - //////////////////////////////////////////////////////////// - -+#include <cstddef> - - //////////////////////////////////////////////////////////// - /// Default constructor diff --git a/devel/sfml1/files/patch-src__SFML__Audio__Makefile b/devel/sfml1/files/patch-src__SFML__Audio__Makefile deleted file mode 100644 index f64ca2a4c4d1..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Audio__Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- src/SFML/Audio/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/Audio/Makefile 2014-08-18 16:52:27.000000000 +0400 -@@ -8,7 +8,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-audio.so -+ LIB = libsfml1-audio.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -18,14 +18,14 @@ - libsfml-audio-s.a: $(OBJ) $(OBJVORBIS) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS) - --libsfml-audio.so: $(OBJ) $(OBJVORBIS) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal -+libsfml1-audio.so: $(OBJ) $(OBJVORBIS) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - $(OBJVORBIS): %.o: %.c -- $(CC) -o $@ -c $< $(CFLAGSEXT) -+ $(CC) -o $@ -c $< $(CFLAGS) - - .PHONY: clean mrproper - diff --git a/devel/sfml1/files/patch-src__SFML__Graphics__Makefile b/devel/sfml1/files/patch-src__SFML__Graphics__Makefile deleted file mode 100644 index e567ea54e24a..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Graphics__Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- src/SFML/Graphics/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/Graphics/Makefile 2014-08-18 16:52:41.000000000 +0400 -@@ -16,7 +16,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-graphics.so -+ LIB = libsfml1-graphics.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -26,14 +26,14 @@ - libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) - --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 -+libsfml1-graphics.so: $(OBJ) $(OBJGLEW) $(OBJSOIL) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -lX11 -lGL -lpng -ljpeg -lz - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2 -+ $(CXX) -o $@ -c $< $(CXXFLAGS) -I/usr/include/freetype2 - - $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c -- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG -+ $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG - - .PHONY: clean mrproper - diff --git a/devel/sfml1/files/patch-src__SFML__Makefile b/devel/sfml1/files/patch-src__SFML__Makefile deleted file mode 100644 index e135231d049f..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Makefile +++ /dev/null @@ -1,40 +0,0 @@ ---- src/SFML/Makefile.orig 2010-01-27 17:00:37.000000000 +0300 -+++ src/SFML/Makefile 2010-08-25 07:08:45.000000000 +0400 -@@ -4,7 +4,7 @@ - ifeq ($(DEBUGBUILD), yes) - DEBUGFLAGS = -g -DDEBUG - else -- DEBUGFLAGS = -O2 -DNDEBUG -+ DEBUGFLAGS = - endif - - ifeq ($(STATIC), no) -@@ -15,11 +15,11 @@ - LINKFLAGS = - endif - --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 CC ?= gcc -+export CXX ?= g++ -+export CFLAGS += -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -+export CXXFLAGS += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -+export LDFLAGS = -L${LOCALBASE}/lib $(LINKFLAGS) - export LIBPATH = ../../../lib - export VERSION = 1.6 - export CP = cp -@@ -27,9 +27,9 @@ - export LNFLAGS = -s -f - export AR = ar - export ARFLAGS = rcs --export DESTDIR = /usr/local -+export DESTDIR = ${STAGEDIR}${PREFIX} - export DESTLIBDIR = $(DESTDIR)/lib --export DESTINCDIR = $(DESTDIR)/include -+export DESTINCDIR = $(DESTDIR)/include/SFML - - all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio - diff --git a/devel/sfml1/files/patch-src__SFML__Network__Makefile b/devel/sfml1/files/patch-src__SFML__Network__Makefile deleted file mode 100644 index 466a8280bcb2..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Network__Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- src/SFML/Network/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/Network/Makefile 2014-08-18 16:53:09.000000000 +0400 -@@ -6,7 +6,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-network.so -+ LIB = libsfml1-network.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -16,11 +16,11 @@ - libsfml-network-s.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - --libsfml-network.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -+libsfml1-network.so: $(OBJ) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - diff --git a/devel/sfml1/files/patch-src__SFML__System__Makefile b/devel/sfml1/files/patch-src__SFML__System__Makefile deleted file mode 100644 index fd2be586cb4c..000000000000 --- a/devel/sfml1/files/patch-src__SFML__System__Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- src/SFML/System/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/System/Makefile 2014-08-18 16:52:53.000000000 +0400 -@@ -6,7 +6,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-system.so -+ LIB = libsfml1-system.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -16,11 +16,11 @@ - libsfml-system-s.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - --libsfml-system.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread -+libsfml1-system.so: $(OBJ) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - diff --git a/devel/sfml1/files/patch-src__SFML__Window__Makefile b/devel/sfml1/files/patch-src__SFML__Window__Makefile deleted file mode 100644 index 6d3f8e272000..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Window__Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- src/SFML/Window/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/Window/Makefile 2014-08-18 16:53:01.000000000 +0400 -@@ -7,7 +7,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-window.so -+ LIB = libsfml1-window.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -17,11 +17,11 @@ - libsfml-window-s.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - --libsfml-window.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL -+libsfml1-window.so: $(OBJ) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - |