From d842693c3dac14a37a4c14b39bf65f8671842551 Mon Sep 17 00:00:00 2001 From: Phil Schumann Date: Tue, 5 Dec 2023 11:24:38 +0100 Subject: [PATCH] SFML: update to 2.6.1 --- common/shlibs | 10 +++---- srcpkgs/CSFML/template | 2 +- srcpkgs/Cendric/template | 2 +- srcpkgs/EmptyEpsilon/template | 2 +- ...95ac20866fcecc93e33cda457b3fe54b1b0c.patch | 26 ------------------- srcpkgs/SFML/template | 12 ++++----- srcpkgs/SLADE/template | 2 +- srcpkgs/TSC/template | 2 +- srcpkgs/attract/template | 2 +- srcpkgs/deerportal/template | 2 +- srcpkgs/dolphin-emu/template | 2 +- srcpkgs/etr/template | 2 +- srcpkgs/vba-m/template | 2 +- 13 files changed, 21 insertions(+), 47 deletions(-) delete mode 100644 srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch diff --git a/common/shlibs b/common/shlibs index 1b25a12956eeb..b38c3c70ec5fd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2223,11 +2223,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 diff --git a/srcpkgs/CSFML/template b/srcpkgs/CSFML/template index 2fdc3c179b475..3e0cbfae7cf98 100644 --- a/srcpkgs/CSFML/template +++ b/srcpkgs/CSFML/template @@ -1,7 +1,7 @@ # Template file for 'CSFML' pkgname=CSFML version=2.5 -revision=1 +revision=2 build_style=cmake makedepends="SFML-devel" short_desc="Official binding of SFML for C" diff --git a/srcpkgs/Cendric/template b/srcpkgs/Cendric/template index c8cd71289a0be..c62e5d5b6130a 100644 --- a/srcpkgs/Cendric/template +++ b/srcpkgs/Cendric/template @@ -1,7 +1,7 @@ # Template file for 'Cendric' pkgname=Cendric version=1.1.3 -revision=3 +revision=4 build_style=cmake configure_args="-DUSE_SYSTEM_SFML=on -DCENDRIC_EXTERNAL_DOCUMENT_FOLDER=on -DUSE_SYSTEM_PATHS=on" diff --git a/srcpkgs/EmptyEpsilon/template b/srcpkgs/EmptyEpsilon/template index 12b0315c505be..a5950a5865f52 100644 --- a/srcpkgs/EmptyEpsilon/template +++ b/srcpkgs/EmptyEpsilon/template @@ -1,7 +1,7 @@ # Template file for 'EmptyEpsilon' pkgname=EmptyEpsilon version=2021.03.31 -revision=1 +revision=2 _ver_major="${version%%.*}" _ver_minor="${version%.*}" _ver_minor="${_ver_minor#*.}" diff --git a/srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch b/srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch deleted file mode 100644 index 606280379a884..0000000000000 --- a/srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch +++ /dev/null @@ -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 -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(NULL)); -+ NULL); - } - else - { diff --git a/srcpkgs/SFML/template b/srcpkgs/SFML/template index 66009b130482f..ee094c496cbc0 100644 --- a/srcpkgs/SFML/template +++ b/srcpkgs/SFML/template @@ -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 " 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" } diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index 8c2ea6e40cc5c..3a9bdc6befc53 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -1,7 +1,7 @@ # Template file for 'SLADE' pkgname=SLADE version=3.2.1 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config p7zip which" diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template index 16612c13d38a2..0d2d4b882f71b 100644 --- a/srcpkgs/TSC/template +++ b/srcpkgs/TSC/template @@ -1,7 +1,7 @@ # Template file for 'TSC' pkgname=TSC version=2.1.0 -revision=6 +revision=7 build_wrksrc=tsc build_style=cmake build_helper="qemu" diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template index 26144e931a3c7..24017d2bacc24 100644 --- a/srcpkgs/attract/template +++ b/srcpkgs/attract/template @@ -1,7 +1,7 @@ # Template file for 'attract' pkgname=attract version=2.6.2 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="VERBOSE=1" make_use_env=yes diff --git a/srcpkgs/deerportal/template b/srcpkgs/deerportal/template index d38900ff36e1c..58e53cebc1750 100644 --- a/srcpkgs/deerportal/template +++ b/srcpkgs/deerportal/template @@ -1,7 +1,7 @@ # Template file for 'deerportal' pkgname=deerportal version=0.8.2 -revision=2 +revision=3 build_style=cmake makedepends="SFML-devel" depends="deerportal-data" diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 070993aac31d2..96edf50d3e4a1 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -1,7 +1,7 @@ # Template file for 'dolphin-emu' pkgname=dolphin-emu version=5.0.19368 -revision=2 +revision=3 _dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107 _mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9 _googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48 diff --git a/srcpkgs/etr/template b/srcpkgs/etr/template index 615f2d754d830..955bc4316b356 100644 --- a/srcpkgs/etr/template +++ b/srcpkgs/etr/template @@ -1,7 +1,7 @@ # Template file for 'etr' pkgname=etr version=0.8.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="SFML-devel glu-devel" diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 9c71cefe3f8dd..2223d297c31f5 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -2,7 +2,7 @@ pkgname=vba-m reverts=1292_2 version=2.1.7 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE -DCMAKE_BUILD_TYPE=Release" hostmakedepends="gettext pkg-config unzip zip yasm wxWidgets-gtk3-devel"