* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/
@ 2015-12-01 5:00 Michael Sterrett
0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett @ 2015-12-01 5:00 UTC (permalink / raw
To: gentoo-commits
commit: e0f2aec8ea3a586a9d42ad16f612df8f3a2312cf
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 1 04:59:16 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 04:59:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f2aec8
clean old
Package-Manager: portage-2.2.20.1
media-libs/libsfml/Manifest | 2 -
.../libsfml/files/libsfml-2.2-shared-glew.patch | 12 ----
media-libs/libsfml/libsfml-2.2.ebuild | 65 ----------------------
media-libs/libsfml/libsfml-2.3.1.ebuild | 65 ----------------------
4 files changed, 144 deletions(-)
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 10781c0..5542da5 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,4 +1,2 @@
DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8 SHA512 518121bf05ab8b1f4ad917eaca72951ff870e992f79e2b3da94baad762e7de63ce331cf4cade172e285015fb6fec501e25039c633be2f7b77d77b171dc29cb0a WHIRLPOOL fee6692123c394b4d67d1937756315daf7386bf8d0292bbeb94ba7db53552010e8f92187496ce9b72f6aad4922e5ea5da191ddaf9baf0f96a7b741a1d1d17f2e
-DIST libsfml-2.2.tar.gz 17614806 SHA256 543458923e35868c16ac70e5f4c3bf172e136af9820d7b546b52afc7f1fc77f5 SHA512 cf30d431afc19d0f0126f2879dcb4c81ff4f689ce1e7aab5c3f156e8a88cdd54574e60de6230a9a5f7793a6c41ac81d811c68a9f1971ce079dada8d281ca34a3 WHIRLPOOL 8ba9c968840839295707e92281ecbc5d88b8900bab85dac0e1a4d66a0b8521bca0d5c6b0d1d330a1191aedf073f9633c7ce8f6dcbef9f84e3fac8c61d9c7c96e
-DIST libsfml-2.3.1.tar.gz 22209471 SHA256 59d7fd6b6c1194393ccac4cb7da3c41adbad973ab2116421ad6fcfe823221d6f SHA512 8a4d61be38cfae7b00f0c9669aed8d3e2cafd0e69aa840a155f3d6adfd9cf0cd37e6f69e4d52828f96f32b03a3c9bddb0f06366ab5e171775a036823164dcbe6 WHIRLPOOL 95c7c534915afb63e38d37ec712433267673aa22597ee3052df5f62becb6723d364440aa1e922e4012e043302c2ad70eb52fedaa4bfa6ee8a4ad3f4b0649141b
DIST libsfml-2.3.2.tar.gz 22203359 SHA256 55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512 db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424 WHIRLPOOL acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83
diff --git a/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch b/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch
deleted file mode 100644
index 42c701e..0000000
--- a/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
diff --git a/media-libs/libsfml/libsfml-2.2.ebuild b/media-libs/libsfml/libsfml-2.2.ebuild
deleted file mode 100644
index efc8506..0000000
--- a/media-libs/libsfml/libsfml-2.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-MY_P=SFML-${PV}
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://www.sfml-dev.org/ https://github.com/LaurentGomila/SFML"
-SRC_URI="https://github.com/LaurentGomila/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="media-libs/freetype:2
- media-libs/glew:=
- media-libs/libpng:0=
- media-libs/libsndfile
- media-libs/mesa
- media-libs/openal
- sys-libs/zlib
- virtual/jpeg
- virtual/udev
- x11-libs/libX11
- x11-libs/libXrandr"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-DOCS="changelog.txt readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-docs.patch
- epatch "${FILESDIR}"/${P}-shared-glew.patch
-
- sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
- doc/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use doc SFML_BUILD_DOC)
- -DSFML_INSTALL_PKGCONFIG_FILES=TRUE
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /usr/share/cmake/Modules
- doins cmake/Modules/FindSFML.cmake
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
- fi
-}
diff --git a/media-libs/libsfml/libsfml-2.3.1.ebuild b/media-libs/libsfml/libsfml-2.3.1.ebuild
deleted file mode 100644
index 572bbad..0000000
--- a/media-libs/libsfml/libsfml-2.3.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-MY_P=SFML-${PV}
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="media-libs/freetype:2
- media-libs/libpng:0=
- media-libs/mesa
- media-libs/flac
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- sys-libs/zlib
- virtual/jpeg:0
- virtual/udev
- x11-libs/libX11
- x11-libs/libXrandr"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-DOCS="changelog.txt readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.2-no-docs.patch
-
- sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
- doc/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use doc SFML_BUILD_DOC)
- -DSFML_INSTALL_PKGCONFIG_FILES=TRUE
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /usr/share/cmake/Modules
- doins cmake/Modules/FindSFML.cmake
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/
@ 2016-05-09 1:45 Michael Sterrett
0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett @ 2016-05-09 1:45 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/
@ 2018-03-25 18:24 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2018-03-25 18:24 UTC (permalink / raw
To: gentoo-commits
commit: da3ff27aa3315ae8d276a724a2d8ff8b94dffeab
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Mon Mar 19 22:58:25 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 18:24:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3ff27a
media-libs/libsfml: build and install pkgconfig on mingw-w64
This is an upstream commit, which will be in the 2.5.0 release, which
allows creation of the sfml pkgconfig files on mingw-w64 when either
SFML_INSTALL_PKGCONFIG_FILES is true or if their internal check
SFML_OS_SUPPORTS_PKGCONFIG returns true; since we explicitly set the
former this change will allow build and install of sfml pc files on
mingw-w64 and (I think) osx targets.
Closes: https://github.com/gentoo/gentoo/pull/7518
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../libsfml/files/libsfml-2.4.2-pkg-config.patch | 217 +++++++++++++++++++++
media-libs/libsfml/libsfml-2.4.2-r2.ebuild | 84 ++++++++
2 files changed, 301 insertions(+)
diff --git a/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch b/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch
new file mode 100644
index 00000000000..a281d46c9ba
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch
@@ -0,0 +1,217 @@
+commit 5fe5e5d6d7792e37685a437551ffa8ed5161fcc1
+Author: Rafael Kitover <rkitover@gmail.com>
+Date: Mon Dec 19 13:16:07 2016 -0800
+
+ packaging support improvements
+
+ This grew out of my work creating an sfml port for macports, but should
+ be helpful for package maintainers of various distributions:
+
+ * add an SFML_USE_SYSTEM_DEPS option to ignore everything in extlibs/
+ except for headers/stb_image, and use the system versions
+
+ * install pkg-config files if a pkg-config program is found
+ and either lib/pkgconfig or libdata/pkgconfig exists under the
+ INSTALL_PREFIX, or the SFML_INSTALL_PKGCONFIG_FILES flag is set
+ explicitly
+
+ * install pkg-config files for static libs too, add the necessary
+ Requires.private and Libs.private entries to the .pc files to support
+ static linking
+
+ * on OS X, honor all INSTALL_NAME and RPATH related cmake variables and
+ only set the INSTALL_NAME_DIR to "@rpath" if none of them is set, this
+ preserves the default behavior of using @rpath but also allows
+ overriding by the usual cmake mechanisms
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e7914ac9..419d56d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,6 +16,9 @@ sfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug
+ # Suppress Cygwin legacy warning
+ set(CMAKE_LEGACY_CYGWIN_WIN32 0)
+
++# Suppress Mac OS X RPATH warnings and adopt new related behaviors
++cmake_policy(SET CMP0042 NEW)
++
+ # set Android specific options
+
+ # define the minimum API level to be used
+@@ -130,6 +133,39 @@ if(NOT BUILD_SHARED_LIBS)
+ add_definitions(-DSFML_STATIC)
+ endif()
+
++# allow not using bundled dependencies with a switch
++# (except for stb_image)
++# yes this is horrible, but GLOB_RECURSE sucks
++sfml_set_option(SFML_USE_SYSTEM_DEPS FALSE BOOL "TRUE to use system dependencies, FALSE to use the bundled ones.")
++if(SFML_USE_SYSTEM_DEPS)
++ if(SFML_INSTALL_XCODE_TEMPLATES)
++ message(FATAL_ERROR "XCode templates installation cannot be used with the SFML_USE_SYSTEM_DEPS option (the bundled frameworks are required.)")
++ endif()
++
++ file(GLOB_RECURSE DEP_LIBS "${CMAKE_SOURCE_DIR}/extlibs/libs*/*")
++ file(GLOB_RECURSE DEP_BINS "${CMAKE_SOURCE_DIR}/extlibs/bin*/*")
++ file(GLOB_RECURSE DEP_HEADERS "${CMAKE_SOURCE_DIR}/extlibs/headers/*")
++
++ foreach(DEP_FILE ${DEP_LIBS} ${DEP_BINS} ${DEP_HEADERS})
++ get_filename_component(DEP_DIR ${DEP_FILE} PATH)
++
++ if(NOT DEP_DIR MATCHES "/stb_image(/|$)")
++ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_DIR})
++ endif()
++
++ get_filename_component(DEP_PARENT_DIR ${DEP_DIR} PATH)
++ while(NOT DEP_PARENT_DIR STREQUAL "${CMAKE_SOURCE_DIR}/extlibs")
++ if(NOT DEP_DIR MATCHES "/stb_image(/|$)")
++ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_PARENT_DIR})
++ endif()
++
++ get_filename_component(DEP_PARENT_DIR ${DEP_PARENT_DIR} PATH)
++ endwhile()
++ endforeach()
++
++ list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH)
++endif()
++
+ # Visual C++: remove warnings regarding SL security and algorithms on pointers
+ if(SFML_COMPILER_MSVC)
+ # add an option to choose whether PDB debug symbols should be generated (defaults to true when possible)
+@@ -202,30 +238,6 @@ if(SFML_OS_MACOSX)
+ set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
+ endif()
+
+-if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
+- set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
+- if(SFML_OS_FREEBSD)
+- set(PKGCONFIG_DIR libdata/pkgconfig)
+- endif()
+- if(BUILD_SHARED_LIBS)
+- sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
+- if(SFML_INSTALL_PKGCONFIG_FILES)
+- foreach(sfml_module IN ITEMS all system window graphics audio network)
+- CONFIGURE_FILE(
+- "tools/pkg-config/sfml-${sfml_module}.pc.in"
+- "tools/pkg-config/sfml-${sfml_module}.pc"
+- @ONLY)
+- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/${PKGCONFIG_DIR}")
+- endforeach()
+- endif()
+- else()
+- if(SFML_INSTALL_PKGCONFIG_FILES)
+- message(WARNING "No pkg-config files are provided for the static SFML libraries (SFML_INSTALL_PKGCONFIG_FILES will be ignored).")
+- endif()
+- endif()
+-endif()
+-
+ # enable project folders
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake")
+@@ -239,6 +251,19 @@ if(SFML_BUILD_DOC)
+ add_subdirectory(doc)
+ endif()
+
++sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
++
++if(SFML_OS_SUPPORTS_PKGCONFIG OR SFML_INSTALL_PKGCONFIG_FILES)
++ foreach(sfml_module IN ITEMS all system window graphics audio network)
++ CONFIGURE_FILE(
++ "tools/pkg-config/sfml-${sfml_module}.pc.in"
++ "tools/pkg-config/sfml-${sfml_module}.pc"
++ @ONLY)
++ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
++ DESTINATION "${CMAKE_INSTALL_PREFIX}/${SFML_OS_PKGCONFIG_DIR}")
++ endforeach()
++endif()
++
+ # setup the install rules
+ if(NOT SFML_BUILD_FRAMEWORKS)
+ install(DIRECTORY include
+diff --git a/cmake/Config.cmake b/cmake/Config.cmake
+index cff54d00..c447113a 100644
+--- a/cmake/Config.cmake
++++ b/cmake/Config.cmake
+@@ -73,6 +73,19 @@ else()
+ return()
+ endif()
+
++# check if OS or package system supports pkg-config
++# this could be e.g. macports on mac or msys2 on windows etc.
++find_package(PkgConfig QUIET)
++if(PKG_CONFIG_EXECUTABLE)
++ if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
++ set(SFML_OS_SUPPORTS_PKGCONFIG ON)
++ set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
++ elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
++ set(SFML_OS_SUPPORTS_PKGCONFIG ON)
++ set(SFML_OS_PKGCONFIG_DIR "/libdata/pkgconfig")
++ endif()
++endif()
++
+ # detect the compiler and its version
+ # Note: on some platforms (OS X), CMAKE_COMPILER_IS_GNUCXX is true
+ # even when CLANG is used, therefore the Clang test is done first
+diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
+index cd2ca8fc..0f316034 100644
+--- a/cmake/Macros.cmake
++++ b/cmake/Macros.cmake
+@@ -105,9 +105,17 @@ macro(sfml_add_library target)
+ endif()
+
+ # adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
+- set_target_properties(${target} PROPERTIES
+- BUILD_WITH_INSTALL_RPATH 1
+- INSTALL_NAME_DIR "@rpath")
++ # but only if cmake rpath options aren't set
++ if(NOT CMAKE_SKIP_RPATH AND NOT CMAKE_SKIP_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH AND NOT CMAKE_INSTALL_NAME_DIR)
++ if(CMAKE_SKIP_BUILD_RPATH)
++ set_target_properties(${target} PROPERTIES
++ INSTALL_NAME_DIR "@rpath")
++ else()
++ set_target_properties(${target} PROPERTIES
++ BUILD_WITH_INSTALL_RPATH 1
++ INSTALL_NAME_DIR "@rpath")
++ endif()
++ endif()
+ endif()
+
+ # enable automatic reference counting on iOS
+diff --git a/tools/pkg-config/sfml-audio.pc.in b/tools/pkg-config/sfml-audio.pc.in
+index 7456daaa..0d7a3ce1 100644
+--- a/tools/pkg-config/sfml-audio.pc.in
++++ b/tools/pkg-config/sfml-audio.pc.in
+@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, audio module.
+ URL: http://www.sfml-dev.org
+ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+ Requires: sfml-system
++Requires.private: openal, vorbisenc, vorbisfile, vorbis, ogg, flac
+ Libs: -L${libdir} -lsfml-audio
++# openal may be a system framework
++Libs.private: @OPENAL_LIBRARY@
+ Cflags: -I${includedir}
+diff --git a/tools/pkg-config/sfml-graphics.pc.in b/tools/pkg-config/sfml-graphics.pc.in
+index d0a88a13..a96b72c9 100644
+--- a/tools/pkg-config/sfml-graphics.pc.in
++++ b/tools/pkg-config/sfml-graphics.pc.in
+@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, graphics module.
+ URL: http://www.sfml-dev.org
+ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+ Requires: sfml-window
++Requires.private: sfml-system, freetype2
+ Libs: -L${libdir} -lsfml-graphics
++# gl and jpeg may not be in pkg-config
++Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@ @JPEG_LIBRARY@
+ Cflags: -I${includedir}
+diff --git a/tools/pkg-config/sfml-window.pc.in b/tools/pkg-config/sfml-window.pc.in
+index b0266e67..93bf344c 100644
+--- a/tools/pkg-config/sfml-window.pc.in
++++ b/tools/pkg-config/sfml-window.pc.in
+@@ -9,4 +9,6 @@ URL: http://www.sfml-dev.org
+ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+ Requires: sfml-system
+ Libs: -L${libdir} -lsfml-window
++# gl may not be in pkg-config
++Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@
+ Cflags: -I${includedir}
diff --git a/media-libs/libsfml/libsfml-2.4.2-r2.ebuild b/media-libs/libsfml/libsfml-2.4.2-r2.ebuild
new file mode 100644
index 00000000000..dda2accf7c6
--- /dev/null
+++ b/media-libs/libsfml/libsfml-2.4.2-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+MY_P="SFML-${PV}"
+
+DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
+HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
+SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+
+RDEPEND="
+ media-libs/flac
+ media-libs/freetype:2
+ media-libs/libpng:0=
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/openal
+ sys-libs/zlib
+ virtual/jpeg:0
+ kernel_linux? (
+ virtual/libudev:0
+ )
+ virtual/opengl
+ !kernel_Winnt? (
+ x11-libs/libX11
+ x11-libs/libXrandr
+ x11-libs/libxcb
+ x11-libs/xcb-util-image
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
+
+DOCS=( changelog.txt readme.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2-no-docs.patch
+ "${FILESDIR}"/${PN}-2.4.2-no-install-extlibs-mingw.patch
+ "${FILESDIR}"/${PN}-2.4.2-pkg-config.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
+ doc/CMakeLists.txt || die
+
+ find examples -name CMakeLists.txt -delete || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSFML_BUILD_DOC=$(usex doc)
+ -DSFML_INSTALL_PKGCONFIG_FILES=TRUE
+ )
+
+ if use kernel_Winnt; then
+ mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
+ fi
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/cmake/Modules
+ doins cmake/Modules/FindSFML.cmake
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/
@ 2022-04-21 23:20 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-04-21 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 5a170689c47562cb74f84575d42bd542cfc78fa7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 23:20:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 23:20:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a170689
media-libs/libsfml: fix build with musl 1.2.3
Closes: https://bugs.gentoo.org/839639
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch | 14 ++++++++++++++
media-libs/libsfml/libsfml-2.5.1.ebuild | 6 +++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch b/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch
new file mode 100644
index 000000000000..dc26ba285e17
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/839639
+https://github.com/SFML/SFML/commit/c9f7cb3d525a995912fc62507802f3f265de2728.patch
+https://git.alpinelinux.org/aports/plain/community/sfml/musl-1.2.3.patch
+--- a/src/SFML/Window/Unix/WindowImplX11.cpp
++++ b/src/SFML/Window/Unix/WindowImplX11.cpp
+@@ -1556,7 +1556,7 @@
+ m_window,
+ XNInputStyle,
+ XIMPreeditNothing | XIMStatusNothing,
+- reinterpret_cast<void*>(NULL));
++ reinterpret_cast<void*>(0));
+ }
+ else
+ {
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index d7a9017536bd..8131a7a919d6 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,10 @@ DOCS=( changelog.md readme.md )
S="${WORKDIR}/SFML-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${P}-musl-1.2.3-nullptr.patch
+)
+
src_prepare() {
sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
doc/CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/
@ 2023-08-01 18:53 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2023-08-01 18:53 UTC (permalink / raw
To: gentoo-commits
commit: 96fa8a539c7ff58af0123e7be1b5805d92d6329d
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jul 31 14:34:47 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Aug 1 18:53:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fa8a53
media-libs/libsfml: Fix no member named 'auto_ptr'
The backport is needed as some packges are still dependent on 2.5.1
Closes: https://bugs.gentoo.org/910519
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32121
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../files/libsfml-2.5.1-clang-16-auto_ptr.patch | 50 +++++++++++++++
media-libs/libsfml/libsfml-2.5.1-r2.ebuild | 75 ++++++++++++++++++++++
2 files changed, 125 insertions(+)
diff --git a/media-libs/libsfml/files/libsfml-2.5.1-clang-16-auto_ptr.patch b/media-libs/libsfml/files/libsfml-2.5.1-clang-16-auto_ptr.patch
new file mode 100644
index 000000000000..ba4f90e4c465
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-2.5.1-clang-16-auto_ptr.patch
@@ -0,0 +1,50 @@
+https://github.com/SFML/SFML/commit/bf92efe9a4035fee0258386173d53556aa196e49
+Bug: https://bugs.gentoo.org/910519
+From: Tobias Widlund <widlundtobias@gmail.com>
+Date: Fri, 18 Jan 2019 14:12:14 +0100
+Subject: [PATCH] Remove usages of std::auto_ptr to get rid of warnings when
+ building with gcc 8.2+
+
+--- a/src/SFML/Audio/AudioDevice.cpp
++++ b/src/SFML/Audio/AudioDevice.cpp
+@@ -29,7 +29,7 @@
+ #include <SFML/Audio/ALCheck.hpp>
+ #include <SFML/Audio/Listener.hpp>
+ #include <SFML/System/Err.hpp>
+-#include <memory>
++#include <vector>
+
+
+ namespace
+@@ -107,9 +107,13 @@ bool AudioDevice::isExtensionSupported(const std::string& extension)
+ // This device will not be used in this function and merely
+ // makes sure there is a valid OpenAL device for extension
+ // queries if none has been created yet.
+- std::auto_ptr<AudioDevice> device;
++ //
++ // Using an std::vector for this since auto_ptr is deprecated
++ // and we have no better STL facility for dynamically allocating
++ // a temporary instance with strong exception guarantee.
++ std::vector<AudioDevice> device;
+ if (!audioDevice)
+- device.reset(new AudioDevice);
++ device.resize(1);
+
+ if ((extension.length() > 2) && (extension.substr(0, 3) == "ALC"))
+ return alcIsExtensionPresent(audioDevice, extension.c_str()) != AL_FALSE;
+@@ -125,9 +129,13 @@ int AudioDevice::getFormatFromChannelCount(unsigned int channelCount)
+ // This device will not be used in this function and merely
+ // makes sure there is a valid OpenAL device for format
+ // queries if none has been created yet.
+- std::auto_ptr<AudioDevice> device;
++ //
++ // Using an std::vector for this since auto_ptr is deprecated
++ // and we have no better STL facility for dynamically allocating
++ // a temporary instance with strong exception guarantee.
++ std::vector<AudioDevice> device;
+ if (!audioDevice)
+- device.reset(new AudioDevice);
++ device.resize(1);
+
+ // Find the good format according to the number of channels
+ int format = 0;
diff --git a/media-libs/libsfml/libsfml-2.5.1-r2.ebuild b/media-libs/libsfml/libsfml-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..d6b70ddf935e
--- /dev/null
+++ b/media-libs/libsfml/libsfml-2.5.1-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
+HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
+SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug doc examples"
+
+RDEPEND="
+ media-libs/flac:=
+ media-libs/freetype:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/openal
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXrandr
+ x11-libs/libxcb
+ x11-libs/xcb-util-image
+ kernel_linux? ( virtual/libudev:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+"
+
+DOCS=( changelog.md readme.md )
+
+S="${WORKDIR}/SFML-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-musl-1.2.3-nullptr.patch
+ "${FILESDIR}"/${P}-clang-16-auto_ptr.patch
+)
+
+src_prepare() {
+ sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
+ doc/CMakeLists.txt || die
+
+ find examples -name CMakeLists.txt -delete || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSFML_BUILD_DOC=$(usex doc)
+ -DSFML_INSTALL_PKGCONFIG_FILES=TRUE
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /usr/share/cmake/Modules
+ doins cmake/SFMLConfig.cmake.in
+ doins cmake/SFMLConfigDependencies.cmake.in
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/
@ 2023-08-19 12:59 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2023-08-19 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 9e84772f1984bd5c52aae9e7c06fc2fea3aca82c
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jul 31 17:23:26 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 12:57:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e84772f
media-libs/libsfml: add 2.6.0
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32122
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/libsfml/Manifest | 1 +
.../files/libsfml-2.6.0-supress-werror.patch | 30 ++++++++++
media-libs/libsfml/libsfml-2.6.0.ebuild | 70 ++++++++++++++++++++++
3 files changed, 101 insertions(+)
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index cbcca3da50d8..4d099784e2e0 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1 +1,2 @@
DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
+DIST libsfml-2.6.0.tar.gz 25493305 BLAKE2B 205db3aa9fa197dbc29c8b3a74c09651fb9ca8e60bf18e385b8ecfa350d85b31ab33b6d2e61b6cdcfdc3caf77a8af37cbe97445e871b6e688359b320a12a3cea SHA512 aac734e8b0e16936c0238ec792c922923545ec6cf06576bc70004fa1920cd05b4c5e56fbc8a77b650bbe6e202adc39df1d30509dbce95778d04338917a38a87a
diff --git a/media-libs/libsfml/files/libsfml-2.6.0-supress-werror.patch b/media-libs/libsfml/files/libsfml-2.6.0-supress-werror.patch
new file mode 100644
index 000000000000..1110b4b89492
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-2.6.0-supress-werror.patch
@@ -0,0 +1,30 @@
+This primarily to suppress error such as:
+/var/tmp/portage/media-libs/libsfml-2.6.0/work/SFML-2.6.0/src/SFML/Window/Unix/JoystickImpl.cpp:405:36: error: implicit conversion changes signedness: 'unsigned long' to 'int' [-Werror,-Wsign-conversion]
+ int result = ioctl(fd, JSIOCGNAME(sizeof(name)), name);
+ ~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/linux/joystick.h:59:26: note: expanded from macro 'JSIOCGNAME'
+#define JSIOCGNAME(len) _IOC(_IOC_READ, 'j', 0x13, len) /* get identifier string */
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Even seems like upstream is has removed it with commit
+https://github.com/SFML/SFML/commit/aa82ea132b9296a31922772027ad5d14c1fa381b
+--- a/cmake/CompilerWarnings.cmake
++++ b/cmake/CompilerWarnings.cmake
+@@ -68,16 +68,11 @@ function(set_file_warnings)
+ # -Wimplicit-fallthrough # warn when a missing break causes control flow to continue at the next case in a switch statement (disabled until better compiler support for explicit fallthrough is available)
+ ${NON_ANDROID_CLANG_AND_GCC_WARNINGS}
+ )
+-
++
+ # Disable warnings as errors when using Clang on Windows to work around deprecation warnings in Windows APIs
+ if(SFML_OS_WINDOWS AND (SFML_COMPILER_CLANG OR SFML_COMPILER_CLANG_CL))
+ set(WARNINGS_AS_ERRORS FALSE)
+ endif()
+-
+- if(WARNINGS_AS_ERRORS)
+- set(CLANG_AND_GCC_WARNINGS ${CLANG_AND_GCC_WARNINGS} -Werror)
+- set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX)
+- endif()
+
+ set(CLANG_WARNINGS
+ ${CLANG_AND_GCC_WARNINGS}
diff --git a/media-libs/libsfml/libsfml-2.6.0.ebuild b/media-libs/libsfml/libsfml-2.6.0.ebuild
new file mode 100644
index 000000000000..5f453650bf72
--- /dev/null
+++ b/media-libs/libsfml/libsfml-2.6.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
+HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
+SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug doc examples"
+
+RDEPEND="
+ media-libs/flac:=
+ media-libs/freetype:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/openal
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXrandr
+ x11-libs/libxcb
+ x11-libs/xcb-util-image
+ kernel_linux? ( virtual/libudev:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+"
+
+DOCS=( changelog.md readme.md )
+
+S="${WORKDIR}/SFML-${PV}"
+
+src_prepare() {
+ sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
+ doc/CMakeLists.txt || die
+
+ find examples -name CMakeLists.txt -delete || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSFML_BUILD_DOC=$(usex doc)
+ -DSFML_INSTALL_PKGCONFIG_FILES=TRUE
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /usr/share/cmake/Modules
+ doins cmake/SFMLConfig.cmake.in
+ doins cmake/SFMLConfigDependencies.cmake.in
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-19 12:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-01 18:53 [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2023-08-19 12:59 Joonas Niilola
2022-04-21 23:20 Sam James
2018-03-25 18:24 Michał Górny
2016-05-09 1:45 Michael Sterrett
2015-12-01 5:00 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox