Skip to content

Commit 4bae861

Browse files
committed
minetest: rename to luanti
Make Linux only, we moved the mac build to a cask Homebrew/homebrew-cask#200275
1 parent 17f09e6 commit 4bae861

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

.github/autobump.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2140,7 +2140,7 @@ millet
21402140
mimalloc
21412141
mimirtool
21422142
minder
2143-
minetest
2143+
luanti
21442144
minica
21452145
minigraph
21462146
minijinja-cli

Formula/m/minetest.rb renamed to Formula/l/luanti.rb

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
class Minetest < Formula
1+
class Luanti < Formula
22
desc "Free, open source voxel game engine and game"
33
homepage "https://www.minetest.net/"
44
license "LGPL-2.1-or-later"
5+
revision 1
56

67
stable do
78
url "https://github.com/minetest/minetest/archive/refs/tags/5.11.0.tar.gz"
@@ -19,12 +20,16 @@ class Minetest < Formula
1920
end
2021

2122
bottle do
23+
<<<<<<< HEAD:Formula/m/minetest.rb
2224
sha256 cellar: :any, arm64_sequoia: "9ff03cc17ac3b53b2f7715298ed614e4b02157ae6d6cd2a9a6d7a10d08d38644"
2325
sha256 cellar: :any, arm64_sonoma: "3583b7f63bc30c3ddb8d63ff21cbf92533af3e64f98949946bae0169d27477f6"
2426
sha256 cellar: :any, arm64_ventura: "6bad098cf55692d28cfb1b08a99ab8d8ccd38ceb9f0abbacbbc2356d48031143"
2527
sha256 cellar: :any, sonoma: "76e0b80ebb30a408fab7184f2122a693432e71af40949f85d73838454f431f71"
2628
sha256 cellar: :any, ventura: "6905ae40165af014ebb852e26a13b87a6f90ff5fe5a898744fc7ea18cc796756"
2729
sha256 x86_64_linux: "4b08c9839555bdfd8cf5d515eb33cecabdc1f864dc5c094750ec6fad3adb3f5e"
30+
=======
31+
sha256 x86_64_linux: "81295a377962e1212a9a1217e1284622a0d8411f7b3ec796b03493cd33607df3"
32+
>>>>>>> 3c42b03fddd (minetest: rename to luanti):Formula/l/luanti.rb
2833
end
2934

3035
head do
@@ -36,6 +41,7 @@ class Minetest < Formula
3641
end
3742

3843
depends_on "cmake" => :build
44+
depends_on "curl"
3945
depends_on "freetype"
4046
depends_on "gettext"
4147
depends_on "gmp"
@@ -44,27 +50,20 @@ class Minetest < Formula
4450
depends_on "libogg"
4551
depends_on "libpng"
4652
depends_on "libvorbis"
53+
depends_on "libx11"
54+
depends_on "libxi"
55+
depends_on "libxxf86vm"
56+
depends_on :linux
4757
depends_on "luajit"
58+
depends_on "mesa"
59+
depends_on "ncurses"
60+
depends_on "openal-soft"
61+
depends_on "sqlite"
62+
depends_on "xinput"
63+
depends_on "zlib"
4864
depends_on "zstd"
4965

50-
uses_from_macos "curl"
51-
uses_from_macos "ncurses"
52-
uses_from_macos "sqlite"
53-
uses_from_macos "zlib"
54-
55-
on_linux do
56-
depends_on "libx11"
57-
depends_on "libxi"
58-
depends_on "libxxf86vm"
59-
depends_on "mesa"
60-
depends_on "openal-soft"
61-
depends_on "xinput"
62-
end
63-
6466
def install
65-
# Disable CMake fixup_bundle to prevent copying dylibs into app bundle
66-
inreplace "src/CMakeLists.txt", "fixup_bundle(", "# \\0"
67-
6867
# Remove bundled libraries to prevent fallback
6968
%w[lua gmp jsoncpp].each { |lib| rm_r(buildpath/"lib"/lib) }
7069

@@ -78,14 +77,10 @@ def install
7877
-DENABLE_GETTEXT=1
7978
-DCUSTOM_GETTEXT_PATH=#{Formula["gettext"].opt_prefix}
8079
]
81-
# Workaround for 'Could NOT find GettextLib (missing: ICONV_LIBRARY)'
82-
args << "-DICONV_LIBRARY=#{MacOS.sdk_path}/usr/lib/libiconv.tbd" if OS.mac? && MacOS.version >= :big_sur
8380

8481
system "cmake", "-S", ".", "-B", "build", *std_cmake_args, *args
8582
system "cmake", "--build", "build"
8683
system "cmake", "--install", "build"
87-
88-
bin.write_exec_script prefix/"luanti.app/Contents/MacOS/luanti" if OS.mac?
8984
end
9085

9186
test do

formula_renames.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
"mkl-dnn": "onednn",
103103
"mobile-shell": "mosh",
104104
"mongo-c": "mongo-c-driver",
105+
"minetest": "luanti",
105106
"mpich2": "mpich",
106107
"mps-youtube": "yewtube",
107108
"mr2": "zoro",

0 commit comments

Comments
 (0)