Skip to content

Commit f119f76

Browse files
committed
nuvie: use sdl2 on HEAD
1 parent 5e463ca commit f119f76

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Formula/n/nuvie.rb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
class Nuvie < Formula
22
desc "Ultima 6 engine"
33
homepage "https://nuvie.sourceforge.net/"
4-
url "https://downloads.sourceforge.net/project/nuvie/Nuvie/0.5/nuvie-0.5.tgz"
5-
sha256 "ff026f6d569d006d9fe954f44fdf0c2276dbf129b0fc5c0d4ef8dce01f0fc257"
64
license "GPL-2.0-or-later"
75
revision 1
86

7+
stable do
8+
url "https://downloads.sourceforge.net/project/nuvie/Nuvie/0.5/nuvie-0.5.tgz"
9+
sha256 "ff026f6d569d006d9fe954f44fdf0c2276dbf129b0fc5c0d4ef8dce01f0fc257"
10+
depends_on "sdl12-compat"
11+
end
12+
913
no_autobump! because: :requires_manual_review
1014

1115
bottle do
@@ -22,16 +26,15 @@ class Nuvie < Formula
2226
url "https://github.com/nuvie/nuvie.git", branch: "master"
2327
depends_on "autoconf" => :build
2428
depends_on "automake" => :build
29+
depends_on "sdl2"
2530
end
2631

27-
depends_on "sdl12-compat"
28-
2932
def install
3033
# Work around GCC 11 / Clang 17 failure due to higher default C++ standard.
3134
# We use C++03 standard as C++11 standard needs upstream fix.
3235
# We append to CXX because CXXFLAGS is also used for C code somehow.
3336
# Ref: https://github.com/nuvie/nuvie/commit/69fb52d35d5eaffcf3bca56929ab58a99defec3d
34-
ENV.append "CXX", "-std=c++03" if OS.linux? || DevelopmentTools.clang_build_version >= 1700
37+
ENV.append "CXX", "-std=c++03" if build.stable? && (OS.linux? || DevelopmentTools.clang_build_version >= 1700)
3538

3639
inreplace "./nuvie.cpp" do |s|
3740
s.gsub! 'datadir", "./data"',
@@ -50,7 +53,7 @@ def install
5053

5154
args = []
5255
# Help old config scripts identify arm64 linux
53-
args << "--build=aarch64-unknown-linux-gnu" if OS.linux? && Hardware::CPU.arm? && Hardware::CPU.is_64_bit?
56+
args << "--build=aarch64-unknown-linux-gnu" if OS.linux? && Hardware::CPU.arm64?
5457

5558
system "./configure", "--disable-sdltest", *args, *std_configure_args
5659
system "make"

0 commit comments

Comments
 (0)