From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3ED3A139360 for ; Tue, 10 Aug 2021 20:36:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4172BE084A; Tue, 10 Aug 2021 20:36:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CA79E083E for ; Tue, 10 Aug 2021 20:36:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFBF9335D9A for ; Tue, 10 Aug 2021 20:36:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8222F87B for ; Tue, 10 Aug 2021 20:36:27 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1628627772.97a89516d141ca133cc34200b0c5422c3821a2a5.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libsdl2/Manifest media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch media-libs/libsdl2/libsdl2-2.0.16.ebuild media-libs/libsdl2/metadata.xml X-VCS-Directories: media-libs/libsdl2/ media-libs/libsdl2/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 97a89516d141ca133cc34200b0c5422c3821a2a5 X-VCS-Branch: master Date: Tue, 10 Aug 2021 20:36:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9763b11d-c881-427f-bc2c-f823f8b42189 X-Archives-Hash: ea7016564923d28956f7b89e8f9a3b49 commit: 97a89516d141ca133cc34200b0c5422c3821a2a5 Author: James Le Cuirot gentoo org> AuthorDate: Tue Aug 10 20:35:35 2021 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Aug 10 20:36:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a89516 media-libs/libsdl2: Version bump to 2.0.16, EAPI 8 This version adds PipeWire support. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: James Le Cuirot gentoo.org> media-libs/libsdl2/Manifest | 1 + .../libsdl2/files/libsdl2-2.0.16-static-libs.patch | 35 ++++ media-libs/libsdl2/libsdl2-2.0.16.ebuild | 213 +++++++++++++++++++++ media-libs/libsdl2/metadata.xml | 1 + 4 files changed, 250 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index d4a910d2b22..580340a47af 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1 +1,2 @@ DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee +DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f diff --git a/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch new file mode 100644 index 00000000000..d57c7b8f1c6 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch @@ -0,0 +1,35 @@ +Fix --disable-static. + +Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 +Bug: https://github.com/gentoo/gentoo/pull/20087 + +--- a/configure.ac 2021-08-06 20:36:54.000000000 +0100 ++++ b/configure.ac 2021-08-10 20:59:58.766664082 +0100 +@@ -3920,7 +3920,7 @@ + if test -f /lib/w32api/libuuid.a; then + LIBUUID=/lib/w32api/libuuid.a + else +- LIBUUID=-luuid ++ LIBUUID=-Wl,-luuid + fi + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID" + BUILD_LDFLAGS="$BUILD_LDFLAGS -Wc,-static-libgcc" +--- a/Makefile.in 2021-08-06 20:36:54.000000000 +0100 ++++ b/Makefile.in 2021-08-10 21:03:44.144233884 +0100 +@@ -154,13 +154,13 @@ + .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) + + $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + + $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static + + $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static + + install: all install-bin install-hdrs install-lib install-data + install-bin: diff --git a/media-libs/libsdl2/libsdl2-2.0.16.ebuild b/media-libs/libsdl2/libsdl2-2.0.16.ebuild new file mode 100644 index 00000000000..3cbbf819aa3 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.16.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs 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 ~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 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 xinerama xscreensaver" +REQUIRED_USE=" + alsa? ( sound ) + fcitx4? ( dbus ) + gles1? ( video ) + gles2? ( video ) + ibus? ( dbus ) + jack? ( sound ) + nas? ( sound ) + opengl? ( video ) + pulseaudio? ( sound ) + sndio? ( sound ) + vulkan? ( video ) + wayland? ( gles2 ) + xinerama? ( X ) + 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.0.6[${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/libXi-1.7.2[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + xinerama? ( >=x11-libs/libXinerama-1.1.3[${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 +" + +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 +) + +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) + --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 xinerama video-x11-xinerama) + $(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 X video-x11-vm) + $(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 +} + +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 +} diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml index 06de1fd4760..0adf2dc71a9 100644 --- a/media-libs/libsdl2/metadata.xml +++ b/media-libs/libsdl2/metadata.xml @@ -32,6 +32,7 @@ Control joystick support (disable at your own risk) Build the KMSDRM video driver Enable support for the media-sound/sndio backend + Enable support for the media-video/pipewire audio backend Control audio support (disable at your own risk) Control video support (disable at your own risk) Enable Vulkan support