SFML: update to 2.6.1.

closes #47595
closes #47454
This commit is contained in:
Phil Schumann 2023-12-05 23:26:35 +01:00 committed by John
parent 2242f4158b
commit 0252f2b859
3 changed files with 11 additions and 37 deletions

View File

@ -2224,11 +2224,11 @@ libwebsockets.so.19 libwebsockets-4.3.2_1
libnfc.so.6 libnfc-1.8.0_1
libfuzzy.so.2 libfuzzy-2.12_1
libSDL_gfx.so.15 SDL_gfx-2.0.25_2
libsfml-network.so.2.5 SFML-2.5.0_1
libsfml-system.so.2.5 SFML-2.5.0_1
libsfml-window.so.2.5 SFML-2.5.0_1
libsfml-audio.so.2.5 SFML-2.5.0_1
libsfml-graphics.so.2.5 SFML-2.5.0_1
libsfml-network.so.2.6 SFML-2.6.1_1
libsfml-system.so.2.6 SFML-2.6.1_1
libsfml-window.so.2.6 SFML-2.6.1_1
libsfml-audio.so.2.6 SFML-2.6.1_1
libsfml-graphics.so.2.6 SFML-2.6.1_1
libclamav.so.9 clamav-0.103.1_2
libclamunrar.so.9 clamav-0.103.1_2
libclamunrar_iface.so.9 clamav-0.103.1_2

View File

@ -1,26 +0,0 @@
Upstream: yes
Src: https://github.com/SFML/SFML/commit/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch
Reason: error: invalid cast from type 'std::nullptr_t' to type 'void*
From 119195ac20866fcecc93e33cda457b3fe54b1b0c Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 16 Oct 2018 18:08:13 +0300
Subject: [PATCH] Remove unneeded cast
---
src/SFML/Window/Unix/WindowImplX11.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/SFML/Window/Unix/WindowImplX11.cpp b/src/SFML/Window/Unix/WindowImplX11.cpp
index da69750525..5f538f46d6 100644
--- a/src/SFML/Window/Unix/WindowImplX11.cpp
+++ b/src/SFML/Window/Unix/WindowImplX11.cpp
@@ -1556,7 +1556,7 @@ void WindowImplX11::initialize()
m_window,
XNInputStyle,
XIMPreeditNothing | XIMStatusNothing,
- reinterpret_cast<void*>(NULL));
+ NULL);
}
else
{

View File

@ -1,19 +1,19 @@
# Template file for 'SFML'
pkgname=SFML
version=2.5.1
revision=3
version=2.6.1
revision=1
build_style=cmake
configure_args="-DSFML_BUILD_EXAMPLES=0 -DSFML_BUILD_DOC=1 -DSFML_INSTALL_PKGCONFIG_FILES=1"
hostmakedepends="doxygen"
makedepends="libsndfile-devel libXrandr-devel libjpeg-turbo-devel
libopenal-devel glew-devel freetype-devel MesaLib-devel glu-devel
xcb-util-image-devel"
xcb-util-image-devel libXcursor libXcursor-devel"
short_desc="Simple and Fast Multimedia Library"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Zlib"
homepage="http://www.sfml-dev.org/"
distfiles="https://github.com/SFML/SFML/archive/${version}.tar.gz"
checksum=438c91a917cc8aa19e82c6f59f8714da353c488584a007d401efac8368e1c785
checksum=82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d
post_install() {
rm -f ${DESTDIR}/usr/sfml-*.pc
@ -21,12 +21,12 @@ post_install() {
SFML-devel_package() {
depends="SFML>=${version}_${revision} libopenal-devel libsndfile-devel
freetype-devel"
freetype-devel libXcursor-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/SFML
vmove usr/share/doc/SFML
vmove usr/lib/cmake
vmove "usr/lib/*.so"
}