Update to 7.35 and enable aarch64 builds

This commit is contained in:
Hernan Martinez 2024-02-28 22:53:26 -07:00 committed by GitHub
parent 10a21a17f1
commit a97dc3be45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 63 additions and 48 deletions

View File

@ -1,6 +1,7 @@
--- vrpn-07.34/CMakeLists.txt.orig 2018-08-08 21:24:13.993245200 +0300
+++ vrpn-07.34/CMakeLists.txt 2018-08-08 21:28:26.415682900 +0300
@@ -1276,9 +1276,12 @@
diff -bur vrpn-07.35-orig/CMakeLists.txt vrpn-07.35/CMakeLists.txt
--- vrpn-07.35-orig/CMakeLists.txt 2024-02-28 22:14:55.826965700 -0700
+++ vrpn-07.35/CMakeLists.txt 2024-02-28 22:16:44.742742700 -0700
@@ -1284,9 +1284,12 @@
set(VRPN_CLIENT_LIBRARY)
if(VRPN_BUILD_SERVER_LIBRARY)
@ -16,7 +17,7 @@
target_link_libraries(vrpnserver ${EXTRA_LIBS} ${SERVER_EXTRA_LIBS})
set(VRPN_CLIENT_LIBRARY vrpnserver)
set(VRPN_SERVER_LIBRARY vrpnserver)
@@ -1329,7 +1329,12 @@
@@ -1337,7 +1340,12 @@
if(VRPN_BUILD_CLIENT_LIBRARY)
@ -30,17 +31,18 @@
target_link_libraries(vrpn ${EXTRA_LIBS})
set(VRPN_CLIENT_LIBRARY vrpn)
@@ -1355,7 +1355,7 @@
if(NOT VRPN_CLIENT_ONLY)
set_property(TARGET
vrpn
- PROPERTY
+ APPEND PROPERTY
COMPILE_DEFINITIONS
"VRPN_CLIENT_ONLY")
endif()
--- vrpn-07.34/server_src/vrpn_Generic_server_object.h.orig 2018-08-08 22:17:32.507189700 +0300
+++ vrpn-07.34/server_src/vrpn_Generic_server_object.h 2018-08-08 22:17:41.111681900 +0300
@@ -1355,7 +1363,7 @@
# Always compile code the client library with VRPN_CLIENT_ONLY defined.
set_property(TARGET
vrpn
- PROPERTY
+ APPEND PROPERTY
COMPILE_DEFINITIONS
"VRPN_CLIENT_ONLY")
diff -bur vrpn-07.35-orig/server_src/vrpn_Generic_server_object.h vrpn-07.35/server_src/vrpn_Generic_server_object.h
--- vrpn-07.35-orig/server_src/vrpn_Generic_server_object.h 2024-02-28 22:14:55.800273500 -0700
+++ vrpn-07.35/server_src/vrpn_Generic_server_object.h 2024-02-28 22:18:05.367469200 -0700
@@ -15,7 +15,7 @@
class VRPN_API vrpn_IMU_Axis_Params;
class VRPN_API vrpn_PA_axis;
@ -50,17 +52,21 @@
public:
vrpn_Generic_Server_Object(vrpn_Connection *connection_to_use,
const char *config_file_name = "vrpn.cfg",
--- vrpn-07.34/vrpn_Shared.h.orig 2018-08-08 22:19:46.728866800 +0300
+++ vrpn-07.34/vrpn_Shared.h 2018-08-08 22:20:14.867476200 +0300
@@ -499,5 +499,5 @@
diff -bur vrpn-07.35-orig/vrpn_Shared.h vrpn-07.35/vrpn_Shared.h
--- vrpn-07.35-orig/vrpn_Shared.h 2024-02-28 22:14:55.842649500 -0700
+++ vrpn-07.35/vrpn_Shared.h 2024-02-28 22:19:48.984720100 -0700
@@ -499,7 +499,7 @@
}
// Returns true if tests work and false if they do not.
-extern bool vrpn_test_pack_unpack(void);
+VRPN_API bool vrpn_test_pack_unpack(void);
--- vrpn-07.34/vrpn_Thread.h.orig 2018-08-08 22:14:22.346313100 +0300
+++ vrpn-07.34/vrpn_Thread.h 2018-08-08 22:14:31.190819000 +0300
/// Null-terminated-string copy function that both guarantees not to overrun
/// the buffer and guarantees that the last character copied is a NULL terminator
diff -bur vrpn-07.35-orig/vrpn_Thread.h vrpn-07.35/vrpn_Thread.h
--- vrpn-07.35-orig/vrpn_Thread.h 2024-02-28 22:14:55.842649500 -0700
+++ vrpn-07.35/vrpn_Thread.h 2024-02-28 22:19:44.087038900 -0700
@@ -237,7 +237,7 @@
};

View File

@ -0,0 +1,29 @@
diff -bur vrpn-07.35-orig/vrpn_Vality.C vrpn-07.35/vrpn_Vality.C
--- vrpn-07.35-orig/vrpn_Vality.C 2024-02-28 22:30:45.245106200 -0700
+++ vrpn-07.35/vrpn_Vality.C 2024-02-28 22:30:47.112562100 -0700
@@ -3,6 +3,7 @@
#include <stdio.h> // for fprintf, stderr, NULL
#include <string.h> // for memset
#include <math.h> // for fabs
+#include <stdint.h> // for uint8_t
#include "vrpn_Vality.h"
#include "vrpn_MessageMacros.h" // for VRPN_MSG_INFO, VRPN_MSG_WARNING, VRPN_MSG_ERROR
diff -bur vrpn-07.35-orig/vrpn_Shared.C vrpn-07.35/vrpn_Shared.C
--- vrpn-07.35-orig/vrpn_Shared.C 2024-02-28 22:33:17.494354900 -0700
+++ vrpn-07.35/vrpn_Shared.C 2024-02-28 22:33:23.830402400 -0700
@@ -23,14 +23,6 @@
#define CHECK(a) \
if (a == -1) return -1
-#if defined(VRPN_USE_WINSOCK_SOCKETS)
-/* from HP-UX */
-struct timezone {
- int tz_minuteswest; /* minutes west of Greenwich */
- int tz_dsttime; /* type of dst correction */
-};
-#endif
-
// perform normalization of a timeval
// XXX this still needs to be checked for errors if the timeval
// or the rate is negative

View File

@ -1,20 +0,0 @@
--- a/client_src/CMakeLists.txt
+++ b/client_src/CMakeLists.txt
@@ -93,7 +93,7 @@
add_executable(testimager_client testimager_client.C)
target_link_libraries(testimager_client
${VRPN_CLIENT_LIBRARY}
- ${GLUT_glut_LIBRARY}
+ ${GLUT_LIBRARIES}
${OPENGL_LIBRARIES})
set_target_properties(testimager_client PROPERTIES FOLDER Tests)
@@ -119,7 +119,7 @@
add_executable(vrpn_orientation vrpn_orientation.C)
target_link_libraries(vrpn_orientation
${VRPN_CLIENT_LIBRARY}
- ${GLUT_glut_LIBRARY}
+ ${GLUT_LIBRARIES}
${OPENGL_LIBRARIES})
set_target_properties(vrpn_orientation PROPERTIES FOLDER Clients)

View File

@ -3,12 +3,12 @@
_realname=vrpn
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=7.34
pkgver=7.35
_pkgver=0${pkgver}
pkgrel=9
pkgrel=1
pkgdesc="The Virtual-Reality Peripheral Network (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
url="https://github.com/vrpn/vrpn/wiki"
license=('spdx:BSL-1.0')
depends=("${MINGW_PACKAGE_PREFIX}-hidapi"
@ -22,16 +22,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-ninja")
source=("https://github.com/${_realname}/${_realname}/archive/v${_pkgver}/${_realname}-${pkgver}.tar.gz"
"0002-fix-shared-build.patch"
"0003-link-to-glut-libraries.patch")
sha256sums=('45024722110afe4b0663b12b68ea46864e79197ea752bba90c599f87e4d51dbe'
'21244cdc98bd23b6faf5ada5219b848bc79efe30d019af5a63e37bcb203ff687'
'ccccbe61f031594107584e1f03f8e8e7208c9ca667579e3b582140a51d980c28')
"0003-fix-includes.patch")
sha256sums=('83139846247e6a0530b974e03744bb358d11f88109f231a3031815924374bb9d'
'14855180b0f6612b548ccf56a4b66de3fb1ef69b4b6418ab76e39fd643e9e609'
'a2c08e4d18213aaacfa32894c284015c42dd72af609611c8c4cf36048ed26447')
prepare() {
cd "${srcdir}/${_realname}-${_pkgver}"
patch -p1 -i ${srcdir}/0002-fix-shared-build.patch
patch -p1 -i ${srcdir}/0003-link-to-glut-libraries.patch
patch -p1 -i ${srcdir}/0003-fix-includes.patch
}
build() {