Upstream: 3.0

7 files changed, 36 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f6b98eb26a9..6c2d19ba9572 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vice-gtkglext
 	pkgdesc = A Versatile Commodore Emulator , with enabled gtkglext
-	pkgver = 2.4
-	pkgrel = 4
+	pkgver = 3.0
+	pkgrel = 1
 	url = http://vice-emu.sourceforge.net
 	install = vice-gtkglext.install
 	arch = i686
@@ -11,29 +11,23 @@ pkgbase = vice-gtkglext
 	depends = alsa-lib
 	depends = gtkglext
 	depends = giflib
-	depends = libjpeg
+	depends = libjpeg-turbo
 	depends = libpng
 	depends = libxrandr
 	depends = vte
 	depends = lame
 	depends = libpcap
 	depends = libnet
-	provides = vice=2.4
+	provides = vice=3.0
 	conflicts = vice
-	conflicts = vice-gnomeui
+	conflicts = vice-gtk
 	conflicts = vice-sdl
 	conflicts = vice-ethernet
 	replaces = vice
-	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-2.4.tar.gz
-	source = vice-no-fc-cache.patch
-	source = vice-notexi-notxt.patch
-	source = vice-x11video.patch
-	source = vice-2.4-giflib-5.1.0.patch
-	md5sums = b017647a0c159bbe43cdb81762d1c577
-	md5sums = c7ba8ff930bee0e41565f4a1d9594922
-	md5sums = 877f93db1550ea81386aae7c3b578442
-	md5sums = 99931efcb779734c9df069e94f0b38a5
-	md5sums = 94563e3023d804341f1d252c0e6d1384
+	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.0.tar.gz
+	source = no-fc-cache.patch
+	sha1sums = 424860f897b2dffd7162d133ee4a15e970491cd0
+	sha1sums = 1eb7b3d0574d60f4e11edfc48566019451e94ccd
 
 pkgname = vice-gtkglext
 
diff --git a/PKGBUILD b/PKGBUILD
index a4cb90c4607d..d17893cc217d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,39 +2,33 @@
 
 pkgname=vice-gtkglext
 _pkgname=vice
-pkgver=2.4
-pkgrel=4
+pkgver=3.0
+pkgrel=1
 pkgdesc="A Versatile Commodore Emulator , with enabled gtkglext"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://vice-emu.sourceforge.net"
-depends=('alsa-lib' 'gtkglext' 'giflib' 'libjpeg' 'libpng' 'libxrandr' 'vte' 'lame' 'libpcap' 'libnet')
+depends=('alsa-lib' 'gtkglext' 'giflib' 'libjpeg-turbo' 'libpng' 'libxrandr' 'vte' 'lame' 'libpcap' 'libnet')
 makedepends=('pkg-config')
 provides=("vice=$pkgver")
-conflicts=('vice' 'vice-gnomeui' 'vice-sdl' 'vice-ethernet')
+conflicts=('vice' 'vice-gtk' 'vice-sdl' 'vice-ethernet')
 replaces=('vice')
 install=${pkgname}.install
-source=(http://downloads.sourceforge.net/project/vice-emu/releases/${_pkgname}-${pkgver}.tar.gz
-        vice-no-fc-cache.patch vice-notexi-notxt.patch vice-x11video.patch vice-2.4-giflib-5.1.0.patch)
-md5sums=('b017647a0c159bbe43cdb81762d1c577'
-         'c7ba8ff930bee0e41565f4a1d9594922'
-         '877f93db1550ea81386aae7c3b578442'
-         '99931efcb779734c9df069e94f0b38a5'
-         '94563e3023d804341f1d252c0e6d1384')
+source=(http://downloads.sourceforge.net/project/vice-emu/releases/${_pkgname}-${pkgver}.tar.gz no-fc-cache.patch)
+sha1sums=('424860f897b2dffd7162d133ee4a15e970491cd0'
+          '1eb7b3d0574d60f4e11edfc48566019451e94ccd')
 
 
 prepare() {
   cd ${_pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}"/vice-no-fc-cache.patch
-  patch -Np1 -i "${srcdir}"/vice-notexi-notxt.patch
-  patch -Np1 -i "${srcdir}"/vice-x11video.patch
-  patch -Np1 -i "${srcdir}"/vice-2.4-giflib-5.1.0.patch
+  patch -Np0 -i ../no-fc-cache.patch
 }
 
+
 build() {
   cd ${_pkgname}-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --enable-gnomeui \
-     --enable-ethernet --disable-ffmpeg
+    --enable-ethernet
   make
 }
 
diff --git a/no-fc-cache.patch b/no-fc-cache.patch
new file mode 100644
index 000000000000..eb191136fd1b
--- /dev/null
+++ b/no-fc-cache.patch
@@ -0,0 +1,17 @@
+--- configure.ac	2016-12-15 04:44:32.000000000 +0100
++++ configure.ac1	2016-12-23 18:47:56.561929262 +0100
+@@ -2998,12 +2998,8 @@
+ 
+ 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
diff --git a/vice-2.4-giflib-5.1.0.patch b/vice-2.4-giflib-5.1.0.patch
deleted file mode 100644
index be1caa898ca0..000000000000
--- a/vice-2.4-giflib-5.1.0.patch
+++ /dev/null
@@ -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;
diff --git a/vice-no-fc-cache.patch b/vice-no-fc-cache.patch
deleted file mode 100644
index b7a6babeb9da..000000000000
--- a/vice-no-fc-cache.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.in	2011-02-19 23:07:05.000000000 +0100
-+++ b/configure.in	2012-08-06 13:18:46.000000000 +0200
-@@ -1990,12 +1990,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
-
- if test x"$is_amigaos4" = "xyes"; then
-   if test x"$enable_sdlui" != "xyes"; then
diff --git a/vice-notexi-notxt.patch b/vice-notexi-notxt.patch
deleted file mode 100644
index 58121b702ab1..000000000000
--- a/vice-notexi-notxt.patch
+++ /dev/null
@@ -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)
diff --git a/vice-x11video.patch b/vice-x11video.patch
deleted file mode 100644
index 423688ba91cd..000000000000
--- a/vice-x11video.patch
+++ /dev/null
@@ -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>