Merge pull request #2 from yuzu-mirror/master

Staying up-to-date to mirror
pull/8/head
Semih Kaplan 2 years ago committed by GitHub
commit a514744f52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -51,7 +51,7 @@ rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester
# Download tools needed to build an AppImage # Download tools needed to build an AppImage
wget -nc https://raw.githubusercontent.com/yuzu-emu/ext-linux-bin/main/appimage/deploy-linux.sh wget -nc https://raw.githubusercontent.com/yuzu-emu/ext-linux-bin/main/appimage/deploy-linux.sh
wget -nc https://raw.githubusercontent.com/yuzu-emu/AppImageKit-checkrt/old/AppRun.sh wget -nc https://raw.githubusercontent.com/yuzu-emu/AppImageKit-checkrt/old/AppRun.sh
wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/exec-x86_64.so wget -nc https://github.com/yuzu-mirror/ext-linux-bin/raw/main/appimage/exec-x86_64.so
# Set executable bit # Set executable bit
chmod 755 \ chmod 755 \
deploy-linux.sh \ deploy-linux.sh \

@ -27,7 +27,7 @@ fi
# Build an AppImage # Build an AppImage
cd build cd build
wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage wget -nc https://github.com/yuzu-mirror/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage
chmod 755 appimagetool-x86_64.AppImage chmod 755 appimagetool-x86_64.AppImage
# if FUSE is not available, then fallback to extract and run # if FUSE is not available, then fallback to extract and run

@ -15,7 +15,7 @@ def check_individual(labels):
return False return False
def do_page(page): def do_page(page):
url = f"https://api.github.com/repos/yuzu-emu/yuzu/pulls?page={page}" url = f"https://api.github.com/repos/yuzu-mirror/yuzu/pulls?page={page}"
response = requests.get(url) response = requests.get(url)
response.raise_for_status() response.raise_for_status()
if (response.ok): if (response.ok):
@ -26,7 +26,7 @@ def do_page(page):
if (check_individual(pr["labels"])): if (check_individual(pr["labels"])):
pn = pr["number"] pn = pr["number"]
print(f"Matched PR# {pn}") print(f"Matched PR# {pn}")
print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", f"pull/{pn}/head:pr-{pn}", "-f", "--no-recurse-submodules"])) print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-mirror/yuzu.git", f"pull/{pn}/head:pr-{pn}", "-f", "--no-recurse-submodules"]))
print(subprocess.check_output(["git", "merge", "--squash", f"pr-{pn}"])) print(subprocess.check_output(["git", "merge", "--squash", f"pr-{pn}"]))
print(subprocess.check_output(["git", "commit", f"-m\"Merge {tagline} PR {pn}\""])) print(subprocess.check_output(["git", "commit", f"-m\"Merge {tagline} PR {pn}\""]))

@ -126,7 +126,7 @@ async function tagAndPushEA(github, owner, repo, execa) {
const newTag = `ea-${tagNumber + 1}`; const newTag = `ea-${tagNumber + 1}`;
console.log(`New tag: ${newTag}`); console.log(`New tag: ${newTag}`);
console.info('Pushing tags to GitHub ...'); console.info('Pushing tags to GitHub ...');
await execa("git", ["remote", "add", "android", "https://github.com/yuzu-emu/yuzu-android.git"]); await execa("git", ["remote", "add", "android", "https://github.com/yuzu-mirror/yuzu-android.git"]);
await execa("git", ["fetch", "android"]); await execa("git", ["fetch", "android"]);
await execa("git", ['tag', newTag]); await execa("git", ['tag', newTag]);
@ -224,7 +224,7 @@ async function resetBranch(execa) {
console.log("::group::Reset master branch"); console.log("::group::Reset master branch");
let hasFailed = false; let hasFailed = false;
try { try {
await execa("git", ["remote", "add", "source", "https://github.com/yuzu-emu/yuzu.git"]); await execa("git", ["remote", "add", "source", "https://github.com/yuzu-mirror/yuzu.git"]);
await execa("git", ["fetch", "source"]); await execa("git", ["fetch", "source"]);
const process1 = await execa("git", ["rev-parse", "source/master"]); const process1 = await execa("git", ["rev-parse", "source/master"]);
const headCommit = process1.stdout; const headCommit = process1.stdout;
@ -274,7 +274,7 @@ async function getMainlineTag(execa) {
console.log(`::group::Getting mainline tag android-${MAINLINE_TAG}`); console.log(`::group::Getting mainline tag android-${MAINLINE_TAG}`);
let hasFailed = false; let hasFailed = false;
try { try {
await execa("git", ["remote", "add", "mainline", "https://github.com/yuzu-emu/yuzu-android.git"]); await execa("git", ["remote", "add", "mainline", "https://github.com/yuzu-mirror/yuzu-android.git"]);
await execa("git", ["fetch", "mainline", "--tags"]); await execa("git", ["fetch", "mainline", "--tags"]);
await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]); await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]);
await execa("git", ["submodule", "update", "--init", "--recursive"]); await execa("git", ["submodule", "update", "--init", "--recursive"]);
@ -300,7 +300,7 @@ async function mergebot(github, context, execa) {
} }
console.info("The following pull requests will be merged:"); console.info("The following pull requests will be merged:");
console.table(displayList); console.table(displayList);
await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa); await fetchPullRequests(pulls, "https://github.com/yuzu-mirror/yuzu", execa);
const mergeResults = await mergePullRequests(pulls, execa); const mergeResults = await mergePullRequests(pulls, execa);
if (BUILD_EA) { if (BUILD_EA) {

2
.gitmodules vendored

@ -9,7 +9,7 @@
url = https://github.com/mozilla/cubeb.git url = https://github.com/mozilla/cubeb.git
[submodule "dynarmic"] [submodule "dynarmic"]
path = externals/dynarmic path = externals/dynarmic
url = https://github.com/merryhime/dynarmic.git url = https://github.com/yuzu-mirror/dynarmic.git
[submodule "libusb"] [submodule "libusb"]
path = externals/libusb/libusb path = externals/libusb/libusb
url = https://github.com/libusb/libusb.git url = https://github.com/libusb/libusb.git

@ -126,7 +126,7 @@ if (YUZU_USE_BUNDLED_VCPKG)
set(VCPKG_DOWNLOADS_PATH ${PROJECT_SOURCE_DIR}/externals/vcpkg/downloads) set(VCPKG_DOWNLOADS_PATH ${PROJECT_SOURCE_DIR}/externals/vcpkg/downloads)
set(NASM_VERSION "2.16.01") set(NASM_VERSION "2.16.01")
set(NASM_DESTINATION_PATH ${VCPKG_DOWNLOADS_PATH}/nasm-${NASM_VERSION}-win64.zip) set(NASM_DESTINATION_PATH ${VCPKG_DOWNLOADS_PATH}/nasm-${NASM_VERSION}-win64.zip)
set(NASM_DOWNLOAD_URL "https://github.com/yuzu-emu/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip") set(NASM_DOWNLOAD_URL "https://github.com/yuzu-mirror/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip")
if (NOT EXISTS ${NASM_DESTINATION_PATH}) if (NOT EXISTS ${NASM_DESTINATION_PATH})
file(DOWNLOAD ${NASM_DOWNLOAD_URL} ${NASM_DESTINATION_PATH} SHOW_PROGRESS STATUS NASM_STATUS) file(DOWNLOAD ${NASM_DOWNLOAD_URL} ${NASM_DESTINATION_PATH} SHOW_PROGRESS STATUS NASM_STATUS)
@ -620,7 +620,7 @@ if (NOT CLANG_FORMAT)
message(STATUS "Clang format not found! Downloading...") message(STATUS "Clang format not found! Downloading...")
set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe") set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe")
file(DOWNLOAD file(DOWNLOAD
https://github.com/yuzu-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe https://github.com/yuzu-mirror/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
"${CLANG_FORMAT}" SHOW_PROGRESS "${CLANG_FORMAT}" SHOW_PROGRESS
STATUS DOWNLOAD_SUCCESS) STATUS DOWNLOAD_SUCCESS)
if (NOT DOWNLOAD_SUCCESS EQUAL 0) if (NOT DOWNLOAD_SUCCESS EQUAL 0)

@ -7,7 +7,7 @@
# prefix_var: name of a variable which will be set with the path to the extracted contents # prefix_var: name of a variable which will be set with the path to the extracted contents
function(download_bundled_external remote_path lib_name prefix_var) function(download_bundled_external remote_path lib_name prefix_var)
set(package_base_url "https://github.com/yuzu-emu/") set(package_base_url "https://github.com/yuzu-mirror/")
set(package_repo "no_platform") set(package_repo "no_platform")
set(package_extension "no_platform") set(package_extension "no_platform")
if (WIN32) if (WIN32)

@ -3,4 +3,4 @@ SPDX-FileCopyrightText: 2018 yuzu Emulator Project
SPDX-License-Identifier: GPL-2.0-or-later SPDX-License-Identifier: GPL-2.0-or-later
--> -->
**The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-emu/yuzu/wiki/Contributing).** **The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-mirror/yuzu/wiki/Contributing).**

@ -20,10 +20,10 @@ It is written in C++ with portability in mind, and we actively maintain builds f
> This is an unofficial mirror fork of the original repository. > This is an unofficial mirror fork of the original repository.
<p align="center"> <p align="center">
<a href="https://dev.azure.com/yuzu-emu/yuzu/"> <!-- <a href="https://dev.azure.com/yuzu-emu/yuzu/">
<img src="https://dev.azure.com/yuzu-emu/yuzu/_apis/build/status/yuzu%20mainline?branchName=master" <img src="https://dev.azure.com/yuzu-emu/yuzu/_apis/build/status/yuzu%20mainline?branchName=master"
alt="Azure Mainline CI Build Status"> alt="Azure Mainline CI Build Status">
</a> </a> -->
<a href="https://discord.com/invite/u77vRWY"> <a href="https://discord.com/invite/u77vRWY">
<img src="https://img.shields.io/discord/398318088170242053?color=5865F2&label=yuzu&logo=discord&logoColor=white" <img src="https://img.shields.io/discord/398318088170242053?color=5865F2&label=yuzu&logo=discord&logoColor=white"
alt="Discord"> alt="Discord">
@ -43,7 +43,7 @@ It is written in C++ with portability in mind, and we actively maintain builds f
The emulator is capable of running most commercial games at full speed, provided you meet the [necessary hardware requirements](https://yuzu-emu.org/help/quickstart/#hardware-requirements). The emulator is capable of running most commercial games at full speed, provided you meet the [necessary hardware requirements](https://yuzu-emu.org/help/quickstart/#hardware-requirements).
For a full list of games yuzu supports, please visit our [Compatibility page](https://yuzu-emu.org/game/). For a full list of games yuzu supports, please visit our [Compatibility page](https://web.archive.org/web/20240303155638/https://yuzu-emu.org/game/).
Check out our [website](https://yuzu-emu.org/) for the latest news on exciting features, monthly progress reports, and more! Check out our [website](https://yuzu-emu.org/) for the latest news on exciting features, monthly progress reports, and more!
@ -51,19 +51,19 @@ Check out our [website](https://yuzu-emu.org/) for the latest news on exciting f
Most of the development happens on GitHub. It's also where [our central repository](https://github.com/yuzu-emu/yuzu) is hosted. For development discussion, please join us on [Discord](https://discord.com/invite/u77vRWY). Most of the development happens on GitHub. It's also where [our central repository](https://github.com/yuzu-emu/yuzu) is hosted. For development discussion, please join us on [Discord](https://discord.com/invite/u77vRWY).
If you want to contribute, please take a look at the [Contributor's Guide](https://github.com/yuzu-emu/yuzu/wiki/Contributing) and [Developer Information](https://github.com/yuzu-emu/yuzu/wiki/Developer-Information). If you want to contribute, please take a look at the [Contributor's Guide](https://github.com/yuzu-mirror/yuzu/wiki/Contributing) and [Developer Information](https://github.com/yuzu-mirror/yuzu/wiki/Developer-Information).
You can also contact any of the developers on Discord in order to know about the current state of the emulator. You can also contact any of the developers on Discord in order to know about the current state of the emulator.
If you want to contribute to the user interface translation project, please check out the [yuzu project on transifex](https://www.transifex.com/yuzu-emulator/yuzu). We centralize translation work there, and periodically upstream translations. If you want to contribute to the user interface translation project, please check out the [yuzu project on transifex](https://www.transifex.com/yuzu-emulator/yuzu). We centralize translation work there, and periodically upstream translations.
## Building ## Building
* __Windows__: [Windows Build](https://github.com/yuzu-emu/yuzu/wiki/Building-For-Windows) * __Windows__: [Windows Build](https://github.com/yuzu-mirror/yuzu/wiki/Building-For-Windows)
* __Linux__: [Linux Build](https://github.com/yuzu-emu/yuzu/wiki/Building-For-Linux) * __Linux__: [Linux Build](https://github.com/yuzu-mirror/yuzu/wiki/Building-For-Linux)
## Download ## Download
You can download the latest releases automatically via the installer on our [downloads](https://yuzu-emu.org/downloads/) page. You can download the latest releases automatically via the installer on our [downloads](https://web.archive.org/web/20240304063132/https://yuzu-emu.org/downloads/) page.
## Support ## Support

@ -3583,7 +3583,7 @@ void GMainWindow::OpenURL(const QUrl& url) {
} }
void GMainWindow::OnOpenModsPage() { void GMainWindow::OnOpenModsPage() {
OpenURL(QUrl(QStringLiteral("https://github.com/yuzu-emu/yuzu/wiki/Switch-Mods"))); OpenURL(QUrl(QStringLiteral("https://github.com/yuzu-mirror/yuzu/wiki/Switch-Mods")));
} }
void GMainWindow::OnOpenQuickstartGuide() { void GMainWindow::OnOpenQuickstartGuide() {

Loading…
Cancel
Save