[arch-commits] Commit in vice/trunk (7 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Thu Jan 5 23:06:59 UTC 2017
Date: Thursday, January 5, 2017 @ 23:06:58
Author: bpiotrowski
Revision: 285316
upgpkg: vice 3.0-1
new upstream release
Added:
vice/trunk/disable-fc-cache.patch
Modified:
vice/trunk/PKGBUILD
Deleted:
vice/trunk/vice-2.4-giflib-5.1.0.patch
vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch
vice/trunk/vice-2.4-notexi-notxt.patch
vice/trunk/vice-2.4-x11video.patch
vice/trunk/vice-2.4-zlib-1.2.7.patch
-------------------------------------+
PKGBUILD | 47 ++++++++++------------------------
disable-fc-cache.patch | 16 +++++++++++
vice-2.4-giflib-5.1.0.patch | 39 ----------------------------
vice-2.4-no-fc-cache-no-lib64.patch | 25 ------------------
vice-2.4-notexi-notxt.patch | 28 --------------------
vice-2.4-x11video.patch | 11 -------
vice-2.4-zlib-1.2.7.patch | 37 --------------------------
7 files changed, 31 insertions(+), 172 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-05 21:45:28 UTC (rev 285315)
+++ PKGBUILD 2017-01-05 23:06:58 UTC (rev 285316)
@@ -3,40 +3,26 @@
# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
pkgname=vice
-pkgver=2.4
-pkgrel=10
+pkgver=3.0
+pkgrel=1
pkgdesc="The Versatile Commodore 8-bit Emulator"
arch=('i686' 'x86_64')
license=('GPL')
url="http://vice-emu.sourceforge.net/"
-depends=('alsa-lib' 'pulseaudio' 'giflib' 'libxxf86vm' 'vte' 'libnet' 'libpcap')
-makedepends=('xorg-font-utils')
-options=('!makeflags')
+depends=('gtk3' 'libpulse' 'giflib')
+makedepends=('xorg-bdftopcf' 'xorg-mkfontdir' 'libpcap' 'libxaw' 'ffmpeg')
source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
- 'vice-2.4-x11video.patch'
- 'vice-2.4-no-fc-cache-no-lib64.patch'
- 'vice-2.4-notexi-notxt.patch'
- 'vice-2.4-zlib-1.2.7.patch'
- 'vice-2.4-giflib-5.1.0.patch')
-md5sums=('b017647a0c159bbe43cdb81762d1c577'
- '99931efcb779734c9df069e94f0b38a5'
- 'b0d1392664decd3169740baf90661710'
- '877f93db1550ea81386aae7c3b578442'
- '9d9f62f05a967a5926df496e86404148'
- '94563e3023d804341f1d252c0e6d1384')
+ 'disable-fc-cache.patch')
+md5sums=('c732d76a70ac1232a43456dae540b43a'
+ 'b1dee4fef59f835534683fabbe1fbbce')
prepare() {
cd ${pkgname}-${pkgver}
+ rm -rf src/lib/{liblame,libx264,libffmpeg}
- patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch"
- patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch"
- patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch"
- patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch"
- patch -Np1 -i "${srcdir}/vice-2.4-giflib-5.1.0.patch"
-
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
-
- autoreconf -vi
+ patch -p1 -i "$srcdir/disable-fc-cache.patch"
+ sed -i 's/lib64/lib/g' configure.ac
+ autoreconf -fi
}
build() {
@@ -43,12 +29,9 @@
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
- --enable-ethernet \
- --with-alsa \
- --with-pulse \
- --enable-fullscreen \
- --enable-gnomeui \
- --disable-ffmpeg
+ --libdir=/usr/lib \
+ --enable-gnomeui3 \
+ --enable-external-ffmpeg
make
}
@@ -55,6 +38,6 @@
package() {
cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install
+ make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install -j1
ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc"
}
Added: disable-fc-cache.patch
===================================================================
--- disable-fc-cache.patch (rev 0)
+++ disable-fc-cache.patch 2017-01-05 23:06:58 UTC (rev 285316)
@@ -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
Deleted: vice-2.4-giflib-5.1.0.patch
===================================================================
--- vice-2.4-giflib-5.1.0.patch 2017-01-05 21:45:28 UTC (rev 285315)
+++ vice-2.4-giflib-5.1.0.patch 2017-01-05 23:06:58 UTC (rev 285316)
@@ -1,39 +0,0 @@
-diff -rupN a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
---- a/src/gfxoutputdrv/gifdrv.c 2012-07-25 23:46:05.000000000 +0000
-+++ b/src/gfxoutputdrv/gifdrv.c 2014-06-01 11:48:40.493722851 +0000
-@@ -114,7 +114,7 @@ static int gifdrv_open(screenshot_t *scr
- if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
- EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
- {
-- EGifCloseFile(sdata->fd);
-+ EGifCloseFile(sdata->fd, NULL);
- VICE_FreeMapObject(gif_colors);
- lib_free(sdata->data);
- lib_free(sdata->ext_filename);
-@@ -145,7 +145,7 @@ static int gifdrv_close(screenshot_t *sc
-
- sdata = screenshot->gfxoutputdrv_data;
-
-- EGifCloseFile(sdata->fd);
-+ EGifCloseFile(sdata->fd, NULL);
- VICE_FreeMapObject(gif_colors);
-
- /* for some reason giflib will create a file with unexpected
-@@ -184,7 +184,7 @@ static char *gifdrv_memmap_ext_filename;
-
- static int gifdrv_close_memmap(void)
- {
-- EGifCloseFile(gifdrv_memmap_fd);
-+ EGifCloseFile(gifdrv_memmap_fd, NULL);
- VICE_FreeMapObject(gif_colors);
- lib_free(gifdrv_memmap_ext_filename);
-
-@@ -231,7 +231,7 @@ static int gifdrv_open_memmap(const char
- if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
- EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
- {
-- EGifCloseFile(gifdrv_memmap_fd);
-+ EGifCloseFile(gifdrv_memmap_fd, NULL);
- VICE_FreeMapObject(gif_colors);
- lib_free(gifdrv_memmap_ext_filename);
- return -1;
Deleted: vice-2.4-no-fc-cache-no-lib64.patch
===================================================================
--- vice-2.4-no-fc-cache-no-lib64.patch 2017-01-05 21:45:28 UTC (rev 285315)
+++ vice-2.4-no-fc-cache-no-lib64.patch 2017-01-05 23:06:58 UTC (rev 285316)
@@ -1,25 +0,0 @@
---- a/configure.in 2012-11-01 16:37:51.000000000 +0100
-+++ b/configure.in 2012-11-03 18:07:35.000000000 +0100
-@@ -2090,12 +2090,7 @@
-
- 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"; then
-@@ -3424,7 +3419,7 @@
- ;;
- linux*)
- if test x"$host_cpu" = "xx86_64"; then
-- VICEDIR="$PREFIX/lib64/vice"
-+ VICEDIR="$PREFIX/lib/vice"
- AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
- else
- VICEDIR="$PREFIX/lib/vice"
Deleted: vice-2.4-notexi-notxt.patch
===================================================================
--- vice-2.4-notexi-notxt.patch 2017-01-05 21:45:28 UTC (rev 285315)
+++ vice-2.4-notexi-notxt.patch 2017-01-05 23:06:58 UTC (rev 285316)
@@ -1,28 +0,0 @@
---- a/doc/Makefile.am 2012-10-20 01:32:30.000000000 +0200
-+++ b/doc/Makefile.am 2012-11-03 18:29:03.000000000 +0100
-@@ -79,19 +79,6 @@
- $(srcdir)/fixdox.sh txt <vicetmp.txt | sed 's/ \+$$//' >$(builddir)/vice.txt
- rm -f vicetmp.txt
-
--$(builddir)/vice.pdf: $(srcdir)/vice.texi
--if BUILD_PDF
-- sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi
-- $(TEXI2DVI) -q --clean --pdf -o $(builddir)/vice.pdf vicepdf.texi
-- rm -f vicepdf.texi
--
--PDF_DEPS=$(builddir)/vice.pdf
--else
-- touch $(builddir)/vice.pdf
--
--PDF_DEPS=
--endif
--
- $(builddir)/vice.guide: $(srcdir)/vice.texi
- if BUILD_AMIGAGUIDE
- $(srcdir)/texi2guide.sh $(MAKEGUIDE) $(builddir)/vice.guide $(srcdir)/vice.texi
-@@ -148,4 +135,4 @@
- touch $(builddir)/vice.info
- $(MAKEINFO) -o $(builddir)/vice.info --no-split $(srcdir)/vice.texi
-
--INFO_DEPS = $(builddir)/vice.txt $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
-+INFO_DEPS = $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
Deleted: vice-2.4-x11video.patch
===================================================================
--- vice-2.4-x11video.patch 2017-01-05 21:45:28 UTC (rev 285315)
+++ vice-2.4-x11video.patch 2017-01-05 23:06:58 UTC (rev 285316)
@@ -1,11 +0,0 @@
---- a/src/arch/unix/x11/xaw/x11video.c 2012-10-28 22:26:24.000000000 +0100
-+++ b/src/arch/unix/x11/xaw/x11video.c 2012-11-03 18:54:08.000000000 +0100
-@@ -60,6 +60,8 @@
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
- #include <X11/cursorfont.h>
-+#include <X11/Xmd.h>
-+#include <X11/extensions/shmproto.h>
-
- #include <stdio.h>
- #include <stdlib.h>
Deleted: vice-2.4-zlib-1.2.7.patch
===================================================================
--- vice-2.4-zlib-1.2.7.patch 2017-01-05 21:45:28 UTC (rev 285315)
+++ vice-2.4-zlib-1.2.7.patch 2017-01-05 23:06:58 UTC (rev 285316)
@@ -1,37 +0,0 @@
---- a/src/zfile.c 2012-10-13 14:53:16.000000000 +0200
-+++ b/src/zfile.c 2012-11-03 18:47:40.000000000 +0100
-@@ -198,10 +198,10 @@
- do {
- char buf[256];
-
-- len = gzread(fdsrc, (void *)buf, 256);
-+ len = gzread((gzFile)fdsrc, (void *)buf, 256);
- if (len > 0) {
- if (fwrite((void *)buf, 1, (size_t)len, fddest) < len) {
-- gzclose(fdsrc);
-+ gzclose((gzFile)fdsrc);
- fclose(fddest);
- ioutil_remove(tmp_name);
- lib_free(tmp_name);
-@@ -210,7 +210,7 @@
- }
- } while (len > 0);
-
-- gzclose(fdsrc);
-+ gzclose((gzFile)fdsrc);
- fclose(fddest);
-
- return tmp_name;
-@@ -779,10 +779,10 @@
- char buf[256];
- len = fread((void *)buf, 256, 1, fdsrc);
- if (len > 0)
-- gzwrite(fddest, (void *)buf, (unsigned int)len);
-+ gzwrite((gzFile)fddest, (void *)buf, (unsigned int)len);
- } while (len > 0);
-
-- gzclose(fddest);
-+ gzclose((gzFile)fddest);
- fclose(fdsrc);
-
- archdep_file_set_gzip(dest);
More information about the arch-commits
mailing list