diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 27 | ||||
-rw-r--r-- | cw.h | 51 | ||||
-rw-r--r-- | no-fc-cache-no-lib64.patch | 18 | ||||
-rw-r--r-- | notexi-notxt.patch | 6 |
5 files changed, 84 insertions, 34 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Jun 21 01:00:50 UTC 2016 +# Tue Aug 2 18:58:25 UTC 2016 pkgbase = vice-gnomeui-devel pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI) - pkgver = 2.4.28 + pkgver = 2.4.29 pkgrel = 1 url = http://vice-emu.sourceforge.net install = vice-gnomeui-devel.install @@ -24,22 +24,22 @@ pkgbase = vice-gnomeui-devel provides = vice conflicts = vice options = !makeflags - source = http://downloads.sourceforge.net/project/vice-emu/development-releases/vice-2.4.28.tar.gz + source = http://downloads.sourceforge.net/project/vice-emu/development-releases/vice-2.4.29.tar.gz source = vice.png source = vice.desktop source = x11video.patch source = no-fc-cache-no-lib64.patch source = zlib-1.2.7.patch source = notexi-notxt.patch - source = paraport-close-no-return.patch - sha512sums = 78fbff6fd56bd0055fc95329eca697983a0f576701ce140719cd506e02b139c459df9f3b63bcfd530530578ada9dd23ce4524dc21f10b707a602f4a5d20e6a8a + source = cw.h + sha512sums = 010b9937d5e1f5fcd7eab276960be638f8ba832c05bbdae104b25238314b65c1fcbcf43b4a08cd41918ca5b65009ca19638733b0299341e73c69951d67b89f0f sha512sums = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf sha512sums = dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a sha512sums = 076e684ecac402ccb014faebe5eaab5bb46e9e9caca9ba23374ddf94a1c83172b0874343e449c91186763114d0f388dac0060afd831bdc9eceffc6cf3529c58d - sha512sums = a0b764c15c0e55ef606ae8ba5c7e760ea197bebbea897e943d4097798e77f0bd08a4fc35bbfc0a006c7762538941d88362d7cb3efea137f5f0646f7056892585 + sha512sums = 702e00c0ff7117fd9b23c005728355d9fe325e5ab24a9d67ce8f39f77fda9aed786b4e65cc6a904ac8505cc2a5c52003525aa6bd937d9438460a20fe733d741d sha512sums = d37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd - sha512sums = 7506936c33eb5bb6843f5e6b340e9a0a30ce57aa5c7f569cbbf9fed541682965f02ada819f987be3b4800f61b32b6c15b789de708f5224f2a89519ce47779ffc - sha512sums = 4b40ede13b86d49d6904b5e255fc707d51dad928d879325f5ee70e54026d7b2edfc691804e3a048133b2abb44e36116ec57d41551a82861b49712f37691073b6 + sha512sums = d7637b0604490f1792dde1083211d418b850ecbeaf688b3013913c5af7e752796fe8d45c8306b7a1593b62c028c9def7bf04e81bc0187d05cd464727f0c5645a + sha512sums = b94e2a5420c89dbef21504e2b7d6ae4b36fd8ba751811228ef0310882c7626eea43b3cf19dbc9d22d2f5821793da8922a9af28a9eed1c2bf0aab4611e3de76e8 pkgname = vice-gnomeui-devel @@ -7,7 +7,7 @@ _pkgname=vice pkgname=$_pkgname-gnomeui-devel -pkgver=2.4.28 +pkgver=2.4.29 pkgrel=1 pkgdesc='Versatile Commodore Emulator (development release with the Gnome UI)' arch=('i686' 'x86_64') @@ -28,17 +28,17 @@ source=( 'no-fc-cache-no-lib64.patch' 'zlib-1.2.7.patch' 'notexi-notxt.patch' - 'paraport-close-no-return.patch' + 'cw.h' ) sha512sums=( - '78fbff6fd56bd0055fc95329eca697983a0f576701ce140719cd506e02b139c459df9f3b63bcfd530530578ada9dd23ce4524dc21f10b707a602f4a5d20e6a8a' + '010b9937d5e1f5fcd7eab276960be638f8ba832c05bbdae104b25238314b65c1fcbcf43b4a08cd41918ca5b65009ca19638733b0299341e73c69951d67b89f0f' '1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf' 'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a' '076e684ecac402ccb014faebe5eaab5bb46e9e9caca9ba23374ddf94a1c83172b0874343e449c91186763114d0f388dac0060afd831bdc9eceffc6cf3529c58d' - 'a0b764c15c0e55ef606ae8ba5c7e760ea197bebbea897e943d4097798e77f0bd08a4fc35bbfc0a006c7762538941d88362d7cb3efea137f5f0646f7056892585' + '702e00c0ff7117fd9b23c005728355d9fe325e5ab24a9d67ce8f39f77fda9aed786b4e65cc6a904ac8505cc2a5c52003525aa6bd937d9438460a20fe733d741d' 'd37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd' - '7506936c33eb5bb6843f5e6b340e9a0a30ce57aa5c7f569cbbf9fed541682965f02ada819f987be3b4800f61b32b6c15b789de708f5224f2a89519ce47779ffc' - '4b40ede13b86d49d6904b5e255fc707d51dad928d879325f5ee70e54026d7b2edfc691804e3a048133b2abb44e36116ec57d41551a82861b49712f37691073b6' + 'd7637b0604490f1792dde1083211d418b850ecbeaf688b3013913c5af7e752796fe8d45c8306b7a1593b62c028c9def7bf04e81bc0187d05cd464727f0c5645a' + 'b94e2a5420c89dbef21504e2b7d6ae4b36fd8ba751811228ef0310882c7626eea43b3cf19dbc9d22d2f5821793da8922a9af28a9eed1c2bf0aab4611e3de76e8' ) prepare() { @@ -48,13 +48,17 @@ prepare() { patch -Np1 -i ../no-fc-cache-no-lib64.patch patch -Np1 -i ../zlib-1.2.7.patch patch -Np1 -i ../notexi-notxt.patch - patch -Np1 -i ../paraport-close-no-return.patch + + # Add missing header file + install -Dm644 ../cw.h src/arch/unix/cw.h # Convert MS-DOS linebreaks to Unix style ones printf '%s ' 'Converting MS-DOS format linebreaks to Unix format...' + while read -r; do - dos2unix -q "$REPLY" + dos2unix -q "$REPLY" done < <(find . -type f -regextype posix-egrep -regex '.*\.([ch]|in)$') + printf '%s\n' 'DONE!' # Reconfigure the project build environment @@ -64,11 +68,7 @@ prepare() { build() { # Build the project cd $_pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-fullscreen \ - --enable-gnomeui \ - --enable-ethernet \ - --enable-memmap + ./configure --prefix=/usr --enable-fullscreen --enable-gnomeui --enable-ethernet --enable-memmap make } @@ -88,4 +88,3 @@ package() { install -d "$pkgdir/usr/share/fonts/TTF" ln -s /usr/lib/$_pkgname/fonts/CBM.ttf "$pkgdir/usr/share/fonts/TTF/CBM.ttf" } - @@ -0,0 +1,51 @@ +/* + * cw.h + * + * Written by + * Marco van den Heuvel <blackystardust68@yahoo.com> + * + * This file is part of VICE, the Versatile Commodore Emulator. + * See README for copyright notice. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA. + * + */ + +#ifndef VICE_CW_H +#define VICE_CW_H + +#include "sid-snapshot.h" +#include "types.h" + +extern int cw_device_open(void); +extern int cw_pci_open(void); + +extern int cw_device_close(void); +extern int cw_pci_close(void); + +extern int cw_device_read(WORD addr, int chipno); +extern int cw_pci_read(WORD addr, int chipno); + +extern void cw_device_store(WORD addr, BYTE val, int chipno); +extern void cw_pci_store(WORD addr, BYTE val, int chipno); + +extern int cw_device_available(void); +extern int cw_pci_available(void); + +extern void cw_device_set_machine_parameter(long cycles_per_sec); +extern void cw_pci_set_machine_parameter(long cycles_per_sec); + +#endif diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch index 2a0e35944be9..1eaeffb395cf 100644 --- a/no-fc-cache-no-lib64.patch +++ b/no-fc-cache-no-lib64.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 64d437d..c8c8b49 100755 +index bf38ca6..82e49b7 100755 --- a/configure +++ b/configure -@@ -19608,7 +19608,7 @@ _ACEOF +@@ -19796,7 +19796,7 @@ _ACEOF *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -11,7 +11,7 @@ index 64d437d..c8c8b49 100755 *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi -@@ -24579,7 +24579,7 @@ fi +@@ -24773,7 +24773,7 @@ fi ;; linux*) if test x"$host_cpu" = "xx86_64"; then @@ -21,10 +21,10 @@ index 64d437d..c8c8b49 100755 ALTERNATE_DOCDIR_TRUE= ALTERNATE_DOCDIR_FALSE='#' diff --git a/configure.ac b/configure.ac -index b5403d2..0f1a37d 100755 +index 0d0a6de..3c26154 100755 --- a/configure.ac +++ b/configure.ac -@@ -2917,12 +2917,7 @@ if test x"$enable_lame" != "xno" ; then +@@ -2952,12 +2952,7 @@ if test x"$enable_lame" != "xno" ; then fi @@ -38,7 +38,7 @@ index b5403d2..0f1a37d 100755 if test x"$is_amigaos4" = "xyes"; then if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then -@@ -4542,7 +4537,7 @@ case "$host_os" in +@@ -4620,7 +4615,7 @@ case "$host_os" in ;; linux*) if test x"$host_cpu" = "xx86_64"; then @@ -48,10 +48,10 @@ index b5403d2..0f1a37d 100755 else VICEDIR="$PREFIX/lib/vice" diff --git a/configure.proto b/configure.proto -index b5403d2..0f1a37d 100755 +index 0d0a6de..3c26154 100755 --- a/configure.proto +++ b/configure.proto -@@ -2917,12 +2917,7 @@ if test x"$enable_lame" != "xno" ; then +@@ -2952,12 +2952,7 @@ if test x"$enable_lame" != "xno" ; then fi @@ -65,7 +65,7 @@ index b5403d2..0f1a37d 100755 if test x"$is_amigaos4" = "xyes"; then if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then -@@ -4542,7 +4537,7 @@ case "$host_os" in +@@ -4620,7 +4615,7 @@ case "$host_os" in ;; linux*) if test x"$host_cpu" = "xx86_64"; then diff --git a/notexi-notxt.patch b/notexi-notxt.patch index 725c169a4208..f610041ab3c0 100644 --- a/notexi-notxt.patch +++ b/notexi-notxt.patch @@ -1,8 +1,8 @@ diff --git a/doc/Makefile.am b/doc/Makefile.am -index e9f3804..dbf88a3 100755 +index b60651f..d6974e0 100755 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -58,19 +58,6 @@ $(builddir)/vice.txt: $(srcdir)/vice.texi +@@ -60,19 +60,6 @@ $(builddir)/vice.txt: $(srcdir)/vice.texi $(srcdir)/fixdox.sh txt <vicetmp.txt | sed 's/ \+$$//' >$(builddir)/vice.txt
rm -f vicetmp.txt
@@ -22,7 +22,7 @@ index e9f3804..dbf88a3 100755 $(builddir)/vice.guide: $(srcdir)/vice.texi
if BUILD_AMIGAGUIDE
cp $(srcdir)/vice.texi tmp.texi
-@@ -132,6 +119,6 @@ $(builddir)/vice.info: $(srcdir)/vice.texi +@@ -134,6 +121,6 @@ $(builddir)/vice.info: $(srcdir)/vice.texi touch $(builddir)/vice.info
$(MAKEINFO) -D$(PLATFORM_DOX_FLAGS) -o $(builddir)/vice.info --no-split $(srcdir)/vice.texi
|