updated to 0.79.1 and cleaned up installation

2 files changed, 10 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2563c49130a3..977238d9ba12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dosbox-staging
 	pkgdesc = DOS/x86 emulator focusing on ease of use. Based on DOSBox
-	pkgver = 0.79.0
-	pkgrel = 3
+	pkgver = 0.79.1
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/dosbox-staging/dosbox-staging
 	arch = any
@@ -22,7 +22,7 @@ pkgbase = dosbox-staging
 	optdepends = ncurses
 	provides = dosbox
 	conflicts = dosbox
-	source = https://github.com/dosbox-staging/dosbox-staging/archive/v0.79.0.tar.gz
-	sha256sums = 4c45dff631b6edbcec76f88be6e800b373d0303ef66189a6769a5a18fef106f2
+	source = https://github.com/dosbox-staging/dosbox-staging/archive/v0.79.1.tar.gz
+	sha256sums = 43f23fd0a5cff55e06a3ba2be8403f872ae47423f3bb4f823301eaae8a39ac2f
 
 pkgname = dosbox-staging
diff --git a/PKGBUILD b/PKGBUILD
index 84a0d38e6ad3..842a6f2214cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributer: Wouter Wijsman <wwijsman@live.nl>
 
 pkgname=dosbox-staging
-pkgver=0.79.0
-pkgrel=3
+pkgver=0.79.1
+pkgrel=1
 epoch=1
 pkgdesc="DOS/x86 emulator focusing on ease of use. Based on DOSBox"
 arch=('any')
@@ -17,48 +17,19 @@ conflicts=("dosbox")
 source=(
   "https://github.com/dosbox-staging/${pkgname}/archive/v${pkgver}.tar.gz"
 )
-sha256sums=('4c45dff631b6edbcec76f88be6e800b373d0303ef66189a6769a5a18fef106f2')
-
-prepare() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  meson setup -Ddefault_library=shared --prefix /usr build
-}
+sha256sums=('43f23fd0a5cff55e06a3ba2be8403f872ae47423f3bb4f823301eaae8a39ac2f')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
-  ninja -C build
+  meson setup --prefix "/usr" build
+  meson compile -C build
 }
 
 package() {
   cd "$srcdir/${pkgname}-${pkgver}"
 
-  # gzip the man file
-  gzip -f "docs/dosbox.1" >  "docs/dosbox.1.gz"
-
-  # install all files
-  install -Dm 755 "build/dosbox" "$pkgdir/usr/bin/dosbox"
-  install -Dm 644 "docs/dosbox.1.gz" "$pkgdir/usr/share/man/man1/dosbox.1.gz"
+  meson install -C build --destdir "$pkgdir"
 
-  # desktop file and icon
-  install -Dm 644 "contrib/icons/dosbox-staging.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/dosbox-staging.svg"
-  install -Dm 644 "contrib/linux/dosbox-staging.desktop" "$pkgdir/usr/share/applications/dosbox-staging.desktop"
-
-  # dosbox-staging documents
-  install -Dm 644 "README.md" "$pkgdir/usr/share/doc/${pkgname}/README"
   install -Dm 644 "docs/README.video" "$pkgdir/usr/share/doc/${pkgname}/video.txt"
   install -Dm 644 "README" "$pkgdir/usr/share/doc/${pkgname}/manual.txt"
-
-  # bash completions
-  install -Dm 644 "contrib/linux/bash-completion/dosbox" "$pkgdir/usr/share/bash-completion/completions/dosbox"
-
-  # dosbox resources
-  #fix for a wierd thing cp is doing to drives as it seems to extract the internal files instead of copying the files
-  install -d "$pkgdir/usr/share/dosbox-staging/drives"
-  cp -r "build/resources/drives/y" "$pkgdir/usr/share/dosbox-staging/drives"
-  cp -r "build/resources/drives/y.conf" "$pkgdir/usr/share/dosbox-staging/drives/"
-
-  cp -r "build/resources/freedos-cpi" "$pkgdir/usr/share/dosbox-staging/"
-  cp -r "build/resources/freedos-keyboard" "$pkgdir/usr/share/dosbox-staging/"
-  cp -r "build/resources/glshaders" "$pkgdir/usr/share/dosbox-staging/"
-  cp -r "build/resources/translations" "$pkgdir/usr/share/dosbox-staging/"
 }