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

[Antonio Rojas]

    Date: Monday, May 21, 2018 @ 07:07:34
  Author: arojas
Revision: 324663

archrelease: copy trunk to extra-x86_64

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

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-21 07:07:12 UTC (rev 324662)
+++ PKGBUILD	2018-05-21 07:07:34 UTC (rev 324663)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=vice
-pkgver=3.1
-pkgrel=2
-pkgdesc="The Versatile Commodore 8-bit Emulator"
-arch=('x86_64')
-license=('GPL')
-url="http://vice-emu.sourceforge.net/"
-depends=('gtkglext' 'libpulse' 'giflib')
-makedepends=('xorg-bdftopcf' 'xorg-mkfontdir' 'libpcap' 'libxaw' 'ffmpeg')
-source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
-        'disable-fc-cache.patch')
-sha256sums=('3eb8159633816095006dec36c5c3edd055a87fd8bda193a1194a6801685d1240'
-            '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-gnomeui \
-    --enable-external-ffmpeg
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install -j1
-  ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc"
-}

Copied: vice/repos/extra-x86_64/PKGBUILD (from rev 324662, vice/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-21 07:07:34 UTC (rev 324663)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer:
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=vice
+pkgver=3.2
+pkgrel=1
+pkgdesc="The Versatile Commodore 8-bit Emulator"
+arch=('x86_64')
+license=('GPL')
+url="http://vice-emu.sourceforge.net/"
+depends=('gtkglext' 'libpulse' 'giflib')
+makedepends=('xorg-bdftopcf' 'xorg-mkfontdir' 'libpcap' 'libxaw' 'ffmpeg' 'xa')
+source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
+        'disable-fc-cache.patch')
+sha256sums=('28d99f5e110720c97ef16d8dd4219cf9a67661d58819835d19378143697ba523'
+            '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
+
+  sed -e 's|CODEC_CAP_VARIABLE_FRAME_SIZE|AV_&|g' -e 's|CODEC_FLAG_GLOBAL_HEADER|AV_&|g' -e 's|\& AVFMT_RAWPICTURE||' \
+    -i src/gfxoutputdrv/ffmpegdrv.c # Fix build with ffmpeg 4
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib \
+    --enable-gnomeui \
+    --enable-external-ffmpeg
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make 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	2018-05-21 07:07:12 UTC (rev 324662)
+++ disable-fc-cache.patch	2018-05-21 07:07:34 UTC (rev 324663)
@@ -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/extra-x86_64/disable-fc-cache.patch (from rev 324662, vice/trunk/disable-fc-cache.patch)
===================================================================
--- disable-fc-cache.patch	                        (rev 0)
+++ disable-fc-cache.patch	2018-05-21 07:07:34 UTC (rev 324663)
@@ -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