Received: from sebsite.pw (sebsite.pw [71.19.150.50]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id E3D31780DE4 for <~alpine/aports@lists.alpinelinux.org>; Mon, 20 Dec 2021 03:25:28 +0000 (UTC) Received: from localhost.localdomain (unknown [8.9.88.219]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by sebsite.pw (Postfix) with ESMTPSA id 1E5C9380137; Mon, 20 Dec 2021 03:25:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=sebsite.pw; s=sebsite; t=1639970708; bh=F89MFms5Q1Voqwp4te7FDO+fWhQN4zqpXVfhDpIZekw=; h=From:To:Cc:Subject:Date; b=song60L7YxVuqpZ40V7JjQvZyIjhb0sRWt316KpaQvmXfBDOb+WcgtrbBcoNZsTev EA50Q4Jx8Ljr1x+DyNAyQN1JcyG/rhQ/43ZoMiDFqEurIW5GGxkAxI/BN08cU3lHbH 5KFKXH1EkP8tTCcLwD71RN4AbtfrZM02Idbhohi+8mxupt7BoTYIUCMGAf+A60yELJ YuDSu/u0f9ruhipJ3kF2gRa6e9JttlnloZtG9nEC1q4Cv2tq0kmyuexRna5eFkhI79 leK1tG2Y3plfaaCDBYc2eS/86cdgCrDeP/79owGk8GePgllU7JsLf76Xp+ekvfzwGU cOvDhIW3X9mWg== From: Sebastian To: ~alpine/aports@lists.alpinelinux.org Cc: Sebastian Subject: [PATCH] testing/ace-of-penguins: new aport Date: Sun, 19 Dec 2021 16:23:46 -0500 Message-Id: <20211219212346.13524-1-sebastian@sebsite.pw> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastian --- testing/ace-of-penguins/APKBUILD | 39 ++++++++++++++++++ testing/ace-of-penguins/ace.patch | 66 +++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 testing/ace-of-penguins/APKBUILD create mode 100644 testing/ace-of-penguins/ace.patch diff --git a/testing/ace-of-penguins/APKBUILD b/testing/ace-of-penguins/APKBUILD new file mode 100644 index 00000000..821abcd9 --- /dev/null +++ b/testing/ace-of-penguins/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Sebastian Hudak +# Maintainer: Sebastian Hudak +pkgname=ace-of-penguins +pkgver=1.4 +pkgrel=0 +pkgdesc="Collection of one-player games for X" +url="https://www.delorie.com/store/ace/" +arch="all" +license="GPL-2.0-or-later" +depends="libpng libx11 libxpm zlib" +makedepends="libpng-dev libx11-dev libxpm-dev make zlib-dev" +subpackages="$pkgname-doc" +source="https://www.delorie.com/store/ace/ace-$pkgver.tar.gz + ace.patch" +builddir="$srcdir/ace-$pkgver" + +prepare() { + default_prepare +} + +build() { + ./configure --prefix=/usr + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + mkdir -p "$pkgdir"/usr/share/doc/ace-of-penguins/ + install -Dm644 docs/*.* "$pkgdir"/usr/share/doc/ace-of-penguins/ +} + +sha512sums=" +cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc ace-1.4.tar.gz +c92e99947a625de54f1187ade75565d523a60d3f24e3753bc39ab81caf9ed4ad92a84af233407a686843734ed65aa9122257188e7cdc7c8ab154891a067f5865 ace.patch +" diff --git a/testing/ace-of-penguins/ace.patch b/testing/ace-of-penguins/ace.patch new file mode 100644 index 00000000..86cdacf1 --- /dev/null +++ b/testing/ace-of-penguins/ace.patch @@ -0,0 +1,66 @@ +Some patches have been taken from the ace-of-penguins AUR package. +https://aur.archlinux.org/cgit/aur.git/tree/ace14_fixes.patch?h=ace-of-penguins + +diff -Naur ace-1.4/config.guess ace-1.4-alpine/config.guess +--- ace-1.4/config.guess 2012-03-24 18:00:49.000000000 +0000 ++++ ace-1.4-alpine/config.guess 2021-12-19 19:29:00.270659587 +0000 +@@ -882,6 +882,9 @@ + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; ++ aarch64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +diff -Naur ace-1.4/lib/Makefile.am ace-1.4-alpine/lib/Makefile.am +--- ace-1.4/lib/Makefile.am 2012-03-24 18:00:49.000000000 +0000 ++++ ace-1.4-alpine/lib/Makefile.am 2021-12-19 19:27:23.923989595 +0000 +@@ -6,7 +6,7 @@ + CLEANFILES = images.c images.d + + INCLUDES = $(X_CFLAGS) @PDA@ +-AM_LDFLAGS = $(X_LIBS) ++AM_LDFLAGS = $(X_LIBS) -lpng -lz -lm + + BUILD_CC = @BUILD_CC@ + AR = @AR@ +diff -Naur ace-1.4/lib/make-imglib.c ace-1.4-alpine/lib/make-imglib.c +--- ace-1.4/lib/make-imglib.c 2012-03-24 18:00:49.000000000 +0000 ++++ ace-1.4-alpine/lib/make-imglib.c 2021-12-19 19:25:57.450653287 +0000 +@@ -86,7 +86,7 @@ + png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + info_ptr = png_create_info_struct (png_ptr); + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + fclose (f); + continue; + } +diff -Naur ace-1.4/lib/xwin.c ace-1.4-alpine/lib/xwin.c +--- ace-1.4/lib/xwin.c 2012-03-24 18:00:49.000000000 +0000 ++++ ace-1.4-alpine/lib/xwin.c 2021-12-19 19:27:58.433990789 +0000 +@@ -55,7 +55,6 @@ + { "-visual", OPTION_INTEGER, &visual_id }, + { 0, 0, 0 } + }; +-OptionDesc *xwin_options = xwin_options_list; + + Display *display=0; + int screen=0; +@@ -841,13 +840,13 @@ + png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + info_ptr = png_create_info_struct (png_ptr); + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + fprintf(stderr, "Invalid PNG image!\n"); + return; + } + + file_bytes = src->file_data; +- png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader); ++ png_set_read_fn (png_ptr, &file_bytes, (png_rw_ptr)png_reader); + + png_read_info (png_ptr, info_ptr); -- 2.34.1