From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] scummvm: update to 2.1.0.
Date: Mon, 07 Oct 2019 12:30:04 +0200 [thread overview]
Message-ID: <20191007103004.T7Tsove9HDcTvjIah1gHi9jB32KPymoZdzqpQWW53Fc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15196@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages scummvm
https://github.com/void-linux/void-packages/pull/15196
[WIP] scummvm: update to 2.1.0.
2.1.0 is not yet officially released, but already tagged,
A patch file from https://github.com/void-linux/void-packages/pull/15196.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scummvm-15196.patch --]
[-- Type: text/x-diff, Size: 2552 bytes --]
From 73e8ac9cae0472090e0766f3a423dea15071a595 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Mon, 7 Oct 2019 01:22:17 +0300
Subject: [PATCH] scummvm: update to 2.1.0.
---
srcpkgs/scummvm/template | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..1db0afc8291 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,36 +1,30 @@
# Template file for 'scummvm'
pkgname=scummvm
-version=2.0.0
+version=2.1.0
revision=1
build_style=configure
-configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
+configure_args="--prefix=/usr --enable-all-engines
+ --enable-release-mode --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config nasm"
-makedepends="zlib-devel libpng-devel SDL-devel libmad-devel faad2-devel
+makedepends="zlib-devel libpng-devel SDL2-devel libmad-devel faad2-devel
fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel
freetype-devel libjpeg-turbo-devel"
short_desc="Free implementation of LucasArts' SCUMM interpreter"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.scummvm.org/"
-license="GPL-2"
-distfiles="http://www.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=9784418d555ba75822d229514a05cf226b8ce1a751eec425432e6b7e128fca60
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later"
+homepage="https://www.scummvm.org/"
+distfiles="https://www.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
+checksum=6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" --host=${XBPS_CROSS_TRIPLET} --disable-nasm"
- CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL"
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*);;
+ *) configure_args+=" --disable-nasm";;
+esac
- pre_configure() {
- sed -i -e "s|_ranlib=ranlib|_ranlib=${XBPS_CROSS_TRIPLET}-ranlib|" \
- -e "s|_strip=strip|_strip=${XBPS_CROSS_TRIPLET}-strip|" \
- -e "s|_ar=\"ar cru\"|_ar=\"${XBPS_CROSS_TRIPLET}-ar cru\"|" \
- -e "s|_as=\"as\"|_as=\"${XBPS_CROSS_TRIPLET}-as\"|" configure
- }
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
-do_install() {
- vbin scummvm
- vman dists/scummvm.6
- vinstall dists/scummvm.desktop 644 usr/share/applications
- vinstall icons/scummvm.xpm 644 usr/share/pixmaps
- vinstall gui/themes/scummmodern.zip 644 usr/share/scummvm
+do_check() {
+ make test
}
next prev parent reply other threads:[~2019-10-07 10:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-06 22:27 [PR PATCH] " voidlinux-github
2019-10-07 10:30 ` voidlinux-github [this message]
2019-10-07 10:30 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-08 18:09 ` voidlinux-github
2019-10-08 18:09 ` voidlinux-github
2019-10-12 20:19 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191007103004.T7Tsove9HDcTvjIah1gHi9jB32KPymoZdzqpQWW53Fc@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).