remove dep on wxgtk3-dev

3 files changed, 49 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a4568853742..f4ea96f2da54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = apriltag-trackers-git
 	pkgdesc = Full-body tracking in VR using AprilTag markers.
 	pkgver = r538.e7cde55
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ju1ce/April-Tag-VR-FullBody-Tracker
 	install = apriltag-trackers.install
 	arch = x86_64
 	license = MIT
 	makedepends = cmake
 	makedepends = git
-	makedepends = wxgtk3-dev
 	depends = opencv-git
 	depends = openvr
 	depends = apriltag
@@ -24,7 +23,7 @@ pkgbase = apriltag-trackers-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = a9fb604adc3a757903f0be0d525227df5a8a14b6c273e29d72bf69cb4becf7e8
+	sha256sums = 7e7ead4354a582ae3eeacea3ed7dfe3aee157122f825313db0442c7baa555dc8
 	sha256sums = 4393499c484670ce1392e73533efd49b9809055c53b3df5b92cd54b45396748a
 	sha256sums = 9cc3bf832456119b2f9f978eb3aad0dfd644f2a899333214268b3b9620c257e0
 
diff --git a/PKGBUILD b/PKGBUILD
index e54f4b8ac8a6..80ccf77d3901 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,17 @@
 pkgname=apriltag-trackers-git
 _name="${pkgname%-git}"
 pkgver=r538.e7cde55
-pkgrel=1
+pkgrel=2
 pkgdesc="Full-body tracking in VR using AprilTag markers."
 arch=('x86_64')
 url="https://github.com/ju1ce/April-Tag-VR-FullBody-Tracker"
 license=('MIT')
 depends=('opencv-git' 'openvr' 'apriltag' 'wxgtk3')
-makedepends=('cmake' 'git' 'wxgtk3-dev')
+makedepends=('cmake' 'git')
 provides=("${_name}")
 conflicts=("${_name}")
 install="${pkgname%-git}.install"
 source=(
-		# "${_name}::git+https://github.com/funnbot/April-Tag-VR-FullBody-Tracker#branch=pr/uncheck-close-preview"
 		"${_name}::git+https://github.com/ju1ce/April-Tag-VR-FullBody-Tracker"
 		"bridge-driver::git+https://github.com/ju1ce/Simple-OpenVR-Bridge-Driver"
 		"git+https://github.com/sgorsten/linalg"
@@ -24,7 +23,7 @@ source=(
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            'a9fb604adc3a757903f0be0d525227df5a8a14b6c273e29d72bf69cb4becf7e8'
+            '7e7ead4354a582ae3eeacea3ed7dfe3aee157122f825313db0442c7baa555dc8'
             '4393499c484670ce1392e73533efd49b9809055c53b3df5b92cd54b45396748a'
             '9cc3bf832456119b2f9f978eb3aad0dfd644f2a899333214268b3b9620c257e0')
 
diff --git a/apriltag-trackers.patch b/apriltag-trackers.patch
index c43801e3d102..eb22c5691856 100644
--- a/apriltag-trackers.patch
+++ b/apriltag-trackers.patch
@@ -29,6 +29,50 @@ index 0b56197..da15ab0 100644
      common::semver)
  
  # Ensure compiler with c++17 language features
+diff --git a/AprilTagTrackers/GUI/U8String.cpp b/AprilTagTrackers/GUI/U8String.cpp
+index 55d6be3..7f617da 100644
+--- a/AprilTagTrackers/GUI/U8String.cpp
++++ b/AprilTagTrackers/GUI/U8String.cpp
+@@ -4,7 +4,7 @@
+ 
+ U8String::operator wxString() const
+ {
+-    return wxString::FromUTF8Unchecked(str);
++    return wxString::FromUTF8Unchecked(str.c_str());
+ }
+ 
+ U8StringView::operator wxString() const
+diff --git a/AprilTagTrackers/GUI/wxHelpers.h b/AprilTagTrackers/GUI/wxHelpers.h
+index 937cda1..9a8ef19 100644
+--- a/AprilTagTrackers/GUI/wxHelpers.h
++++ b/AprilTagTrackers/GUI/wxHelpers.h
+@@ -145,7 +145,7 @@ inline bool FromWXString(const wxString& str, double& out_val)
+ }
+ inline bool FromWXString(const wxString& str, std::string& out_val)
+ {
+-    out_val = str.utf8_string();
++    out_val = str.utf8_str();
+     return true;
+ }
+ inline bool FromWXString(const wxString& str, wxString& out_val)
+@@ -169,7 +169,7 @@ inline bool FromWXString(const wxString& str, FS::Valid<T>& out_val)
+ /// Must be inverse of FromString.
+ inline wxString ToWXString(const std::string& val)
+ {
+-    return wxString::FromUTF8Unchecked(val);
++    return wxString::FromUTF8Unchecked(val.c_str());
+ }
+ inline wxString ToWXString(const wxString& val)
+ {
+@@ -180,7 +180,7 @@ inline wxString ToWXString(const T& val)
+ {
+     std::ostringstream ss;
+     ss << val;
+-    return wxString::FromUTF8(ss.str());
++    return wxString::FromUTF8(ss.str().c_str());
+ }
+ template <typename T>
+ inline wxString ToWXString(const FS::Valid<T>& val)
 diff --git a/AprilTagTrackers/Serializable.h b/AprilTagTrackers/Serializable.h
 index 6e143ed..98d80e9 100644
 --- a/AprilTagTrackers/Serializable.h