5.0.r20916

* update depends
* update build variables

2 files changed, 12 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 356db64cb07d..e6e1bc86150c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dolphin-emu-debugfast-git
 	pkgdesc = A Gamecube and Wii emulator
-	pkgver = 5.0.r20842.g3cb5d3455f
+	pkgver = 5.0.r20916.g63453bda4d
 	pkgrel = 1
 	url = https://github.com/dolphin-emu/dolphin
 	arch = x86_64
@@ -39,7 +39,6 @@ pkgbase = dolphin-emu-debugfast-git
 	depends = lzo
 	depends = mbedtls2
 	depends = miniupnpc
-	depends = minizip-ng
 	depends = pugixml
 	depends = sdl2
 	depends = sfml
diff --git a/PKGBUILD b/PKGBUILD
index 9f1c5548262d..17a7502e2b34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@
 # basic info
 _pkgname="dolphin-emu"
 pkgname="$_pkgname${_pkgtype:-}"
-pkgver=5.0.r20842.g3cb5d3455f
+pkgver=5.0.r20916.g63453bda4d
 pkgrel=1
 pkgdesc='A Gamecube and Wii emulator'
 url="https://github.com/dolphin-emu/dolphin"
@@ -62,7 +62,6 @@ _main_package() {
     lzo
     mbedtls2
     miniupnpc
-    minizip-ng
     pugixml
     sdl2
     sfml
@@ -71,6 +70,7 @@ _main_package() {
     ## broken
     #enet
     #libmgba
+    #minizip-ng
     #xxhash
     #zlib-ng
   )
@@ -228,8 +228,8 @@ prepare() {
     -i "${srcdir:?}/$_pkgsrc/CMake/ScmRevGen.cmake"
 
   # Fix minizip-ng name for Arch
-  sed -E -e 's@(pkgconfig\(MINIZIP minizip)([^a-z]+)@\1-ng\2@' \
-    -i "${srcdir:?}/$_pkgsrc/CMakeLists.txt"
+  #sed -E -e 's@(pkgconfig\(MINIZIP minizip)([^a-z]+)@\1-ng\2@' \
+  #  -i "${srcdir:?}/$_pkgsrc/CMakeLists.txt"
 
   # Delete gcc specific options
   sed '/_ARCHIVE_/d' -i "${srcdir:?}/$_pkgsrc/CMakeLists.txt"
@@ -249,6 +249,7 @@ build() {
 
     -DUSE_SYSTEM_ENET=OFF
     -DUSE_SYSTEM_LIBMGBA=OFF
+    -DUSE_SYSTEM_MINIZIP=OFF
     -DUSE_SYSTEM_XXHASH=OFF
     -DUSE_SYSTEM_ZLIB=OFF
 
@@ -263,10 +264,10 @@ build() {
   if [[ "${_build_clang::1}" == "t" ]] ; then
     export AR=llvm-ar
     export NM=llvm-nm
+    export CC=clang
+    export CXX=clang++
 
     _cmake_options+=(
-      -DCMAKE_C_COMPILER=clang
-      -DCMAKE_CXX_COMPILER=clang++
       -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
       -DENABLE_LTO=ON
     )
@@ -275,22 +276,14 @@ build() {
   fi
 
   if [[ "${_build_mold::1}" == "t" ]] ; then
-    _cmake_options+=(
-      -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=mold"
-      -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=mold"
-      -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=mold"
-    )
+    export LDFLAGS+=" -fuse-ld=mold"
   elif [[ "${_build_clang::1}" == "t" ]] ; then
-    _cmake_options+=(
-      -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld"
-      -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld"
-      -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld"
-    )
+    export LDFLAGS+=" -fuse-ld=lld"
   fi
 
   if [[ "${_build_avx::1}" == "t" ]] ; then
-    export CFLAGS="$(echo "$CFLAGS" | sed -E 's@(\s*-(march|mtune)=\S+\s*)@ @g;s@\s*-O[0-9]\s*@ @g;s@\s+@ @g') -march=x86-64-v3 -mtune=skylake -O3"
-    export CXXFLAGS="$(echo "$CXXFLAGS" | sed -E 's@(\s*-(march|mtune)=\S+\s*)@ @g;s@\s*-O[0-9]\s*@ @g;s@\s+@ @g') -march=x86-64-v3 -mtune=skylake -O3"
+    export CFLAGS="$(echo "$CFLAGS" | sed -E 's@(\s*-(march|mtune)=\S+\s*)@ @g;s@\s*-O[0-9]\s*@ @g;s@\s+@ @g') -march=x86-64-v3 -mtune=generic -O3"
+    export CXXFLAGS="$(echo "$CXXFLAGS" | sed -E 's@(\s*-(march|mtune)=\S+\s*)@ @g;s@\s*-O[0-9]\s*@ @g;s@\s+@ @g') -march=x86-64-v3 -mtune=generic -O3"
   fi
 
   cmake "${_cmake_options[@]}"