optional libunwind backtrace and debug

2 files changed, 12 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d81e5f73576..54b1a5706082 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -31,7 +31,6 @@ pkgbase = xorg-server-rootless-nosystemd-minimal-git
 	makedepends = xcb-util-wm
 	makedepends = xcb-util-keysyms
 	makedepends = libxshmfence
-	makedepends = libunwind
 	makedepends = wayland-protocols
 	makedepends = egl-wayland
 	makedepends = meson
@@ -49,7 +48,6 @@ pkgname = xorg-server-rootless-nosystemd-minimal-git
 	depends = libxfont2
 	depends = pixman
 	depends = xorg-server-common-rootless-nosystemd-minimal-git
-	depends = libunwind
 	depends = dbus
 	depends = libgl
 	depends = xf86-input-libinput
@@ -57,6 +55,7 @@ pkgname = xorg-server-rootless-nosystemd-minimal-git
 	depends = libpciaccess
 	depends = libdrm
 	depends = libxshmfence
+	optdepends = libunwind: unwind backtrace support
 	provides = X-ABI-VIDEODRV_VERSION=24.0
 	provides = X-ABI-XINPUT_VERSION=24.1
 	provides = X-ABI-EXTENSION_VERSION=10.0
@@ -90,13 +89,13 @@ pkgname = xorg-server-xephyr-rootless-nosystemd-minimal-git
 pkgname = xorg-server-xvfb-rootless-nosystemd-minimal-git
 	pkgdesc = Virtual framebuffer X server
 	depends = libxfont2
-	depends = libunwind
 	depends = pixman
 	depends = xorg-server-common-rootless-nosystemd-minimal-git
 	depends = xorg-xauth
 	depends = libgl
 	depends = nettle
 	depends = libtirpc
+	optdepends = libunwind: unwind backtrace support
 	provides = xorg-server-xvfb
 	conflicts = xorg-server-xvfb
 
diff --git a/PKGBUILD b/PKGBUILD
index 0524b4de07d4..9ebb0905ba19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -45,7 +45,7 @@ makedepends=(
 	'xcb-util-wm'
 	'xcb-util-keysyms'
 	'libxshmfence'
-	'libunwind'
+#	'libunwind'
 	'wayland-protocols'
 	'egl-wayland'
 	'meson')
@@ -82,7 +82,9 @@ build() {
     -D xkb_output_dir=/var/lib/xkb \
     -D systemd_logind=false \
     -D b_lto=false \
-    -D b_lundef=false
+    -D b_lundef=false \
+    -D unwind=false \
+    -D debug=false
      
 
   # Print config
@@ -120,9 +122,10 @@ package_xorg-server-common-rootless-nosystemd-minimal-git() {
 
 package_xorg-server-rootless-nosystemd-minimal-git() {
   pkgdesc="Xorg X server"
-  depends=(libepoxy libxfont2 pixman xorg-server-common-rootless-nosystemd-minimal-git libunwind 
+  depends=(libepoxy libxfont2 pixman xorg-server-common-rootless-nosystemd-minimal-git 
            dbus libgl xf86-input-libinput nettle
            libpciaccess libdrm libxshmfence) # FS#52949
+  optdepends=('libunwind: unwind backtrace support')
 
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
@@ -165,7 +168,8 @@ package_xorg-server-xephyr-rootless-nosystemd-minimal-git() {
 
 package_xorg-server-xvfb-rootless-nosystemd-minimal-git() {
   pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont2 libunwind pixman xorg-server-common-rootless-nosystemd-minimal-git xorg-xauth libgl nettle libtirpc)
+  depends=(libxfont2 pixman xorg-server-common-rootless-nosystemd-minimal-git xorg-xauth libgl nettle libtirpc)
+  optdepends=('libunwind: unwind backtrace support')
   conflicts=('xorg-server-xvfb')
   provides=('xorg-server-xvfb')
   
@@ -194,8 +198,9 @@ package_xorg-server-xnest-rootless-nosystemd-minimal-git() {
 
 #package_xorg-server-xwayland-rootless-nosystemd-minimal-git() {
 #  pkgdesc="run X clients under wayland"
-#  depends=(libxfont2 libepoxy libunwind libgl pixman xorg-server-common-rootless-nosystemd-minimal-git
+#  depends=(libxfont2 libepoxy libgl pixman xorg-server-common-rootless-nosystemd-minimal-git
 #           nettle libtirpc)
+#  optdepends=('libunwind: unwind backtrace support')
 #  conflicts=('xorg-server-xwayland')
 #  provides=('xorg-server-xwayland')