sfml 2.2

Version bump and attempt to fix the issues raised in #35279.

Closes #35479.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

1 files changed, 19 insertions, 9 deletions

diff --git a/Library/Formula/sfml.rb b/Library/Formula/sfml.rb
index c49b604a6..14857a45a 100644
--- a/Library/Formula/sfml.rb
+++ b/Library/Formula/sfml.rb
@@ -1,16 +1,16 @@
-require "formula"
-
 class Sfml < Formula
   homepage "http://www.sfml-dev.org/"
 
   stable do
-    url "http://www.sfml-dev.org/download/sfml/2.1/SFML-2.1-sources.zip"
-    sha1 "c27bdffdc4bedb5f6a20db03ceca715d42aa5752"
+    url "http://www.sfml-dev.org/download/sfml/2.2/SFML-2.2-sources.zip"
+    sha1 "b21721a3dc221a790e4b81d6ba358c16cb1c1cd3"
 
-    # Too many upstream differences to fix Yosemite compile.
-    # Big code changes upstream since previous release 15 months ago.
-    # Please remove this block with the next stable release.
-    depends_on MaximumMacOSRequirement => :mavericks
+    # Patch to support removing the extlibs dir which caused install_name_tool complications.
+    # Already merged in HEAD and will be in the next release.
+    patch do
+      url "https://github.com/LaurentGomila/SFML/commit/9f2aecf9cff75307.diff"
+      sha1 "87646d34cf0315c814ca6313cf75bb0439113eef"
+    end
   end
 
   bottle do
@@ -27,9 +27,19 @@ class Sfml < Formula
   depends_on "glew"
   depends_on "jpeg"
   depends_on "libsndfile"
+  depends_on "doxygen" => :optional
 
   def install
-    system "cmake", ".", "-DCMAKE_INSTALL_FRAMEWORK_PREFIX=#{frameworks}/", *std_cmake_args
+    args = std_cmake_args
+    args << "."
+
+    args << "-DSFML_BUILD_DOC=TRUE" if build.with? "doxygen"
+
+    # Always remove the "extlibs" to avoid install_name_tool failure.
+    # https://github.com/Homebrew/homebrew/pull/35279
+    rm_rf buildpath/"extlibs"
+
+    system "cmake", *args
     system "make", "install"
   end
 end