games/citra: Updated for version 0.1811.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 49 insertions, 43 deletions

diff --git a/games/citra/citra.SlackBuild b/games/citra/citra.SlackBuild
index 18e55f31888b4..66a9c761a241b 100644
--- a/games/citra/citra.SlackBuild
+++ b/games/citra/citra.SlackBuild
@@ -26,29 +26,30 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=citra
 SRCNAM=$PRGNAM-nightly-nightly
-PRGVER=${PRGVER:-"1785"}
-VERSION=${VERSION:-0.1785}
-BOOST=${BOOST:-36603a1e665e849d29b1735a12c0a51284a10dd0}
-CATCH=${CATCH:-c4e3767e265808590986d5db6ca1b5532a7f3d13}
+PRGVER=${PRGVER:-"1811"}
+VERSION=${VERSION:-0.1811}
+BOOST=${BOOST:-66937ea62d126a92b5057e3fd9ceac7c44daf4f5}
+CATCH=${CATCH:-dc001fa935d71b4b77f263fce405c9dbdfcbfe28}
 CPPJWT=${CPPJWT:-e12ef06218596b52d9b5d6e1639484866a8e7067}
 CRYPTOPP=${CRYPTOPP:-f2102243e6fdd48c0b2a393a0993cca228f20573}
-CUBEB=${CUBEB:-1d66483ad2b93f0e00e175f9480c771af90003a7}
+CUBEB=${CUBEB:-dc511c6b3597b6384d28949285b9289e009830ea}
 DISCORDRPC=${DISCORDRPC:-963aa9f3e5ce81a4682c6ca3d136cddda614db33}
-DYNARMIC=${DYNARMIC:-9f88f234a180a5e8d5620b4803c971fb6dc2d9f2}
-ENET=${ENET:-498b9e3571c2e096d7143c3c76852c5ec28d7885}
+DYNARMIC=${DYNARMIC:-45bc7a82de5fab362ad01268a08e7eaa689ae2c2}
+ENET=${ENET:-4f8e9bdc4ce6d1f61a6274b0e557065a38190952}
 EXTSOUNDTOUCH=${EXTSOUNDTOUCH:-060181eaf273180d3a7e87349895bd0cb6ccbf4a}
-FMTLIB=${FMTLIB:-cc09f1a6798c085c325569ef466bcdcffdc266d4}
+FMTLIB=${FMTLIB:-a33701196adfad74917046096bf5a2aa0ab0bb50}
 GOOGLETEST=${GOOGLETEST:-800f5422ac9d9e0ad59cd860a2ef3a679588acb4}
-INIH=${INIH:-1e80a47dffbda813604f0913e2ad68c7054c14e4}
+INIH=${INIH:-5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b}
 LIBRESSL=${LIBRESSL:-8929f818fd748fd31a34fec7c04558399e13014a}
-LIBUSB=${LIBUSB:-c6a35c56016ea2ab2f19115d2ea1e85e0edae155}
-LIBYUV=${LIBYUV:-19d71f6b351fe992ae34b114eebd872c383a6bdb}
-LODEPNG=${LODEPNG:-31d9704fdcca0b68fb9656d4764fa0fb60e460c2}
+LIBUSB=${LIBUSB:-e782eeb2514266f6738e242cdcb18e3ae1ed06fa}
+LIBYUV=${LIBYUV:-6900494d90ae095d44405cd4cc3f346971fa69c9}
+LODEPNG=${LODEPNG:-18964554bc769255401942e0e6dfd09f2fab2093}
 NIHSTRO=${NIHSTRO:-fd69de1a1b960ec296cc67d32257b0f9e2d89ac6}
 SANITIZERSCMAKE=${SANITIZERSCMAKE:-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a}
+SDL2=${SDL2:-a1d1946dcba6509f0679f507b57e7b228d32e6f8}
 TEAKRA=${TEAKRA:-01db7cdd00aabcce559a8dddce8798dabb71949b}
-XBYAK=${XBYAK:-c306b8e5786eeeb87b8925a8af5c3bf057ff5a90}
-ZSTD=${ZSTD:-97a3da1df009d4dc67251de0c4b1c9d7fe286fc1}
+XBYAK=${XBYAK:-48457bfa0ded67bb4ae2d4c141c36b35469257ee}
+ZSTD=${ZSTD:-e47e674cd09583ff0503f0f6defd6d23d8b718d3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -97,7 +98,7 @@ tar xvf $CWD/$SRCNAM-$PRGVER.tar.?z
 tar xvf $CWD/boost-$BOOST.tar.gz -C \
   $DEPS/boost --strip-components 1
 tar xvf $CWD/catch-$CATCH.tar.gz -C \
-  $DEPS/catch --strip-components 1
+  $DEPS/catch2 --strip-components 1
 tar xvf $CWD/cpp-jwt-$CPPJWT.tar.gz -C \
   $DEPS/cpp-jwt --strip-components 1
 tar xvf $CWD/cryptopp-$CRYPTOPP.tar.gz -C \
@@ -130,6 +131,8 @@ tar xvf $CWD/nihstro-$NIHSTRO.tar.gz -C \
   $DEPS/nihstro --strip-components 1
 tar xvf $CWD/sanitizers-cmake-$SANITIZERSCMAKE.tar.gz -C \
   $DEPS/cubeb/cmake/sanitizers-cmake --strip-components 1
+tar xvf $CWD/SDL-$SDL2.tar.gz -C \
+  $DEPS/sdl2/SDL --strip-components 1
 tar xvf $CWD/teakra-$TEAKRA.tar.gz -C \
   $DEPS/teakra --strip-components 1
 tar xvf $CWD/xbyak-$XBYAK.tar.gz -C \
@@ -140,7 +143,7 @@ tar xvf $CWD/zstd-$ZSTD.tar.gz -C \
 # citra checks for external components by checking for their .git files.
 # Since these are not included when we downloaded the commit tarballs, we'll create them.
 echo "gitdir: ../../.git/modules/boost" > $DEPS/boost/.git
-echo "gitdir: ../../.git/modules/catch" > $DEPS/catch/.git
+echo "gitdir: ../../.git/modules/catch" > $DEPS/catch2/.git
 echo "gitdir: ../../.git/modules/cpp-jwt" > $DEPS/cpp-jwt/.git
 echo "gitdir: ../../.git/modules/cryptopp" > $DEPS/cryptopp/cryptopp/.git
 echo "gitdir: ../../.git/modules/cubeb" > $DEPS/cubeb/.git
@@ -155,6 +158,7 @@ echo "gitdir: ../../../.git/modules/libusb" > $DEPS/libusb/libusb/.git
 echo "gitdir: ../../.git/modules/libyuv" > $DEPS/libyuv/.git
 echo "gitdir: ../../../.git/modules/lodepng" > $DEPS/lodepng/lodepng/.git
 echo "gitdir: ../../.git/modules/nihstro" > $DEPS/nihstro/.git 
+echo "gitdir: ../../.git/modules/sdl2/SDL" > $DEPS/sdl2/SDL/.git
 echo "gitdir: ../../.git/modules/teakra" > $DEPS/teakra/.git
 echo "gitdir: ../../.git/modules/xbyak" > $DEPS/xbyak/.git
 echo "gitdir: ../../.git/modules/zstd" > $DEPS/zstd/.git 
diff --git a/games/citra/citra.info b/games/citra/citra.info
index 26abf4f233252..d53cbb317e749 100644
--- a/games/citra/citra.info
+++ b/games/citra/citra.info
@@ -1,52 +1,54 @@
 PRGNAM="citra"
-VERSION="0.1785"
+VERSION="0.1811"
 HOMEPAGE="https://citra-emu.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/citra-emu/ext-boost/archive/36603a1e665e849d29b1735a12c0a51284a10dd0/boost-36603a1e665e849d29b1735a12c0a51284a10dd0.tar.gz \
-                 https://github.com/catchorg/Catch2/archive/c4e3767e265808590986d5db6ca1b5532a7f3d13/catch-c4e3767e265808590986d5db6ca1b5532a7f3d13.tar.gz \
-                 https://github.com/citra-emu/citra-nightly/archive/nightly-1785/citra-nightly-nightly-1785.tar.gz \
+DOWNLOAD_x86_64="https://github.com/citra-emu/ext-boost/archive/66937ea62d126a92b5057e3fd9ceac7c44daf4f5/boost-66937ea62d126a92b5057e3fd9ceac7c44daf4f5.tar.gz \
+                 https://github.com/catchorg/Catch2/archive/dc001fa935d71b4b77f263fce405c9dbdfcbfe28/catch-dc001fa935d71b4b77f263fce405c9dbdfcbfe28.tar.gz \
+                 https://github.com/citra-emu/citra-nightly/archive/nightly-1811/citra-nightly-nightly-1811.tar.gz \
                  https://github.com/arun11299/cpp-jwt/archive/e12ef06218596b52d9b5d6e1639484866a8e7067/cpp-jwt-e12ef06218596b52d9b5d6e1639484866a8e7067.tar.gz \
                  https://github.com/weidai11/cryptopp/archive/f2102243e6fdd48c0b2a393a0993cca228f20573/cryptopp-f2102243e6fdd48c0b2a393a0993cca228f20573.tar.gz \
-                 https://github.com/kinetiknz/cubeb/archive/1d66483ad2b93f0e00e175f9480c771af90003a7/cubeb-1d66483ad2b93f0e00e175f9480c771af90003a7.tar.gz \
+                 https://github.com/kinetiknz/cubeb/archive/dc511c6b3597b6384d28949285b9289e009830ea/cubeb-dc511c6b3597b6384d28949285b9289e009830ea.tar.gz \
                  https://github.com/yuzu-emu/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33/discord-rpc-963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz \
-                 https://github.com/citra-emu/dynarmic/archive/9f88f234a180a5e8d5620b4803c971fb6dc2d9f2/dynarmic-9f88f234a180a5e8d5620b4803c971fb6dc2d9f2.tar.gz \
-                 https://github.com/lsalzman/enet/archive/498b9e3571c2e096d7143c3c76852c5ec28d7885/enet-498b9e3571c2e096d7143c3c76852c5ec28d7885.tar.gz \
+                 https://github.com/citra-emu/dynarmic/archive/45bc7a82de5fab362ad01268a08e7eaa689ae2c2/dynarmic-45bc7a82de5fab362ad01268a08e7eaa689ae2c2.tar.gz \
+                 https://github.com/lsalzman/enet/archive/4f8e9bdc4ce6d1f61a6274b0e557065a38190952/enet-4f8e9bdc4ce6d1f61a6274b0e557065a38190952.tar.gz \
                  https://github.com/citra-emu/ext-soundtouch/archive/060181eaf273180d3a7e87349895bd0cb6ccbf4a/ext-soundtouch-060181eaf273180d3a7e87349895bd0cb6ccbf4a.tar.gz \
-                 https://github.com/fmtlib/fmt/archive/cc09f1a6798c085c325569ef466bcdcffdc266d4/fmtlib-cc09f1a6798c085c325569ef466bcdcffdc266d4.tar.gz \
+                 https://github.com/fmtlib/fmt/archive/a33701196adfad74917046096bf5a2aa0ab0bb50/fmtlib-a33701196adfad74917046096bf5a2aa0ab0bb50.tar.gz \
                  https://github.com/google/googletest/archive/800f5422ac9d9e0ad59cd860a2ef3a679588acb4/googletest-800f5422ac9d9e0ad59cd860a2ef3a679588acb4.tar.gz \
-                 https://github.com/benhoyt/inih/archive/1e80a47dffbda813604f0913e2ad68c7054c14e4/inih-1e80a47dffbda813604f0913e2ad68c7054c14e4.tar.gz \
+                 https://github.com/benhoyt/inih/archive/5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b/inih-5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b.tar.gz \
                  https://github.com/citra-emu/ext-libressl-portable/archive/8929f818fd748fd31a34fec7c04558399e13014a/libressl-portable-8929f818fd748fd31a34fec7c04558399e13014a.tar.gz \
-                 https://github.com/libusb/libusb/archive/c6a35c56016ea2ab2f19115d2ea1e85e0edae155/libusb-c6a35c56016ea2ab2f19115d2ea1e85e0edae155.tar.gz \
-                 https://github.com/lemenkov/libyuv/archive/19d71f6b351fe992ae34b114eebd872c383a6bdb/libyuv-19d71f6b351fe992ae34b114eebd872c383a6bdb.tar.gz \
-                 https://github.com/lvandeve/lodepng/archive/31d9704fdcca0b68fb9656d4764fa0fb60e460c2/lodepng-31d9704fdcca0b68fb9656d4764fa0fb60e460c2.tar.gz \
+                 https://github.com/libusb/libusb/archive/e782eeb2514266f6738e242cdcb18e3ae1ed06fa/libusb-e782eeb2514266f6738e242cdcb18e3ae1ed06fa.tar.gz \
+                 https://github.com/lemenkov/libyuv/archive/6900494d90ae095d44405cd4cc3f346971fa69c9/libyuv-6900494d90ae095d44405cd4cc3f346971fa69c9.tar.gz \
+                 https://github.com/lvandeve/lodepng/archive/18964554bc769255401942e0e6dfd09f2fab2093/lodepng-18964554bc769255401942e0e6dfd09f2fab2093.tar.gz \
                  https://github.com/neobrain/nihstro/archive/fd69de1a1b960ec296cc67d32257b0f9e2d89ac6/nihstro-fd69de1a1b960ec296cc67d32257b0f9e2d89ac6.tar.gz \
                  https://github.com/arsenm/sanitizers-cmake/archive/aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a/sanitizers-cmake-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a.tar.gz \
+		 https://github.com/libsdl-org/SDL/archive/a1d1946dcba6509f0679f507b57e7b228d32e6f8/SDL-a1d1946dcba6509f0679f507b57e7b228d32e6f8.tar.gz \
                  https://github.com/wwylele/teakra/archive/01db7cdd00aabcce559a8dddce8798dabb71949b/teakra-01db7cdd00aabcce559a8dddce8798dabb71949b.tar.gz \
-                 https://github.com/herumi/xbyak/archive/c306b8e5786eeeb87b8925a8af5c3bf057ff5a90/xbyak-c306b8e5786eeeb87b8925a8af5c3bf057ff5a90.tar.gz \
-                 https://github.com/facebook/zstd/archive/97a3da1df009d4dc67251de0c4b1c9d7fe286fc1/zstd-97a3da1df009d4dc67251de0c4b1c9d7fe286fc1.tar.gz"
-MD5SUM_x86_64="fa265e0a76b6f09d43d4c0b19636ef15 \
-               235536413d9d70ff956e014935d8a95e \
-               dfd831bf912a24ab77f11dfc7a217b38 \
+                 https://github.com/herumi/xbyak/archive/48457bfa0ded67bb4ae2d4c141c36b35469257ee/xbyak-48457bfa0ded67bb4ae2d4c141c36b35469257ee.tar.gz \
+                 https://github.com/facebook/zstd/archive/e47e674cd09583ff0503f0f6defd6d23d8b718d3/zstd-e47e674cd09583ff0503f0f6defd6d23d8b718d3.tar.gz"
+MD5SUM_x86_64="5174ce071059df72e3218962510f009e \
+               68b777fb3397d3488005497258f1210e \
+               733bd0c6397140248feeb8087b975ea0 \
                aaedf57982eb620c232238b87d136a2c \
                a028163a91b5c6cb8212780171cd62de \
-               9ef7db1c92b99eb7b6888ebf7fb5e569 \
+               5a40e81e1d6b2438c9b618ffcb679430 \
                8e479c0b0af279df39e68188510e8715 \
-               24b1d0e61fb59f347514c8ec41446ec1 \
-               9ff1d9420e8251297a513a405e1923ac \
+               1994a6775c0f6bc4696b02796e604db4 \
+               f96dcd8f181700c9bf94869fedd2557a \
                d11181250ea5119cd4cd43693e00ced8 \
-               4d81f1ab58831f9787bf1f0fdf10fd73 \
+               5069920ee4e07003d7b135d0d477ced8 \
                b0b23c6e3137c995ed842b6fbae37e7b \
-               ebe3151002aac5d1c1999329d0d21315 \
+               2efd90e94765baf588dc83c699a59b55 \
                390d2b55703008acb8eceab019002581 \
-               5b925726fb0e8c901b67b54f6042dbfb \
-               f45e22aac3e3345a1224345c21ebfb8d \
-               88262b7d2aaacde68e1d1e040e2364c2 \
+               9c5f7279aa00af06d8810abeaf165c05 \
+               85196b92d055cb9e8b01a34ae5f62da2 \
+               9850cc6d95840a8ce41da7dcaadf4ea0 \
                496cca29e17d0b2c5b4f60142eb19297 \
                0492fedbd255d1d831db432c2578a0c1 \
+	       d1bc6ea361b9d65d05fb698968466ace \
                6dda693557776e2b77be1f91c0e318bf \
-               2a7204a58bd1cbc6bb99260efa8d3081 \
-               e20c7e3e7c20bc9f51bbc2f7820e794b"
+               d835d9375fbafd27e7ef86d3f745adbd \
+               1b8367e01dc956bb8bfafcc7a835af71"
 REQUIRES=""
 MAINTAINER="Nathaniel Russell"
 EMAIL="naterussell83@gmail.com"