commit: 14056e8c17312eaec4e00a17cd9d02c2a1c14bad
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 01:45:27 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Mon May 9 01:45:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14056e8c
media-libs/libsfml: clean old
Package-Manager: portage-2.2.26
media-libs/libsfml/Manifest | 1 -
.../libsfml/files/libsfml-1.6-deps-and-flags.patch | 111 --------------------
media-libs/libsfml/files/libsfml-1.6-destdir.patch | 112 ---------------------
media-libs/libsfml/files/libsfml-1.6-gcc46.patch | 11 --
media-libs/libsfml/files/libsfml-1.6-gcc47.patch | 11 --
.../libsfml/files/libsfml-1.6-libpng15.patch | 20 ----
media-libs/libsfml/libsfml-1.6-r1.ebuild | 64 ------------
7 files changed, 330 deletions(-)
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 5542da5..7c8b38c 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,2 +1 @@
-DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 SHA256
b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8 SHA512
518121bf05ab8b1f4ad917eaca72951ff870e992f79e2b3da94baad762e7de63ce331cf4cade172e285015fb6fec501e25039c633be2f7b77d77b171dc29cb0a
WHIRLPOOL
fee6692123c394b4d67d1937756315daf7386bf8d0292bbeb94ba7db53552010e8f92187496ce9b72f6aad4922e5ea5da191ddaf9baf0f96a7b741a1d1d17f2e
DIST libsfml-2.3.2.tar.gz 22203359 SHA256
55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512
db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424
WHIRLPOOL
acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83
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
deleted file mode 100644
index bd24ce5..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- 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
deleted file mode 100644
index 33a6f91..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-destdir.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- 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
deleted file mode 100644
index 9b31d1b..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 8608cf5..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 46be00e..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/libsfml-1.6-r1.ebuild
b/media-libs/libsfml/libsfml-1.6-r1.ebuild
deleted file mode 100644
index fc3cfb6..0000000
--- a/media-libs/libsfml/libsfml-1.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="SFML-${PV}"
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://www.sfml-dev.org/";
-SRC_URI="mirror://sourceforge/sfml/${MY_P}-sdk-linux-32.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples static-libs"
-
-DEPEND="media-libs/freetype:2
- media-libs/glew
- >=media-libs/libpng-1.4
- media-libs/libsndfile
- media-libs/mesa
- media-libs/openal
- sys-libs/zlib
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXrandr"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-destdir.patch \
- "${FILESDIR}"/${P}-deps-and-flags.patch \
- "${FILESDIR}"/${P}-gcc46.patch \
- "${FILESDIR}"/${P}-gcc47.patch \
- "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_compile() {
- local myconf
- use debug && myconf="$myconf DEBUGBUILD=yes"
-
- emake $myconf CPP=$(tc-getCXX) CC=$(tc-getCC)
- use static-libs && emake $myconf STATIC=yes CPP=$(tc-getCXX)
CC=$(tc-getCC)
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix=/usr libdir=/usr/$(get_libdir) install
-
- use static-libs && dolib.a lib/*.a
- use doc && dohtml doc/html/*
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- local i
- for i in ftp opengl pong post-fx qt sockets sound sound_capture
voip window wxwidgets X11 ; do
- insinto /usr/share/doc/${PF}/examples/$i
- doins samples/$i/*
- done
- fi
-}
