Build from source

5 files changed, 34 insertions, 394 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a08ab6c2f3bd..6874cbf9c942 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = s25rttr
 	pkgdesc = Return to the Roots is an unofficial extension of (Die Siedler II) ® by BlueByte Software GmbH. Put the files from the original game in the folder (/usr/share/s25rttr/S2/)
 	pkgver = 0.9.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.siedler25.org/
 	install = s25rttr.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = cmake
+	makedepends = boost
 	depends = sdl2
 	depends = sdl2_mixer
-	source = s25rttr
-	source = s25rttr.desktop
-	source = s25rttr.xpm
-	source = s25rttr.install
-	source = http://www.siedler25.org/uploads/stable/s25rttr_0.9.5-397f2b2315e997504d4958bfbdea0af815ce559a-linux.x86_64.tar.bz2
-	md5sums = 23235e636d60c380aa1631b44fabbb6b
-	md5sums = 8c486f63efb1c9bec6d50306270f1b4c
-	md5sums = a7bf0908aac3dbfaed837c19695ca362
-	md5sums = f51bc71ef665266ae68ce134892ca612
-	md5sums = 108b58ee7a25e08637f3acbead239ded
+	depends = libcurl-gnutls
+	depends = bzip2
+	depends = glfw
+	depends = libsamplerate
+	depends = boost-libs
+	depends = miniupnpc
+	depends = lua51
+	source = s25rttr-0.9.5.tar.gz::https://github.com/Return-To-The-Roots/s25client/releases/download/v0.9.5/s25client_src_v0.9.5.tar.gz
+	sha256sums = c6a9ef5b90943b5f2e81543f1e3290ff773663a45ebbbcc5a786bb5f5495fbec
 
 pkgname = s25rttr
diff --git a/PKGBUILD b/PKGBUILD
index e22a14ec3cbf..32d55370acec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,35 @@
 
 pkgname=s25rttr
 pkgver=0.9.5
-build=397f2b2315e997504d4958bfbdea0af815ce559a
-pkgrel=1
+pkgrel=2
 pkgdesc="Return to the Roots is an unofficial extension of (Die Siedler II) ® by BlueByte Software GmbH. Put the files from the original game in the folder (/usr/share/s25rttr/S2/)"
 arch=('i686' 'x86_64')
 url="https://www.siedler25.org/"
 license=('GPL3')
-depends=('sdl2' 'sdl2_mixer')
+depends=('sdl2' 'sdl2_mixer' 'libcurl-gnutls' 'bzip2' 'glfw' 'libsamplerate' 'boost-libs' 'miniupnpc' 'lua51')
+makedepends=('cmake' 'boost')
 install="s25rttr.install"
-source=($pkgname $pkgname.desktop $pkgname.xpm $pkgname.install)
-md5sums=('23235e636d60c380aa1631b44fabbb6b'
-         '8c486f63efb1c9bec6d50306270f1b4c'
-         'a7bf0908aac3dbfaed837c19695ca362'
-         'f51bc71ef665266ae68ce134892ca612')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/Return-To-The-Roots/s25client/releases/download/v$pkgver/s25client_src_v$pkgver.tar.gz")
+sha256sums=('c6a9ef5b90943b5f2e81543f1e3290ff773663a45ebbbcc5a786bb5f5495fbec')
 
-if [[ $CARCH == 'x86_64' ]]; then
-    source+=("http://www.siedler25.org/uploads/stable/${pkgname}_${pkgver}-${build}-linux.x86_64.tar.bz2")
-    md5sums+=('108b58ee7a25e08637f3acbead239ded')
-fi
+build() {
+    cmake -B build -S "s25client_v$pkgver" \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D RTTR_BUILD_UPDATER=OFF \
+    -D RTTR_USE_SYSTEM_LIBS=ON \
+    -D BUILD_TESTING=OFF \
+    -D LUA_INCLUDE_DIR=/usr/include/lua5.1/
+
+    cmake --build build
+}
 
 package() {
-    install -d -m755 "$pkgdir"/usr/share/
-    cp -ra "$srcdir"/"$pkgname"_"$pkgver"/share/* "$pkgdir"/usr/share/
-    cp -ra "$srcdir"/"$pkgname"_"$pkgver"/lib/ "$pkgdir"/usr/lib/
-    find "$pkgdir"/usr/ -type d -exec chmod 755 "{}" \;
-    find "$pkgdir"/usr/ -type f -exec chmod 644 "{}" \;
+    pushd build
+    make DESTDIR="$pkgdir" install
+    popd
 
-    install -Dm644 "$srcdir"/"$pkgname".xpm "$pkgdir"/usr/share/pixmaps/"$pkgname".xpm
-    install -Dm644 "$srcdir"/"$pkgname".desktop "$pkgdir"/usr/share/applications/"$pkgname".desktop
-    install -Dm755 "$srcdir"/"$pkgname" "$pkgdir"/usr/bin/"$pkgname"
-    install -Dm755 "$srcdir"/"$pkgname"_"$pkgver"/bin/s25client "$pkgdir"/usr/bin/s25client
+    pushd "s25client_v$pkgver"
+    install -D -m 0644 tools/release/debian/s25rttr.desktop "${pkgdir}/usr/share/applications/s25rttr.desktop"
+    install -D -m 0644 tools/release/debian/s25rttr.png "${pkgdir}/usr/share/icons/hicolor/64x64/apps/s25rttr.png"
+    popd
 }
diff --git a/s25rttr b/s25rttr
deleted file mode 100755
index 793aea0bc4fa..000000000000
--- a/s25rttr
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ "$LD_LIBRARY_PATH" = "" ] ; then
-	export LD_LIBRARY_PATH="/usr/share/s25rttr/lib"
-else
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/share/s25rttr/lib"
-fi
-
-/usr/bin/s25client
diff --git a/s25rttr.desktop b/s25rttr.desktop
deleted file mode 100644
index db9911003272..000000000000
--- a/s25rttr.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Exec=s25rttr
-Icon=s25rttr
-Type=Application
-Categories=Game;StrategyGame;
-Name=Return to the Roots
-StartupNotify=false
-Terminal=false 
diff --git a/s25rttr.xpm b/s25rttr.xpm
deleted file mode 100644
index 5a3bd52e5e00..000000000000
--- a/s25rttr.xpm
+++ /dev/null
@@ -1,343 +0,0 @@
-/* XPM */
-static char * s25rttr_xpm[] = {
-"32 32 308 2",
-"  	c None",
-". 	c #FF5600",
-"+ 	c #FF7F00",
-"@ 	c #FF9600",
-"# 	c #FF9800",
-"$ 	c #FF8C00",
-"% 	c #FF6300",
-"& 	c #FF5900",
-"* 	c #FE3400",
-"= 	c #FFB300",
-"- 	c #FFD200",
-"; 	c #FFEB00",
-"> 	c #FFEF00",
-", 	c #FFEE00",
-"' 	c #FFED00",
-") 	c #FFD600",
-"! 	c #FF9700",
-"~ 	c #FF8400",
-"{ 	c #FFCE00",
-"] 	c #FFC900",
-"^ 	c #FF1700",
-"/ 	c #FFD700",
-"( 	c #FFE900",
-"_ 	c #FFC400",
-": 	c #FFE600",
-"< 	c #FFE500",
-"[ 	c #FFA900",
-"} 	c #FC2100",
-"| 	c #FFAE00",
-"1 	c #FFE300",
-"2 	c #FFAD00",
-"3 	c #B73A00",
-"4 	c #830000",
-"5 	c #530000",
-"6 	c #650000",
-"7 	c #DA4000",
-"8 	c #FEC300",
-"9 	c #FFE000",
-"0 	c #FFDE00",
-"a 	c #FF7B00",
-"b 	c #FC4E00",
-"c 	c #FFCC00",
-"d 	c #FFE200",
-"e 	c #FFDF00",
-"f 	c #FF6B00",
-"g 	c #080000",
-"h 	c #000000",
-"i 	c #000100",
-"j 	c #1B0000",
-"k 	c #BF1B00",
-"l 	c #FFDA00",
-"m 	c #FFD800",
-"n 	c #FFDB00",
-"o 	c #FF2700",
-"p 	c #FD3400",
-"q 	c #FE8300",
-"r 	c #FFC500",
-"s 	c #EA7000",
-"t 	c #FFB200",
-"u 	c #FFDD00",
-"v 	c #FFDC00",
-"w 	c #FFB600",
-"x 	c #FF3C00",
-"y 	c #4D0000",
-"z 	c #FFD300",
-"A 	c #FFD100",
-"B 	c #FF9900",
-"C 	c #FFA600",
-"D 	c #FFBF00",
-"E 	c #CF3000",
-"F 	c #570000",
-"G 	c #C34200",
-"H 	c #FFC600",
-"I 	c #FFD400",
-"J 	c #FF9000",
-"K 	c #FF7200",
-"L 	c #FFD500",
-"M 	c #FFCD00",
-"N 	c #FF6600",
-"O 	c #FFA100",
-"P 	c #A70500",
-"Q 	c #470000",
-"R 	c #DF7400",
-"S 	c #5B0000",
-"T 	c #FF6E00",
-"U 	c #F46900",
-"V 	c #E74200",
-"W 	c #0A0000",
-"X 	c #8C1000",
-"Y 	c #F9A600",
-"Z 	c #FF2400",
-"` 	c #6A0000",
-" .	c #FFC700",
-"..	c #FFC000",
-"+.	c #F36700",
-"@.	c #E54200",
-"#.	c #FF9400",
-"$.	c #1E0000",
-"%.	c #CE3500",
-"&.	c #FFBC00",
-"*.	c #FFC100",
-"=.	c #FFC200",
-"-.	c #FFA800",
-";.	c #D53800",
-">.	c #FFBE00",
-",.	c #FFBB00",
-"'.	c #FFB900",
-").	c #F56500",
-"!.	c #E84100",
-"~.	c #3A0000",
-"{.	c #E75D00",
-"].	c #F67400",
-"^.	c #FB7A00",
-"/.	c #FF8E00",
-"(.	c #FF8F00",
-"_.	c #FFB500",
-":.	c #FFB400",
-"<.	c #F56100",
-"[.	c #E83E00",
-"}.	c #730400",
-"|.	c #FF7400",
-"1.	c #BE3300",
-"2.	c #FC2400",
-"3.	c #FF8900",
-"4.	c #FE7700",
-"5.	c #C20D00",
-"6.	c #FF6400",
-"7.	c #FFB700",
-"8.	c #FFB000",
-"9.	c #FFAF00",
-"0.	c #F55F00",
-"a.	c #E83D00",
-"b.	c #FF8800",
-"c.	c #A30600",
-"d.	c #FF8200",
-"e.	c #ED6600",
-"f.	c #8E0E00",
-"g.	c #FC3B00",
-"h.	c #FFA400",
-"i.	c #FD5500",
-"j.	c #920000",
-"k.	c #FF6100",
-"l.	c #FFAB00",
-"m.	c #F55D00",
-"n.	c #E83C00",
-"o.	c #FF8500",
-"p.	c #FB3E00",
-"q.	c #CE3700",
-"r.	c #E53E00",
-"s.	c #9D0000",
-"t.	c #FF5F00",
-"u.	c #FFB100",
-"v.	c #FFAA00",
-"w.	c #F55B00",
-"x.	c #E83B00",
-"y.	c #FF8300",
-"z.	c #FE2A00",
-"A.	c #FE6C00",
-"B.	c #FE5F00",
-"C.	c #B80000",
-"D.	c #C43800",
-"E.	c #FE7600",
-"F.	c #FFA700",
-"G.	c #FFAC00",
-"H.	c #F75100",
-"I.	c #FF5C00",
-"J.	c #F55A00",
-"K.	c #E83A00",
-"L.	c #FF0000",
-"M.	c #FE5700",
-"N.	c #FF8B00",
-"O.	c #FF7000",
-"P.	c #5B0900",
-"Q.	c #C12C00",
-"R.	c #FF9500",
-"S.	c #FEAD00",
-"T.	c #FF9A00",
-"U.	c #E83900",
-"V.	c #FFA000",
-"W.	c #FF1500",
-"X.	c #020000",
-"Y.	c #230000",
-"Z.	c #A01A00",
-"`.	c #FF9100",
-" +	c #E83700",
-".+	c #FF8A00",
-"++	c #AA2300",
-"@+	c #F45C00",
-"#+	c #E73B00",
-"$+	c #FF8700",
-"%+	c #C80000",
-"&+	c #B31C00",
-"*+	c #F06200",
-"=+	c #FE9F00",
-"-+	c #FF6500",
-";+	c #290000",
-">+	c #CA4100",
-",+	c #F45D00",
-"'+	c #7D0600",
-")+	c #050000",
-"!+	c #450000",
-"~+	c #B13000",
-"{+	c #FF8D00",
-"]+	c #FF4800",
-"^+	c #550000",
-"/+	c #1C0000",
-"(+	c #991300",
-"_+	c #FFA500",
-":+	c #0F0000",
-"<+	c #BC1B00",
-"[+	c #F56000",
-"}+	c #1D0000",
-"|+	c #BD1D00",
-"1+	c #FF4500",
-"2+	c #720000",
-"3+	c #FF9E00",
-"4+	c #FFB800",
-"5+	c #F56300",
-"6+	c #E84000",
-"7+	c #440100",
-"8+	c #FF6A00",
-"9+	c #5A0000",
-"0+	c #FF8100",
-"a+	c #FFC300",
-"b+	c #FFBD00",
-"c+	c #F46600",
-"d+	c #FF9200",
-"e+	c #0E0000",
-"f+	c #9B1C00",
-"g+	c #FF3300",
-"h+	c #A70000",
-"i+	c #FA6100",
-"j+	c #F53800",
-"k+	c #6E1200",
-"l+	c #FFBA00",
-"m+	c #FA5200",
-"n+	c #FAA600",
-"o+	c #FFC800",
-"p+	c #FF3800",
-"q+	c #410000",
-"r+	c #D16200",
-"s+	c #FF7E00",
-"t+	c #FE5100",
-"u+	c #FFCF00",
-"v+	c #FF0700",
-"w+	c #EC5A00",
-"x+	c #3E0000",
-"y+	c #B04000",
-"z+	c #FF9300",
-"A+	c #FFE100",
-"B+	c #FC8500",
-"C+	c #8E1D00",
-"D+	c #FBB000",
-"E+	c #FF9D00",
-"F+	c #FA4900",
-"G+	c #FFE700",
-"H+	c #FFD000",
-"I+	c #F48C00",
-"J+	c #430000",
-"K+	c #E27F00",
-"L+	c #FFEA00",
-"M+	c #F53600",
-"N+	c #FEB800",
-"O+	c #FFF500",
-"P+	c #F47F00",
-"Q+	c #BF4E00",
-"R+	c #A03A00",
-"S+	c #8E2000",
-"T+	c #852000",
-"U+	c #8A2100",
-"V+	c #9D3700",
-"W+	c #CE5900",
-"X+	c #FFE400",
-"Y+	c #FFE800",
-"Z+	c #EA8100",
-"`+	c #A20B00",
-" @	c #0D0000",
-".@	c #9B1700",
-"+@	c #FED800",
-"@@	c #F98E00",
-"#@	c #BA2100",
-"$@	c #EA9000",
-"%@	c #CE4000",
-"&@	c #780F00",
-"*@	c #4A0700",
-"=@	c #220000",
-"-@	c #270000",
-";@	c #5C0A00",
-">@	c #B72C00",
-",@	c #EF9700",
-"'@	c #970700",
-")@	c #2E0000",
-"!@	c #E25600",
-"~@	c #FFF700",
-"{@	c #FFF000",
-"]@	c #F08700",
-"^@	c #8F1100",
-"/@	c #4C0000",
-"(@	c #540000",
-"_@	c #260000",
-":@	c #120000",
-"<@	c #5F0000",
-"[@	c #F6C700",
-"}@	c #B51300",
-"|@	c #3C0000",
-"1@	c #C24000",
-"2@	c #D05000",
-"3@	c #750000",
-"                                                                ",
-"          . + @ # $ %                     % &                   ",
-"      * = - ; > , ' ) !                 ~ { ] ^                 ",
-"      / ( # _ : < < < < [           } | 1 < < 2                 ",
-"      3 4 5 6 7 8 9 0 0 : a       b c d 0 0 e - f               ",
-"      g   h i j k { l m m n o p q r s t u m m v w x             ",
-"              h y + l z z A B C D E F G H I z z / J             ",
-"                y K L M M M # N O P h Q R M M M { A .           ",
-"                S T { H H _ U V B     W X Y H H H H ] Z         ",
-"                ` f  .....D +.@.#.      $.%.&.*.....=.-.        ",
-"                ;.@ >.,.,.'.).!.J         ~.{.=.,...| ].        ",
-"              ^./.(.'._._.:.<.[.$         h }.|.*.$ 1.          ",
-"          2.3.4.5.6.7.8.8.9.0.a.b.          c.d.e.f.            ",
-"        g.h.i.j.F k.= 2 2 l.m.n.o.        p.O q.5               ",
-"      N _.| $ r.s.t.u.v.v.[ w.x.y.    z.A.8.B.C.                ",
-"    D.E.F.l.G.O H.I.9.-.-.F.J.K.~ L.M.N.2 [ 2 O.                ",
-"    j P.Q.R.S.[ h.T.[ -.-.C J.U.$ + V.v.-.-.-.-.a W.            ",
-"      X.Y.Z.`.l.[ [ [ [ [ -.w. +O l.l.v.[ [ [ [ l..+            ",
-"        h $.++! v.v.v.v.v.[ @+#+$+%+&+*+=+l.v.v.v.t -+          ",
-"          h ;+>+l.2 2 2 2 l.,+#+3.'+)+!+~+{+9.2 2 G.w ]+        ",
-"            h ^+T :.8.8.8.| 0.a.3.    h /+(+_+t 8.8.8.T.        ",
-"              :+<+>.= :.:.t [+[..+        }+|+'.:.:.:.l.1+      ",
-"                2+3+,.4+4+7.5+6+/.        h 7+8+D 4+4+7.+       ",
-"                9+0+a+b+b+&.c+V d+          e+f+'.>.b+>.3+g+    ",
-"                h+0+] a+a+*.i+j+R.            k+J  .a+a+l+I.    ",
-"              m+n+*.] ] ] o+t O u.p+          q+r+M ] ] { s+    ",
-"          t+-.u+u+u+u+u+u+u+u+u+u+M C ]+v+  w+x+y+*.u+u+A ,.Z   ",
-"        z+A+/ L / / / ) ) L L L L L / e t 9.B+  C+D+L L L v E+6.",
-"    F+V.G+1 e H+= t t _.u+: 9 v n n n v 0 I+    J+K+l n n n L+:.",
-"  M+N+O+_.P+Q+R+S+T+T+U+V+W+O X+Y+A+d A+Z+`+     @.@+@A+d L+@@#@",
-"  $@8.%@&@*@=@:+W g g g  @-@;@>@l.; : ,@'@        )@!@~@{@]@^@  ",
-"  /@(@_@                    h :@<@P+[@}@          )+|@1@2@3@    "};