From 2a1349cde33d2d766431c766ce081cf9be3a5abc Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 24 Nov 2022 05:22:48 +0000 Subject: media-libs/libsdl2: add 2.26.0 Signed-off-by: Sam James --- media-libs/libsdl2/Manifest | 1 + .../libsdl2/files/libsdl2-2.26.0-wayland.patch | 27 +++ media-libs/libsdl2/libsdl2-2.26.0.ebuild | 231 +++++++++++++++++++++ 3 files changed, 259 insertions(+) create mode 100644 media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch create mode 100644 media-libs/libsdl2/libsdl2-2.26.0.ebuild (limited to 'media-libs/libsdl2') diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 18ffc7264276..fdaafb4057c0 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,2 +1,3 @@ DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 DIST SDL2-2.24.2.tar.gz 7525041 BLAKE2B bdd6fdffca8f5360b96bba31b2f64e5b01f1081c184070fba6a0a52b7ee5f6d08ca5d647a40bbfb9b2ba49374ce7d7f21bc60e798017fa79d673ab048f5a281c SHA512 6f3ce5c4121a17d4e85a087c9010fdff37eb4e381517dc0d64fff955cf7041016aa1f37ac2f14a335bfaac13cb92031431eb31bfa0f00a6827c177b5a671f841 +DIST SDL2-2.26.0.tar.gz 8085459 BLAKE2B 4971cef0d34706dd02eff5277fd58b35523ee3b1d860999b37ddf4dbc463f493859a43325c4faa9bd048c519d49788adb3dd7f38e6b29eb635c0e0e405c944e9 SHA512 b4379140399e2248b28c4fe36ba6bb142cd047014c3cfc6fd2c0fee7110ad28af6553f24ca4ccf4996165940de127aafe8d744b09bea9d5684ce8244697996bf diff --git a/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch b/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch new file mode 100644 index 000000000000..6727a3e4f4bc --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch @@ -0,0 +1,27 @@ +https://github.com/libsdl-org/SDL/pull/6608 +https://github.com/libsdl-org/SDL/issues/6589 + +From e99b5df49ec3bddd1d72889d682fedfe0da91307 Mon Sep 17 00:00:00 2001 +From: Frank Praznik +Date: Wed, 23 Nov 2022 23:11:25 -0500 +Subject: [PATCH] wayland: Fix build when not using the shared Wayland + libraries + +Explicitly include the Wayland protocol headers when statically linking against the Wayland libraries or older system headers might be used instead of the local versions. +--- a/src/video/wayland/SDL_waylanddyn.h ++++ b/src/video/wayland/SDL_waylanddyn.h +@@ -166,6 +166,13 @@ void SDL_WAYLAND_UnloadSymbols(void); + + #else /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */ + ++/* ++ * These must be included before libdecor.h, otherwise the libdecor header ++ * pulls in the system Wayland protocol headers instead of ours. ++ */ ++#include "wayland-client-protocol.h" ++#include "wayland-egl.h" ++ + #ifdef HAVE_LIBDECOR_H + #include + #endif + diff --git a/media-libs/libsdl2/libsdl2-2.26.0.ebuild b/media-libs/libsdl2/libsdl2-2.26.0.ebuild new file mode 100644 index 000000000000..c65bbfda6547 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.26.0.ebuild @@ -0,0 +1,231 @@ +# 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=" + virtual/libiconv[${MULTILIB_USEDEP}] + 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}-wayland.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="${BROOT}/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-system-iconv + --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) + --disable-werror + $(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-65-gdbad