Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libretro-mupen64plus: update to 20190611
@ 2019-06-11 15:53 voidlinux-github
  2019-06-11 15:54 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (32 more replies)
  0 siblings, 33 replies; 34+ messages in thread
From: voidlinux-github @ 2019-06-11 15:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 991 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/void-power/void-packages libretro-mupen64plus
https://github.com/void-linux/void-packages/pull/12400

libretro-mupen64plus: update to 20190611
Our 2015something version is aging and I don't think it's worth it to do any more fixes on it, especially considering there have been many commits upstream since and updating also allows building on ppc platforms and so on. However, there are no releases, ever, so trying a github commit snapshot (dunno if that's the right thing to do, but it can't be worse than using a random netbsd distfile...)

I also wonder if the default `rpi` option for armv6/7 is right, as that will make it not work on anything but... rpi, which is not exactly a generic target, we have many different ones now. Maybe we should switch that to standard mesa opengl. Thoughts?

A patch file from https://github.com/void-linux/void-packages/pull/12400.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libretro-mupen64plus-12400.patch --]
[-- Type: application/text/x-diff, Size: 2506 bytes --]

From 73b6e1b08d697c5482c39c4a3a2cd52d127b6768 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 11 Jun 2019 17:35:54 +0200
Subject: [PATCH] libretro-mupen64plus: update to 20190611

---
 srcpkgs/libretro-mupen64plus/template | 29 +++++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/libretro-mupen64plus/template b/srcpkgs/libretro-mupen64plus/template
index e98aaabba44..1b3dc0b6492 100644
--- a/srcpkgs/libretro-mupen64plus/template
+++ b/srcpkgs/libretro-mupen64plus/template
@@ -1,37 +1,44 @@
 # Template file for 'libretro-mupen64plus'
 pkgname=libretro-mupen64plus
-version=20150204
+version=20190611
 revision=1
-wrksrc="mupen64plus-libretro-master"
-build_options="opengl rpi"
+_gitrev=e64ef9d9f214e32341fb7cd9633260fbb44b2326
+wrksrc="mupen64plus-libretro-${_gitrev}"
 hostmakedepends="pkg-config unzip"
-makedepends="$(vopt_if opengl MesaLib-devel) $(vopt_if rpi rpi-firmware)"
+makedepends="$(vopt_if opengl MesaLib-devel) $(vopt_if rpi rpi-firmware) zlib-devel"
 short_desc="Libretro port of Mupen64 Plus"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.libretro.com/"
-distfiles="http://ftp.netbsd.org/pub/NetBSD/misc/jmcneill/retroarch/mupen64plus-libretro-${version}.zip"
-checksum=643379eaa840d632cd8fa046fc4858cc8ccd5a57ce5991771ab16f1ef675cee2
+distfiles="https://github.com/libretro/mupen64plus-libretro/archive/${_gitrev}.tar.gz"
+checksum=947abfb1d5ff34d6b22fecfb2df02bd3759fde3f4a0e5d238f65ec7e97d964d4
+
+build_options="opengl rpi"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)  build_options_default="opengl";;
+	i686*|x86_64*|aarch64*|ppc*)  build_options_default="opengl";;
 	armv[67]*) build_options_default="rpi";;
 esac
 
 do_build() {
 	local _args
 
+	# setting ARCH makes sure proper dynarec is selected
 	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="DYNAREC=x86";;
-		x86_64*) _args="DYNAREC=x86_64";;
-		arm*) _args="DYNAREC=arm";;
+		i686*) _args="ARCH=i686";;
+		arm*) _args="ARCH=arm";;
+		aarch64*) _args="ARCH=aarch64";;
+		x86_64*) _args="ARCH=x86_64";;
+		*) _args="ARCH=${XBPS_TARGET_MACHINE%-musl}";;
 	esac
+
 	if [ "$build_option_rpi" ]; then
 		install -d /opt/vc/lib
 		_args+=" platform=rpi"
 		sed -i "s|-L/opt/vc/lib|-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib|g" Makefile
 		sed -i 's|/opt/vc/include|${XBPS_CROSS_BASE}/opt/vc/include|g' Makefile
 	fi
+
 	make CC=$CC ${_args} ${makejobs}
 }
 do_install() {

^ permalink raw reply	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2019-06-15 12:43 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-11 15:53 [PR PATCH] libretro-mupen64plus: update to 20190611 voidlinux-github
2019-06-11 15:54 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-11 15:54 ` voidlinux-github
2019-06-11 16:20 ` voidlinux-github
2019-06-11 16:20 ` voidlinux-github
2019-06-11 16:21 ` voidlinux-github
2019-06-11 16:41 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-11 16:41 ` voidlinux-github
2019-06-11 16:42 ` voidlinux-github
2019-06-11 17:02 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-11 17:02 ` voidlinux-github
2019-06-11 17:03 ` voidlinux-github
2019-06-11 17:25 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-11 17:25 ` voidlinux-github
2019-06-11 17:33 ` voidlinux-github
2019-06-11 17:33 ` voidlinux-github
2019-06-11 17:33 ` voidlinux-github
2019-06-11 17:36 ` voidlinux-github
2019-06-11 17:44 ` voidlinux-github
2019-06-11 17:51 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-11 17:51 ` voidlinux-github
2019-06-11 18:50 ` voidlinux-github
2019-06-11 19:36 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-11 19:36 ` voidlinux-github
2019-06-11 19:36 ` voidlinux-github
2019-06-11 19:58 ` voidlinux-github
2019-06-11 20:25 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-11 20:25 ` voidlinux-github
2019-06-11 21:06 ` voidlinux-github
2019-06-11 21:06 ` voidlinux-github
2019-06-11 21:06 ` voidlinux-github
2019-06-11 21:06 ` voidlinux-github
2019-06-11 21:08 ` voidlinux-github
2019-06-15 12:43 ` [PR PATCH] [Merged]: " voidlinux-github

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).