Migrated to AUR4

8 files changed, 247 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..9dba03787b5a
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,36 @@
+pkgbase = vice-sdl
+	pkgdesc = The Versatile Commodore 8-bit Emulator, SDL version
+	pkgver = 2.4
+	pkgrel = 3
+	url = http://vice-emu.sourceforge.net
+	install = vice-sdl.install
+	arch = i686
+	arch = x86_64
+	license = GPL
+	makedepends = xorg-font-utils
+	depends = sdl
+	depends = giflib
+	depends = libpng
+	depends = libpcap
+	provides = vice=2.4
+	conflicts = vice
+	conflicts = vice-gnomeui
+	conflicts = vice-gtkglext
+	conflicts = vice-svn
+	replaces = vice
+	options = !makeflags
+	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-2.4.tar.gz
+	source = vice-2.4-x11video.patch
+	source = vice-2.4-no-fc-cache-no-lib64.patch
+	source = vice-2.4-notexi-notxt.patch
+	source = vice-2.4-zlib-1.2.7.patch
+	source = vice-2.4-giflib-5.1.0.patch
+	md5sums = b017647a0c159bbe43cdb81762d1c577
+	md5sums = 99931efcb779734c9df069e94f0b38a5
+	md5sums = b0d1392664decd3169740baf90661710
+	md5sums = 877f93db1550ea81386aae7c3b578442
+	md5sums = 9d9f62f05a967a5926df496e86404148
+	md5sums = 94563e3023d804341f1d252c0e6d1384
+
+pkgname = vice-sdl
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..2aac66e5bee0
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Sebastian Wolf <fatmike303 at gmail dot com>
+# Contributor: grimi <grimi at poczta dot fm>
+
+pkgname=vice-sdl
+_pkgname=vice
+pkgver=2.4
+pkgrel=3
+pkgdesc="The Versatile Commodore 8-bit Emulator, SDL version"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://vice-emu.sourceforge.net"
+depends=('sdl' 'giflib' 'libpng' 'libpcap')
+makedepends=('xorg-font-utils')
+provides=("vice=$pkgver")
+conflicts=('vice' 'vice-gnomeui' 'vice-gtkglext' 'vice-svn')
+replaces=('vice')
+options=('!makeflags')
+install=vice-sdl.install
+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')
+
+prepare() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	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
+}
+
+build() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	./configure --prefix=/usr --enable-fullscreen --enable-sdlui --with-sdlsound --enable-ethernet --disable-ffmpeg
+	make
+}
+
+package() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install
+	ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc"
+}
diff --git a/vice-2.4-giflib-5.1.0.patch b/vice-2.4-giflib-5.1.0.patch
new file mode 100644
index 000000000000..be1caa898ca0
--- /dev/null
+++ b/vice-2.4-giflib-5.1.0.patch
@@ -0,0 +1,39 @@
+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-2.4-no-fc-cache-no-lib64.patch b/vice-2.4-no-fc-cache-no-lib64.patch
new file mode 100644
index 000000000000..bb27aa3e7d56
--- /dev/null
+++ b/vice-2.4-no-fc-cache-no-lib64.patch
@@ -0,0 +1,25 @@
+--- 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"
diff --git a/vice-2.4-notexi-notxt.patch b/vice-2.4-notexi-notxt.patch
new file mode 100644
index 000000000000..58121b702ab1
--- /dev/null
+++ b/vice-2.4-notexi-notxt.patch
@@ -0,0 +1,28 @@
+--- 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-2.4-x11video.patch b/vice-2.4-x11video.patch
new file mode 100644
index 000000000000..423688ba91cd
--- /dev/null
+++ b/vice-2.4-x11video.patch
@@ -0,0 +1,11 @@
+--- 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>
diff --git a/vice-2.4-zlib-1.2.7.patch b/vice-2.4-zlib-1.2.7.patch
new file mode 100644
index 000000000000..f41c8afc516a
--- /dev/null
+++ b/vice-2.4-zlib-1.2.7.patch
@@ -0,0 +1,37 @@
+--- 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);
diff --git a/vice-sdl.install b/vice-sdl.install
new file mode 100644
index 000000000000..b8b72f7daac9
--- /dev/null
+++ b/vice-sdl.install
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(vice.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}