r25899.093eb075a

Build with Qt6

3 files changed, 33 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ec58de14b1d..cff6422b532e 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = yuzu-git
 	pkgdesc = An experimental open-source emulator for the Nintendo Switch
-	pkgver = r25806.24548b1f5
+	pkgver = r25899.093eb075a
 	pkgrel = 1
 	url = https://github.com/yuzu-emu/yuzu
 	arch = i686
@@ -13,25 +13,19 @@ pkgbase = yuzu-git
 	makedepends = gcc
 	makedepends = git
 	makedepends = glslang
-	makedepends = llvm
 	makedepends = mold
 	makedepends = ninja
 	makedepends = nlohmann-json
-	makedepends = qt5-tools
+	makedepends = qt6-tools
 	makedepends = rapidjson
 	makedepends = robin-map
-	makedepends = spirv-headers
-	makedepends = vulkan-headers
+	makedepends = stb
 	depends = boost-libs
-	depends = cubeb
-	depends = enet
 	depends = fmt
-	depends = libinih
-	depends = mbedtls
-	depends = qt5-multimedia
-	depends = qt5-webengine
+	depends = qt6-multimedia
+	depends = qt6-webengine
 	depends = sdl2
-	optdepends = qt5-wayland: Wayland support
+	optdepends = qt6-wayland: Wayland support
 	provides = yuzu
 	conflicts = yuzu
 	source = yuzu::git+https://github.com/yuzu-emu/yuzu.git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index ca9a75214ae9..40b42baafc79 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 # basic info
 _pkgname="yuzu"
 pkgname="$_pkgname${_pkgtype:+-$_pkgtype}"
-pkgver=r25806.24548b1f5
+pkgver=r25899.093eb075a
 pkgrel=1
 pkgdesc='An experimental open-source emulator for the Nintendo Switch'
 url="https://github.com/yuzu-emu/yuzu"
@@ -19,14 +19,15 @@ arch=('i686' 'x86_64')
 _main_package() {
   depends=(
     'boost-libs'
-    'cubeb'
-    'enet'
     'fmt'
-    'libinih'
-    'mbedtls'
-    'qt5-multimedia'
-    'qt5-webengine'
+    'qt6-multimedia'
+    'qt6-webengine'
     'sdl2'
+
+    #'cubeb'
+    #'enet'
+    #'libinih'
+    #'mbedtls'
   )
   makedepends=(
     'boost'
@@ -36,18 +37,25 @@ _main_package() {
     'gcc'
     'git'
     'glslang'
-    'llvm'
     'mold'
     'ninja'
     'nlohmann-json'
-    'qt5-tools'
+    'qt6-tools'
     'rapidjson'
     'robin-map'
-    'spirv-headers'
-    'vulkan-headers'
+    'stb'
+
+    #'clang'
+    #'cpp-httplib'
+    #'cpp-jwt'
+    #'llvm'
+    #'renderdoc'
+    #'spirv-headers'
+    #'vulkan-headers'
+    #'vulkan-memory-allocator'
   )
   optdepends=(
-    "qt5-wayland: Wayland support"
+    "qt6-wayland: Wayland support"
   )
 
   provides=("$_pkgname")
@@ -219,7 +227,7 @@ pkgver() {
   cd "$_pkgsrc"
   printf 'r%s.%s' \
     "$(git rev-list --count HEAD)" \
-    "$(git rev-parse --short HEAD)"
+    "$(git rev-parse --short=9 HEAD)"
 }
 
 prepare() {
@@ -262,21 +270,17 @@ build() {
     -DYUZU_USE_EXTERNAL_VULKAN_HEADERS=OFF
     -DYUZU_USE_QT_MULTIMEDIA=ON
     -DYUZU_USE_QT_WEB_ENGINE=ON
-    -DENABLE_QT6=OFF
+    -DENABLE_QT6=ON
     -DENABLE_QT_TRANSLATION=ON
     -DUSE_DISCORD_PRESENCE=ON
-    -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON
+    -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=OFF
 
     -DBUILD_REPOSITORY=yuzu-emu/yuzu
-    -DBUILD_TAG="${pkgver}"
     -DTITLE_BAR_FORMAT_IDLE="yuzu | ${pkgver} {}"
     -DTITLE_BAR_FORMAT_RUNNING="yuzu | ${pkgver} | {}"
     -Wno-dev
 
-    -DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON
     -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
-    -DYUZU_USE_BUNDLED_LIBUSB=OFF
-    -DYUZU_USE_BUNDLED_OPUS=OFF
   )
 
   cmake "${_cmake_options[@]}"