1 |
commit: 2d5bbeddf2d0e2c65f21f05dd54cd97d76ee0c7d |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 16 08:37:16 2019 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 16 08:55:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5bbedd |
7 |
|
8 |
media-libs/libsfml: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
|
13 |
media-libs/libsfml/Manifest | 1 - |
14 |
media-libs/libsfml/files/libsfml-2.2-no-docs.patch | 15 -- |
15 |
.../libsfml-2.4.2-no-install-extlibs-mingw.patch | 74 ------- |
16 |
.../libsfml/files/libsfml-2.4.2-pkg-config.patch | 217 --------------------- |
17 |
media-libs/libsfml/libsfml-2.4.2-r2.ebuild | 84 -------- |
18 |
media-libs/libsfml/libsfml-2.4.2.ebuild | 73 ------- |
19 |
6 files changed, 464 deletions(-) |
20 |
|
21 |
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest |
22 |
index 8c9c8f9e102..cbcca3da50d 100644 |
23 |
--- a/media-libs/libsfml/Manifest |
24 |
+++ b/media-libs/libsfml/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST libsfml-2.4.2.tar.gz 24576150 BLAKE2B 05d1c06cb360aae6ec8a53225666119168075ab61dd87fe86a105f2c104d21b5897c4b35e66f5c0dae7193697437d168a963c018e3d39bd7b8b6bed957a63d94 SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972 |
27 |
DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 |
28 |
|
29 |
diff --git a/media-libs/libsfml/files/libsfml-2.2-no-docs.patch b/media-libs/libsfml/files/libsfml-2.2-no-docs.patch |
30 |
deleted file mode 100644 |
31 |
index ef69107c56f..00000000000 |
32 |
--- a/media-libs/libsfml/files/libsfml-2.2-no-docs.patch |
33 |
+++ /dev/null |
34 |
@@ -1,15 +0,0 @@ |
35 |
---- SFML-2.2/CMakeLists.txt |
36 |
-+++ SFML-2.2/CMakeLists.txt |
37 |
-@@ -239,12 +239,6 @@ |
38 |
- COMPONENT devel) |
39 |
- endif() |
40 |
- |
41 |
--install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR}) |
42 |
--install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR}) |
43 |
--if(NOT SFML_OS_ANDROID) |
44 |
-- install(FILES cmake/Modules/FindSFML.cmake DESTINATION ${INSTALL_MISC_DIR}/cmake/Modules) |
45 |
--endif() |
46 |
-- |
47 |
- # install 3rd-party libraries and tools |
48 |
- if(SFML_OS_WINDOWS) |
49 |
- |
50 |
|
51 |
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 |
52 |
deleted file mode 100644 |
53 |
index b45063160e7..00000000000 |
54 |
--- a/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch |
55 |
+++ /dev/null |
56 |
@@ -1,74 +0,0 @@ |
57 |
---- SFML-2.4.2/CMakeLists.txt 2017-02-08 05:29:16.000000000 -0600 |
58 |
-+++ SFML-2.4.2.new/CMakeLists.txt 2017-06-05 22:12:39.166300154 -0500 |
59 |
-@@ -305,24 +305,26 @@ |
60 |
- # install 3rd-party libraries and tools |
61 |
- if(SFML_OS_WINDOWS) |
62 |
- |
63 |
-- # install the binaries of SFML dependencies |
64 |
-- if(ARCH_32BITS) |
65 |
-- install(DIRECTORY extlibs/bin/x86/ DESTINATION bin) |
66 |
-- if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) |
67 |
-- install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib) |
68 |
-- elseif(SFML_COMPILER_MSVC) |
69 |
-- install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib) |
70 |
-- else() |
71 |
-- install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib) |
72 |
-- endif() |
73 |
-- elseif(ARCH_64BITS) |
74 |
-- install(DIRECTORY extlibs/bin/x64/ DESTINATION bin) |
75 |
-- if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) |
76 |
-- install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib) |
77 |
-- elseif(SFML_COMPILER_MSVC) |
78 |
-- install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib) |
79 |
-- else() |
80 |
-- install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib) |
81 |
-+ if(NOT SFML_USE_SYSTEM_DEPS) |
82 |
-+ # install the binaries of SFML dependencies |
83 |
-+ if(ARCH_32BITS) |
84 |
-+ install(DIRECTORY extlibs/bin/x86/ DESTINATION bin) |
85 |
-+ if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) |
86 |
-+ install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib) |
87 |
-+ elseif(SFML_COMPILER_MSVC) |
88 |
-+ install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib) |
89 |
-+ else() |
90 |
-+ install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib) |
91 |
-+ endif() |
92 |
-+ elseif(ARCH_64BITS) |
93 |
-+ install(DIRECTORY extlibs/bin/x64/ DESTINATION bin) |
94 |
-+ if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) |
95 |
-+ install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib) |
96 |
-+ elseif(SFML_COMPILER_MSVC) |
97 |
-+ install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib) |
98 |
-+ else() |
99 |
-+ install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib) |
100 |
-+ endif() |
101 |
- endif() |
102 |
- endif() |
103 |
- |
104 |
-@@ -379,9 +381,11 @@ |
105 |
- install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/\$ENV{CONFIGURATION}/" DESTINATION lib${LIB_SUFFIX}) |
106 |
- endif() |
107 |
- |
108 |
-- # since the iOS libraries are built as static, we must install the SFML dependencies |
109 |
-- # too so that the end user can easily link them to its final application |
110 |
-- install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib) |
111 |
-+ if(NOT SFML_USE_SYSTEM_DEPS) |
112 |
-+ # since the iOS libraries are built as static, we must install the SFML dependencies |
113 |
-+ # too so that the end user can easily link them to its final application |
114 |
-+ install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib) |
115 |
-+ endif() |
116 |
- |
117 |
- elseif(SFML_OS_ANDROID) |
118 |
- |
119 |
-@@ -389,7 +393,9 @@ |
120 |
- install(DIRECTORY extlibs/libs-android/${ANDROID_ABI} DESTINATION extlibs/lib) |
121 |
- install(FILES extlibs/Android.mk DESTINATION extlibs) |
122 |
- |
123 |
-- # install Android.mk so the NDK knows how to set up SFML |
124 |
-- install(FILES src/SFML/Android.mk DESTINATION .) |
125 |
-+ if(NOT SFML_USE_SYSTEM_DEPS) |
126 |
-+ # install Android.mk so the NDK knows how to set up SFML |
127 |
-+ install(FILES src/SFML/Android.mk DESTINATION .) |
128 |
-+ endif() |
129 |
- |
130 |
- endif() |
131 |
|
132 |
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 |
133 |
deleted file mode 100644 |
134 |
index a281d46c9ba..00000000000 |
135 |
--- a/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch |
136 |
+++ /dev/null |
137 |
@@ -1,217 +0,0 @@ |
138 |
-commit 5fe5e5d6d7792e37685a437551ffa8ed5161fcc1 |
139 |
-Author: Rafael Kitover <rkitover@×××××.com> |
140 |
-Date: Mon Dec 19 13:16:07 2016 -0800 |
141 |
- |
142 |
- packaging support improvements |
143 |
- |
144 |
- This grew out of my work creating an sfml port for macports, but should |
145 |
- be helpful for package maintainers of various distributions: |
146 |
- |
147 |
- * add an SFML_USE_SYSTEM_DEPS option to ignore everything in extlibs/ |
148 |
- except for headers/stb_image, and use the system versions |
149 |
- |
150 |
- * install pkg-config files if a pkg-config program is found |
151 |
- and either lib/pkgconfig or libdata/pkgconfig exists under the |
152 |
- INSTALL_PREFIX, or the SFML_INSTALL_PKGCONFIG_FILES flag is set |
153 |
- explicitly |
154 |
- |
155 |
- * install pkg-config files for static libs too, add the necessary |
156 |
- Requires.private and Libs.private entries to the .pc files to support |
157 |
- static linking |
158 |
- |
159 |
- * on OS X, honor all INSTALL_NAME and RPATH related cmake variables and |
160 |
- only set the INSTALL_NAME_DIR to "@rpath" if none of them is set, this |
161 |
- preserves the default behavior of using @rpath but also allows |
162 |
- overriding by the usual cmake mechanisms |
163 |
- |
164 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
165 |
-index e7914ac9..419d56d7 100644 |
166 |
---- a/CMakeLists.txt |
167 |
-+++ b/CMakeLists.txt |
168 |
-@@ -16,6 +16,9 @@ sfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug |
169 |
- # Suppress Cygwin legacy warning |
170 |
- set(CMAKE_LEGACY_CYGWIN_WIN32 0) |
171 |
- |
172 |
-+# Suppress Mac OS X RPATH warnings and adopt new related behaviors |
173 |
-+cmake_policy(SET CMP0042 NEW) |
174 |
-+ |
175 |
- # set Android specific options |
176 |
- |
177 |
- # define the minimum API level to be used |
178 |
-@@ -130,6 +133,39 @@ if(NOT BUILD_SHARED_LIBS) |
179 |
- add_definitions(-DSFML_STATIC) |
180 |
- endif() |
181 |
- |
182 |
-+# allow not using bundled dependencies with a switch |
183 |
-+# (except for stb_image) |
184 |
-+# yes this is horrible, but GLOB_RECURSE sucks |
185 |
-+sfml_set_option(SFML_USE_SYSTEM_DEPS FALSE BOOL "TRUE to use system dependencies, FALSE to use the bundled ones.") |
186 |
-+if(SFML_USE_SYSTEM_DEPS) |
187 |
-+ if(SFML_INSTALL_XCODE_TEMPLATES) |
188 |
-+ message(FATAL_ERROR "XCode templates installation cannot be used with the SFML_USE_SYSTEM_DEPS option (the bundled frameworks are required.)") |
189 |
-+ endif() |
190 |
-+ |
191 |
-+ file(GLOB_RECURSE DEP_LIBS "${CMAKE_SOURCE_DIR}/extlibs/libs*/*") |
192 |
-+ file(GLOB_RECURSE DEP_BINS "${CMAKE_SOURCE_DIR}/extlibs/bin*/*") |
193 |
-+ file(GLOB_RECURSE DEP_HEADERS "${CMAKE_SOURCE_DIR}/extlibs/headers/*") |
194 |
-+ |
195 |
-+ foreach(DEP_FILE ${DEP_LIBS} ${DEP_BINS} ${DEP_HEADERS}) |
196 |
-+ get_filename_component(DEP_DIR ${DEP_FILE} PATH) |
197 |
-+ |
198 |
-+ if(NOT DEP_DIR MATCHES "/stb_image(/|$)") |
199 |
-+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_DIR}) |
200 |
-+ endif() |
201 |
-+ |
202 |
-+ get_filename_component(DEP_PARENT_DIR ${DEP_DIR} PATH) |
203 |
-+ while(NOT DEP_PARENT_DIR STREQUAL "${CMAKE_SOURCE_DIR}/extlibs") |
204 |
-+ if(NOT DEP_DIR MATCHES "/stb_image(/|$)") |
205 |
-+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_PARENT_DIR}) |
206 |
-+ endif() |
207 |
-+ |
208 |
-+ get_filename_component(DEP_PARENT_DIR ${DEP_PARENT_DIR} PATH) |
209 |
-+ endwhile() |
210 |
-+ endforeach() |
211 |
-+ |
212 |
-+ list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH) |
213 |
-+endif() |
214 |
-+ |
215 |
- # Visual C++: remove warnings regarding SL security and algorithms on pointers |
216 |
- if(SFML_COMPILER_MSVC) |
217 |
- # add an option to choose whether PDB debug symbols should be generated (defaults to true when possible) |
218 |
-@@ -202,30 +238,6 @@ if(SFML_OS_MACOSX) |
219 |
- set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)") |
220 |
- endif() |
221 |
- |
222 |
--if(SFML_OS_LINUX OR SFML_OS_FREEBSD) |
223 |
-- set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig) |
224 |
-- if(SFML_OS_FREEBSD) |
225 |
-- set(PKGCONFIG_DIR libdata/pkgconfig) |
226 |
-- endif() |
227 |
-- if(BUILD_SHARED_LIBS) |
228 |
-- sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML") |
229 |
-- if(SFML_INSTALL_PKGCONFIG_FILES) |
230 |
-- foreach(sfml_module IN ITEMS all system window graphics audio network) |
231 |
-- CONFIGURE_FILE( |
232 |
-- "tools/pkg-config/sfml-${sfml_module}.pc.in" |
233 |
-- "tools/pkg-config/sfml-${sfml_module}.pc" |
234 |
-- @ONLY) |
235 |
-- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc" |
236 |
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${PKGCONFIG_DIR}") |
237 |
-- endforeach() |
238 |
-- endif() |
239 |
-- else() |
240 |
-- if(SFML_INSTALL_PKGCONFIG_FILES) |
241 |
-- message(WARNING "No pkg-config files are provided for the static SFML libraries (SFML_INSTALL_PKGCONFIG_FILES will be ignored).") |
242 |
-- endif() |
243 |
-- endif() |
244 |
--endif() |
245 |
-- |
246 |
- # enable project folders |
247 |
- set_property(GLOBAL PROPERTY USE_FOLDERS ON) |
248 |
- set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake") |
249 |
-@@ -239,6 +251,19 @@ if(SFML_BUILD_DOC) |
250 |
- add_subdirectory(doc) |
251 |
- endif() |
252 |
- |
253 |
-+sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML") |
254 |
-+ |
255 |
-+if(SFML_OS_SUPPORTS_PKGCONFIG OR SFML_INSTALL_PKGCONFIG_FILES) |
256 |
-+ foreach(sfml_module IN ITEMS all system window graphics audio network) |
257 |
-+ CONFIGURE_FILE( |
258 |
-+ "tools/pkg-config/sfml-${sfml_module}.pc.in" |
259 |
-+ "tools/pkg-config/sfml-${sfml_module}.pc" |
260 |
-+ @ONLY) |
261 |
-+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc" |
262 |
-+ DESTINATION "${CMAKE_INSTALL_PREFIX}/${SFML_OS_PKGCONFIG_DIR}") |
263 |
-+ endforeach() |
264 |
-+endif() |
265 |
-+ |
266 |
- # setup the install rules |
267 |
- if(NOT SFML_BUILD_FRAMEWORKS) |
268 |
- install(DIRECTORY include |
269 |
-diff --git a/cmake/Config.cmake b/cmake/Config.cmake |
270 |
-index cff54d00..c447113a 100644 |
271 |
---- a/cmake/Config.cmake |
272 |
-+++ b/cmake/Config.cmake |
273 |
-@@ -73,6 +73,19 @@ else() |
274 |
- return() |
275 |
- endif() |
276 |
- |
277 |
-+# check if OS or package system supports pkg-config |
278 |
-+# this could be e.g. macports on mac or msys2 on windows etc. |
279 |
-+find_package(PkgConfig QUIET) |
280 |
-+if(PKG_CONFIG_EXECUTABLE) |
281 |
-+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig") |
282 |
-+ set(SFML_OS_SUPPORTS_PKGCONFIG ON) |
283 |
-+ set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig") |
284 |
-+ elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") |
285 |
-+ set(SFML_OS_SUPPORTS_PKGCONFIG ON) |
286 |
-+ set(SFML_OS_PKGCONFIG_DIR "/libdata/pkgconfig") |
287 |
-+ endif() |
288 |
-+endif() |
289 |
-+ |
290 |
- # detect the compiler and its version |
291 |
- # Note: on some platforms (OS X), CMAKE_COMPILER_IS_GNUCXX is true |
292 |
- # even when CLANG is used, therefore the Clang test is done first |
293 |
-diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake |
294 |
-index cd2ca8fc..0f316034 100644 |
295 |
---- a/cmake/Macros.cmake |
296 |
-+++ b/cmake/Macros.cmake |
297 |
-@@ -105,9 +105,17 @@ macro(sfml_add_library target) |
298 |
- endif() |
299 |
- |
300 |
- # adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle |
301 |
-- set_target_properties(${target} PROPERTIES |
302 |
-- BUILD_WITH_INSTALL_RPATH 1 |
303 |
-- INSTALL_NAME_DIR "@rpath") |
304 |
-+ # but only if cmake rpath options aren't set |
305 |
-+ 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) |
306 |
-+ if(CMAKE_SKIP_BUILD_RPATH) |
307 |
-+ set_target_properties(${target} PROPERTIES |
308 |
-+ INSTALL_NAME_DIR "@rpath") |
309 |
-+ else() |
310 |
-+ set_target_properties(${target} PROPERTIES |
311 |
-+ BUILD_WITH_INSTALL_RPATH 1 |
312 |
-+ INSTALL_NAME_DIR "@rpath") |
313 |
-+ endif() |
314 |
-+ endif() |
315 |
- endif() |
316 |
- |
317 |
- # enable automatic reference counting on iOS |
318 |
-diff --git a/tools/pkg-config/sfml-audio.pc.in b/tools/pkg-config/sfml-audio.pc.in |
319 |
-index 7456daaa..0d7a3ce1 100644 |
320 |
---- a/tools/pkg-config/sfml-audio.pc.in |
321 |
-+++ b/tools/pkg-config/sfml-audio.pc.in |
322 |
-@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, audio module. |
323 |
- URL: http://www.sfml-dev.org |
324 |
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ |
325 |
- Requires: sfml-system |
326 |
-+Requires.private: openal, vorbisenc, vorbisfile, vorbis, ogg, flac |
327 |
- Libs: -L${libdir} -lsfml-audio |
328 |
-+# openal may be a system framework |
329 |
-+Libs.private: @OPENAL_LIBRARY@ |
330 |
- Cflags: -I${includedir} |
331 |
-diff --git a/tools/pkg-config/sfml-graphics.pc.in b/tools/pkg-config/sfml-graphics.pc.in |
332 |
-index d0a88a13..a96b72c9 100644 |
333 |
---- a/tools/pkg-config/sfml-graphics.pc.in |
334 |
-+++ b/tools/pkg-config/sfml-graphics.pc.in |
335 |
-@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, graphics module. |
336 |
- URL: http://www.sfml-dev.org |
337 |
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ |
338 |
- Requires: sfml-window |
339 |
-+Requires.private: sfml-system, freetype2 |
340 |
- Libs: -L${libdir} -lsfml-graphics |
341 |
-+# gl and jpeg may not be in pkg-config |
342 |
-+Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@ @JPEG_LIBRARY@ |
343 |
- Cflags: -I${includedir} |
344 |
-diff --git a/tools/pkg-config/sfml-window.pc.in b/tools/pkg-config/sfml-window.pc.in |
345 |
-index b0266e67..93bf344c 100644 |
346 |
---- a/tools/pkg-config/sfml-window.pc.in |
347 |
-+++ b/tools/pkg-config/sfml-window.pc.in |
348 |
-@@ -9,4 +9,6 @@ URL: http://www.sfml-dev.org |
349 |
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ |
350 |
- Requires: sfml-system |
351 |
- Libs: -L${libdir} -lsfml-window |
352 |
-+# gl may not be in pkg-config |
353 |
-+Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@ |
354 |
- Cflags: -I${includedir} |
355 |
|
356 |
diff --git a/media-libs/libsfml/libsfml-2.4.2-r2.ebuild b/media-libs/libsfml/libsfml-2.4.2-r2.ebuild |
357 |
deleted file mode 100644 |
358 |
index dda2accf7c6..00000000000 |
359 |
--- a/media-libs/libsfml/libsfml-2.4.2-r2.ebuild |
360 |
+++ /dev/null |
361 |
@@ -1,84 +0,0 @@ |
362 |
-# Copyright 1999-2018 Gentoo Foundation |
363 |
-# Distributed under the terms of the GNU General Public License v2 |
364 |
- |
365 |
-EAPI=6 |
366 |
- |
367 |
-inherit cmake-utils versionator |
368 |
- |
369 |
-MY_P="SFML-${PV}" |
370 |
- |
371 |
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)" |
372 |
-HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML" |
373 |
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz" |
374 |
- |
375 |
-LICENSE="ZLIB" |
376 |
-SLOT="0/$(get_version_component_range 1-2)" |
377 |
-KEYWORDS="~amd64 ~x86" |
378 |
-IUSE="debug doc examples" |
379 |
- |
380 |
-RDEPEND=" |
381 |
- media-libs/flac |
382 |
- media-libs/freetype:2 |
383 |
- media-libs/libpng:0= |
384 |
- media-libs/libogg |
385 |
- media-libs/libvorbis |
386 |
- media-libs/openal |
387 |
- sys-libs/zlib |
388 |
- virtual/jpeg:0 |
389 |
- kernel_linux? ( |
390 |
- virtual/libudev:0 |
391 |
- ) |
392 |
- virtual/opengl |
393 |
- !kernel_Winnt? ( |
394 |
- x11-libs/libX11 |
395 |
- x11-libs/libXrandr |
396 |
- x11-libs/libxcb |
397 |
- x11-libs/xcb-util-image |
398 |
- ) |
399 |
-" |
400 |
-DEPEND=" |
401 |
- ${RDEPEND} |
402 |
- doc? ( app-doc/doxygen ) |
403 |
-" |
404 |
- |
405 |
-DOCS=( changelog.txt readme.txt ) |
406 |
- |
407 |
-PATCHES=( |
408 |
- "${FILESDIR}"/${PN}-2.2-no-docs.patch |
409 |
- "${FILESDIR}"/${PN}-2.4.2-no-install-extlibs-mingw.patch |
410 |
- "${FILESDIR}"/${PN}-2.4.2-pkg-config.patch |
411 |
-) |
412 |
- |
413 |
-S="${WORKDIR}/${MY_P}" |
414 |
- |
415 |
-src_prepare() { |
416 |
- sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \ |
417 |
- doc/CMakeLists.txt || die |
418 |
- |
419 |
- find examples -name CMakeLists.txt -delete || die |
420 |
- cmake-utils_src_prepare |
421 |
-} |
422 |
- |
423 |
-src_configure() { |
424 |
- local mycmakeargs=( |
425 |
- -DSFML_BUILD_DOC=$(usex doc) |
426 |
- -DSFML_INSTALL_PKGCONFIG_FILES=TRUE |
427 |
- ) |
428 |
- |
429 |
- if use kernel_Winnt; then |
430 |
- mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE ) |
431 |
- fi |
432 |
- cmake-utils_src_configure |
433 |
-} |
434 |
- |
435 |
-src_install() { |
436 |
- cmake-utils_src_install |
437 |
- |
438 |
- insinto /usr/share/cmake/Modules |
439 |
- doins cmake/Modules/FindSFML.cmake |
440 |
- |
441 |
- if use examples ; then |
442 |
- docompress -x /usr/share/doc/${PF}/examples |
443 |
- dodoc -r examples |
444 |
- fi |
445 |
-} |
446 |
|
447 |
diff --git a/media-libs/libsfml/libsfml-2.4.2.ebuild b/media-libs/libsfml/libsfml-2.4.2.ebuild |
448 |
deleted file mode 100644 |
449 |
index cced9bb41be..00000000000 |
450 |
--- a/media-libs/libsfml/libsfml-2.4.2.ebuild |
451 |
+++ /dev/null |
452 |
@@ -1,73 +0,0 @@ |
453 |
-# Copyright 1999-2017 Gentoo Foundation |
454 |
-# Distributed under the terms of the GNU General Public License v2 |
455 |
- |
456 |
-EAPI=6 |
457 |
- |
458 |
-inherit cmake-utils versionator |
459 |
- |
460 |
-MY_P="SFML-${PV}" |
461 |
- |
462 |
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)" |
463 |
-HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML" |
464 |
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz" |
465 |
- |
466 |
-LICENSE="ZLIB" |
467 |
-SLOT="0/$(get_version_component_range 1-2)" |
468 |
-KEYWORDS="amd64 x86" |
469 |
-IUSE="debug doc examples" |
470 |
- |
471 |
-RDEPEND=" |
472 |
- media-libs/flac |
473 |
- media-libs/freetype:2 |
474 |
- media-libs/libpng:0= |
475 |
- media-libs/libogg |
476 |
- media-libs/libvorbis |
477 |
- media-libs/mesa |
478 |
- media-libs/openal |
479 |
- sys-libs/zlib |
480 |
- virtual/jpeg:0 |
481 |
- virtual/libudev:0 |
482 |
- virtual/opengl |
483 |
- x11-libs/libX11 |
484 |
- x11-libs/libXrandr |
485 |
- x11-libs/libxcb |
486 |
- x11-libs/xcb-util-image |
487 |
-" |
488 |
-DEPEND=" |
489 |
- ${RDEPEND} |
490 |
- doc? ( app-doc/doxygen ) |
491 |
-" |
492 |
- |
493 |
-DOCS=( changelog.txt readme.txt ) |
494 |
- |
495 |
-PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch ) |
496 |
- |
497 |
-S="${WORKDIR}/${MY_P}" |
498 |
- |
499 |
-src_prepare() { |
500 |
- sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \ |
501 |
- doc/CMakeLists.txt || die |
502 |
- |
503 |
- cmake-utils_src_prepare |
504 |
-} |
505 |
- |
506 |
-src_configure() { |
507 |
- local mycmakeargs=( |
508 |
- -DSFML_BUILD_DOC=$(usex doc) |
509 |
- -DSFML_INSTALL_PKGCONFIG_FILES=TRUE |
510 |
- ) |
511 |
- cmake-utils_src_configure |
512 |
-} |
513 |
- |
514 |
-src_install() { |
515 |
- cmake-utils_src_install |
516 |
- |
517 |
- insinto /usr/share/cmake/Modules |
518 |
- doins cmake/Modules/FindSFML.cmake |
519 |
- |
520 |
- if use examples ; then |
521 |
- docompress -x /usr/share/doc/${PF}/examples |
522 |
- dodoc -r examples |
523 |
- find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete |
524 |
- fi |
525 |
-} |