From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- media-libs/libsdl2/Manifest | 5 +- .../libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 +- media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild | 192 --------------------- media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild | 5 +- 4 files changed, 5 insertions(+), 201 deletions(-) delete mode 100644 media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild (limited to 'media-libs/libsdl2') diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 07398d72f489..1d599af52c70 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,11 +1,10 @@ AUX libsdl2-2.0.12-egl-detection.patch 744 BLAKE2B cfcb6db61505e7f8dbd327c73098c2df88860c336438af531905aba5f8de1f696b41cbbab7a09a6a1fc067a39c3178aebbc2e86146f45e2d3ddac8ab1e6bb892 SHA512 1640c71d5a5c86e99d60123b3c5c8e60a9e1bcdf886662d9d2c8f2fda994cba873c5ac515cdf41e5e81663a895e6e2db08ea5e180999a5cebac8e08d2438d59b AUX libsdl2-2.0.12-static-libs.patch 2510 BLAKE2B 2c93b5a9ba38d797281d2d3b13eeb1848b46835e99dec20a325fd6e4e30ff44ae1966292f8b0cf95e3356e6a6d2787e90ea51c47fd92948cba2943c6ecbfb8c3 SHA512 d0f6a3f8282275f9ae63bfb363a357deb804d079be6feeaa0d8c749b79df1ad195da59b0da22f1eae4f527eecd63ceef210f52c1f303229a7aa13b71c3d711b0 AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c1176055193505bc091569925f2f31f6e623254fa19df3eeb3fe477b97b4eef1973a3f9961d8f5159cf62aae39b8ab84d178ca5f8cf8346fd SHA512 20a6f433c973bb521d4db19c682b1a063b314405a0f2b68ed88a68030ef2a4ba71a8b84c45c0980c6218f2b9f332cc3cfd1354aebcd0932584169161638e011e -AUX libsdl2-2.0.14-static-libs.patch 1820 BLAKE2B 54a6e92a2fd52c54ae25a1b859502cc403fa9bfcb6e2f3b83ca90fa125ff98c5ed0478cf786d6f1142968187230efbc994a57f706ae1a90bd1fe21eeada1673a SHA512 cf3762b03600c80f26e72f8828b4c0d6ac3c32ae00e1e0f5c9ab46fb4de178f4b045dcfd68f5d371c835235c96c5f1762e5966377d2a95874a012008eb2b13b9 +AUX libsdl2-2.0.14-static-libs.patch 1812 BLAKE2B 47f2e3f2d9c5d7c86d2cd046c0d4012c417ec4eb4f78d561abe9f6b07fee94364040947978898758ba6647c342c475f8ff32d7026de7a9ff7189207405996922 SHA512 1e0fa0c12a089c4fe39cdf458e566378fd2fde6c1da5e0950c7978930e9429f3da407bc69f3d6c30acb6a268a292f7c6f11f675b6e27fbe0ef601340de969812 AUX libsdl2-2.0.14-vulkan.patch 554 BLAKE2B 654415d20fc1782ee8d3a979355dcb743537cad60bebf4edf5299feec821cacbd75c45247820d1c41cb4c706b3bbf58fd2e33ed38b1150a50b0be0aab9d3f536 SHA512 d379da36a27c82c8e178f05ba572022119c012b304ffa672529d652c41d00ee7ad00ce715892306c7e6e914a3071d2879c67f37198139d5a786ce4da442309c0 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee -EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd EBUILD libsdl2-2.0.12-r2.ebuild 5895 BLAKE2B 4ef95d547e288bd1ae52a35aaf20e2c679655c51e7c749327ce089644aa02c799bd8461033e918c327bf455dd5e7f97448a3ccf1c3fb327aeadea6b5139eafbe SHA512 54e4c662d6ced0f013e87310639154b9d1900a9ecd3bdfda48cfa54fbc5e0d793fee512e393a37d13a6e7f05ec621613b7c4f8b551d21713b30d8c4d8cd00091 -EBUILD libsdl2-2.0.14-r1.ebuild 6155 BLAKE2B c38ffed9cd5160241f44268b9b34d267b82b9315cea18f9b0fcc3cf562018d3256c5266d5fec5c841df532133b3f184c7230ff4dae9828ed2d626c640a732bd5 SHA512 c3d07224b7be960c8e6201b659e5ee7923d2f2a3cb6aaadfe3118cbd7b27ec88dc9a3f2f4199f43d82bbb67eda21852a424d1c5e6d04b8aa6a98d1f69474b37e +EBUILD libsdl2-2.0.14-r1.ebuild 6061 BLAKE2B 14e534a1cb0f97092c0a71c715e5c69c8d2d0069a275dac254d2c52d9f2b7e39d944447e6363a2675133edff7fe9e34d04f2084736a30f0e847cac897f482ac9 SHA512 333006640172dd85d3f4b08b708d265b33b179d184c8978b6355f2b09399f247579fe62089dbb2e79559fc7826f3a375d919fa19942cd14d94e368892170f2d0 MISC metadata.xml 1805 BLAKE2B 16d4961cf6d0c9997fe706dd5deb51b98f153135cb4f0bedbc29e842d485ba2f4493003830385957b7ac92fd9f6d31bcf4319d800a7f2bd46a9a1772b86f3e5a SHA512 37e976d6a469c6e17e3efb178a189903c3ac2baf99d0e3aa7fb80bfc6d297e52c910ae6361e119fe1173d6d8a9d2aef47172bb4a1185ef4f99f36c75d1f8c19f 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 index 01b9c5134379..0d4dfdcb445e 100644 --- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch @@ -24,11 +24,11 @@ Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(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.12-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild deleted file mode 100644 index 4c094388884f..000000000000 --- a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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 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 gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - gles2? ( video ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( 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}] ) - gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - kms? ( - >=x11-libs/libdrm-2.4.46[${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}] - ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - tslib? ( >=x11-libs/tslib-1.0-r3[${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} - 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.12-static-libs.patch - "${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos || die - - AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - # 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 pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - $(use_enable nas) - --disable-nas-shared - --disable-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) - --disable-video-opengles1 - $(use_enable gles2 video-opengles2) - $(use_enable vulkan video-vulkan) - $(use_enable udev libudev) - $(use_enable dbus) - --disable-ibus - $(use_enable tslib input-tslib) - --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,README-SDL,TODO,WhatsNew}.txt docs/README*.md -} diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild index 4d1a2b292c97..a7e5d16fe307 100644 --- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 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 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" REQUIRED_USE=" @@ -112,9 +112,6 @@ src_prepare() { multilib_src_configure() { use custom-cflags || strip-flags - # libsdl2-2.0.14 build regression. Please check if still needed - append-flags -D__LINUX__ - 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 -- cgit v1.2.3