diff options
-rw-r--r-- | .SRCINFO | 42 | ||||
-rw-r--r-- | PKGBUILD | 62 | ||||
-rw-r--r-- | no-fc-cache-no-lib64.patch | 76 | ||||
-rw-r--r-- | vice-2.4-giflib-5.1.0.patch | 39 | ||||
-rw-r--r-- | vice-2.4-no-fc-cache-no-lib64.patch | 25 | ||||
-rw-r--r-- | vice-2.4-notexi-notxt.patch | 28 | ||||
-rw-r--r-- | vice-2.4-x11video.patch | 11 | ||||
-rw-r--r-- | vice-2.4-zlib-1.2.7.patch | 37 | ||||
-rw-r--r-- | vice-sdl.install | 18 | ||||
-rw-r--r-- | vice.desktop | 10 | ||||
-rw-r--r-- | vice.png | bin | 0 -> 2088 bytes |
11 files changed, 138 insertions, 210 deletions
@@ -1,36 +1,42 @@ +# Generated by mksrcinfo v8 +# Tue Dec 20 08:40:19 UTC 2016 pkgbase = vice-sdl pkgdesc = The Versatile Commodore 8-bit Emulator, SDL version - pkgver = 2.4 - pkgrel = 3 + pkgver = 3.0 + pkgrel = 1 url = http://vice-emu.sourceforge.net - install = vice-sdl.install arch = i686 arch = x86_64 license = GPL makedepends = xorg-font-utils depends = sdl + depends = libpulse + depends = portaudio + depends = mpg123 + depends = mesa + depends = pciutils depends = giflib depends = libpng depends = libpcap - provides = vice=2.4 + depends = libjpeg-turbo + depends = libieee1284 + provides = vice conflicts = vice - conflicts = vice-gnomeui + conflicts = vice-gtk + conflicts = vice-sdl + conflicts = vice-sdl-devel conflicts = vice-gtkglext - conflicts = vice-svn + conflicts = vice-gnomeui-devel 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 + source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.0.tar.gz + source = no-fc-cache-no-lib64.patch + source = vice.desktop + source = vice.png + sha256sums = bc56811381920d43ab5f2f85a5e08f21ab5bdf6190dd5dfe9f500a745d14972b + sha256sums = b0254ac814918d76c60d0130f0e8e874c71aaf77e979a36c6a67dbbf7322cbb5 + sha256sums = e0a600d72c2352826282a0f7fcf380b24272fba10a9ed31c8fd45a21d597f3ad + sha256sums = 0d51f822b70d24bbc9d813d552138660cf705aaaecc12115bc1416364e1473b3 pkgname = vice-sdl @@ -3,51 +3,45 @@ pkgname=vice-sdl _pkgname=vice -pkgver=2.4 -pkgrel=3 -pkgdesc="The Versatile Commodore 8-bit Emulator, SDL version" +pkgver=3.0 +pkgrel=1 +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') +url='http://vice-emu.sourceforge.net' +depends=('sdl' 'libpulse' 'portaudio' 'mpg123' 'mesa' 'pciutils' 'giflib' 'libpng' 'libpcap' 'libjpeg-turbo' 'libieee1284') makedepends=('xorg-font-utils') -provides=("vice=$pkgver") -conflicts=('vice' 'vice-gnomeui' 'vice-gtkglext' 'vice-svn') +provides=('vice') +conflicts=('vice' 'vice-gtk' 'vice-sdl' 'vice-sdl-devel' 'vice-gtkglext' 'vice-gnomeui-devel') 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') +source=( + http://downloads.sourceforge.net/project/vice-emu/releases/${_pkgname}-${pkgver}.tar.gz + no-fc-cache-no-lib64.patch + ${_pkgname}.desktop + ${_pkgname}.png +) +sha256sums=( + bc56811381920d43ab5f2f85a5e08f21ab5bdf6190dd5dfe9f500a745d14972b + b0254ac814918d76c60d0130f0e8e874c71aaf77e979a36c6a67dbbf7322cbb5 + e0a600d72c2352826282a0f7fcf380b24272fba10a9ed31c8fd45a21d597f3ad + 0d51f822b70d24bbc9d813d552138660cf705aaaecc12115bc1416364e1473b3 +) 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 + cd ${srcdir}/${_pkgname}-${pkgver} + patch -Np1 -i ../no-fc-cache-no-lib64.patch } build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-fullscreen --enable-sdlui --with-sdlsound --enable-ethernet --disable-ffmpeg - make + cd ${srcdir}/${_pkgname}-${pkgver} + ./configure --prefix=/usr --enable-fullscreen --enable-sdlui --with-sdlsound --enable-ethernet + 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" + install -Dm644 ${_pkgname}.desktop $pkgdir/usr/share/applications/${_pkgname}.desktop + install -Dm644 ${_pkgname}.png $pkgdir/usr/share/pixmaps/${_pkgname}.png + cd ${srcdir}/${_pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch new file mode 100644 index 000000000000..466251658c27 --- /dev/null +++ b/no-fc-cache-no-lib64.patch @@ -0,0 +1,76 @@ +diff --git a/configure b/configure +index c5f25a4..6c15e46 100755 +--- a/configure ++++ b/configure +@@ -19813,7 +19813,7 @@ _ACEOF + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in +- /usr/lib | /usr/lib64 | /lib | /lib64) ;; ++ /usr/lib | /usr/lib | /lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi +@@ -24802,7 +24802,7 @@ fi + ;; + linux*) + if test x"$host_cpu" = "xx86_64"; then +- VICEDIR="$PREFIX/lib64/vice" ++ VICEDIR="$PREFIX/lib/vice" + if false; then + ALTERNATE_DOCDIR_TRUE= + ALTERNATE_DOCDIR_FALSE='#' +diff --git a/configure.ac b/configure.ac +index 73f5b22..842e246 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -2954,12 +2954,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 +@@ -4636,7 +4631,7 @@ case "$host_os" in + ;; + 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/configure.proto b/configure.proto +index 73f5b22..842e246 100755 +--- a/configure.proto ++++ b/configure.proto +@@ -2954,12 +2954,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 +@@ -4636,7 +4631,7 @@ case "$host_os" in + ;; + 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-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-2.4-no-fc-cache-no-lib64.patch b/vice-2.4-no-fc-cache-no-lib64.patch deleted file mode 100644 index bb27aa3e7d56..000000000000 --- a/vice-2.4-no-fc-cache-no-lib64.patch +++ /dev/null @@ -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" diff --git a/vice-2.4-notexi-notxt.patch b/vice-2.4-notexi-notxt.patch deleted file mode 100644 index 58121b702ab1..000000000000 --- a/vice-2.4-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-2.4-x11video.patch b/vice-2.4-x11video.patch deleted file mode 100644 index 423688ba91cd..000000000000 --- a/vice-2.4-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> diff --git a/vice-2.4-zlib-1.2.7.patch b/vice-2.4-zlib-1.2.7.patch deleted file mode 100644 index f41c8afc516a..000000000000 --- a/vice-2.4-zlib-1.2.7.patch +++ /dev/null @@ -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); diff --git a/vice-sdl.install b/vice-sdl.install deleted file mode 100644 index b8b72f7daac9..000000000000 --- a/vice-sdl.install +++ /dev/null @@ -1,18 +0,0 @@ -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 -} diff --git a/vice.desktop b/vice.desktop new file mode 100644 index 000000000000..1bc5bf64318f --- /dev/null +++ b/vice.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=VICE: C64 Emulator +Comment=Commodore 64 Emulator +Exec=x64 +Icon=vice +Terminal=false +StartupNotify=false +Categories=Game; diff --git a/vice.png b/vice.png Binary files differnew file mode 100644 index 000000000000..44249cadeb48 --- /dev/null +++ b/vice.png |