diff --git a/src/sfml-1-fixes-crlf.patch b/src/sfml-1-fixes.patch similarity index 68% rename from src/sfml-1-fixes-crlf.patch rename to src/sfml-1-fixes.patch index 0f189a6a..e10dcc11 100644 --- a/src/sfml-1-fixes-crlf.patch +++ b/src/sfml-1-fixes.patch @@ -2,21 +2,21 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 4e522133482f3f37ee8f498a35294eb31738e307 Mon Sep 17 00:00:00 2001 -From: MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "fix@me" Date: Sat, 6 Jul 2013 17:55:39 +1000 -Subject: fix openal static +Subject: [PATCH 1/1] fix openal static -diff --git a/CMakeLists.txt b/CMakeLists.txt +diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake index 1111111..2222222 100644 --- a/cmake/Macros.cmake +++ b/cmake/Macros.cmake -@@ -173,6 +173,7 @@ +@@ -178,6 +178,7 @@ macro(sfml_add_library target) # define SFML_STATIC if the build type is not set to 'shared' if(NOT BUILD_SHARED_LIBS) target_compile_definitions(${target} PUBLIC "SFML_STATIC") + target_compile_definitions(${target} PUBLIC "AL_LIBTYPE_STATIC") endif() - + endmacro() diff --git a/src/sfml.mk b/src/sfml.mk index 494f077a..c7431db1 100644 --- a/src/sfml.mk +++ b/src/sfml.mk @@ -4,8 +4,8 @@ PKG := sfml $(PKG)_WEBSITE := https://www.sfml-dev.org/ $(PKG)_DESCR := SFML $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.0 -$(PKG)_CHECKSUM := 4bc5ed0b6658f73a31bfb8b36878d71fe1678e6e95e4f20834ab589a1bdc7ef4 +$(PKG)_VERSION := 2.5.1 +$(PKG)_CHECKSUM := 438c91a917cc8aa19e82c6f59f8714da353c488584a007d401efac8368e1c785 $(PKG)_GH_CONF := SFML/SFML/tags $(PKG)_DEPS := cc freetype glew jpeg libsndfile openal @@ -25,13 +25,8 @@ define $(PKG)_BUILD echo 'Version: $($(PKG)_VERSION)'; \ echo 'Description: sfml'; \ echo 'Requires: freetype2 glew openal sndfile vorbisenc vorbisfile'; \ - $(if $(findstring static,$(TARGET)), \ - echo 'Cflags: -DSFML_STATIC'; \ - echo 'Libs: -lsfml-audio-s -lsfml-network-s -lsfml-graphics-s -lsfml-window-s -lsfml-system-s'; \ - $(else), \ - echo 'Cflags: -DSFML_SHARED'; \ - echo 'Libs: -lsfml-audio -lsfml-network -lsfml-graphics -lsfml-window -lsfml-system'; \ - ) \ + echo 'Cflags.private: -DSFML_STATIC'; \ + echo 'Libs: $(addprefix -lsfml-,$(addsuffix $(if $(BUILD_STATIC),-s), audio network graphics window system))'; \ echo 'Libs.private: -ljpeg -lws2_32 -lgdi32';) \ > '$(PREFIX)/$(TARGET)/lib/pkgconfig/sfml.pc' cat '$(PREFIX)/$(TARGET)/lib/pkgconfig/sfml.pc'