| 1 |
commit: 4d0a1b310fa79c52a6e70d2657fcc8608bfdb3f9 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 2 19:46:27 2021 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 2 19:46:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0a1b31 |
| 7 |
|
| 8 |
media-libs/libsdl2: Drop old 2.0.14-r1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/814332 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/libsdl2/Manifest | 1 - |
| 14 |
.../libsdl2/files/libsdl2-2.0.14-static-libs.patch | 34 ---- |
| 15 |
.../libsdl2/files/libsdl2-2.0.14-vulkan.patch | 13 -- |
| 16 |
media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild | 210 --------------------- |
| 17 |
4 files changed, 258 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest |
| 20 |
index 580340a47af..f599232c762 100644 |
| 21 |
--- a/media-libs/libsdl2/Manifest |
| 22 |
+++ b/media-libs/libsdl2/Manifest |
| 23 |
@@ -1,2 +1 @@ |
| 24 |
-DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee |
| 25 |
DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f |
| 26 |
|
| 27 |
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch |
| 28 |
deleted file mode 100644 |
| 29 |
index 0d4dfdcb445..00000000000 |
| 30 |
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,34 +0,0 @@ |
| 33 |
-Fix --disable-static. |
| 34 |
- |
| 35 |
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 |
| 36 |
- |
| 37 |
---- SDL2-2.0.14/configure.ac |
| 38 |
-+++ SDL2-2.0.14/configure.ac |
| 39 |
-@@ -3863,7 +3863,7 @@ |
| 40 |
- if test -f /lib/w32api/libuuid.a; then |
| 41 |
- LIBUUID=/lib/w32api/libuuid.a |
| 42 |
- else |
| 43 |
-- LIBUUID=-luuid |
| 44 |
-+ LIBUUID=-Wl,-luuid |
| 45 |
- fi |
| 46 |
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc" |
| 47 |
- # The Windows platform requires special setup |
| 48 |
---- SDL2-2.0.14/Makefile.in |
| 49 |
-+++ SDL2-2.0.14/Makefile.in |
| 50 |
-@@ -151,13 +151,13 @@ |
| 51 |
- .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) |
| 52 |
- |
| 53 |
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) |
| 54 |
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 55 |
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 56 |
- |
| 57 |
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
| 58 |
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) |
| 59 |
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static |
| 60 |
- |
| 61 |
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
| 62 |
-- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) |
| 63 |
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static |
| 64 |
- |
| 65 |
- install: all install-bin install-hdrs install-lib install-data |
| 66 |
- install-bin: |
| 67 |
|
| 68 |
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch |
| 69 |
deleted file mode 100644 |
| 70 |
index 948f68fe234..00000000000 |
| 71 |
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch |
| 72 |
+++ /dev/null |
| 73 |
@@ -1,13 +0,0 @@ |
| 74 |
---- SDL2-2.0.14/src/video/SDL_vulkan_utils.c |
| 75 |
-+++ SDL2-2.0.14/src/video/SDL_vulkan_utils.c |
| 76 |
-@@ -91,8 +91,10 @@ |
| 77 |
- return "VK_ERROR_VALIDATION_FAILED_EXT"; |
| 78 |
- case VK_ERROR_INVALID_SHADER_NV: |
| 79 |
- return "VK_ERROR_INVALID_SHADER_NV"; |
| 80 |
-+#if VK_HEADER_VERSION < 162 |
| 81 |
- case VK_ERROR_INCOMPATIBLE_VERSION_KHR: |
| 82 |
- return "VK_ERROR_INCOMPATIBLE_VERSION_KHR"; |
| 83 |
-+#endif |
| 84 |
- case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT: |
| 85 |
- return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT"; |
| 86 |
- case VK_ERROR_NOT_PERMITTED_EXT: |
| 87 |
|
| 88 |
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild |
| 89 |
deleted file mode 100644 |
| 90 |
index 263553b6bc0..00000000000 |
| 91 |
--- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild |
| 92 |
+++ /dev/null |
| 93 |
@@ -1,210 +0,0 @@ |
| 94 |
-# Copyright 1999-2021 Gentoo Authors |
| 95 |
-# Distributed under the terms of the GNU General Public License v2 |
| 96 |
- |
| 97 |
-EAPI=7 |
| 98 |
- |
| 99 |
-inherit autotools flag-o-matic multilib-minimal |
| 100 |
- |
| 101 |
-MY_P="SDL2-${PV}" |
| 102 |
-DESCRIPTION="Simple Direct Media Layer" |
| 103 |
-HOMEPAGE="https://www.libsdl.org/" |
| 104 |
-SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" |
| 105 |
- |
| 106 |
-LICENSE="ZLIB" |
| 107 |
-SLOT="0" |
| 108 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" |
| 109 |
- |
| 110 |
-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 udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" |
| 111 |
-REQUIRED_USE=" |
| 112 |
- alsa? ( sound ) |
| 113 |
- fcitx4? ( dbus ) |
| 114 |
- gles2? ( video ) |
| 115 |
- ibus? ( dbus ) |
| 116 |
- jack? ( sound ) |
| 117 |
- nas? ( sound ) |
| 118 |
- opengl? ( video ) |
| 119 |
- pulseaudio? ( sound ) |
| 120 |
- vulkan? ( video ) |
| 121 |
- wayland? ( gles2 ) |
| 122 |
- xinerama? ( X ) |
| 123 |
- xscreensaver? ( X )" |
| 124 |
- |
| 125 |
-CDEPEND=" |
| 126 |
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) |
| 127 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 128 |
- fcitx4? ( app-i18n/fcitx:4 ) |
| 129 |
- gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) |
| 130 |
- ibus? ( app-i18n/ibus ) |
| 131 |
- jack? ( virtual/jack[${MULTILIB_USEDEP}] ) |
| 132 |
- kms? ( |
| 133 |
- >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] |
| 134 |
- >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm] |
| 135 |
- ) |
| 136 |
- libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) |
| 137 |
- nas? ( |
| 138 |
- >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] |
| 139 |
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
| 140 |
- ) |
| 141 |
- opengl? ( |
| 142 |
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
| 143 |
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] |
| 144 |
- ) |
| 145 |
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) |
| 146 |
- udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) |
| 147 |
- wayland? ( |
| 148 |
- >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] |
| 149 |
- >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland] |
| 150 |
- >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] |
| 151 |
- ) |
| 152 |
- X? ( |
| 153 |
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
| 154 |
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] |
| 155 |
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 156 |
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] |
| 157 |
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] |
| 158 |
- >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] |
| 159 |
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) |
| 160 |
- xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) |
| 161 |
- )" |
| 162 |
-RDEPEND="${CDEPEND} |
| 163 |
- vulkan? ( media-libs/vulkan-loader )" |
| 164 |
-DEPEND="${CDEPEND} |
| 165 |
- ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) |
| 166 |
- vulkan? ( dev-util/vulkan-headers ) |
| 167 |
- X? ( x11-base/xorg-proto ) |
| 168 |
-" |
| 169 |
-BDEPEND=" |
| 170 |
- virtual/pkgconfig |
| 171 |
-" |
| 172 |
- |
| 173 |
-MULTILIB_WRAPPED_HEADERS=( |
| 174 |
- /usr/include/SDL2/SDL_config.h |
| 175 |
- /usr/include/SDL2/SDL_platform.h |
| 176 |
- /usr/include/SDL2/begin_code.h |
| 177 |
- /usr/include/SDL2/close_code.h |
| 178 |
-) |
| 179 |
- |
| 180 |
-PATCHES=( |
| 181 |
- "${FILESDIR}"/${PN}-2.0.14-static-libs.patch |
| 182 |
- "${FILESDIR}"/${PN}-2.0.14-vulkan.patch |
| 183 |
-) |
| 184 |
- |
| 185 |
-S="${WORKDIR}/${MY_P}" |
| 186 |
- |
| 187 |
-src_prepare() { |
| 188 |
- default |
| 189 |
- |
| 190 |
- # Unbundle some headers. |
| 191 |
- rm -r src/video/khronos || die |
| 192 |
- ln -s "${ESYSROOT}/usr/include" src/video/khronos || die |
| 193 |
- |
| 194 |
- # SDL seems to customize SDL_config.h.in to remove macros like |
| 195 |
- # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from |
| 196 |
- # being reintroduced. |
| 197 |
- # https://bugs.gentoo.org/764959 |
| 198 |
- AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \ |
| 199 |
- eautoreconf |
| 200 |
- |
| 201 |
- # libsdl2-2.0.14 build regression. Please check if still needed |
| 202 |
- multilib_copy_sources |
| 203 |
-} |
| 204 |
- |
| 205 |
-multilib_src_configure() { |
| 206 |
- use custom-cflags || strip-flags |
| 207 |
- |
| 208 |
- if use ibus; then |
| 209 |
- 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" |
| 210 |
- fi |
| 211 |
- |
| 212 |
- # sorted by `./configure --help` |
| 213 |
- local myeconfargs=( |
| 214 |
- $(use_enable static-libs static) |
| 215 |
- --enable-atomic |
| 216 |
- $(use_enable sound audio) |
| 217 |
- $(use_enable video) |
| 218 |
- --enable-render |
| 219 |
- --enable-events |
| 220 |
- $(use_enable joystick) |
| 221 |
- $(use_enable haptic) |
| 222 |
- --enable-power |
| 223 |
- --enable-filesystem |
| 224 |
- $(use_enable threads) |
| 225 |
- --enable-timers |
| 226 |
- --enable-file |
| 227 |
- --enable-loadso |
| 228 |
- --enable-cpuinfo |
| 229 |
- --enable-assembly |
| 230 |
- $(use_enable cpu_flags_ppc_altivec altivec) |
| 231 |
- $(use_enable cpu_flags_x86_sse ssemath) |
| 232 |
- $(use_enable cpu_flags_x86_mmx mmx) |
| 233 |
- $(use_enable cpu_flags_x86_3dnow 3dnow) |
| 234 |
- $(use_enable cpu_flags_x86_sse sse) |
| 235 |
- $(use_enable cpu_flags_x86_sse2 sse2) |
| 236 |
- $(use_enable oss) |
| 237 |
- $(use_enable alsa) |
| 238 |
- --disable-alsa-shared |
| 239 |
- $(use_enable jack) |
| 240 |
- --disable-jack-shared |
| 241 |
- --disable-esd |
| 242 |
- $(use_enable pulseaudio) |
| 243 |
- --disable-pulseaudio-shared |
| 244 |
- --disable-arts |
| 245 |
- $(use_enable libsamplerate) |
| 246 |
- $(use_enable nas) |
| 247 |
- --disable-nas-shared |
| 248 |
- --disable-sndio |
| 249 |
- --disable-sndio-shared |
| 250 |
- $(use_enable sound diskaudio) |
| 251 |
- $(use_enable sound dummyaudio) |
| 252 |
- $(use_enable wayland video-wayland) |
| 253 |
- --disable-wayland-shared |
| 254 |
- $(use_enable video_cards_vc4 video-rpi) |
| 255 |
- $(use_enable X video-x11) |
| 256 |
- --disable-x11-shared |
| 257 |
- $(use_enable X video-x11-xcursor) |
| 258 |
- $(use_enable X video-x11-xdbe) |
| 259 |
- $(use_enable xinerama video-x11-xinerama) |
| 260 |
- $(use_enable X video-x11-xinput) |
| 261 |
- $(use_enable X video-x11-xrandr) |
| 262 |
- $(use_enable xscreensaver video-x11-scrnsaver) |
| 263 |
- $(use_enable X video-x11-xshape) |
| 264 |
- $(use_enable X video-x11-vm) |
| 265 |
- $(use_enable aqua video-cocoa) |
| 266 |
- --disable-video-directfb |
| 267 |
- --disable-fusionsound |
| 268 |
- --disable-fusionsound-shared |
| 269 |
- $(use_enable kms video-kmsdrm) |
| 270 |
- --disable-kmsdrm-shared |
| 271 |
- $(use_enable video video-dummy) |
| 272 |
- $(use_enable opengl video-opengl) |
| 273 |
- --disable-video-opengles1 |
| 274 |
- $(use_enable gles2 video-opengles2) |
| 275 |
- $(use_enable vulkan video-vulkan) |
| 276 |
- $(use_enable udev libudev) |
| 277 |
- $(use_enable dbus) |
| 278 |
- $(use_enable fcitx4 fcitx) |
| 279 |
- $(use_enable ibus) |
| 280 |
- --disable-directx |
| 281 |
- --disable-rpath |
| 282 |
- --disable-render-d3d |
| 283 |
- $(use_with X x) |
| 284 |
- ) |
| 285 |
- |
| 286 |
- #ECONF_SOURCE="${S}" |
| 287 |
- econf "${myeconfargs[@]}" |
| 288 |
-} |
| 289 |
- |
| 290 |
-multilib_src_compile() { |
| 291 |
- emake V=1 |
| 292 |
-} |
| 293 |
- |
| 294 |
-multilib_src_install() { |
| 295 |
- emake DESTDIR="${D}" install |
| 296 |
-} |
| 297 |
- |
| 298 |
-multilib_src_install_all() { |
| 299 |
- # Do not delete the static .a libraries here as some are |
| 300 |
- # mandatory. They may be needed even when linking dynamically. |
| 301 |
- find "${ED}" -type f -name "*.la" -delete || die |
| 302 |
- dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md |
| 303 |
-} |
Archives