Attachment 229801 Details for Bug 260124 – port diff

[patch] port diff

ripes.diff (text/plain), 10.49 KB, created by Mitchell Clay on 2021-11-29 20:03:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mitchell Clay

Created: 2021-11-29 20:03:33 UTC

Size: 10.49 KB

patch

obsolete

>diff --git a/emulators/Makefile b/emulators/Makefile
>deleted file mode 100644
>index ea5b9addf8b8..000000000000
>--- a/emulators/Makefile
>+++ /dev/null
>@@ -1,184 +0,0 @@
>-    COMMENT = Emulators for other operating systems
>-
>-    SUBDIR += adamem
>-    SUBDIR += almostti
>-    SUBDIR += anese
>-    SUBDIR += aqemu
>-    SUBDIR += aranym
>-    SUBDIR += atari800
>-    SUBDIR += bfe
>-    SUBDIR += bochs
>-    SUBDIR += bsvc
>-    SUBDIR += cannonball
>-    SUBDIR += cemu
>-    SUBDIR += cingb
>-    SUBDIR += citra
>-    SUBDIR += citra-qt5
>-    SUBDIR += cpmemu
>-    SUBDIR += cpmtools
>-    SUBDIR += cpmtools2
>-    SUBDIR += darcnes
>-    SUBDIR += dgen-sdl
>-    SUBDIR += dolphin-emu
>-    SUBDIR += dosbox
>-    SUBDIR += dosbox-staging
>-    SUBDIR += dynamips-community
>-    SUBDIR += edumips64
>-    SUBDIR += elliott-803
>-    SUBDIR += emu64
>-    SUBDIR += emulationstation
>-    SUBDIR += fmsx
>-    SUBDIR += frodo
>-    SUBDIR += fs-uae
>-    SUBDIR += fs-uae-launcher
>-    SUBDIR += fuse
>-    SUBDIR += fuse-roms
>-    SUBDIR += fuse-utils
>-    SUBDIR += gbe
>-    SUBDIR += gens
>-    SUBDIR += gngb
>-    SUBDIR += gngeo
>-    SUBDIR += gxemul
>-    SUBDIR += hatari
>-    SUBDIR += hercules
>-    SUBDIR += higan
>-    SUBDIR += hugo
>-    SUBDIR += hv_kvp_cmd
>-    SUBDIR += ines
>-    SUBDIR += javatari
>-    SUBDIR += joytran
>-    SUBDIR += jzintv
>-    SUBDIR += kcemu
>-    SUBDIR += klh10
>-    SUBDIR += lib765
>-    SUBDIR += libc6-shim
>-    SUBDIR += libdsk
>-    SUBDIR += libretro-ppsspp
>-    SUBDIR += libretro-vice
>-    SUBDIR += libspectrum
>-    SUBDIR += linux-c7
>-    SUBDIR += linux-power10-functional-sim
>-    SUBDIR += linux-power9-functional-sim
>-    SUBDIR += linux_base-c7
>-    SUBDIR += lisaem
>-    SUBDIR += magia
>-    SUBDIR += mame
>-    SUBDIR += mastergear
>-    SUBDIR += mednafen
>-    SUBDIR += mesen
>-    SUBDIR += mess
>-    SUBDIR += mgba
>-    SUBDIR += mtools
>-    SUBDIR += mupen64plus
>-    SUBDIR += mupen64plus-audio-sdl
>-    SUBDIR += mupen64plus-core
>-    SUBDIR += mupen64plus-input-sdl
>-    SUBDIR += mupen64plus-plugins
>-    SUBDIR += mupen64plus-qt
>-    SUBDIR += mupen64plus-rsp-cxd4
>-    SUBDIR += mupen64plus-rsp-hle
>-    SUBDIR += mupen64plus-rsp-z64
>-    SUBDIR += mupen64plus-ui-console
>-    SUBDIR += mupen64plus-video-arachnoid
>-    SUBDIR += mupen64plus-video-glide64
>-    SUBDIR += mupen64plus-video-glide64mk2
>-    SUBDIR += mupen64plus-video-rice
>-    SUBDIR += mupen64plus-video-z64
>-    SUBDIR += nemu
>-    SUBDIR += nestopia
>-    SUBDIR += o2em
>-    SUBDIR += ods2reader
>-    SUBDIR += open-vm-tools
>-    SUBDIR += openmsx
>-    SUBDIR += p5-Acme-6502
>-    SUBDIR += parallels-tools
>-    SUBDIR += pcem
>-    SUBDIR += pcemu
>-    SUBDIR += pcsxr
>-    SUBDIR += ppsspp
>-    SUBDIR += ppsspp-qt5
>-    SUBDIR += py-gns3-converter
>-    SUBDIR += py-unicorn
>-    SUBDIR += qemu
>-    SUBDIR += qemu-cheri
>-    SUBDIR += qemu-devel
>-    SUBDIR += qemu-guest-agent
>-    SUBDIR += qemu-powernv
>-    SUBDIR += qemu-user-static
>-    SUBDIR += qemu-user-static-devel
>-    SUBDIR += qemu-utils
>-    SUBDIR += qemu41
>-    SUBDIR += qemu42
>-    SUBDIR += qemu5
>-    SUBDIR += qmc2
>-    SUBDIR += quasi88
>-    SUBDIR += riscv-isa-sim
>-    SUBDIR += rpcs3
>-    SUBDIR += rtc
>-    SUBDIR += rubygem-fission
>-    SUBDIR += sameboy
>-    SUBDIR += simh
>-    SUBDIR += simh-hp2100
>-    SUBDIR += simh-hp3000
>-    SUBDIR += simh-hpdoc
>-    SUBDIR += skyeye
>-    SUBDIR += snes9x-gtk
>-    SUBDIR += spim
>-    SUBDIR += stella
>-    SUBDIR += stonx
>-    SUBDIR += teo
>-    SUBDIR += tiemu3
>-    SUBDIR += tilem
>-    SUBDIR += tme
>-    SUBDIR += tnylpo
>-    SUBDIR += tpm-emulator
>-    SUBDIR += tuxnes
>-    SUBDIR += uae
>-    SUBDIR += ucon64
>-    SUBDIR += ukncbtl
>-    SUBDIR += unicorn
>-    SUBDIR += vba
>-    SUBDIR += vboxtool
>-    SUBDIR += vgb-bin
>-    SUBDIR += vgba-bin
>-    SUBDIR += vice
>-    SUBDIR += virtualbox-ose
>-    SUBDIR += virtualbox-ose-additions
>-    SUBDIR += virtualbox-ose-additions-legacy
>-    SUBDIR += virtualbox-ose-additions-nox11
>-    SUBDIR += virtualbox-ose-additions-nox11-legacy
>-    SUBDIR += virtualbox-ose-kmod
>-    SUBDIR += virtualbox-ose-kmod-legacy
>-    SUBDIR += virtualbox-ose-legacy
>-    SUBDIR += virtualbox-ose-nox11
>-    SUBDIR += virtualbox-ose-nox11-legacy
>-    SUBDIR += visualboyadvance-m
>-    SUBDIR += vmips
>-    SUBDIR += vmsbackup
>-    SUBDIR += vmw
>-    SUBDIR += vxtools
>-    SUBDIR += wine
>-    SUBDIR += wine-devel
>-    SUBDIR += wine-gecko
>-    SUBDIR += wine-gecko-devel
>-    SUBDIR += wine-mono
>-    SUBDIR += wine-mono-devel
>-    SUBDIR += wine-proton
>-    SUBDIR += winetricks
>-    SUBDIR += x16-emulator
>-    SUBDIR += x16-rom
>-    SUBDIR += x48
>-    SUBDIR += x49gp
>-    SUBDIR += xbraitenberg
>-    SUBDIR += xcpc
>-    SUBDIR += xen-kernel
>-    SUBDIR += xhomer
>-    SUBDIR += xsystem35
>-    SUBDIR += xzx
>-    SUBDIR += yaze-ag
>-    SUBDIR += yuzu
>-    SUBDIR += yuzu-qt5
>-    SUBDIR += z80pack
>-    SUBDIR += zsnes
>-
>-.include <bsd.port.subdir.mk>
>diff --git a/emulators/ripes/Makefile b/emulators/ripes/Makefile
>new file mode 100644
>index 000000000000..c1b8408b55c8
>--- /dev/null
>+++ b/emulators/ripes/Makefile
>@@ -0,0 +1,24 @@
>+PORTNAME=	ripes
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2.2.3
>+CATEGORIES=	emulators
>+
>+MAINTAINER=	mclay@astate.edu
>+COMMENT=	Graphical processor simulator and assembly editor for the RISC-V ISA
>+
>+LICENSE=        MIT
>+
>+USES=		cmake qt:5
>+
>+USE_QT=		core charts gui widgets
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	mortbopet
>+GH_PROJECT=	Ripes
>+GH_TUPLE=	mortbopet:VSRTL:65ac251:VSRTL/external/VSRTL \
>+		serge1:ELFIO:79fcd11:ELFIO/external/ELFIO \
>+		pbhogan:Signals:17881fb:Signals/external/VSRTL/external/Signals \
>+		USCiLab:cereal:51cbda5:cereal/external/VSRTL/external/cereal \
>+		mortbopet:better-enums:52a694b:better_enums/external/VSRTL/external/better-enums
>+
>+.include <bsd.port.mk>
>diff --git a/emulators/ripes/distinfo b/emulators/ripes/distinfo
>new file mode 100644
>index 000000000000..d34b74de4f63
>--- /dev/null
>+++ b/emulators/ripes/distinfo
>@@ -0,0 +1,13 @@
>+TIMESTAMP = 1638160024
>+SHA256 (mortbopet-Ripes-v2.2.3_GH0.tar.gz) = 321dbe3884a339d859e36c6d5fd1c402c616916c72fba5ead544eef64075e7ca
>+SIZE (mortbopet-Ripes-v2.2.3_GH0.tar.gz) = 14150373
>+SHA256 (mortbopet-VSRTL-65ac251_GH0.tar.gz) = 872b619e5c6f590d94a0ab6fec5e037cc3c948fefe3d3e59f7b5ba3bf9bfe8cc
>+SIZE (mortbopet-VSRTL-65ac251_GH0.tar.gz) = 14500229
>+SHA256 (serge1-ELFIO-79fcd11_GH0.tar.gz) = 2f2478e48dc20b30fd705e9ae7208ea8ab175b5aa9195d0705142ad6e9054e55
>+SIZE (serge1-ELFIO-79fcd11_GH0.tar.gz) = 4229577
>+SHA256 (pbhogan-Signals-17881fb_GH0.tar.gz) = 7d2c420dc34471519306dd4070c571c74cb129cac782cb0a38ba07f0ba8488f8
>+SIZE (pbhogan-Signals-17881fb_GH0.tar.gz) = 38528
>+SHA256 (USCiLab-cereal-51cbda5_GH0.tar.gz) = efa214cfc850a4a2360baf4419b88c93be2a08b09ff5f9bac604a18498b83cfb
>+SIZE (USCiLab-cereal-51cbda5_GH0.tar.gz) = 335754
>+SHA256 (mortbopet-better-enums-52a694b_GH0.tar.gz) = 6fe24b59328a174eae7b4d755d606615a5bc0397a2b9846079a931486bf94cd3
>+SIZE (mortbopet-better-enums-52a694b_GH0.tar.gz) = 136663
>diff --git a/emulators/ripes/files/patch-CMakeLists.txt b/emulators/ripes/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..03c1f28af0aa
>--- /dev/null
>+++ b/emulators/ripes/files/patch-CMakeLists.txt
>@@ -0,0 +1,66 @@
>+--- CMakeLists.txt.orig	2021-11-29 18:06:47 UTC
>++++ CMakeLists.txt
>+@@ -1,4 +1,4 @@
>+-cmake_minimum_required(VERSION 3.9)
>++cmake_minimum_required(VERSION 3.13)
>+ set(CMAKE_CXX_STANDARD 17)
>+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
>+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
>+@@ -9,12 +9,20 @@ if(CCACHE_PROGRAM)
>+     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
>+ endif()
>+ 
>+-project(Ripes CXX)
>++project(Ripes
>++        LANGUAGES CXX
>++        DESCRIPTION "A graphical processor simulator and assembly editor for the RISC-V ISA"
>++        HOMEPAGE_URL "https://github.com/mortbopet/Ripes"
>++)
>+ 
>++if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
>++    include(GNUInstallDirs) #Must exist after declaring a project
>++endif()
>++
>+ # Error flags on everything but MSVC
>+ if(NOT MSVC)
>+     set(CMAKE_CXX_FLAGS "-Wextra -Wall \
>+-        -Werror=switch -Werror=return-type -Werror=shadow \
>++        -Werror=switch -Werror=return-type \
>+         -Werror=unreachable-code")
>+ endif()
>+ 
>+@@ -89,6 +97,9 @@ elseif(${WIN32})
>+ endif()
>+ 
>+ add_subdirectory(external)
>++
>++# Fix the name of the ripes library.
>++set(RIPES_LIB ripes_lib)
>+ add_subdirectory(src)
>+ 
>+ option(RIPES_BUILD_TESTS "Build Ripes tests" OFF)
>+@@ -102,4 +113,23 @@ add_executable(${APP_NAME} ${SYSTEM_FLAGS} ${ICONS_SRC
>+ # Link Qt libraries
>+ target_link_libraries(${APP_NAME} Qt5::Core Qt5::Widgets)
>+ # Link Ripes library
>+-target_link_libraries(${APP_NAME} ripes_lib)
>++target_link_libraries(${APP_NAME} ${RIPES_LIB})
>++
>++if(UNIX AND NOT APPLE) #Define the LINUX variable before testing it
>++    set(LINUX TRUE)
>++endif()
>++
>++if(${LINUX})
>++    install(TARGETS ${APP_NAME}
>++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
>++    )
>++elseif(${APPLE})
>++    install(TARGETS ${APP_NAME}
>++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
>++        BUNDLE  DESTINATION ${CMAKE_INSTALL_BINDIR}
>++    )
>++endif()
>++
>++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/appdir/usr/
>++    DESTINATION ${CMAKE_INSTALL_PREFIX}
>++)
>diff --git a/emulators/ripes/pkg-descr b/emulators/ripes/pkg-descr
>new file mode 100644
>index 000000000000..e05e5a24cd18
>--- /dev/null
>+++ b/emulators/ripes/pkg-descr
>@@ -0,0 +1,11 @@
>+Ripes is a graphical processor simulator and assembly code editor built
>+for the RISC-V instruction set architecture, suitable for teaching how
>+assembly level code is executed on various microarchitectures.
>+
>+Ripes may be used to explore concepts such as how machine code is executed
>+on a variety of microarchitectures (RV32IMC/RV64IMC based), how different
>+cache designs influence performance, how C and assembly code is compiled
>+and assembled to executable machine code, and how a processor interacts
>+with memory-mapped I/O.
>+
>+WWW: https://github.com/mortbopet/ripes
>diff --git a/emulators/ripes/pkg-plist b/emulators/ripes/pkg-plist
>new file mode 100644
>index 000000000000..dbef8e2e1369
>--- /dev/null
>+++ b/emulators/ripes/pkg-plist
>@@ -0,0 +1,11 @@
>+/usr/local/bin/Ripes
>+/usr/local/share/applications/Ripes.desktop
>+/usr/local/share/icons/hicolor/48x48/apps/Ripes.png
>+/usr/local/share/icons/hicolor/64x64/apps/Ripes.png
>+/usr/local/share/icons/hicolor/512x512/apps/Ripes.png
>+/usr/local/share/icons/hicolor/256x256/apps/Ripes.png
>+/usr/local/share/icons/hicolor/24x24/apps/Ripes.png
>+/usr/local/share/icons/hicolor/128x128/apps/Ripes.png
>+/usr/local/share/icons/hicolor/22x22/apps/Ripes.png
>+/usr/local/share/icons/hicolor/32x32/apps/Ripes.png
>+/usr/local/share/icons/hicolor/16x16/apps/Ripes.png

Actions: View | Diff

Attachments on bug 260124: 229801 | 230285 | 230743 | 230744