From c8f83ad526fb6b554daf375e0ad65eb2d56e669b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 Aug 2022 04:49:49 +0100 Subject: gentoo auto-resync : 31:08:2022 - 04:49:49 --- media-libs/libsdl2/Manifest | 2 + .../files/libsdl2-2.24.0-cmake-target-fixes.patch | 145 +++++++++++++ media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild | 228 +++++++++++++++++++++ 3 files changed, 375 insertions(+) create mode 100644 media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch create mode 100644 media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild (limited to 'media-libs/libsdl2') diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index fa2f786f7c77..96f0d438448d 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,8 +1,10 @@ AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839ce266dafe8cd79167911bceac5341e58c5ff13ff9604b741ee8726bd4990238345327038cf2cd61df5c28d7a15eeae67b62 SHA512 da34e0da810b119d230e40b17b8f3bb3b3f7c9414960bc41c528a366c9b5f5b2afb321bdfa5871d898ba2bcb98610c2848619ef0f0bc54a0675f75a40a6ce8d4 +AUX libsdl2-2.24.0-cmake-target-fixes.patch 6489 BLAKE2B 3703cae1f4220d6ca7899a2a1b61c083f560db30996f032eb6570f80e7b0bb3969b2c929ec104d461297502d5e46a8ae0a34d38f04d76b274894d124aa486905 SHA512 43710fa7d5321b688b2bd65460fff77d16943ff25280b7ba25c2676112db8e1ce9daeb2c144d41ed5473dcb4b38ad0a91686859949ff4a10ed4bea8769188b15 DIST SDL2-2.0.20.tar.gz 7207221 BLAKE2B 03c6d462674aeb90559003e9f4c74f66833e193d2de3f3975f1e1684c5bdccb5c1b3c64c22c822777a63ee218d87fd04ff047b012d8db30a1565dafa34161623 SHA512 4889949eaa674948bdb0a01bb2a842a0943b15b08ff27ec0079b0fd4f79d071ffb32488a5a51c12ad7c74ed5fe73b608cdf6336a44c95dae8a0fb3f47d0f01de DIST SDL2-2.0.22.tar.gz 7250633 BLAKE2B 7f8b3efa709a0514f6a76df4ffc8b756d287d1e372ed107d0525a22cb5e6a168709136d375b6708b2073a76dd30d1bf06203d2c5c3eb2990e80519c7d1558df5 SHA512 ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 EBUILD libsdl2-2.0.20-r1.ebuild 6517 BLAKE2B 89efe9162d5573532ef96dc696b62761430ea8e15e45dd40a2091775d192427c467b57869eeebdba6eb2f7bfaa4e0a51fb894d67a81f55cf45d1b6f2fac0c2c6 SHA512 de9198b77019e8afe0599084d88cc1cf1bf564079d5bb79e7f914e150b2b4640e0b38d835d329b6902f0cffcb0da26103e3213a1a211b82140af3ffffd95c2d2 EBUILD libsdl2-2.0.22.ebuild 6496 BLAKE2B efc239ff9990aa047ca2364d169d70ef0c7c862c8ff3f9fd6b51a80af9799a638890b9a59eadfc5497e5f15441f00b7f8e193f6b3675d2ec91a6ffde542ee5ad SHA512 948022ba842ae928f73b5213aa042b163f7bbfe8096e5c1629865e9a0c0d3c9b89238f13d3713a8b65e7de1b012336f7ed97674c0bc1ec9b7cdb624ee2007be7 +EBUILD libsdl2-2.24.0-r1.ebuild 6418 BLAKE2B 54e9a9d42d25e56793b9516f36f7bac92eba16f5151bbd750c090dbb9cf448fbb3df0b99d9a5c6b2e73a0ddc902db012868f2cc9a0afbb671feca61acf3ed11c SHA512 3472a2c282c9505fb55539b8552943c479d5a6766f1f37faaecc22a7d34a3d903dc43af597f424dc421c962bbf6a16f0f6d2bc58bd0da07a4ca39cdb796d4161 EBUILD libsdl2-2.24.0.ebuild 6373 BLAKE2B 174e817baa1a7203465903ee1b94edff04c5dd931e1c945a30afe5f19375b98632d327fdeff1ef2b5561452ef8643bc1623daa170b33bffd460aac6bee2ab3f5 SHA512 3c3512a3a2d9bd9f708f021c872e6b703efd9554dddaa65974fae10674256eff5ab634faeb967195882cefa4961213167b13589bb2e681c7503fb5e2d4fa38a9 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1 diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch new file mode 100644 index 000000000000..59353b98e06d --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch @@ -0,0 +1,145 @@ +https://github.com/libsdl-org/SDL/commit/329794daf3f58088b56a64bdfa36b2021903be20 +https://github.com/libsdl-org/SDL/commit/62302d08f13ca5303135505c6b355afbbf069745 + +From: Anonymous Maarten +Date: Sun, 21 Aug 2022 04:03:32 +0200 +Subject: [PATCH] cmake: add library directories & pthread to imported targets + of sdl2-config.cmake + +This fixes linking to SDL2::SDL2-static on systems where external libraries such as X11 are not in a standard location. +Pthread also needs special care. +--- a/sdl2-config.cmake.in ++++ b/sdl2-config.cmake.in +@@ -39,18 +39,25 @@ unset(bindir) + unset(libdir) + unset(includedir) + +-set(_sdl2_libraries "@SDL_LIBS@") +-set(_sdl2_static_private_libs "@SDL_STATIC_LIBS@") ++set(_sdl2_libraries_in "@SDL_LIBS@") ++set(_sdl2_static_private_libs_in "@SDL_STATIC_LIBS@") + +-# Convert _sdl2_libraries to list and keep only libraries +-string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries}") ++# Convert _sdl2_libraries to list and keep only libraries + library directories ++string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries_in}") + string(REGEX REPLACE "^-l" "" _sdl2_libraries "${_sdl2_libraries}") + string(REGEX REPLACE ";-l" ";" _sdl2_libraries "${_sdl2_libraries}") ++string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_libdirs "${_sdl2_libraries_in}") ++string(REGEX REPLACE "^-L" "" _sdl2_libdirs "${_sdl2_libdirs}") ++string(REGEX REPLACE ";-L" ";" _sdl2_libdirs "${_sdl2_libdirs}") ++list(APPEND _sdl2_libdirs "${SDL2_LIBDIR}") + +-# Convert _sdl2_static_private_libs to list and keep only libraries +-string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)" _sdl2_static_private_libs "${_sdl2_static_private_libs}") ++# Convert _sdl2_static_private_libs to list and keep only libraries + library directories ++string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)|(-pthread)" _sdl2_static_private_libs "${_sdl2_static_private_libs_in}") + string(REGEX REPLACE "^-l" "" _sdl2_static_private_libs "${_sdl2_static_private_libs}") + string(REGEX REPLACE ";-l" ";" _sdl2_static_private_libs "${_sdl2_static_private_libs}") ++string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_static_private_libdirs "${_sdl2_static_private_libs_in}") ++string(REGEX REPLACE "^-L" "" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}") ++string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}") + + if(_sdl2_libraries MATCHES ".*SDL2main.*") + list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main) +@@ -103,6 +110,7 @@ if(WIN32) + set_target_properties(SDL2::SDL2 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}" ++ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_IMPLIB "${_sdl2_implib}" + IMPORTED_LOCATION "${_sdl2_dll}" +@@ -122,6 +130,7 @@ else() + set_target_properties(SDL2::SDL2 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}" ++ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${_sdl2_shared}" + ) +@@ -142,6 +151,7 @@ if(EXISTS "${_sdl2_static}") + IMPORTED_LOCATION "${_sdl2_static}" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries};${_sdl2_static_private_libs}" ++ INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs};${_sdl2_static_private_libdirs}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) + endif() + +From: Anonymous Maarten +Date: Wed, 24 Aug 2022 04:14:52 +0200 +Subject: [PATCH] cmake: always create SDL2::SDL2main target in autotools' + cmake config script + +--- a/sdl2-config.cmake.in ++++ b/sdl2-config.cmake.in +@@ -62,38 +62,39 @@ string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_priv + if(_sdl2_libraries MATCHES ".*SDL2main.*") + list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main) + list(INSERT SDL2_STATIC_LIBRARIES 0 SDL2::SDL2main) +- set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}) +- if(EXISTS "${_sdl2main_library}") +- set(SDL2MAIN_LIBRARY SDL2::SDL2main) +- if(NOT TARGET SDL2::SDL2main) +- add_library(SDL2::SDL2main STATIC IMPORTED) +- set_target_properties(SDL2::SDL2main +- PROPERTIES +- IMPORTED_LOCATION "${_sdl2main_library}" +- ) +- if(WIN32) +- # INTERFACE_LINK_OPTIONS needs CMake 3.13 +- cmake_minimum_required(VERSION 3.13) +- # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker. +- if(CMAKE_SIZEOF_VOID_P EQUAL 4) +- set_target_properties(SDL2::SDL2main +- PROPERTIES +- INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16" +- ) +- else() +- set_target_properties(SDL2::SDL2main +- PROPERTIES +- INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain" +- ) +- endif() ++endif() ++ ++set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}) ++if(EXISTS "${_sdl2main_library}") ++ set(SDL2MAIN_LIBRARY SDL2::SDL2main) ++ if(NOT TARGET SDL2::SDL2main) ++ add_library(SDL2::SDL2main STATIC IMPORTED) ++ set_target_properties(SDL2::SDL2main ++ PROPERTIES ++ IMPORTED_LOCATION "${_sdl2main_library}" ++ ) ++ if(WIN32) ++ # INTERFACE_LINK_OPTIONS needs CMake 3.13 ++ cmake_minimum_required(VERSION 3.13) ++ # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker. ++ if(CMAKE_SIZEOF_VOID_P EQUAL 4) ++ set_target_properties(SDL2::SDL2main ++ PROPERTIES ++ INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16" ++ ) ++ else() ++ set_target_properties(SDL2::SDL2main ++ PROPERTIES ++ INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain" ++ ) + endif() + endif() +- set(SDL2_SDL2main_FOUND TRUE) +- else() +- set(SDL2_SDL2main_FOUND FALSE) + endif() +- unset(_sdl2main_library) ++ set(SDL2_SDL2main_FOUND TRUE) ++else() ++ set(SDL2_SDL2main_FOUND FALSE) + endif() ++unset(_sdl2main_library) + + # Remove SDL2 since this is the "central" library + # Remove SDL2main since this will be provided by SDL2::SDL2main (if available) + diff --git a/media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild b/media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild new file mode 100644 index 000000000000..6d4ad20ae903 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multilib-minimal + +MY_P="SDL2-${PV}" +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="https://www.libsdl.org/" +SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + +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 doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" +REQUIRED_USE=" + alsa? ( sound ) + fcitx4? ( dbus ) + gles1? ( video ) + gles2? ( video ) + haptic? ( joystick ) + ibus? ( dbus ) + jack? ( sound ) + nas? ( sound ) + opengl? ( video ) + pulseaudio? ( sound ) + sndio? ( sound ) + vulkan? ( video ) + wayland? ( gles2 ) + xscreensaver? ( X )" + +CDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + fcitx4? ( app-i18n/fcitx:4 ) + gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] ) + gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) + ibus? ( app-i18n/ibus ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + kms? ( + >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] + >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] + ) + libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) + nas? ( + >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + ) + opengl? ( + >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] + >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] + ) + pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] + >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland] + >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] + ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] + xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) + )" +RDEPEND="${CDEPEND} + vulkan? ( media-libs/vulkan-loader )" +DEPEND="${CDEPEND} + ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) + vulkan? ( dev-util/vulkan-headers ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) + wayland? ( >=dev-util/wayland-scanner-1.20 ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/SDL2/SDL_config.h + /usr/include/SDL2/SDL_platform.h + /usr/include/SDL2/begin_code.h + /usr/include/SDL2/close_code.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.16-static-libs.patch + "${FILESDIR}"/${P}-cmake-target-fixes.patch +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Unbundle some headers. + rm -r src/video/khronos || die + ln -s "${ESYSROOT}/usr/include" src/video/khronos || die + + # SDL seems to customize SDL_config.h.in to remove macros like + # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from + # being reintroduced. + # https://bugs.gentoo.org/764959 + AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \ + eautoreconf +} + +multilib_src_configure() { + use custom-cflags || strip-flags + + if use ibus; then + 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" + fi + + # sorted by `./configure --help` + local myeconfargs=( + $(use_enable static-libs static) + --enable-atomic + $(use_enable sound audio) + $(use_enable video) + --enable-render + --enable-events + $(use_enable joystick) + $(use_enable haptic) + --enable-power + --enable-filesystem + $(use_enable threads pthreads) + --enable-timers + --enable-file + --enable-loadso + --enable-cpuinfo + --enable-assembly + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_x86_sse ssemath) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_3dnow 3dnow) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable oss) + $(use_enable alsa) + --disable-alsa-shared + $(use_enable jack) + --disable-jack-shared + --disable-esd + $(use_enable pipewire) + --disable-pipewire-shared + $(use_enable pulseaudio) + --disable-pulseaudio-shared + --disable-arts + $(use_enable libsamplerate) + $(use_enable nas) + --disable-nas-shared + $(use_enable sndio) + --disable-sndio-shared + $(use_enable sound diskaudio) + $(use_enable sound dummyaudio) + $(use_enable wayland video-wayland) + --disable-wayland-shared + $(use_enable video_cards_vc4 video-rpi) + $(use_enable X video-x11) + --disable-x11-shared + $(use_enable X video-x11-xcursor) + $(use_enable X video-x11-xdbe) + $(use_enable X video-x11-xfixes) + $(use_enable X video-x11-xinput) + $(use_enable X video-x11-xrandr) + $(use_enable xscreensaver video-x11-scrnsaver) + $(use_enable X video-x11-xshape) + $(use_enable aqua video-cocoa) + --disable-video-directfb + --disable-fusionsound + --disable-fusionsound-shared + $(use_enable kms video-kmsdrm) + --disable-kmsdrm-shared + $(use_enable video video-dummy) + $(use_enable opengl video-opengl) + $(use_enable gles1 video-opengles1) + $(use_enable gles2 video-opengles2) + $(use_enable vulkan video-vulkan) + $(use_enable udev libudev) + $(use_enable dbus) + $(use_enable fcitx4 fcitx) + $(use_enable ibus) + --disable-directx + --disable-rpath + --disable-render-d3d + $(use_with X x) + ) + + ECONF_SOURCE="${S}" \ + econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake V=1 +} + +src_compile() { + multilib-minimal_src_compile + + if use doc; then + cd docs || die + doxygen || die + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + # Do not delete the static .a libraries here as some are + # mandatory. They may be needed even when linking dynamically. + find "${ED}" -type f -name "*.la" -delete || die + + dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md + use doc && dodoc -r docs/output/html/ +} -- cgit v1.2.3