[arch-commits] Commit in vice/repos/community-x86_64 (4 files)

[Alexander Rødseth]

    Date: Thursday, November 26, 2020 @ 12:31:55
  Author: arodseth
Revision: 763339

archrelease: copy trunk to community-x86_64

Added:
  vice/repos/community-x86_64/PKGBUILD
    (from rev 763338, vice/trunk/PKGBUILD)
  vice/repos/community-x86_64/disable-fc-cache.patch
    (from rev 763338, vice/trunk/disable-fc-cache.patch)
Deleted:
  vice/repos/community-x86_64/PKGBUILD
  vice/repos/community-x86_64/disable-fc-cache.patch

------------------------+
 PKGBUILD               |   89 +++++++++++++++++++++++------------------------
 disable-fc-cache.patch |   32 ++++++++--------
 2 files changed, 60 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-26 12:31:48 UTC (rev 763338)
+++ PKGBUILD	2020-11-26 12:31:55 UTC (rev 763339)
@@ -1,45 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=vice
-pkgver=3.4
-pkgrel=2
-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)
-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)
-sha256sums=('4bd00c1c63d38cd1fe01b90032834b52f774bc29e4b67eeb1e525b14fee07aeb'
-            '8058210e092c4943a55baeff47e6d5f3661aeb3686fd1f75e07f47888da9cc98')
-
-prepare() {
-  cd $pkgname-$pkgver
-  rm -rf src/lib/{liblame,libx264,libffmpeg}
-  patch -p1 -i "$srcdir/disable-fc-cache.patch"
-  sed -i 's/lib64/lib/g' configure.ac
-  autoreconf -fi
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --enable-external-ffmpeg \
-    --enable-x64
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" \
-    DESTDIR="$pkgdir" \
-    realdocdir="/usr/share/doc/vice" \
-    install -j1
-  ln -s /usr/share/doc/vice "$pkgdir/usr/lib/vice/doc"
-}
-
-# vim: ts=2 sw=2 et:

Copied: vice/repos/community-x86_64/PKGBUILD (from rev 763338, vice/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-26 12:31:55 UTC (rev 763339)
@@ -0,0 +1,44 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=vice
+pkgver=3.4
+pkgrel=3
+pkgdesc='The Versatile Commodore 8-bit Emulator'
+arch=(x86_64)
+license=(GPL)
+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)
+sha256sums=('4bd00c1c63d38cd1fe01b90032834b52f774bc29e4b67eeb1e525b14fee07aeb'
+            '8058210e092c4943a55baeff47e6d5f3661aeb3686fd1f75e07f47888da9cc98')
+
+prepare() {
+  cd $pkgname-$pkgver
+  rm -rf src/lib/{liblame,libx264,libffmpeg}
+  patch -p1 -i ../disable-fc-cache.patch
+  sed -i 's/lib64/lib/g' configure.ac
+  autoreconf -fi
+}
+
+build() {
+  cd $pkgname-$pkgver
+  export CFLAGS="$CFLAGS -w -Wl,--allow-multiple-definition"
+  ./configure \
+    --enable-external-ffmpeg \
+    --enable-x64 \
+    --libdir=/usr/lib \
+    --prefix=/usr
+  make
+}
+
+package() {
+  make -C $pkgname-$pkgver \
+    DESTDIR="$pkgdir" \
+    realdocdir=/usr/share/doc/vice \
+    install -j1
+  ln -s /usr/share/doc/vice "$pkgdir/usr/lib/vice/doc"
+}

Deleted: disable-fc-cache.patch
===================================================================
--- disable-fc-cache.patch	2020-11-26 12:31:48 UTC (rev 763338)
+++ disable-fc-cache.patch	2020-11-26 12:31:55 UTC (rev 763339)
@@ -1,16 +0,0 @@
---- a/configure.ac.orig	2016-12-15 04:44:32.000000000 +0100
-+++ b/configure.ac	2017-01-05 23:24:59.072247182 +0100
-@@ -2998,12 +2998,7 @@ if test x"$enable_lame" != "xno" ; then
- 
- fi
- 
--AC_PATH_PROGS(FCCACHE, fc-cache, false)
--if test x"$FCCACHE" = "xfalse"; then
--  AM_CONDITIONAL(HAVE_FC_CACHE, false)
--else
--  AM_CONDITIONAL(HAVE_FC_CACHE, true)
--fi
-+AM_CONDITIONAL(HAVE_FC_CACHE, false)
- 
- if test x"$is_amigaos4" = "xyes"; then
-   if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then

Copied: vice/repos/community-x86_64/disable-fc-cache.patch (from rev 763338, vice/trunk/disable-fc-cache.patch)
===================================================================
--- disable-fc-cache.patch	                        (rev 0)
+++ disable-fc-cache.patch	2020-11-26 12:31:55 UTC (rev 763339)
@@ -0,0 +1,16 @@
+--- a/configure.ac.orig	2016-12-15 04:44:32.000000000 +0100
++++ b/configure.ac	2017-01-05 23:24:59.072247182 +0100
+@@ -2998,12 +2998,7 @@ if test x"$enable_lame" != "xno" ; then
+ 
+ fi
+ 
+-AC_PATH_PROGS(FCCACHE, fc-cache, false)
+-if test x"$FCCACHE" = "xfalse"; then
+-  AM_CONDITIONAL(HAVE_FC_CACHE, false)
+-else
+-  AM_CONDITIONAL(HAVE_FC_CACHE, true)
+-fi
++AM_CONDITIONAL(HAVE_FC_CACHE, false)
+ 
+ if test x"$is_amigaos4" = "xyes"; then
+   if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then