X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mailauth4.nine.ch (mailauth4.nine.ch [94.230.211.190]) by lists.alpinelinux.org (Postfix) with ESMTP id 549C35C41E7 for ; Tue, 24 Jan 2017 20:55:48 +0000 (GMT) Received: from localhost (localhost [127.0.0.1]) by mailauth4.nine.ch (Postfix) with ESMTP id 857F8BFBBA; Tue, 24 Jan 2017 21:55:47 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mailauth4.nine.ch X-Spam-Flag: NO X-Spam-Score: -0.999 X-Spam-Level: X-Spam-Status: No, score=-0.999 tagged_above=-999 required=5.8 tests=[ALL_TRUSTED=-1, HEADER_FROM_DIFFERENT_DOMAINS=0.001] autolearn=disabled Received: from mailauth4.nine.ch ([127.0.0.1]) by localhost (mailauth4.nine.ch [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iM72796gil36; Tue, 24 Jan 2017 21:55:43 +0100 (CET) Received: from vimes (174.180.4.85.dynamic.wline.res.cust.swisscom.ch [85.4.180.174]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: pf@1042.ch) by mailauth4.nine.ch (Postfix) with ESMTPSA; Tue, 24 Jan 2017 21:55:43 +0100 (CET) Received: by vimes (Postfix, from userid 1000) id E9DE682CCF; Tue, 24 Jan 2017 21:55:42 +0100 (CET) From: Jean-Louis Fuchs To: alpine-aports@lists.alpinelinux.org Cc: Jean-Louis Fuchs Subject: [alpine-aports] [PATCH v3] testing/vice: new aport Date: Tue, 24 Jan 2017 21:54:55 +0100 Message-Id: <20170124205455.7057-1-ganwell@fangorn.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <1485175372.11710.5.camel@gmail.com> References: <1485175372.11710.5.camel@gmail.com> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- Prevent unexpected error applying this commit by: * Removing \r from the fix__u_char.patch * Removing \r from opencbm.h in prepare() testing/vice/APKBUILD | 50 +++++++++++++++++++++++++++++++++++++ testing/vice/disable-fc-cache.patch | 16 ++++++++++++ testing/vice/fix__u_char.patch | 13 ++++++++++ 3 files changed, 79 insertions(+) create mode 100644 testing/vice/APKBUILD create mode 100644 testing/vice/disable-fc-cache.patch create mode 100644 testing/vice/fix__u_char.patch diff --git a/testing/vice/APKBUILD b/testing/vice/APKBUILD new file mode 100644 index 0000000000..cba38c709c --- /dev/null +++ b/testing/vice/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Jean-Louis Fuchs +# Maintainer: Jean-Louis Fuchs +pkgname=vice +pkgver=3.0 +pkgrel=0 +pkgdesc="emulates the C64/DTV, C128, VIC20, almost all PETs, PLUS4 and CBM-II" +url="http://vice-emu.sourceforge.net/" +arch="all" +license="GPL" +depends="" +makedepends="sdl2-dev giflib-dev ffmpeg-dev jpeg-dev alsa-lib-dev + linux-headers texinfo automake autoconf bison flex" +install="" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/vice-emu/vice-$pkgver.tar.gz + disable-fc-cache.patch + fix__u_char.patch" +builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + sed -i 's/\r//' "$builddir"/src/opencbm.h || return 1 + default_prepare || return 1 + sed -i 's/lib64/lib/g' configure.ac || return 1 + autoreconf -fi || return 1 +} + +build() { + cd "$builddir" + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --enable-sdlui2 \ + --disable-no-pic \ + --enable-external-ffmpeg \ + || return 1 + make || return 1 +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" realdocdir="/usr/share/doc/vice" install || return 1 +} +md5sums="c732d76a70ac1232a43456dae540b43a vice-3.0.tar.gz +b1dee4fef59f835534683fabbe1fbbce disable-fc-cache.patch +f562fcd4ce5b6a72008cc46d9ed19881 fix__u_char.patch" +sha256sums="bc56811381920d43ab5f2f85a5e08f21ab5bdf6190dd5dfe9f500a745d14972b vice-3.0.tar.gz +8058210e092c4943a55baeff47e6d5f3661aeb3686fd1f75e07f47888da9cc98 disable-fc-cache.patch +6e888ea744659e1da2f1d4df57e0bf9bf031b8ad8414b08581f085c6336c9a77 fix__u_char.patch" +sha512sums="60d33e644d9977df81ffbdceff8c4feec750de9597cfa9f37c4aa236eabbf507373e6f936e2cc3b06f3e7298e0390d1e098242bfacd6435e628a13991a6a452b vice-3.0.tar.gz +ed6fee34eefcb04c42b4575591dfeffca8548eae354dee66dabdbc4abac0311cbbedcdc07cdfcb01da4840d57ab331a31583e17160820462a2c064835a75d75d disable-fc-cache.patch +3132be50c402068865b530ed9df71a073012623ce48e3fa162f33af7bdcdd6d890590955868bb5591e018c17359e860ccff9eb0cde9bfd99582ac921400e8f2f fix__u_char.patch" diff --git a/testing/vice/disable-fc-cache.patch b/testing/vice/disable-fc-cache.patch new file mode 100644 index 0000000000..c685b676d4 --- /dev/null +++ b/testing/vice/disable-fc-cache.patch @@ -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 diff --git a/testing/vice/fix__u_char.patch b/testing/vice/fix__u_char.patch new file mode 100644 index 0000000000..046ae82a05 --- /dev/null +++ b/testing/vice/fix__u_char.patch @@ -0,0 +1,13 @@ +diff -ru a/src/opencbm.h b/src/opencbm.h +--- a/src/opencbm.h 2016-11-14 00:23:10.000000000 +0100 ++++ b/src/opencbm.h 2017-01-20 19:54:12.098939871 +0100 +@@ -131,6 +131,9 @@ + + #endif + ++/* There is no __u_char on alpine linux */ ++#define __u_char unsigned char /*!< __u_char as unsigned char */ ++ + /* specifiers for the IEC bus lines */ + #define IEC_DATA 0x01 /*!< Specify the DATA line */ + #define IEC_CLOCK 0x02 /*!< Specify the CLOCK line */ -- 2.11.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---