From 6149d153c34c46fa754f9f5e3b72b72d02c08fe0 Mon Sep 17 00:00:00 2001 From: Eric Long Date: Mon, 18 Nov 2024 22:35:48 +0800 Subject: [PATCH] addpatch: ogre-next 3.0.0-1 Upstreamed to https://github.com/OGRECave/ogre-next/pull/478. --- ogre-next/add-riscv64.patch | 14 -------------- ogre-next/riscv64.patch | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 ogre-next/add-riscv64.patch diff --git a/ogre-next/add-riscv64.patch b/ogre-next/add-riscv64.patch deleted file mode 100644 index fe9475b80..000000000 --- a/ogre-next/add-riscv64.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h -index 6754c4e..2337159 100644 ---- a/OgreMain/include/OgrePlatform.h -+++ b/OgreMain/include/OgrePlatform.h -@@ -79,7 +79,8 @@ THE SOFTWARE. - || defined(__ppc64__) \ - || defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64) \ - || defined(__mips64) || defined(__mips64_) \ -- || defined(__alpha__) || defined(__ia64__) || defined(__e2k__) || defined(__s390__) || defined(__s390x__) -+ || defined(__alpha__) || defined(__ia64__) || defined(__e2k__) || defined(__s390__) || defined(__s390x__) \ -+ || (defined(__riscv) && __riscv_xlen == 64) - # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64 - #else - # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32 diff --git a/ogre-next/riscv64.patch b/ogre-next/riscv64.patch index f25b0c157..90289313c 100644 --- a/ogre-next/riscv64.patch +++ b/ogre-next/riscv64.patch @@ -2,7 +2,7 @@ +++ PKGBUILD @@ -14,6 +14,10 @@ install=ogre-next.install source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre-next/archive/v${pkgver}.tar.gz") - sha512sums=('52ed2d2a3375c0d35f0dc695b986514484ad1d47966c5c18351d3b09913123b2487b9729738c6b8b1219c1a992a8c8509a2303e097a6eb26497e152a14d48830') + sha512sums=('2ef8f16517c96cc7ddb31986857e4d0002e33c2eeff845b4af0b8e5848c3e92289dc3b10ededbe66fb63ef6234cbee88ed513466182bd4e70d710d0507f98418') +prepare() { + patch -Np1 -d ogre-next-${pkgver} < "${srcdir}/add-riscv64.patch" @@ -24,7 +24,7 @@ install -Dm644 Docs/License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html } -+source+=("add-riscv64.patch") -+sha512sums+=('e2c3e7abbbfc390accbb8cd783a2e45554cddee39f84c9894e6674bb31d6dc790971192958d65ef5c1ea54cd250328a05c18b569d3659936d7ea382f1d4277c8') ++source+=("add-riscv64.patch::https://github.com/OGRECave/ogre-next/pull/478.diff") ++sha512sums+=('9859a828dc560e49b570ec887853cbbb5467998348fc1ea253ed6032bebeb41d51fc6f1d4e7ea667b23eeb9c7a44c3ba3c8708e01df02c173ac28086c7f94faa') + # vim:set ts=2 sw=2 et: