Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions srcpkgs/libretro-mupen64plus
4 changes: 4 additions & 0 deletions srcpkgs/libretro-mupen64plus-nx/INSTALL.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
The old mupen64plus libretro core was replaced by Mupen64Plus-Next.
The core file is now /usr/lib/libretro/mupen64plus_next_libretro.so;
RetroArch playlists, core options and remaps referencing the old
mupen64plus_libretro.so must be updated to point to the new core.
38 changes: 38 additions & 0 deletions srcpkgs/libretro-mupen64plus-nx/patches/fix-musl-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 9e78ed6c4ec494d29a9341d127cf3131a2e22722 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Mon, 22 Jan 2024 08:03:46 -0800
Subject: [PATCH] util: fix the musl build

samu: job failed with status 1: /usr/lib/ccache/bin/c++ -I/tmp/Granite/util -I/tmp/Granite/application/global -std=gnu++14 -Wshadow -Wall -Wextra -Wno-comment -Wno-missing-field-initializers -Wno-empty-body -fno-omit-frame-pointer -msse3 -ffast-math -MD -MT util/CMakeFiles/granite-util.dir/aligned_alloc.cpp.o -MF util/CMakeFiles/granite-util.dir/aligned_alloc.cpp.o.d -o util/CMakeFiles/granite-util.dir/aligned_alloc.cpp.o -c /tmp/Granite/util/aligned_alloc.cpp
/tmp/Granite/util/aligned_alloc.cpp: In function 'void* Util::memalign_alloc(size_t, size_t)':
/tmp/Granite/util/aligned_alloc.cpp:47:5: error: 'uintptr_t' was not declared in this scope
47 | uintptr_t addr = 0;
| ^~~~~~~~~
/tmp/Granite/util/aligned_alloc.cpp:27:1: note: 'uintptr_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
26 | #include <string.h>
+++ |+#include <cstdint>
27 | #ifdef _WIN32
/tmp/Granite/util/aligned_alloc.cpp:53:5: error: 'addr' was not declared in this scope
53 | addr = ((uintptr_t)ptr + sizeof(uintptr_t) + boundary) & ~(boundary - 1);
| ^~~~
/tmp/Granite/util/aligned_alloc.cpp:53:24: error: expected ')' before 'ptr'
53 | addr = ((uintptr_t)ptr + sizeof(uintptr_t) + boundary) & ~(boundary - 1);
| ~ ^~~
| )
samu: subcommand failed
---
util/aligned_alloc.cpp | 1 +
1 file changed, 1 insertion(+)

diff --git a/mupen64plus-video-paraLLEl/parallel-rdp/util/aligned_alloc.cpp b/mupen64plus-video-paraLLEl/parallel-rdp/util/aligned_alloc.cpp
index 674aeb3c0..9f5900eca 100644
--- a/mupen64plus-video-paraLLEl/parallel-rdp/util/aligned_alloc.cpp
+++ b/mupen64plus-video-paraLLEl/parallel-rdp/util/aligned_alloc.cpp
@@ -21,6 +21,7 @@
*/

#include "aligned_alloc.hpp"
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#ifdef _WIN32
61 changes: 61 additions & 0 deletions srcpkgs/libretro-mupen64plus-nx/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Template file for 'libretro-mupen64plus-nx'
pkgname=libretro-mupen64plus-nx
version=0.0.20260520
revision=1
_gitrev=98c1b0d877542b01314b3b04272282ba223b65b3
hostmakedepends="pkg-config"
makedepends="MesaLib-devel zlib-devel libpng-devel minizip-devel xxHash-devel"
short_desc="Libretro port of Mupen64Plus (Mupen64Plus-Next)"
maintainer="Rutpiv <roger_freitas@live.com>"
license="GPL-2.0-only"
homepage="https://github.com/libretro/mupen64plus-libretro-nx"
distfiles="https://github.com/libretro/mupen64plus-libretro-nx/archive/${_gitrev}.tar.gz"
checksum=3843919d459724d8b0d78e4a819b43a7ef1847dd9bae4bb41e0fd5e8bd72567d

build_options="gles gles3"
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) hostmakedepends+=" nasm";;
armv*|aarch64*) build_options_default="gles";;
esac

do_build() {
local _args
# setting ARCH makes sure proper dynarec is selected
case "$XBPS_TARGET_MACHINE" in
armv*) _args=(ARCH=arm);;
*) _args=(ARCH="${XBPS_TARGET_MACHINE%-musl}");;
esac
case "$XBPS_TARGET_MACHINE" in
# LLE renderers: parallel-rsp JIT only supports 64-bit targets
x86_64*|aarch64*)
_args+=(LLE=1 HAVE_PARALLEL_RSP=1 HAVE_PARALLEL_RDP=1
HAVE_THR_AL=1);;
esac
if [ "$build_option_gles3" ]; then
_args+=(FORCE_GLES3=1)
elif [ "$build_option_gles" ]; then
_args+=(FORCE_GLES=1)
fi
make CC="$CC" CXX="$CXX" platform=unix \
SYSTEM_ZLIB=1 SYSTEM_LIBPNG=1 SYSTEM_MINIZIP=1 SYSTEM_XXHASH=1 \
GIT_VERSION=" ${_gitrev:0:7}" \
"${_args[@]}" ${makejobs}
}

do_install() {
vinstall mupen64plus_next_libretro.so 755 usr/lib/libretro
}

libretro-mupen64plus_package() {
metapackage=yes
short_desc="Libretro port of Mupen64 Plus (transitional dummy package)"
depends="${sourcepkg}>=${version}_${revision}"
reverts="20190611_2 20190611_1 20150204_1"
}

libretro-mupen64plus-rpi_package() {
metapackage=yes
short_desc="Libretro port of Mupen64 Plus (transitional dummy package)"
depends="${sourcepkg}>=${version}_${revision}"
reverts="20190611_2 20190611_1"
}
2 changes: 1 addition & 1 deletion srcpkgs/libretro-mupen64plus-rpi
10 changes: 0 additions & 10 deletions srcpkgs/libretro-mupen64plus/patches/add-string.patch

This file was deleted.

13 changes: 0 additions & 13 deletions srcpkgs/libretro-mupen64plus/patches/gl-typedefs.patch

This file was deleted.

29 changes: 0 additions & 29 deletions srcpkgs/libretro-mupen64plus/patches/types.patch

This file was deleted.

61 changes: 0 additions & 61 deletions srcpkgs/libretro-mupen64plus/template

This file was deleted.