upgpkg: devilutionx-git 1.0.1.r17.g201c6fe8-1

drop multilib build

3 files changed, 29 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c8074577c6a..9e688083cf91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = devilutionx-git
 	pkgdesc = Diablo devolved for linux (git version)
-	pkgver = 0.5.0.r37.g3c416b16
+	pkgver = 1.0.1.r17.g201c6fe8
 	pkgrel = 1
 	url = https://github.com/diasurgical/devilutionX
 	install = devilutionx.install
@@ -8,32 +8,13 @@ pkgbase = devilutionx-git
 	license = custom:unlicense
 	makedepends = git
 	makedepends = cmake
-	makedepends = lib32-gcc-libs
-	makedepends = lib32-sdl2_mixer
-	makedepends = sdl2_ttf
-	makedepends = sdl2_ttf
-	makedepends = lib32-sdl2_ttf
-	makedepends = lib32-libsodium
-	makedepends = libsodium
+	depends = sdl2_mixer
+	depends = sdl2_ttf
+	depends = libsodium
 	optdepends = ttf-charis-sil: CharisSILB.ttf
+	provides = devilutionx=1.0.1.r17.g201c6fe8
 	source = devilutionx::git+https://github.com/diasurgical/devilutionX.git
 	sha256sums = SKIP
 
 pkgname = devilutionx-git
-	pkgdesc = Diablo devolved for linux (native build)
-	depends = sdl2_mixer
-	depends = sdl2_ttf
-	depends = libsodium
-	provides = devilutionx=0.5.0.r37.g3c416b16
-
-pkgname = devilutionx-multilib-git
-	pkgdesc = Diablo devolved for linux (multilib build)
-	depends = lib32-gcc-libs
-	depends = lib32-dbus
-	depends = lib32-sdl2_mixer
-	depends = sdl2_ttf
-	depends = lib32-sdl2_ttf
-	depends = lib32-libsodium
-	depends = libsodium
-	provides = devilutionx=0.5.0.r37.g3c416b16
 
diff --git a/PKGBUILD b/PKGBUILD
index 19a373d55189..3c8ce3073ffe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,17 @@
 # Maintainer: LIN Rs <LinRs[d]users.noreply.github.com>
 
-pkgbase=devilutionx-git
-pkgname=( 'devilutionx-git' 'devilutionx-multilib-git' )
+pkgname=devilutionx-git
 _pkgname=devilutionx
-pkgver=0.5.0.r37.g3c416b16
+pkgver=1.0.1.r17.g201c6fe8
 pkgrel=1
 pkgdesc="Diablo devolved for linux (git version)"
 arch=('x86_64')
 url="https://github.com/diasurgical/devilutionX"
 license=('custom:unlicense')
-makedepends=('git' 'cmake' 'lib32-gcc-libs' 'lib32-sdl2_mixer'
-	     'sdl2_ttf' 'sdl2_ttf' 'lib32-sdl2_ttf'  'lib32-libsodium'
-	     'libsodium')
+depends=('sdl2_mixer' 'sdl2_ttf' 'libsodium')
+makedepends=('git' 'cmake')
 optdepends=('ttf-charis-sil: CharisSILB.ttf')
+provides=("${_pkgname}"="${pkgver}")
 install="${_pkgname}".install
 source=(
     "${_pkgname}::git+https://github.com/diasurgical/devilutionX.git"
@@ -28,36 +27,24 @@ pkgver() {
 
 build() {
     cd "${_pkgname}"
-    rm -rf build32 build64
-    mkdir -p build64 && cd build64
-    cmake .. -DCMAKE_BUILD_TYPE=Release
-    make
-    cd "${srcdir}/${_pkgname}"
-    mkdir -p build32 && cd build32
-    export CC="gcc -m32"
-    export CXX="g++ -m32"
-    cmake .. \
-	  -DCMAKE_TOOLCHAIN_FILE="../CMake/32bit.cmake" \
-	  -DCMAKE_BUILD_TYPE=Release
+    mkdir -p build
+    cd build
+    cmake \
+	-DCMAKE_BUILD_TYPE=Release ..
     make
 }
-package_devilutionx-git() {
-    pkgdesc="Diablo devolved for linux (native build)"
-    provides=("${_pkgname}"="${pkgver}")
-    depends=('sdl2_mixer' 'sdl2_ttf' 'libsodium')
-
-    cd "${_pkgname}"
-    install -vDm755 build64/"${_pkgname}" "${pkgdir}"/usr/bin/"${_pkgname}_native"
-    install -vDm644 LICENSE -t "${pkgdir}"/usr/share/licenses/"${pkgname}"
-}
-package_devilutionx-multilib-git() {
-    pkgdesc="Diablo devolved for linux (multilib build)"
-    provides=("${_pkgname}"="${pkgver}")
-    depends=('lib32-gcc-libs' 'lib32-dbus' 'lib32-sdl2_mixer'
-	     'sdl2_ttf' 'lib32-sdl2_ttf'  'lib32-libsodium'
-	     'libsodium')
-
+package() {
     cd "${_pkgname}"
-    install -vDm755 build32/"${_pkgname}" "${pkgdir}"/usr/bin/"${_pkgname}_multilib"
-    install -vDm644 LICENSE -t "${pkgdir}"/usr/share/licenses/"${pkgname}"
+    install -Dm755 build/"${_pkgname}" \
+	    -t "${pkgdir}"/usr/bin/
+    install -Dm644 LICENSE \
+	    -t "${pkgdir}"/usr/share/licenses/"${pkgname}"
+    install -Dm644 Packaging/resources/16.png \
+	    "${pkgdir}"/usr/share/icons/hicolor/16x16/apps/devilutionx.png
+    install -Dm644 Packaging/resources/Diablo_32.png \
+	    "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/devilutionx.png
+    install -Dm644 Packaging/resources/Diablo_48.png \
+	    "${pkgdir}"/usr/share/icons/hicolor/48x48/apps/devilutionx.png
+    install -Dm644 Packaging/fedora/devilutionx.desktop \
+	    -t "${pkgdir}"/usr/share/applications/
 }
diff --git a/devilutionx.install b/devilutionx.install
index 2aee073ff0be..b91ac8bcc703 100644
--- a/devilutionx.install
+++ b/devilutionx.install
@@ -6,13 +6,8 @@ Copy required files(e.g. diablodat.mpq) to your Diablo directory
 (default is ~/.local/share/diasurgical/devilution) or move the
 devilution executable in the same directory as "diablodat.mpq".
 
-NOTE: There are two versions of build(native and multilib).
-
-Please keep in mind that this is still being worked on and is missing
-parts of UI and SoundEffects are not properly playing now.
-
-see https://github.com/diasurgical/devilutionX/milestone/1 for a full
-list of known issues.
+Demo version:
+http://ftp.blizzard.com/pub/diablo/patches/pc/drtl109.exe
 
 EOF
 }