From ad9d3684a471bdbfbfb404dfe278d97d0bb1f07e Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Wed, 17 Jan 2024 18:23:30 +0100 Subject: [PATCH] testing/sauerbraten: drop DirectFB workaround patch Signed-off-by: David Heidelberg --- testing/sauerbraten/APKBUILD | 4 +--- testing/sauerbraten/sdl2_directfb_build_fix.patch | 13 ------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 testing/sauerbraten/sdl2_directfb_build_fix.patch diff --git a/testing/sauerbraten/APKBUILD b/testing/sauerbraten/APKBUILD index 656dc871cfb..6b19231663a 100644 --- a/testing/sauerbraten/APKBUILD +++ b/testing/sauerbraten/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Simon Zeni pkgname=sauerbraten pkgver=2020.12.29 -pkgrel=2 +pkgrel=3 pkgdesc="Quake-like FPS based on an improved version of the Cube engine" url="http://www.sauerbraten.org/" arch="all" @@ -10,7 +10,6 @@ license="zlib" makedepends="zlib-dev sdl2-dev sdl2_mixer-dev sdl2_image-dev" options="!check" # no tests source="https://downloads.sourceforge.net/sauerbraten/sauerbraten_${pkgver//./_}_linux.tar.bz2 - sdl2_directfb_build_fix.patch sauerbraten-client sauerbraten-server " @@ -39,7 +38,6 @@ package() { sha512sums=" fd2106e4ed3d48352b5cc2f9d4037933a486e6200ef89bf9e3f31952f4a27ef565f7740d45c32bb9b22da0e17e6542257169134f216bc51a6a465ff311f9bae9 sauerbraten_2020_12_29_linux.tar.bz2 -613a643ee4444c589fe02ef402e48c7b39eb94b9417b5e97a36e2a2df2c5db4105b8168f31fb2f0679e57019fae9a4d3a57308c29a66ccf27282c4c5e03443a2 sdl2_directfb_build_fix.patch 67bc774a3df9c8dc08323b0b4feaf06071daf80d88d0d2a83595443239a6ce58f44c6dfc08296cadaffeb1252f6647a74170d5d133e14bce6e3be6c1bc324fd5 sauerbraten-client 84d7c31c083a5d8c1d149f174edd81b046351ee42141a2896e1eec90019579460f2674e0ac25d0f2307b5302720eb24fb4d0fee1c3bd680d8afa1566c92f2e84 sauerbraten-server " diff --git a/testing/sauerbraten/sdl2_directfb_build_fix.patch b/testing/sauerbraten/sdl2_directfb_build_fix.patch deleted file mode 100644 index 7e892cf1017..00000000000 --- a/testing/sauerbraten/sdl2_directfb_build_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -fixes redefinition of 'void operator delete [](void*, void*)' in directfb from -SDL2 include - ---- a/src/engine/main.cpp -+++ b/src/engine/main.cpp -@@ -3,6 +3,7 @@ - #include "engine.h" - - #ifdef SDL_VIDEO_DRIVER_X11 -+#undef SDL_VIDEO_DRIVER_DIRECTFB - #include "SDL_syswm.h" - #endif -