SFML: update to 3.1.0

common/shlibs

@@ -2452,11 +2452,11 @@ libwebsockets.so.21 libwebsockets-4.5.2_1
 libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.16 SDL_gfx-2.0.27_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
+libsfml-network.so.3.1 SFML-3.1.0_1
+libsfml-system.so.3.1 SFML-3.1.0_1
+libsfml-window.so.3.1 SFML-3.1.0_1
+libsfml-audio.so.3.1 SFML-3.1.0_1
+libsfml-graphics.so.3.1 SFML-3.1.0_1
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqca-qt6.so.2 qca-qt6-2.3.8_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
@@ -3658,11 +3658,11 @@ libnss_mdns6_minimal.so.2 nss-mdns-0.14.1_1
 libnss_mdns.so.2 nss-mdns-0.14.1_1
 libnss_mdns4.so.2 nss-mdns-0.14.1_1
 libnss_mdns6.so.2 nss-mdns-0.14.1_1
-libcsfml-audio.so.2.5 CSFML-2.5_1
-libcsfml-graphics.so.2.5 CSFML-2.5_1
-libcsfml-window.so.2.5 CSFML-2.5_1
-libcsfml-system.so.2.5 CSFML-2.5_1
-libcsfml-network.so.2.5 CSFML-2.5_1
+libcsfml-audio.so.3.0 CSFML-3.0.0_1
+libcsfml-graphics.so.3.0 CSFML-3.0.0_1
+libcsfml-window.so.3.0 CSFML-3.0.0_1
+libcsfml-system.so.3.0 CSFML-3.0.0_1
+libcsfml-network.so.3.0 CSFML-3.0.0_1
 libtokyocabinet.so.9 tokyocabinet-1.4.48_1
 libdav1d.so.7 libdav1d-1.3.0_1
 librav1e.so.0.6 rav1e-0.6.3_1

srcpkgs/CSFML/template

@@ -1,21 +1,23 @@
 # Template file for 'CSFML'
 pkgname=CSFML
-version=2.5
-revision=2
+version=3.0.0
+revision=1
 build_style=cmake
-makedepends="SFML-devel"
+configure_args="-DSFML_STATIC_LIBRARIES=OFF"
+makedepends="SFML-devel libXrandr-devel libXcursor-devel libXi-devel eudev-libudev-devel MesaLib-devel glu-devel"
 short_desc="Official binding of SFML for C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.sfml-dev.org/download/csfml/"
 distfiles="https://github.com/SFML/CSFML/archive/${version}.tar.gz"
-checksum=d49ddfbe9c14dbca60dd524d10bca7922142dc32a07a5dfbbd209cda7caad860
+checksum=903cd4a782fb0b233f732dc5b37861b552998e93ae8f268c40bd4ce50b2e88ca
 
 CSFML-devel_package() {
 	depends="CSFML>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/share/CSFML
 		vmove "usr/lib/*.so"
 	}

srcpkgs/Cendric/template

@@ -1,7 +1,8 @@
 # Template file for 'Cendric'
 pkgname=Cendric
 version=1.1.3
-revision=4
+revision=5
+_commit=85e07b5cbb490b6e49ed3dbfc617be1720c53ec6
 build_style=cmake
 configure_args="-DUSE_SYSTEM_SFML=on -DCENDRIC_EXTERNAL_DOCUMENT_FOLDER=on
  -DUSE_SYSTEM_PATHS=on"
@@ -10,8 +11,8 @@ short_desc="RPG Platformer"
 maintainer="John <me@johnnynator.dev>"
 license="MIT, CC-BY-NC-SA-4.0"
 homepage="http://cendric.ch/"
-distfiles="https://github.com/tizian/Cendric2/archive/${version}.tar.gz"
-checksum=db1c251425d2e941352e294514d4af984e537519b97237e70503f8c6bd2d2d90
+distfiles="https://github.com/tizian/Cendric2/archive/${_commit}.tar.gz"
+checksum=07e07dd9787d4eda73d9dd1d5f144131880a7d194070abb05892f4814b99886a
 repository=nonfree
 replaces="Cendric-data>=0"
 

srcpkgs/EmptyEpsilon/template

@@ -1,30 +1,30 @@
 # Template file for 'EmptyEpsilon'
 pkgname=EmptyEpsilon
-version=2021.03.31
-revision=2
+version=2024.12.08
+revision=1
 _ver_major="${version%%.*}"
 _ver_minor="${version%.*}"
 _ver_minor="${_ver_minor#*.}"
 _ver_patch="${version##*.}"
-create_wrksrc=yes
 build_style=cmake
+create_wrksrc=yes
 build_wrksrc="EmptyEpsilon"
 configure_args="
  -DSERIOUS_PROTON_DIR=$XBPS_BUILDDIR/$pkgname-$version/SeriousProton
  -DCPACK_PACKAGE_VERSION=${version}
  -DCPACK_PACKAGE_VERSION_MAJOR=$_ver_major
  -DCPACK_PACKAGE_VERSION_MINOR=$_ver_minor
  -DCPACK_PACKAGE_VERSION_PATCH=$_ver_patch"
-hostmakedepends="python3"
-makedepends="SFML-devel glu-devel"
+hostmakedepends="python3 git"
+makedepends="SFML-devel glu-devel SDL2-devel"
 short_desc="Open source starship bridge simulator"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://daid.github.io/EmptyEpsilon/"
 distfiles="https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz
  https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz>SP-${version}.tar.gz"
-checksum="c1c4f11fefe1afac6076c795e8785c7507a297ba3f7f2be9ed30c97b1e93cb24
- 62ab03dc904bd10f017fff338e55ec97c86f0bc3903a18d6c44285b86776a2d7"
+checksum="8be5360270b9a616a5d749aec9653b3e36beba96b2d6b1651e18594a3314f010
+ fa4a9873c5f8872f9f2d75d03eec06c8a40ea2e0daeb977f0445f14c1e76a236"
 
 post_extract() {
 	mv EmptyEpsilon* EmptyEpsilon

srcpkgs/SFML/template

@@ -1,32 +1,32 @@
 # Template file for 'SFML'
 pkgname=SFML
-version=2.6.2
-revision=2
+version=3.1.0
+revision=1
 build_style=cmake
-configure_args="-DSFML_BUILD_EXAMPLES=0 -DSFML_BUILD_DOC=1 -DSFML_INSTALL_PKGCONFIG_FILES=1"
-hostmakedepends="doxygen"
+configure_args="-DBUILD_SHARED_LIBS=ON -DSFML_BUILD_EXAMPLES=0 -DSFML_BUILD_DOC=0 -DSFML_INSTALL_PKGCONFIG_FILES=1 -DSFML_USE_SYSTEM_DEPS=ON"
+hostmakedepends="git"
 makedepends="libsndfile-devel libXrandr-devel libjpeg-turbo-devel
  libopenal-devel glew-devel freetype-devel MesaLib-devel glu-devel
- xcb-util-image-devel libXcursor libXcursor-devel"
+ xcb-util-image-devel libXcursor libXcursor-devel libXi-devel
+ eudev-libudev-devel mbedtls-devel libssh2-devel harfbuzz-devel"
 short_desc="Simple and Fast Multimedia Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="http://www.sfml-dev.org/"
 distfiles="https://github.com/SFML/SFML/archive/${version}.tar.gz"
-checksum=15ff4d608a018f287c6a885db0a2da86ea389e516d2323629e4d4407a7ce047f
+checksum=91209a112c2bd0bc6f4ce0d5f3e413cfb48b57c0de59f5507dc81f71b1ad7a5c
 
 post_install() {
 	rm -f ${DESTDIR}/usr/sfml-*.pc
+	vlicense license.md
 }
 
 SFML-devel_package() {
-	depends="SFML>=${version}_${revision} libopenal-devel libsndfile-devel
-	 freetype-devel libXcursor-devel"
+	depends="SFML>=${version}_${revision} libopenal-devel libsndfile-devel freetype-devel libXcursor-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/doc/SFML
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}

srcpkgs/SLADE/template

@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.2.12
-revision=2
+revision=3
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config 7zip which"

srcpkgs/TSC/template

@@ -1,31 +1,41 @@
 # Template file for 'TSC'
 pkgname=TSC
-version=2.1.0
-revision=11
+version=2.2.0
+revision=1
+create_wrksrc=yes
 build_wrksrc=tsc
 build_style=cmake
 build_helper="qemu"
 configure_args="-DFIXED_DATA_DIR=/usr/share/TSC -DBINARY_DIR=/usr/bin
- -DUSE_SYSTEM_MRUBY=ON -DUSE_SYSTEM_TINYCLIPBOARD=ON"
-# Hard to build vendored mruby
-# Don't work with mruby 3
+ -DUSE_SYSTEM_MRUBY=ON -DUSE_SYSTEM_TINYCLIPBOARD=ON -DUSE_SYSTEM_CEGUI=ON"
 hostmakedepends="bison gperf pkg-config gettext mruby2"
 makedepends="SFML-devel boost-devel-minimal libboost_chrono libboost_thread
  libboost_filesystem cegui-devel devil-devel gettext-devel
  glew-devel libvorbis-devel libxml++-devel libXt-devel tinyclipboard-devel
- pcre-devel mruby2"
+ pcre-devel mruby2 glm"
 short_desc="OSS 2D platform game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.secretchronicles.org/"
-distfiles="https://github.com/Secretchronicles/TSC/releases/download/v${version}/TSC-${version}.tar.gz"
-checksum=6a16765b4951e3d5d1ea2b84e6da8f67b0271460f0c570b53ccdab80d7396261
+_commit=b25f8220a19ea044384c23c94655cf91f50ad4aa
+_maindistfile="https://github.com/Secretchronicles/TSC/archive/${_commit}.tar.gz"
+_mrubydistfile="https://github.com/mruby/mruby/archive/1a9bdfcde5fd7c91e756747ba0565f29385115a7.tar.gz"
+_poparserdistfile="https://github.com/Secretchronicles/pod-parser/archive/98f8c946ef765111f06f6b67ffc3be1e9adec717.tar.gz"
+distfiles="${_maindistfile}>TSC-${_commit}.tar.gz ${_mrubydistfile}>mruby-${_commit}.tar.gz ${_poparserdistfile}>pod-parser-${_commit}.tar.gz"
+checksum="a236154f6363c1b8ec6cdec7745a3ac831ad6edb474c9c6c1f10ed4b59aee6ba 0e9058205d62e41a2398589c0d6956e900c5b266b9dc21b10749303240b14cf4 6e46667b39ba28c964c2fa3cbb2dc5fcf35f3ad7dfc63493fea51d30b3a1f032"
+skip_extraction="pod-parser-${_commit}.tar.gz"
+
+do_extract() {
+	vsrcextract "TSC-${_commit}.tar.gz"
+	vsrcextract -C mruby/mruby "mruby-${_commit}.tar.gz" --strip-components=1
+	vsrcextract -C pod-parser "pod-parser-${_commit}.tar.gz" --strip-components=1
+}
 replaces="TSC-data>=0"
 
 if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
 	broken="The host ($XBPS_WORDSIZE) and target ($XBPS_TARGET_WORDSIZE) word sizes need to be the same for cross building."
 fi
 
 post_install() {
-	vinstall extras/tsc.desktop 644 usr/share/applications
+	vinstall extras/org.secretchronicles.TSC.desktop 644 usr/share/applications
 }

srcpkgs/attract/patches/Makefile.patch

@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index 4f4793a..82387e0 100644
+index 4f4793a..cee0362 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -69,15 +69,7 @@
+@@ -69,15 +69,8 @@
 
  FE_VERSION=v2.7.0
 
@@ -13,26 +13,47 @@ index 4f4793a..82387e0 100644
 -CPPFLAGS=
 -STRIP=strip
 -OBJCOPY=objcopy
++CXXFLAGS=-std=c++17 -ggdb
  PKG_CONFIG=pkg-config
 -AR=ar
  ARFLAGS=rc
  RM=rm -f
  MD=mkdir -p
-@@ -308,7 +300,7 @@ ifeq ($(FE_DEBUG),1)
+@@ -303,13 +296,13 @@ endif
+ #
+ # Now process the various settings...
+ #
+-ifeq ($(FE_DEBUG),1)
++# ifeq ($(FE_DEBUG),1)
+  CPPFLAGS += -Wall
   FE_FLAGS += -DFE_DEBUG
   ENABLE_DEBUG_SYMBOLS=1
- else
+-else
 - CPPFLAGS += -O$(OPTIMIZE) -DNDEBUG
-+ CPPFLAGS += -DNDEBUG
- endif
+-endif
++# else
++#  CPPFLAGS += -DNDEBUG
++# endif
 
  ifeq ($(USE_GLES),1)
-@@ -512,7 +504,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
+  FE_FLAGS += -DUSE_GLES
+@@ -512,14 +505,14 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
 
  $(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
  	$(EXE_MSG)
 -	$(CXX) -o $@ $^ $(CXXFLAGS) $(CPPFLAGS) $(FE_FLAGS) $(LIBS)
 +	$(CXX) -o $@ $^ $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(FE_FLAGS) $(LIBS)
  ifeq ($(ENABLE_DEBUG_SYMBOLS),1)
  	$(DEBUG_MSG)
- 	$(SILENT)$(OBJCOPY) --only-keep-debug $@ $@.debug
+-	$(SILENT)$(OBJCOPY) --only-keep-debug $@ $@.debug
+-	$(SILENT)$(STRIP) --strip-debug --strip-unneeded $@
+-	$(SILENT)$(OBJCOPY) --add-gnu-debuglink=$@.debug $@
++	# $(SILENT)$(OBJCOPY) --only-keep-debug $@ $@.debug
++	# $(SILENT)$(STRIP) --strip-debug --strip-unneeded $@
++	# $(SILENT)$(OBJCOPY) --add-gnu-debuglink=$@.debug $@
+ else
+-	$(SILENT)$(STRIP) $@
++	# $(SILENT)$(STRIP) $@
+ endif
+
+ .PHONY: clean