summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-10-13 17:57:11 +0000
committerDaniel Bermond2020-10-13 17:57:11 +0000
commitffbd33e58583fd1cbe11e3fb2970691897e06654 (patch)
tree3f546f2916aa4402f0195a9b490736e25aa70ed1
parentdfe3ee67f9e8ccffcdf41678185a2d8d9daccf08 (diff)
downloadaur-ffbd33e58583fd1cbe11e3fb2970691897e06654.tar.gz
Update to version 20201012
-rw-r--r--.SRCINFO8
-rw-r--r--010-m64p-remove-build-jobs-limitation.patch8
-rw-r--r--020-m64p-enable-optimizations.patch4
-rw-r--r--PKGBUILD8
4 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1f4ced479a02..2c9dad926f7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = m64p
pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI
- pkgver = 20201008
+ pkgver = 20201012
pkgrel = 1
url = https://m64p.github.io/
arch = x86_64
@@ -27,13 +27,13 @@ pkgbase = m64p
conflicts = mupen64plus-gui
conflicts = mupen64plus-video-gliden64
conflicts = mupen64plus
- source = git+https://github.com/loganmc10/m64p.git#commit=1b7a01072c2c1e96f8cef0176729fde24999d171
+ source = git+https://github.com/loganmc10/m64p.git#commit=41e17c6616660687e95833f66ac1b6b24f89abcc
source = 010-m64p-remove-build-jobs-limitation.patch
source = 020-m64p-enable-optimizations.patch
source = m64p.desktop
sha256sums = SKIP
- sha256sums = b6e91689d151dfc8e60b3d095a9c20f7777b2df79083cd55a9ed43dd32dcd96b
- sha256sums = 4366b57c9e909495d3d462eb2ce64335cbd015764be7c490fe675fbf6dfe2f84
+ sha256sums = 28c95005fbfa3b30bcee412070c5fc13f74a2b6f52526a9ad733778de3aaec04
+ sha256sums = d3834a29ccf06be9ad1c0a3039efb4ed69d81f61e814d1578a6bd19474aa11c3
sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
pkgname = m64p
diff --git a/010-m64p-remove-build-jobs-limitation.patch b/010-m64p-remove-build-jobs-limitation.patch
index 955617f7cbba..c449a259b76a 100644
--- a/010-m64p-remove-build-jobs-limitation.patch
+++ b/010-m64p-remove-build-jobs-limitation.patch
@@ -1,6 +1,6 @@
--- a/build.sh
+++ b/build.sh
-@@ -19,22 +19,22 @@ mkdir -p $install_dir
+@@ -25,22 +25,22 @@ mkdir -p $install_dir
base_dir=$PWD
cd $base_dir/mupen64plus-core/projects/unix
@@ -27,7 +27,7 @@
if [[ $UNAME == *"MINGW"* ]]; then
cp $base_dir/mupen64plus-input-qt/build/release/mupen64plus-input-qt.dll $install_dir
else
-@@ -42,7 +42,7 @@ else
+@@ -48,7 +48,7 @@ else
fi
cd $base_dir/mupen64plus-audio-sdl2/projects/unix
@@ -36,7 +36,7 @@
cp $base_dir/mupen64plus-audio-sdl2/projects/unix/*$suffix $install_dir
cd $base_dir
-@@ -61,7 +61,7 @@ fi
+@@ -67,7 +67,7 @@ fi
mkdir -p $base_dir/mupen64plus-gui/build
cd $base_dir/mupen64plus-gui/build
qmake ../mupen64plus-gui.pro
@@ -45,7 +45,7 @@
if [[ $UNAME == *"MINGW"* ]]; then
cp $base_dir/mupen64plus-gui/build/release/mupen64plus-gui.exe $install_dir
else
-@@ -77,7 +77,7 @@ if [[ $UNAME == *"MINGW"* ]]; then
+@@ -83,7 +83,7 @@ if [[ $UNAME == *"MINGW"* ]]; then
else
cmake -DMUPENPLUSAPI_GLIDENUI=On -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
fi
diff --git a/020-m64p-enable-optimizations.patch b/020-m64p-enable-optimizations.patch
index 1d5a404d1c02..752375810666 100644
--- a/020-m64p-enable-optimizations.patch
+++ b/020-m64p-enable-optimizations.patch
@@ -1,6 +1,6 @@
--- a/build.sh
+++ b/build.sh
-@@ -19,7 +19,7 @@ mkdir -p $install_dir
+@@ -25,7 +25,7 @@ mkdir -p $install_dir
base_dir=$PWD
cd $base_dir/mupen64plus-core/projects/unix
@@ -9,7 +9,7 @@
cp -P $base_dir/mupen64plus-core/projects/unix/*$suffix* $install_dir
cp $base_dir/mupen64plus-core/data/* $install_dir
-@@ -73,9 +73,9 @@ cd $base_dir/GLideN64/src
+@@ -79,9 +79,9 @@ cd $base_dir/GLideN64/src
cd $base_dir/GLideN64/projects/cmake
if [[ $UNAME == *"MINGW"* ]]; then
diff --git a/PKGBUILD b/PKGBUILD
index 6687c27cd52f..70cc7146ba29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=m64p
-pkgver=20201008
+pkgver=20201012
pkgrel=1
pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI'
arch=('x86_64')
@@ -13,14 +13,14 @@ optdepends=('p7zip: for 7z/zip support')
makedepends=('git' 'cmake' 'nasm' 'icoutils')
provides=('mupen64plus-gui' 'mupen64plus-video-gliden64')
conflicts=('mupen64plus-gui' 'mupen64plus-video-gliden64' 'mupen64plus')
-_commit=1b7a01072c2c1e96f8cef0176729fde24999d171
+_commit=41e17c6616660687e95833f66ac1b6b24f89abcc
source=("git+https://github.com/loganmc10/m64p.git#commit=${_commit}"
'010-m64p-remove-build-jobs-limitation.patch'
'020-m64p-enable-optimizations.patch'
'm64p.desktop')
sha256sums=('SKIP'
- 'b6e91689d151dfc8e60b3d095a9c20f7777b2df79083cd55a9ed43dd32dcd96b'
- '4366b57c9e909495d3d462eb2ce64335cbd015764be7c490fe675fbf6dfe2f84'
+ '28c95005fbfa3b30bcee412070c5fc13f74a2b6f52526a9ad733778de3aaec04'
+ 'd3834a29ccf06be9ad1c0a3039efb4ed69d81f61e814d1578a6bd19474aa11c3'
'8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
prepare() {