1 |
commit: b7123d5088482b6a414f9f3b7da7738360b6d853 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 25 00:39:37 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 25 01:35:08 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7123d50 |
7 |
|
8 |
media-libs/libsdl2: drop vulnerable 2.0.12-r2 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/766204 |
11 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
12 |
|
13 |
media-libs/libsdl2/Manifest | 1 - |
14 |
.../files/libsdl2-2.0.12-egl-detection.patch | 24 --- |
15 |
.../libsdl2/files/libsdl2-2.0.12-static-libs.patch | 48 ----- |
16 |
.../files/libsdl2-2.0.12-vulkan-headers.patch | 17 -- |
17 |
media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild | 204 --------------------- |
18 |
media-libs/libsdl2/metadata.xml | 1 - |
19 |
6 files changed, 295 deletions(-) |
20 |
|
21 |
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest |
22 |
index fef6b59307f..d4a910d2b22 100644 |
23 |
--- a/media-libs/libsdl2/Manifest |
24 |
+++ b/media-libs/libsdl2/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 |
27 |
DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee |
28 |
|
29 |
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch |
30 |
deleted file mode 100644 |
31 |
index 7655ca67494..00000000000 |
32 |
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch |
33 |
+++ /dev/null |
34 |
@@ -1,24 +0,0 @@ |
35 |
-Fix wayland support on systems without X11. |
36 |
- |
37 |
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5270 |
38 |
- |
39 |
---- a/configure Tue Aug 25 04:05:36 2020 +0200 |
40 |
-+++ a/configure Tue Aug 25 06:40:03 2020 -0700 |
41 |
-@@ -22306,6 +22306,7 @@ |
42 |
- #define LINUX |
43 |
- #define EGL_API_FB |
44 |
- #define MESA_EGL_NO_X11_HEADERS |
45 |
-+ #define EGL_NO_X11 |
46 |
- #include <EGL/egl.h> |
47 |
- #include <EGL/eglext.h> |
48 |
- |
49 |
---- a/configure.ac Tue Aug 25 04:05:36 2020 +0200 |
50 |
-+++ a/configure.ac Tue Aug 25 06:40:03 2020 -0700 |
51 |
-@@ -2373,6 +2373,7 @@ |
52 |
- #define LINUX |
53 |
- #define EGL_API_FB |
54 |
- #define MESA_EGL_NO_X11_HEADERS |
55 |
-+ #define EGL_NO_X11 |
56 |
- #include <EGL/egl.h> |
57 |
- #include <EGL/eglext.h> |
58 |
- ],[ |
59 |
|
60 |
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch |
61 |
deleted file mode 100644 |
62 |
index f80dc6c222c..00000000000 |
63 |
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch |
64 |
+++ /dev/null |
65 |
@@ -1,48 +0,0 @@ |
66 |
-Fix --disable-static. |
67 |
- |
68 |
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 |
69 |
- |
70 |
---- SDL2-2.0.12/configure.ac |
71 |
-+++ SDL2-2.0.12/configure.ac |
72 |
-@@ -3751,7 +3751,7 @@ |
73 |
- if test -f /lib/w32api/libuuid.a; then |
74 |
- LIBUUID=/lib/w32api/libuuid.a |
75 |
- else |
76 |
-- LIBUUID=-luuid |
77 |
-+ LIBUUID=-Wl,-luuid |
78 |
- fi |
79 |
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc" |
80 |
- # The Windows platform requires special setup |
81 |
-@@ -4194,10 +4194,10 @@ |
82 |
- |
83 |
- VERSION_OBJECTS=`echo $VERSION_SOURCES` |
84 |
- VERSION_DEPENDS=`echo $VERSION_SOURCES` |
85 |
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` |
86 |
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` |
87 |
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ |
88 |
--\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\ |
89 |
-- \\$(WINDRES) \\$< \\$@,g"` |
90 |
-+\\$(objects)/\\2.lo: \\1/\\2.rc \\$(objects)/.created\\\\ |
91 |
-+ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` |
92 |
- |
93 |
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` |
94 |
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` |
95 |
---- SDL2-2.0.12/Makefile.in |
96 |
-+++ SDL2-2.0.12/Makefile.in |
97 |
-@@ -148,13 +148,13 @@ |
98 |
- .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) |
99 |
- |
100 |
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) |
101 |
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
102 |
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
103 |
- |
104 |
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
105 |
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) |
106 |
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static |
107 |
- |
108 |
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
109 |
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) |
110 |
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static |
111 |
- |
112 |
- install: all install-bin install-hdrs install-lib install-data |
113 |
- install-bin: |
114 |
|
115 |
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch |
116 |
deleted file mode 100644 |
117 |
index 717e5b5db38..00000000000 |
118 |
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch |
119 |
+++ /dev/null |
120 |
@@ -1,17 +0,0 @@ |
121 |
-Fix building against the latest Vulkan headers. |
122 |
- |
123 |
-Bug: https://bugs.gentoo.org/721954 |
124 |
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5227 |
125 |
- |
126 |
---- a/src/video/SDL_vulkan_utils.c 2020-03-10 21:36:18.000000000 -0400 |
127 |
-+++ b/src/video/SDL_vulkan_utils.c 2020-06-14 21:49:15.780898839 -0400 |
128 |
-@@ -85,7 +85,9 @@ |
129 |
- case VK_ERROR_INVALID_SHADER_NV: |
130 |
- return "VK_ERROR_INVALID_SHADER_NV"; |
131 |
- case VK_RESULT_MAX_ENUM: |
132 |
-+#if VK_HEADER_VERSION < 140 |
133 |
- case VK_RESULT_RANGE_SIZE: |
134 |
-+#endif |
135 |
- break; |
136 |
- } |
137 |
- if(result < 0) |
138 |
|
139 |
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild |
140 |
deleted file mode 100644 |
141 |
index a2ca8ec4751..00000000000 |
142 |
--- a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild |
143 |
+++ /dev/null |
144 |
@@ -1,204 +0,0 @@ |
145 |
-# Copyright 1999-2021 Gentoo Authors |
146 |
-# Distributed under the terms of the GNU General Public License v2 |
147 |
- |
148 |
-EAPI=7 |
149 |
- |
150 |
-inherit autotools flag-o-matic multilib-minimal |
151 |
- |
152 |
-MY_P="SDL2-${PV}" |
153 |
-DESCRIPTION="Simple Direct Media Layer" |
154 |
-HOMEPAGE="https://www.libsdl.org/" |
155 |
-SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" |
156 |
- |
157 |
-LICENSE="ZLIB" |
158 |
-SLOT="0" |
159 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" |
160 |
- |
161 |
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" |
162 |
-REQUIRED_USE=" |
163 |
- alsa? ( sound ) |
164 |
- fcitx4? ( dbus ) |
165 |
- gles2? ( video ) |
166 |
- ibus? ( dbus ) |
167 |
- jack? ( sound ) |
168 |
- nas? ( sound ) |
169 |
- opengl? ( video ) |
170 |
- pulseaudio? ( sound ) |
171 |
- vulkan? ( video ) |
172 |
- wayland? ( gles2 ) |
173 |
- xinerama? ( X ) |
174 |
- xscreensaver? ( X )" |
175 |
- |
176 |
-CDEPEND=" |
177 |
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) |
178 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
179 |
- fcitx4? ( app-i18n/fcitx:4 ) |
180 |
- gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) |
181 |
- ibus? ( app-i18n/ibus ) |
182 |
- jack? ( virtual/jack[${MULTILIB_USEDEP}] ) |
183 |
- kms? ( |
184 |
- >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] |
185 |
- >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm] |
186 |
- ) |
187 |
- libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) |
188 |
- nas? ( |
189 |
- >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] |
190 |
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
191 |
- ) |
192 |
- opengl? ( |
193 |
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
194 |
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] |
195 |
- ) |
196 |
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) |
197 |
- tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) |
198 |
- udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) |
199 |
- wayland? ( |
200 |
- >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] |
201 |
- >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland] |
202 |
- >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] |
203 |
- ) |
204 |
- X? ( |
205 |
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
206 |
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] |
207 |
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
208 |
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] |
209 |
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] |
210 |
- >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] |
211 |
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) |
212 |
- xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) |
213 |
- )" |
214 |
-RDEPEND="${CDEPEND} |
215 |
- vulkan? ( media-libs/vulkan-loader )" |
216 |
-DEPEND="${CDEPEND} |
217 |
- ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) |
218 |
- vulkan? ( dev-util/vulkan-headers ) |
219 |
- X? ( x11-base/xorg-proto ) |
220 |
-" |
221 |
-BDEPEND=" |
222 |
- virtual/pkgconfig |
223 |
-" |
224 |
- |
225 |
-MULTILIB_WRAPPED_HEADERS=( |
226 |
- /usr/include/SDL2/SDL_config.h |
227 |
- /usr/include/SDL2/SDL_platform.h |
228 |
- /usr/include/SDL2/begin_code.h |
229 |
- /usr/include/SDL2/close_code.h |
230 |
-) |
231 |
- |
232 |
-PATCHES=( |
233 |
- "${FILESDIR}"/${PN}-2.0.12-static-libs.patch |
234 |
- "${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch |
235 |
- "${FILESDIR}"/${PN}-2.0.12-egl-detection.patch |
236 |
-) |
237 |
- |
238 |
-S="${WORKDIR}/${MY_P}" |
239 |
- |
240 |
-src_prepare() { |
241 |
- default |
242 |
- |
243 |
- # Unbundle some headers. |
244 |
- rm -r src/video/khronos || die |
245 |
- ln -s "${ESYSROOT}/usr/include" src/video/khronos || die |
246 |
- |
247 |
- AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf |
248 |
-} |
249 |
- |
250 |
-multilib_src_configure() { |
251 |
- use custom-cflags || strip-flags |
252 |
- |
253 |
- if use ibus; then |
254 |
- local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include" |
255 |
- fi |
256 |
- |
257 |
- # sorted by `./configure --help` |
258 |
- local myeconfargs=( |
259 |
- $(use_enable static-libs static) |
260 |
- --enable-atomic |
261 |
- $(use_enable sound audio) |
262 |
- $(use_enable video) |
263 |
- --enable-render |
264 |
- --enable-events |
265 |
- $(use_enable joystick) |
266 |
- $(use_enable haptic) |
267 |
- --enable-power |
268 |
- --enable-filesystem |
269 |
- $(use_enable threads) |
270 |
- --enable-timers |
271 |
- --enable-file |
272 |
- --enable-loadso |
273 |
- --enable-cpuinfo |
274 |
- --enable-assembly |
275 |
- $(use_enable cpu_flags_ppc_altivec altivec) |
276 |
- $(use_enable cpu_flags_x86_sse ssemath) |
277 |
- $(use_enable cpu_flags_x86_mmx mmx) |
278 |
- $(use_enable cpu_flags_x86_3dnow 3dnow) |
279 |
- $(use_enable cpu_flags_x86_sse sse) |
280 |
- $(use_enable cpu_flags_x86_sse2 sse2) |
281 |
- $(use_enable oss) |
282 |
- $(use_enable alsa) |
283 |
- --disable-alsa-shared |
284 |
- $(use_enable jack) |
285 |
- --disable-jack-shared |
286 |
- --disable-esd |
287 |
- $(use_enable pulseaudio) |
288 |
- --disable-pulseaudio-shared |
289 |
- --disable-arts |
290 |
- $(use_enable libsamplerate) |
291 |
- $(use_enable nas) |
292 |
- --disable-nas-shared |
293 |
- --disable-sndio |
294 |
- --disable-sndio-shared |
295 |
- $(use_enable sound diskaudio) |
296 |
- $(use_enable sound dummyaudio) |
297 |
- $(use_enable wayland video-wayland) |
298 |
- --disable-wayland-shared |
299 |
- $(use_enable video_cards_vc4 video-rpi) |
300 |
- $(use_enable X video-x11) |
301 |
- --disable-x11-shared |
302 |
- $(use_enable X video-x11-xcursor) |
303 |
- $(use_enable X video-x11-xdbe) |
304 |
- $(use_enable xinerama video-x11-xinerama) |
305 |
- $(use_enable X video-x11-xinput) |
306 |
- $(use_enable X video-x11-xrandr) |
307 |
- $(use_enable xscreensaver video-x11-scrnsaver) |
308 |
- $(use_enable X video-x11-xshape) |
309 |
- $(use_enable X video-x11-vm) |
310 |
- $(use_enable aqua video-cocoa) |
311 |
- --disable-video-directfb |
312 |
- --disable-fusionsound |
313 |
- --disable-fusionsound-shared |
314 |
- $(use_enable kms video-kmsdrm) |
315 |
- --disable-kmsdrm-shared |
316 |
- $(use_enable video video-dummy) |
317 |
- $(use_enable opengl video-opengl) |
318 |
- --disable-video-opengles1 |
319 |
- $(use_enable gles2 video-opengles2) |
320 |
- $(use_enable vulkan video-vulkan) |
321 |
- $(use_enable udev libudev) |
322 |
- $(use_enable dbus) |
323 |
- $(use_enable fcitx4 fcitx) |
324 |
- $(use_enable ibus) |
325 |
- $(use_enable tslib input-tslib) |
326 |
- --disable-directx |
327 |
- --disable-rpath |
328 |
- --disable-render-d3d |
329 |
- $(use_with X x) |
330 |
- ) |
331 |
- |
332 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
333 |
-} |
334 |
- |
335 |
-multilib_src_compile() { |
336 |
- emake V=1 |
337 |
-} |
338 |
- |
339 |
-multilib_src_install() { |
340 |
- emake DESTDIR="${D}" install |
341 |
-} |
342 |
- |
343 |
-multilib_src_install_all() { |
344 |
- # Do not delete the static .a libraries here as some are |
345 |
- # mandatory. They may be needed even when linking dynamically. |
346 |
- find "${ED}" -type f -name "*.la" -delete || die |
347 |
- dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md |
348 |
-} |
349 |
|
350 |
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml |
351 |
index 7c587dc6d2e..06de1fd4760 100644 |
352 |
--- a/media-libs/libsdl2/metadata.xml |
353 |
+++ b/media-libs/libsdl2/metadata.xml |
354 |
@@ -33,7 +33,6 @@ |
355 |
<flag name="kms">Build the KMSDRM video driver</flag> |
356 |
<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag> |
357 |
<flag name="sound">Control audio support (disable at your own risk)</flag> |
358 |
- <flag name="tslib">Build with tslib support for touchscreen devices</flag> |
359 |
<flag name="video">Control video support (disable at your own risk)</flag> |
360 |
<flag name="vulkan">Enable Vulkan support</flag> |
361 |
</use> |