[arch-commits] Commit in vice/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Thursday, November 26, 2020 @ 12:31:48
  Author: arodseth
Revision: 763338

upgpkg: vice 3.4-3

Modified:
  vice/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-26 12:31:36 UTC (rev 763337)
+++ PKGBUILD	2020-11-26 12:31:48 UTC (rev 763338)
@@ -4,12 +4,12 @@
 
 pkgname=vice
 pkgver=3.4
-pkgrel=2
+pkgrel=3
 pkgdesc='The Versatile Commodore 8-bit Emulator'
 arch=(x86_64)
 license=(GPL)
-url='https://vice-emu.sourceforge.net/'
-depends=(giflib libjpeg-turbo libpng libpulse sdl2)
+url='https://vice-emu.sourceforge.io/'
+depends=(alsa-lib giflib libjpeg-turbo libpng libpulse sdl2)
 makedepends=(ffmpeg libpcap libxaw xa xorg-bdftopcf xorg-mkfontdir)
 source=("https://downloads.sourceforge.net/project/vice-emu/releases/$pkgname-$pkgver.tar.gz"
         disable-fc-cache.patch)
@@ -19,7 +19,7 @@
 prepare() {
   cd $pkgname-$pkgver
   rm -rf src/lib/{liblame,libx264,libffmpeg}
-  patch -p1 -i "$srcdir/disable-fc-cache.patch"
+  patch -p1 -i ../disable-fc-cache.patch
   sed -i 's/lib64/lib/g' configure.ac
   autoreconf -fi
 }
@@ -26,20 +26,19 @@
 
 build() {
   cd $pkgname-$pkgver
+  export CFLAGS="$CFLAGS -w -Wl,--allow-multiple-definition"
   ./configure \
-    --prefix=/usr \
+    --enable-external-ffmpeg \
+    --enable-x64 \
     --libdir=/usr/lib \
-    --enable-external-ffmpeg \
-    --enable-x64
+    --prefix=/usr
   make
 }
 
 package() {
-  make -C "$pkgname-$pkgver" \
+  make -C $pkgname-$pkgver \
     DESTDIR="$pkgdir" \
-    realdocdir="/usr/share/doc/vice" \
+    realdocdir=/usr/share/doc/vice \
     install -j1
   ln -s /usr/share/doc/vice "$pkgdir/usr/lib/vice/doc"
 }
-
-# vim: ts=2 sw=2 et: