From 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Mar 2018 04:54:42 +0000 Subject: gentoo resync : 18.03.2018 --- media-libs/libsfml/Manifest | 2 + .../libsfml-2.4.2-no-install-extlibs-mingw.patch | 74 +++++++++++++++++++ media-libs/libsfml/libsfml-2.4.2-r1.ebuild | 83 ++++++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch create mode 100644 media-libs/libsfml/libsfml-2.4.2-r1.ebuild (limited to 'media-libs/libsfml') diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest index f1e04fdcf613..22c65f029a97 100644 --- a/media-libs/libsfml/Manifest +++ b/media-libs/libsfml/Manifest @@ -1,4 +1,6 @@ AUX libsfml-2.2-no-docs.patch 432 BLAKE2B 617c83033c6cafc6455937f1a7a149b73e31e0c3b1430bb471743b04c4f89b604acd1ba67965a3a33e32dfdc2a15e1a374f4e08fd073c26443ca652719658877 SHA512 86c05d82af21ed440e313119d5296097c498030c9aca8f6516a2a47c4913d578064dab9bd1476735b84f00eacf009b21de378e41d1e59615c1098dfeb786b807 +AUX libsfml-2.4.2-no-install-extlibs-mingw.patch 3417 BLAKE2B 4619083ec961ba9da52a3db4d77b157c4bdc1f2c08ccdd3c487e729b14551d0043fcbff3e5dad2d63b269b961f315e2930b082afd5f5c0c7aa372e60391a2bf0 SHA512 8239c021143d7e5ce9ae33d3a3c639b8568fceafe900f0b9d70221402a2f38ff7b5c3a297ffdf8aaaebef7d379b1733749d579f831efa3c85ea252b57721e8cf DIST libsfml-2.4.2.tar.gz 24576150 BLAKE2B 05d1c06cb360aae6ec8a53225666119168075ab61dd87fe86a105f2c104d21b5897c4b35e66f5c0dae7193697437d168a963c018e3d39bd7b8b6bed957a63d94 SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972 +EBUILD libsfml-2.4.2-r1.ebuild 1634 BLAKE2B 408d034ee53e9af9fb7d8c7aa5c33e8128936a3b0f6bd8e7f817928859540394a742b0f5c6f8e68c2b779e049788fb76d814884931ca679c6c961b551926a11e SHA512 dd31edc609d736d771ce2a192942cbbb1aba37655eec6e2dc9de93e8d8f8c8c6e012420c7ed764ebe4b00b25907a03e4584d74bf438f228cfb47aca4bcfc5add EBUILD libsfml-2.4.2.ebuild 1488 BLAKE2B 7823ad6b11566f9b2587528851067098d504db7d7862d5efe8fb57018fb56ddfe551e5467b057f8f85f0778e700424379b7cf146d1c516f1528e6999df206c7a SHA512 250f27afd60470dc9667a504da415621a63cb9f71c23ec64557c7407f683871681e5e98b023984425ebca57b61583a405281cbbc343dae1210e33b02051c75ea MISC metadata.xml 732 BLAKE2B 598678c33da33373a1669f4b9048b95503d9c430730b571b985e4137e034e5104dc509cb0a6605834ef463c6d6438b25bd2bb06ec6ce41d7e1c52fbef7219e3d SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2 diff --git a/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch b/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch new file mode 100644 index 000000000000..b45063160e73 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch @@ -0,0 +1,74 @@ +--- SFML-2.4.2/CMakeLists.txt 2017-02-08 05:29:16.000000000 -0600 ++++ SFML-2.4.2.new/CMakeLists.txt 2017-06-05 22:12:39.166300154 -0500 +@@ -305,24 +305,26 @@ + # install 3rd-party libraries and tools + if(SFML_OS_WINDOWS) + +- # install the binaries of SFML dependencies +- if(ARCH_32BITS) +- install(DIRECTORY extlibs/bin/x86/ DESTINATION bin) +- if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) +- install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib) +- elseif(SFML_COMPILER_MSVC) +- install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib) +- else() +- install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib) +- endif() +- elseif(ARCH_64BITS) +- install(DIRECTORY extlibs/bin/x64/ DESTINATION bin) +- if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) +- install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib) +- elseif(SFML_COMPILER_MSVC) +- install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib) +- else() +- install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib) ++ if(NOT SFML_USE_SYSTEM_DEPS) ++ # install the binaries of SFML dependencies ++ if(ARCH_32BITS) ++ install(DIRECTORY extlibs/bin/x86/ DESTINATION bin) ++ if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) ++ install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib) ++ elseif(SFML_COMPILER_MSVC) ++ install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib) ++ else() ++ install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib) ++ endif() ++ elseif(ARCH_64BITS) ++ install(DIRECTORY extlibs/bin/x64/ DESTINATION bin) ++ if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) ++ install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib) ++ elseif(SFML_COMPILER_MSVC) ++ install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib) ++ else() ++ install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib) ++ endif() + endif() + endif() + +@@ -379,9 +381,11 @@ + install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/\$ENV{CONFIGURATION}/" DESTINATION lib${LIB_SUFFIX}) + endif() + +- # since the iOS libraries are built as static, we must install the SFML dependencies +- # too so that the end user can easily link them to its final application +- install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib) ++ if(NOT SFML_USE_SYSTEM_DEPS) ++ # since the iOS libraries are built as static, we must install the SFML dependencies ++ # too so that the end user can easily link them to its final application ++ install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib) ++ endif() + + elseif(SFML_OS_ANDROID) + +@@ -389,7 +393,9 @@ + install(DIRECTORY extlibs/libs-android/${ANDROID_ABI} DESTINATION extlibs/lib) + install(FILES extlibs/Android.mk DESTINATION extlibs) + +- # install Android.mk so the NDK knows how to set up SFML +- install(FILES src/SFML/Android.mk DESTINATION .) ++ if(NOT SFML_USE_SYSTEM_DEPS) ++ # install Android.mk so the NDK knows how to set up SFML ++ install(FILES src/SFML/Android.mk DESTINATION .) ++ endif() + + endif() diff --git a/media-libs/libsfml/libsfml-2.4.2-r1.ebuild b/media-libs/libsfml/libsfml-2.4.2-r1.ebuild new file mode 100644 index 000000000000..7057c2f13469 --- /dev/null +++ b/media-libs/libsfml/libsfml-2.4.2-r1.ebuild @@ -0,0 +1,83 @@ +# 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 +) + +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 +} -- cgit v1.2.3