Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(x11/sfml): 3.0.0 #22651

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

bump(x11/sfml): 3.0.0 #22651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae9f4d5
bump(x11/sfml): 3.0.0
TwoSpikes Dec 22, 2024
9820968
fix: typo
TwoSpikes Dec 22, 2024
3149b36
Merge branch 'master' of https://github.com/termux/termux-packages
TwoSpikes Dec 22, 2024
74f493e
Merge branch 'master' of https://github.com/termux/termux-packages
TwoSpikes Dec 22, 2024
84f13c5
Merge branch 'master' of https://github.com/termux/termux-packages
TwoSpikes Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x11-packages/sfml/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.sfml-dev.org/
TERMUX_PKG_DESCRIPTION="A simple, fast, cross-platform and object-oriented multimedia API"
TERMUX_PKG_LICENSE="ZLIB"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.6.2"
TERMUX_PKG_VERSION="3.0.0"
TERMUX_PKG_SRCURL=https://github.com/SFML/SFML/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=15ff4d608a018f287c6a885db0a2da86ea389e516d2323629e4d4407a7ce047f
TERMUX_PKG_SHA256=37506fafbd618b1f8e153bbca8811e62203a70b32a1183279fb9612fd0501d2b
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="freetype, libc++, libflac, libogg, libvorbis, libx11, libxcursor, libxrandr, openal-soft, opengl"

Expand Down
20 changes: 10 additions & 10 deletions x11-packages/sfml/include-SFML-Config.hpp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
--- a/include/SFML/Config.hpp
+++ b/include/SFML/Config.hpp
--- a/include/SFML/Config.hpp 2024-12-22 13:32:21.661907053 +0300
+++ b/include/SFML/Config.hpp 2024-12-22 13:34:32.765907003 +0300
@@ -71,12 +71,7 @@
#elif defined(__unix__)

// UNIX system, see which one it is
- #if defined(__ANDROID__)
// UNIX system, see which one it is
-#if defined(__ANDROID__)
-
- // Android
- #define SFML_SYSTEM_ANDROID
-// Android
-#define SFML_SYSTEM_ANDROID
-
- #elif defined(__linux__)
+ #if defined(__linux__)
-#elif defined(__linux__)
+#if define(__linux__)

// Linux
#define SFML_SYSTEM_LINUX
// Linux
#define SFML_SYSTEM_LINUX
20 changes: 0 additions & 20 deletions x11-packages/sfml/src-SFML-System-Unix-ThreadImpl.cpp.patch
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions x11-packages/sfml/src-SFML-Window-CMakeLists.txt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/src/SFML/Window/CMakeLists.txt
+++ b/src/SFML/Window/CMakeLists.txt
@@ -272,7 +272,7 @@
target_link_libraries(sfml-window PRIVATE EGL GLES)
--- a/src/SFML/Window/CMakeLists.txt 2024-12-22 13:48:51.077906675 +0300
+++ b/src/SFML/Window/CMakeLists.txt 2024-12-22 13:49:19.249906665 +0300
@@ -320,7 +320,7 @@
endif()
endif()

-if(SFML_OS_LINUX)
+if(FALSE)
sfml_find_package(UDev INCLUDE "UDEV_INCLUDE_DIR" LINK "UDEV_LIBRARIES")
target_link_libraries(sfml-window PRIVATE UDev)
find_package(UDev REQUIRED)
target_link_libraries(sfml-window PRIVATE UDev::UDev dl)
elseif(SFML_OS_WINDOWS)
Loading