Architecture specific change in rpms/openvr.git
by githook-noreply@fedoraproject.org
The package rpms/openvr.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/openvr.git/commit/?id=118d467b267....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit 118d467b267ee2c0887ac3b262afe9c7698f13e9
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sun Oct 29 19:50:03 2023 -0700
Initial import; Fixes: RHBZ#2244984
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9231b4d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/openvr-1.26.7.tar.gz
diff --git a/1511.patch b/1511.patch
new file mode 100644
index 0000000..eff42c0
--- /dev/null
+++ b/1511.patch
@@ -0,0 +1,53 @@
+From 9803a10192582b21c1bbcbc4c625a1c641ab5b1d Mon Sep 17 00:00:00 2001
+From: Dan Church <amphetamachine(a)gmail.com>
+Date: Sat, 23 Jan 2021 15:59:00 -0600
+Subject: [PATCH 1/2] Use GNUInstallDirs to determine lib install path
+
+---
+ src/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 29b69c5c..4da45b62 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,6 +4,8 @@ project(openvr_api)
+ set( LIBNAME "openvr_api" )
+ set(OPENVR_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../headers)
+
++include(GNUInstallDirs)
++
+ # Set some properies for specific files.
+ if(APPLE)
+ set(CMAKE_MACOSX_RPATH 1)
+@@ -101,7 +103,7 @@ endif()
+ target_link_libraries(${LIBNAME} ${EXTRA_LIBS} ${CMAKE_DL_LIBS})
+ target_include_directories(${LIBNAME} PUBLIC ${OPENVR_HEADER_DIR})
+
+-install(TARGETS ${LIBNAME} DESTINATION lib)
++install(TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES ${PUBLIC_HEADER_FILES} DESTINATION include/openvr)
+
+ # Generate a .pc file for linux environments
+
+From 69ad8a0810e1941062833fdec37e1e9632f390e2 Mon Sep 17 00:00:00 2001
+From: Dan Church <amphetamachine(a)gmail.com>
+Date: Sat, 23 Jan 2021 16:07:36 -0600
+Subject: [PATCH 2/2] Update pkg-config entry
+
+---
+ src/openvr.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/openvr.pc.in b/src/openvr.pc.in
+index 3edba91c..0041a5ce 100644
+--- a/src/openvr.pc.in
++++ b/src/openvr.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+ includedir=${prefix}/include/openvr
+
+ Name: openvr
diff --git a/1716.patch b/1716.patch
new file mode 100644
index 0000000..ecea434
--- /dev/null
+++ b/1716.patch
@@ -0,0 +1,110 @@
+From 54a58e479f4d63e62e9118637cd92a2013a4fb95 Mon Sep 17 00:00:00 2001
+From: Lubosz Sarnecki <lubosz.sarnecki(a)collabora.com>
+Date: Thu, 15 Aug 2019 16:07:01 +0200
+Subject: [PATCH 1/2] cmake: Add option to build with system jsoncpp.
+
+This patch adds the CMake build option `USE_SYSTEM_JSONCPP`,
+which instead of using the internal `jsoncpp.cpp` links against
+the system installed jsoncpp library.
+
+This results in a `libopenvr_api.so` that is only 115K instead of 301K
+on my system.
+
+Distributions like Debian will prefer this behaviour, since it will give
+them the possibility to maintain version and security issues for jsoncpp
+in one place.
+
+This behaviour can be enabled by
+
+```
+cmake -DUSE_SYSTEM_JSONCPP=True .
+```
+
+When the flag is not set, the build will behave like it did before.
+
+I tested this patch using the system wide jsoncpp successfully
+with xrdesktop.
+---
+ CMakeLists.txt | 1 +
+ src/CMakeLists.txt | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8956cdad..1150c53d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,7 @@ option(BUILD_UNIVERSAL "Builds the shared or framework as a universal (fat, 32-
+ option(BUILD_OSX_I386 "Builds the shared or framework as a 32-bit binary, even on a 64-bit platform" OFF)
+ option(USE_LIBCXX "Uses libc++ instead of libstdc++" ON)
+ option(USE_CUSTOM_LIBCXX "Uses a custom libc++" OFF)
++option(USE_SYSTEM_JSONCPP "Uses the system installed jsoncpp." OFF)
+
+ add_definitions( -DVR_API_PUBLIC )
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b83710af..a7b64db9 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -34,8 +34,14 @@ endif()
+ # Set the source group and files.
+ set(CORE_FILES
+ openvr_api_public.cpp
+- jsoncpp.cpp
+ )
++
++if(NOT USE_SYSTEM_JSONCPP)
++ set(JSON_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/jsoncpp)
++ include_directories(${JSON_CPP_DIR})
++ list(APPEND CORE_FILES ${JSON_CPP_DIR}/jsoncpp.cpp)
++endif()
++
+ set(VRCORE_FILES
+ vrcore/dirtools_public.cpp
+ vrcore/envvartools_public.cpp
+@@ -100,6 +106,10 @@ if(USE_CUSTOM_LIBCXX)
+ set(EXTRA_LIBS ${EXTRA_LIBS} c++ c++abi)
+ endif()
+
++if(USE_SYSTEM_JSONCPP)
++ list(APPEND EXTRA_LIBS jsoncpp)
++endif()
++
+ target_link_libraries(${LIBNAME} ${EXTRA_LIBS} ${CMAKE_DL_LIBS})
+ target_include_directories(${LIBNAME} PUBLIC ${OPENVR_HEADER_DIR})
+
+
+From a7a6995d1d6f9ee1a17a3741661156f9706c40ce Mon Sep 17 00:00:00 2001
+From: Lubosz Sarnecki <lubosz.sarnecki(a)collabora.com>
+Date: Thu, 15 Aug 2019 15:05:34 +0200
+Subject: [PATCH 2/2] thirdparty: Move jsoncpp to thridparty directory.
+
+Even though the previous patch in this patch set enabled the build with
+a system wide jsoncpp and worked for me, it still left the internal
+jsoncpp includes in the include path, since the includes were placed
+in `CMAKE_CURRENT_SOURCE_DIR`. This could cause problems on other systems
+when trying to build with a system wide jsoncpp.
+
+In order to remove the internal json.h from the include path,
+I moved all jsoncpp files into a thridparty directory amd include
+it in the case of `USE_SYSTEM_JSONCPP` not being set.
+---
+ {src => thirdparty/jsoncpp}/json/json-forwards.h | 0
+ {src => thirdparty/jsoncpp}/json/json.h | 0
+ {src => thirdparty/jsoncpp}/jsoncpp.cpp | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {src => thirdparty/jsoncpp}/json/json-forwards.h (100%)
+ rename {src => thirdparty/jsoncpp}/json/json.h (100%)
+ rename {src => thirdparty/jsoncpp}/jsoncpp.cpp (100%)
+
+diff --git a/src/json/json-forwards.h b/thirdparty/jsoncpp/json/json-forwards.h
+similarity index 100%
+rename from src/json/json-forwards.h
+rename to thirdparty/jsoncpp/json/json-forwards.h
+diff --git a/src/json/json.h b/thirdparty/jsoncpp/json/json.h
+similarity index 100%
+rename from src/json/json.h
+rename to thirdparty/jsoncpp/json/json.h
+diff --git a/src/jsoncpp.cpp b/thirdparty/jsoncpp/jsoncpp.cpp
+similarity index 100%
+rename from src/jsoncpp.cpp
+rename to thirdparty/jsoncpp/jsoncpp.cpp
diff --git a/openvr-api-soversion.patch b/openvr-api-soversion.patch
new file mode 100644
index 0000000..087ccdd
--- /dev/null
+++ b/openvr-api-soversion.patch
@@ -0,0 +1,11 @@
+diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt 2023-10-24 19:58:37.076421394 -0700
++++ b/src/CMakeLists.txt 2023-10-24 20:00:26.807622046 -0700
+@@ -78,6 +78,7 @@
+ # Build the library.
+ if(BUILD_SHARED)
+ add_library(${LIBNAME} SHARED ${SOURCE_FILES})
++ set_target_properties(${LIBNAME} PROPERTIES SOVERSION 1.0.0)
+ elseif(BUILD_FRAMEWORK)
+ set( LIBNAME "OpenVR" )
+ add_library( ${LIBNAME}
diff --git a/openvr-skip-steamvr-check.patch b/openvr-skip-steamvr-check.patch
new file mode 100644
index 0000000..81c8886
--- /dev/null
+++ b/openvr-skip-steamvr-check.patch
@@ -0,0 +1,13 @@
+diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
+index 545ff1a..3270bcb 100644
+--- a/samples/CMakeLists.txt
++++ b/samples/CMakeLists.txt
+@@ -52,7 +52,7 @@ set(SHARED_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/shared)
+ # (needed to prevent a segfault in OpenVR).
+ if(CMAKE_HOST_UNIX)
+ find_file(OPENVRPATHS openvrpaths.vrpath PATHS $ENV{HOME}/.config/openvr "$ENV{HOME}/Library/Application Support/OpenVR/.openvr")
+- if(${OPENVRPATHS} MATCHES OPENVRPATHS-NOTFOUND)
++ if(${OPENVRPATHS} MATCHES OPENVRPATHS-NOTFOUND AND NOT SKIP_STEAMVR_CHECK)
+ message(FATAL_ERROR "${OPENVRPATHS} Please install SteamVR SDK to continue..")
+ endif()
+ endif()
diff --git a/openvr-use-system-sdl2-vulkan.patch b/openvr-use-system-sdl2-vulkan.patch
new file mode 100644
index 0000000..5cfd545
--- /dev/null
+++ b/openvr-use-system-sdl2-vulkan.patch
@@ -0,0 +1,72 @@
+diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
+index 545ff1a..dacb2ba 100644
+--- a/samples/CMakeLists.txt
++++ b/samples/CMakeLists.txt
+@@ -137,35 +137,44 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ list(APPEND SDL2_LIBRARIES ${${lib}_LIBRARY})
+ endforeach()
+ else()
+- foreach(lib ${SDL_REQUIRED_LIBRARIES})
+- find_library(${lib}_LIBRARY
+- NAMES
++ if (USE_SYSTEM_SDL2)
++ find_package(${SDL_REQUIRED_LIBRARIES} REQUIRED)
++ else()
++ foreach(lib ${SDL_REQUIRED_LIBRARIES})
++ find_library(${lib}_LIBRARY
++ NAMES
+ ${lib}
+- PATHS
+- ${THIRDPARTY_DIR}/sdl2-2.0.3/bin
+- PATH_SUFFIXES
+- linux${PLATFORM}
+- ${WINDOWS_PATH_SUFFIXES}
+- )
+- list(APPEND SDL2_LIBRARIES ${${lib}_LIBRARY})
+- endforeach()
++ PATHS
++ ${THIRDPARTY_DIR}/sdl2-2.0.3/bin
++ PATH_SUFFIXES
++ linux${PLATFORM}
++ ${WINDOWS_PATH_SUFFIXES}
++ )
++ list(APPEND SDL2_LIBRARIES ${${lib}_LIBRARY})
++ endforeach()
++ endif()
+ endif()
+ set(SDL2_INCLUDE_DIR ${THIRDPARTY_DIR}/sdl2-2.0.3/include)
+
+ ## Vulkan
+ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
+- find_library(VULKAN_LIBRARY
+- NAMES
+- vulkan-1
+- vulkan
+- PATHS
+- ${THIRDPARTY_DIR}/vulkan-1.0.49.0/lib
+- PATH_SUFFIXES
+- linux${PLATFORM}
+- ${WINDOWS_PATH_SUFFIXES}
+- NO_DEFAULT_PATH
+- )
+- set(VULKAN_INCLUDE_DIR ${THIRDPARTY_DIR}/vulkan-1.0.49.0/include)
++ if (USE_SYSTEM_VULKAN)
++ find_package(Vulkan REQUIRED)
++ list(APPEND EXTRA_LIBS ${Vulkan_LIBRARIES})
++ else()
++ find_library(VULKAN_LIBRARY
++ NAMES
++ vulkan-1
++ vulkan
++ PATHS
++ ${THIRDPARTY_DIR}/vulkan-1.0.49.0/lib
++ PATH_SUFFIXES
++ linux${PLATFORM}
++ ${WINDOWS_PATH_SUFFIXES}
++ NO_DEFAULT_PATH
++ )
++ set(VULKAN_INCLUDE_DIR ${THIRDPARTY_DIR}/vulkan-1.0.49.0/include)
++ endif()
+ endif()
+
+
diff --git a/openvr.spec b/openvr.spec
new file mode 100644
index 0000000..9e8c447
--- /dev/null
+++ b/openvr.spec
@@ -0,0 +1,206 @@
+# Samples aren't supported on i686
+%ifarch i686
+%bcond_with samples
+%else
+%bcond_without samples
+%endif
+
+%global common_description %{expand:
+OpenVR is an API and runtime that allows access to VR hardware from multiple
+vendors without requiring that applications have specific knowledge of the
+hardware they are targeting.}
+
+Name: openvr
+Version: 1.26.7
+Release: %autorelease
+Summary: OpenVR SDK
+
+License: BSD-3-Clause
+URL: https://github.com/ValveSoftware/openvr
+Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+# Use GNUInstallDirs to determine lib install path
+Patch: %{url}/pull/1511.patch
+# Add ability to build with system installed jsoncpp
+Patch: %{url}/pull/1716.patch
+# Add option to neuter the steamvr check
+Patch: openvr-skip-steamvr-check.patch
+# Add ability to build with system installed SDL2 and Vulkan
+Patch: openvr-use-system-sdl2-vulkan.patch
+# Define soversion for the OpenVR API library
+Patch: openvr-api-soversion.patch
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+
+BuildRequires: jsoncpp-devel
+
+%if %{with samples}
+BuildRequires: chrpath
+BuildRequires: glslang
+BuildRequires: glslc
+BuildRequires: sed
+
+BuildRequires: glew-devel
+BuildRequires: libGL-devel
+BuildRequires: qt5-qtbase-devel
+BuildRequires: SDL2-devel
+BuildRequires: vulkan-loader-devel
+%endif
+
+%description %{common_description}
+
+%package api
+Summary: OpenVR API libraries
+
+%description api %{common_description}
+
+This package provides the shared libraries for the OpenVR Application API.
+
+%package devel
+Summary: Development headers for %{name}
+Requires: jsoncpp-devel
+Requires: %{name}-api%{?_isa} = %{version}-%{release}
+
+%description devel %{common_description}
+
+This package provides the development headers for OpenVR.
+
+%package doc
+Summary: Documentation for %{name}
+BuildArch: noarch
+
+%description doc %{common_description}
+
+This package provides additional documentation for OpenVR.
+
+%if %{with samples}
+%package samples
+Summary: OpenVR Samples
+
+%description samples %{common_description}
+
+This package provides various sample programs and drivers using OpenVR.
+%endif
+
+%prep
+%autosetup -p1
+
+# Delete prebuilt binaries and libraries
+rm -r bin lib samples/bin/{android*,linux*,win*}
+
+# Delete prebuilt shaders
+rm samples/bin/shaders/*.spv
+
+# Delete bundled library sources
+rm -r thirdparty samples/thirdparty
+
+%if %{with samples}
+# Fix paths in samples
+sed -i 's:../hellovr_actions.json:%{_datadir}/%{name}/hellovr_actions.json:' \
+ samples/hellovr_opengl/hellovr_opengl_main.cpp
+sed -i 's:../shaders/:%{_libdir}/%{name}/shaders/:' \
+ samples/hellovr_vulkan/hellovr_vulkan_main.cpp
+sed -i 's:../cube_texture.png:%{_datadir}/%{name}/cube_texture.png:' \
+ samples/hellovr_opengl/hellovr_opengl_main.cpp \
+ samples/hellovr_vulkan/hellovr_vulkan_main.cpp
+%endif
+
+%build
+# Build library
+%cmake \
+ -DBUILD_SHARED=ON \
+ -DUSE_SYSTEM_JSONCPP=ON
+%cmake_build
+
+%if %{with samples}
+# Build shaders
+# see samples/bin/shaders/build_vulkan_shaders.bat
+for f in samples/bin/shaders/*.hlsl; do
+ base="$(dirname "$f")/$(basename "$f" .hlsl)"
+
+ glslangValidator \
+ -S vert \
+ -e VSMain \
+ -o "${base}_vs.spv" \
+ -V \
+ --hlsl-iomap \
+ --auto-map-bindings \
+ --shift-cbuffer-binding 0 \
+ --shift-texture-binding 1 \
+ --shift-sampler-binding 2 \
+ -D "$f"
+
+ glslangValidator \
+ -S frag \
+ -e PSMain \
+ -o "${base}_ps.spv" \
+ -V \
+ --hlsl-iomap \
+ --auto-map-bindings \
+ --shift-cbuffer-binding 0 \
+ --shift-texture-binding 1 \
+ --shift-sampler-binding 2 \
+ -D "$f"
+done
+
+# Build samples
+pushd samples
+%cmake \
+ -DSKIP_STEAMVR_CHECK=ON \
+ -DUSE_SYSTEM_SDL2=ON \
+ -DUSE_SYSTEM_VULKAN=ON
+%cmake_build
+
+# Build sample drivers
+pushd drivers
+%cmake
+%cmake_build
+%endif
+
+%install
+%cmake_install
+
+%if %{with samples}
+# Samples have to be installed manually
+install -Dpm0755 -t %{buildroot}%{_bindir} samples/bin/linux%{__isa_bits}/*
+install -Dpm0644 -t %{buildroot}%{_datadir}/%{name} \
+ samples/bin/*.json \
+ samples/bin/cube_texture.png
+install -Dpm0644 -t %{buildroot}%{_libdir}/%{name}/shaders \
+ samples/bin/shaders/*.spv
+
+# Sample drivers have to be installed manually
+install -Dpm0755 -t %{buildroot}%{_libdir}/%{name}/drivers \
+ samples/drivers/%{_vpath_builddir}/drivers/*/libdriver_*.so
+
+# Fix runpath in samples and sample drivers
+chrpath -d %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/drivers/*.so
+%endif
+
+%files api
+%license LICENSE
+%doc README.md
+%{_libdir}/libopenvr_api.so.1{,.*}
+
+%files devel
+%{_includedir}/%{name}
+%{_datadir}/pkgconfig/%{name}.pc
+%{_libdir}/libopenvr_api.so
+
+%files doc
+%license LICENSE
+%doc docs controller_callouts
+
+%if %{with samples}
+%files samples
+%license LICENSE
+%{_bindir}/hellovr_opengl
+%{_bindir}/hellovr_vulkan
+%{_bindir}/helloworldoverlay
+%{_bindir}/tracked_camera_openvr_sample
+%{_datadir}/%{name}/
+%{_libdir}/%{name}/
+%endif
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..d495c28
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (openvr-1.26.7.tar.gz) = d1f4f3e1b3444a465f1e82e448928f4b14aef91bfdb87d2063df309b590a2e4f62e29b3ea42ee02451d18efe647814b5dabe1528134e0e0f9cf2e4aeb4cf97ee
1 month, 1 week
Architecture specific change in rpms/vrpn.git
by githook-noreply@fedoraproject.org
The package rpms/vrpn.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/vrpn.git/commit/?id=b9fa6f787bf4f...
https://src.fedoraproject.org/cgit/rpms/vrpn.git/commit/?id=c8f5ab52f1ff8...
https://src.fedoraproject.org/cgit/rpms/vrpn.git/commit/?id=baf215cbb0f8e...
https://src.fedoraproject.org/cgit/rpms/vrpn.git/commit/?id=53fa76e72aa3a....
Change:
-%ifarch %{arm}
+%ifarch %{arm}
-%ifarch %{arm}
+%ifarch %{arm}
Thanks.
Full change:
============
commit b9fa6f787bf4f1529d601f8a8493d55377c136e4
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Tue Oct 31 08:17:07 2023 -0700
Unretire and update to 07.35
diff --git a/.gitignore b/.gitignore
index 897c42a..f5b00bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/vrpn-version_07.33.tar.gz
+/vrpn-07.35.tar.gz
diff --git a/1b4676b3cf8bbaff2f75c8e41b005401b189b2e2.patch b/1b4676b3cf8bbaff2f75c8e41b005401b189b2e2.patch
new file mode 100644
index 0000000..71b19a6
--- /dev/null
+++ b/1b4676b3cf8bbaff2f75c8e41b005401b189b2e2.patch
@@ -0,0 +1,23 @@
+From 1b4676b3cf8bbaff2f75c8e41b005401b189b2e2 Mon Sep 17 00:00:00 2001
+From: Russ Taylor <russ(a)reliasolve.com>
+Date: Sun, 1 Jan 2023 11:34:16 -0500
+Subject: [PATCH] Extending range of Python version search to support two-digit
+ minor version to include 3.10 and 3.11
+
+---
+ python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 8c3870f69..c2ea7707e 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -3,7 +3,7 @@ if(PYTHONLIBS_FOUND AND (VRPN_BUILD_PYTHON_HANDCODED_2X OR VRPN_BUILD_PYTHON_HAN
+ include_directories(${PYTHON_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}")
+
+ set(PYTHONVERSIONDIR python)
+- if(PYTHON_LIBRARY MATCHES "python([23].[0-9])")
++ if(PYTHON_LIBRARY MATCHES "python([23].[0-9]+)")
+ set(PYTHONVERSIONDIR "python${CMAKE_MATCH_1}/")
+ endif()
+
diff --git a/sources b/sources
index 90e342c..b81c2e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad1475cdcc2572fcf447f8e88404f753 vrpn-version_07.33.tar.gz
+SHA512 (vrpn-07.35.tar.gz) = 115a37849e7a2d30c1d4cc69b2d9204297497b17591ff19255272b59730388e2c0c157f8e6a7e6f0150cf2469622561c3021964295624833b9da4f6550d4581b
diff --git a/vrpn-config_install.patch b/vrpn-config_install.patch
deleted file mode 100644
index 68b4c81..0000000
--- a/vrpn-config_install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: vrpn-version_07.33/server_src/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/server_src/CMakeLists.txt
-+++ vrpn-version_07.33/server_src/CMakeLists.txt
-@@ -143,13 +143,18 @@ configure_file("${CMAKE_CURRENT_SOURCE_D
- @ONLY)
-
- if(VRPN_INSTALL)
-+ set(SYSCONF_INSTALL_DIR
-+ etc
-+ CACHE
-+ PATH
-+ "Directory to install configuration files")
- if(WIN32)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.cfg"
- DESTINATION bin
- COMPONENT mainserver)
- else()
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.cfg"
-- DESTINATION etc
-+ DESTINATION ${SYSCONF_INSTALL_DIR}
- COMPONENT mainserver)
- endif()
-
diff --git a/vrpn-dont-install-tests.patch b/vrpn-dont-install-tests.patch
new file mode 100644
index 0000000..383efc1
--- /dev/null
+++ b/vrpn-dont-install-tests.patch
@@ -0,0 +1,76 @@
+diff -Naur a/client_src/CMakeLists.txt b/client_src/CMakeLists.txt
+--- a/client_src/CMakeLists.txt 2022-05-30 10:26:37.000000000 -0700
++++ b/client_src/CMakeLists.txt 2023-10-28 09:05:05.727862781 -0700
+@@ -76,9 +76,6 @@
+ target_link_libraries(${APP} ${VRPN_CLIENT_LIBRARY})
+
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
+ endforeach()
+
+ add_test(test_imager test_imager)
+@@ -98,16 +95,6 @@
+ ${OPENGL_LIBRARIES})
+ set_target_properties(testimager_client PROPERTIES FOLDER Tests)
+
+- if(VRPN_INSTALL)
+- install(TARGETS
+- testimager_client
+- RUNTIME
+- DESTINATION
+- bin
+- COMPONENT
+- tests)
+- endif()
+-
+ if(VRPN_GLUT_IS_STATIC_FREEGLUT)
+ set_property(TARGET
+ testimager_client
+@@ -154,17 +141,6 @@
+
+ set_target_properties(c_interface_example PROPERTIES FOLDER Tests)
+
+- if(VRPN_INSTALL)
+- install(TARGETS
+- c_interface_example
+- RUNTIME
+- DESTINATION
+- bin
+- COMPONENT
+- tests)
+- endif()
+-
+-
+ ###
+ # Clients
+ ###
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2023-10-28 09:03:46.843029423 -0700
++++ b/CMakeLists.txt 2023-10-28 09:05:27.864096634 -0700
+@@ -1458,9 +1458,6 @@
+ add_executable(${APP} ${SOURCE})
+ target_link_libraries(${APP} vrpnserver)
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
+ endforeach()
+ endif()
+
+diff -Naur a/server_src/CMakeLists.txt b/server_src/CMakeLists.txt
+--- a/server_src/CMakeLists.txt 2023-10-28 09:03:46.845029444 -0700
++++ b/server_src/CMakeLists.txt 2023-10-28 09:05:16.033971660 -0700
+@@ -217,11 +217,6 @@
+ add_executable(${APP} ${SOURCE})
+ target_link_libraries(${APP} ${VRPN_SERVER_LIBRARY})
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+-
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP}
+- RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
+ endforeach()
+ add_test(test_vrpn test_vrpn)
+ add_test(test_loopback test_loopback)
diff --git a/vrpn-dont_install_garbage.patch b/vrpn-dont_install_garbage.patch
deleted file mode 100644
index 13aaf98..0000000
--- a/vrpn-dont_install_garbage.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: vrpn-version_07.33/client_src/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/client_src/CMakeLists.txt
-+++ vrpn-version_07.33/client_src/CMakeLists.txt
-@@ -74,9 +74,9 @@ if(VRPN_BUILD_CLIENTS)
- target_link_libraries(${APP} ${VRPN_CLIENT_LIBRARY})
-
- set_target_properties(${APP} PROPERTIES FOLDER Tests)
-- if(VRPN_INSTALL)
-- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
-+ #endif()
- endforeach()
-
- if(GLUT_FOUND AND OPENGL_FOUND)
-@@ -89,15 +89,15 @@ if(VRPN_BUILD_CLIENTS)
-
- set_target_properties(testimager_client PROPERTIES FOLDER Tests)
-
-- if(VRPN_INSTALL)
-- install(TARGETS
-- testimager_client
-- RUNTIME
-- DESTINATION
-- bin
-- COMPONENT
-- tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS
-+ # testimager_client
-+ # RUNTIME
-+ # DESTINATION
-+ # bin
-+ # COMPONENT
-+ # tests)
-+ #endif()
- option(VRPN_GLUT_IS_STATIC_FREEGLUT
- "Is the GLUT used for the imaging test client a static build of FreeGLUT?"
- NO)
-@@ -121,15 +121,15 @@ if(VRPN_BUILD_CLIENTS)
-
- set_target_properties(c_interface_example PROPERTIES FOLDER Tests)
-
-- if(VRPN_INSTALL)
-- install(TARGETS
-- c_interface_example
-- RUNTIME
-- DESTINATION
-- bin
-- COMPONENT
-- tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS
-+ # c_interface_example
-+ # RUNTIME
-+ # DESTINATION
-+ # bin
-+ # COMPONENT
-+ # tests)
-+ #endif()
-
-
- ###
-Index: vrpn-version_07.33/server_src/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/server_src/CMakeLists.txt
-+++ vrpn-version_07.33/server_src/CMakeLists.txt
-@@ -219,10 +219,10 @@ if(BUILD_TESTING)
- target_link_libraries(${APP} ${VRPN_SERVER_LIBRARY})
- set_target_properties(${APP} PROPERTIES FOLDER Tests)
-
-- if(VRPN_INSTALL)
-- install(TARGETS ${APP}
-- RUNTIME DESTINATION bin COMPONENT tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS ${APP}
-+ # RUNTIME DESTINATION bin COMPONENT tests)
-+ #endif()
- endforeach()
- add_test(test_loopback test_loopback)
- add_test(test_vrpn test_vrpn)
-Index: vrpn-version_07.33/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/CMakeLists.txt
-+++ vrpn-version_07.33/CMakeLists.txt
-@@ -1393,9 +1393,9 @@ if(VRPN_BUILD_SERVERS AND VRPN_BUILD_SER
- add_executable(${APP} ${SOURCE})
- target_link_libraries(${APP} vrpnserver)
- set_target_properties(${APP} PROPERTIES FOLDER Tests)
-- if(VRPN_INSTALL)
-- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
-+ #endif()
- endforeach()
- endif()
-
diff --git a/vrpn-find_hidapi.patch b/vrpn-find_hidapi.patch
deleted file mode 100644
index b2d596d..0000000
--- a/vrpn-find_hidapi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: vrpn-version_07.33/cmake/FindHIDAPI.cmake
-===================================================================
---- vrpn-version_07.33.orig/cmake/FindHIDAPI.cmake
-+++ vrpn-version_07.33/cmake/FindHIDAPI.cmake
-@@ -24,10 +24,13 @@
- # http://www.boost.org/LICENSE_1_0.txt)
-
- find_library(HIDAPI_LIBRARY
-- NAMES hidapi)
-+ NAMES hidapi hidapi-libusb)
-
- find_path(HIDAPI_INCLUDE_DIR
-- NAMES hidapi.h)
-+ NAMES hidapi.h
-+ PATH_SUFFIXES
-+ include
-+ include/hidapi)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(HIDAPI
diff --git a/vrpn-find_jsoncpp.patch b/vrpn-find_jsoncpp.patch
deleted file mode 100644
index 003966e..0000000
--- a/vrpn-find_jsoncpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vrpn-version_07.33/cmake/FindJsonCpp.cmake
-===================================================================
---- vrpn-version_07.33.orig/cmake/FindJsonCpp.cmake
-+++ vrpn-version_07.33/cmake/FindJsonCpp.cmake
-@@ -69,6 +69,7 @@ list(APPEND _jsoncppnames
-
- find_library(JSONCPP_LIBRARY
- NAMES
-+ jsoncpp
- ${_jsoncppnames}
- PATHS
- "${JSONCPP_ROOT_DIR}/libs"
diff --git a/vrpn-find_modbus.patch b/vrpn-find_modbus.patch
index 8fa2e29..86b8fa3 100644
--- a/vrpn-find_modbus.patch
+++ b/vrpn-find_modbus.patch
@@ -1,8 +1,7 @@
-Index: vrpn-version_07.33/cmake/FindModbus.cmake
-===================================================================
---- vrpn-version_07.33.orig/cmake/FindModbus.cmake
-+++ vrpn-version_07.33/cmake/FindModbus.cmake
-@@ -46,16 +46,16 @@ find_path(MODBUS_INCLUDE_DIR
+diff -Naur a/cmake/FindModbus.cmake b/cmake/FindModbus.cmake
+--- a/cmake/FindModbus.cmake 2022-05-30 10:26:37.000000000 -0700
++++ b/cmake/FindModbus.cmake 2023-10-28 08:57:58.065173100 -0700
+@@ -47,16 +47,16 @@
"${MODBUS_ROOT_DIR}"
PATH_SUFFIXES
include
diff --git a/vrpn-fix_library_install_rules.patch b/vrpn-fix_library_install_rules.patch
deleted file mode 100644
index 8f12fca..0000000
--- a/vrpn-fix_library_install_rules.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a03978b..0ad0c6d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1245,16 +1245,10 @@ if(VRPN_BUILD_SERVER_LIBRARY)
- if(VRPN_INSTALL)
- install(TARGETS
- vrpnserver
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
- endif()
- add_cppcheck(vrpnserver STYLE UNUSED_FUNCTIONS)
- endif()
-@@ -1292,16 +1286,10 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
- if(VRPN_INSTALL)
- install(TARGETS
- vrpn
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- clientsdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- clientsdk)
-+ RUNTIME DESTINATION bin COMPONENT clientsdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
- endif()
- add_cppcheck(vrpn STYLE UNUSED_FUNCTIONS)
- endif()
-diff --git a/atmellib/CMakeLists.txt b/atmellib/CMakeLists.txt
-index 30d51f1..003785c 100644
---- a/atmellib/CMakeLists.txt
-+++ b/atmellib/CMakeLists.txt
-@@ -24,14 +24,8 @@ set_property(TARGET
- if(VRPN_INSTALL)
- install(TARGETS
- vrpn_atmel
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
- endif()
-diff --git a/gpsnmealib/CMakeLists.txt b/gpsnmealib/CMakeLists.txt
-index fee7b3a..9a34e2d 100644
---- a/gpsnmealib/CMakeLists.txt
-+++ b/gpsnmealib/CMakeLists.txt
-@@ -25,14 +25,8 @@ set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
- if(VRPN_INSTALL)
- install(TARGETS
- gpsnmea
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
--endif()
-\ No newline at end of file
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
-+endif()
-diff --git a/quat/CMakeLists.txt b/quat/CMakeLists.txt
-index 597776e..8d48c94 100644
---- a/quat/CMakeLists.txt
-+++ b/quat/CMakeLists.txt
-@@ -38,28 +38,16 @@ set_target_properties(quat PROPERTIES FOLDER Library)
- if(VRPN_INSTALL)
- install(TARGETS
- quat
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
- install(TARGETS
- quat
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- clientsdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- clientsdk)
-+ RUNTIME DESTINATION bin COMPONENT clientsdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
- endif()
-
- add_subdirectory(testapps)
-diff --git a/server_src/timecode_generator_server/CMakeLists.txt b/server_src/timecode_generator_server/CMakeLists.txt
-index 5f8dce6..925bc44 100644
---- a/server_src/timecode_generator_server/CMakeLists.txt
-+++ b/server_src/timecode_generator_server/CMakeLists.txt
-@@ -25,14 +25,8 @@ set_target_properties(vrpn_timecode_generator
- if(VRPN_INSTALL)
- install(TARGETS
- vrpn_timecode_generator
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
--endif()
-\ No newline at end of file
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
-+endif()
diff --git a/vrpn-java_install.patch b/vrpn-java_install.patch
deleted file mode 100644
index b095105..0000000
--- a/vrpn-java_install.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Index: vrpn-version_07.33/java_vrpn/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/java_vrpn/CMakeLists.txt
-+++ vrpn-version_07.33/java_vrpn/CMakeLists.txt
-@@ -6,6 +6,29 @@
-
- if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EXECUTABLE AND VRPN_BUILD_JAVA)
-
-+ set(JAVA_INSTALL_LIBDIR
-+ lib
-+ CACHE PATH
-+ "Where to install java shared objects")
-+ set(JAVA_INSTALL_JNIDIR
-+ share/java
-+ CACHE PATH
-+ "Where to install JNI jar files")
-+
-+ if("${JAVA_INSTALL_LIBDIR}" STREQUAL lib)
-+ set(JAVA_LOAD_VRPN
-+ "System.loadLibrary(\"java_vrpn\")")
-+ else()
-+ if(IS_ABSOLUTE "${JAVA_INSTALL_LIBDIR}")
-+ set(JAVA_LOAD_VRPN
-+ "System.load(\"${JAVA_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}java_vrpn${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
-+ else()
-+ set(JAVA_LOAD_VRPN
-+ "System.load(\"${CMAKE_INSTALL_PREFIX}/${JAVA_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}java_vrpn${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
-+ endif()
-+ endif()
-+ configure_file("vrpn/VRPN.java.in" "vrpn/VRPN.java")
-+
- # Set up file lists
- set(JAVA_CLASSES
- AnalogOutputRemote
-@@ -22,7 +45,6 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
- TextSender
- TrackerRemote
- TrackerRemoteListener
-- VRPN
- VRPNDevice)
- set(JAVAC_OUTPUT)
- set(JAVAC_INPUT)
-@@ -38,6 +60,15 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
- JAVA_JNI_HEADERS
- "${CMAKE_CURRENT_BINARY_DIR}/vrpn_${class}.h")
- endforeach()
-+ list(APPEND
-+ JAVAC_OUTPUT
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.class")
-+ list(APPEND
-+ JAVAC_INPUT
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.java")
-+ list(APPEND
-+ JAVA_JNI_HEADERS
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_VRPN.h")
-
- # *.java -> *.class
- add_custom_command(OUTPUT
-@@ -87,6 +118,20 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
- COMMENT
- "Generating JNI header file for vrpn.${in}")
- endforeach()
-+ add_custom_command(OUTPUT
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_VRPN.h"
-+ DEPENDS
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.class"
-+ COMMAND
-+ "${JAVAH_EXECUTABLE}"
-+ -d
-+ "${CMAKE_CURRENT_BINARY_DIR}"
-+ -jni
-+ -classpath
-+ "${CMAKE_CURRENT_BINARY_DIR}"
-+ vrpn.VRPN
-+ COMMENT
-+ "Generating JNI header file for vrpn.${in}")
-
- # target for vrpn.jar
- add_custom_target(java_vrpn_jar
-@@ -120,12 +165,15 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
-
- if(VRPN_INSTALL)
- install(TARGETS java_vrpn
-- ARCHIVE DESTINATION lib COMPONENT java
-- LIBRARY DESTINATION lib COMPONENT java
-- RUNTIME DESTINATION lib COMPONENT java)
-+ ARCHIVE DESTINATION "${JAVA_INSTALL_LIBDIR}"
-+ COMPONENT java
-+ LIBRARY DESTINATION "${JAVA_INSTALL_LIBDIR}"
-+ COMPONENT java
-+ RUNTIME DESTINATION "${JAVA_INSTALL_LIBDIR}"
-+ COMPONENT java)
-
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.jar"
-- DESTINATION share/java
-+ DESTINATION "${JAVA_INSTALL_JNIDIR}"
- COMPONENT java
- RENAME vrpn-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.jar)
- endif()
-Index: vrpn-version_07.33/java_vrpn/vrpn/VRPN.java
-===================================================================
---- vrpn-version_07.33.orig/java_vrpn/vrpn/VRPN.java
-+++ /dev/null
-@@ -1,34 +0,0 @@
--
--
--package vrpn;
--
--public class VRPN
--{
--
-- /**
-- * All VRPN objects must assert this lock before making any calls
-- * into native code. A corollary of this is that no native methods
-- * may be public; all native methods must be wrapped by other methods
-- * that first synchronize on this lock before calling the native
-- * method.
-- */
-- protected final static Object downInVrpnLock = new Object( );
--
-- static
-- {
-- try { System.loadLibrary( "java_vrpn" ); }
-- catch( UnsatisfiedLinkError e )
-- {
-- System.out.println( e.getMessage( ) );
-- System.out.println( "Error initializing java_vrpn." );
-- System.out.println( " -- Unable to find native library." );
-- }
-- catch( SecurityException e )
-- {
-- System.out.println( e.getMessage( ) );
-- System.out.println( "Security exception: you couldn't load the native vrpn dll." );
-- }
-- } // end static initializer block
--
--
--} // end class VRPN
-Index: vrpn-version_07.33/java_vrpn/vrpn/VRPN.java.in
-===================================================================
---- /dev/null
-+++ vrpn-version_07.33/java_vrpn/vrpn/VRPN.java.in
-@@ -0,0 +1,34 @@
-+
-+
-+package vrpn;
-+
-+public class VRPN
-+{
-+
-+ /**
-+ * All VRPN objects must assert this lock before making any calls
-+ * into native code. A corollary of this is that no native methods
-+ * may be public; all native methods must be wrapped by other methods
-+ * that first synchronize on this lock before calling the native
-+ * method.
-+ */
-+ protected final static Object downInVrpnLock = new Object( );
-+
-+ static
-+ {
-+ try { @JAVA_LOAD_VRPN@; }
-+ catch( UnsatisfiedLinkError e )
-+ {
-+ System.out.println( e.getMessage( ) );
-+ System.out.println( "Error initializing java_vrpn." );
-+ System.out.println( " -- Unable to find native library." );
-+ }
-+ catch( SecurityException e )
-+ {
-+ System.out.println( e.getMessage( ) );
-+ System.out.println( "Security exception: you couldn't load the native vrpn dll." );
-+ }
-+ } // end static initializer block
-+
-+
-+} // end class VRPN
diff --git a/vrpn-soversion.patch b/vrpn-soversion.patch
index e10ed23..4a81e08 100644
--- a/vrpn-soversion.patch
+++ b/vrpn-soversion.patch
@@ -1,8 +1,1621 @@
-Index: vrpn-version_07.33/gpsnmealib/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/gpsnmealib/CMakeLists.txt
-+++ vrpn-version_07.33/gpsnmealib/CMakeLists.txt
-@@ -21,6 +21,10 @@ set_property(TARGET
+diff -Naur a/atmellib/CMakeLists.txt b/atmellib/CMakeLists.txt
+--- a/atmellib/CMakeLists.txt 2022-05-30 10:26:37.000000000 -0700
++++ b/atmellib/CMakeLists.txt 2023-10-28 09:03:00.892526682 -0700
+@@ -21,6 +21,12 @@
+ PROPERTY
+ FOLDER
+ "Library")
++set_target_properties(vrpn_atmel
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn_atmel
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2022-05-30 10:26:37.000000000 -0700
++++ b/CMakeLists.txt 2023-10-28 09:03:00.891526671 -0700
+@@ -1316,6 +1316,12 @@
+ PROPERTY
+ LINK_FLAGS
+ ${SERVER_LINK_FLAGS})
++ set_target_properties(vrpnserver
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(UNIX)
+ add_subdirectory(atmellib)
+@@ -1369,6 +1375,12 @@
+ PROPERTY
+ FOLDER
+ "Library")
++ set_target_properties(vrpn
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+diff -Naur a/CMakeLists.txt.orig b/CMakeLists.txt.orig
+--- a/CMakeLists.txt.orig 1969-12-31 16:00:00.000000000 -0800
++++ b/CMakeLists.txt.orig 2022-05-30 10:26:37.000000000 -0700
+@@ -0,0 +1,1565 @@
++cmake_minimum_required(VERSION 2.8.3)
++project(VRPN)
++
++#-----------------------------------------------------------------------------
++# XXX Things to make better.
++#
++# Repeat for all other configurable headers/libraries - see below for a list
++# Move the shared-library code over to CMake's normal definition
++# Improve this CPack installer.
++
++###
++# Local CMake Modules - keep this first
++###
++list(APPEND CMAKE_MODULE_PATH ${VRPN_SOURCE_DIR}/cmake)
++include(UseBackportedModules)
++include(MSVCMultipleProcessCompile)
++include(CppcheckTargets)
++include(SetDefaultBuildType)
++include(OptionRequires)
++include(CTest)
++include(CheckIncludeFileCXX)
++
++if((NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) OR VRPN_SUBPROJECT_BUILD)
++ # If you're using this as a subproject and want things installed, set VRPN_INSTALL TRUE.
++ set(SUBPROJECT TRUE)
++ set(DEFAULT_OFF_IF_SUBPROJECT OFF_BY_DEFAULT)
++ set(TRUE_UNLESS_SUBPROJECT FALSE)
++ set(QUIET_IF_SUBPROJECT QUIET) # silently search for optional deps as a subproject
++ set(BUILD_TESTING FALSE) # don't build testing or create dashboard scripts if a subproject
++else()
++ set(VRPN_INSTALL TRUE)
++ set(SUBPROJECT FALSE)
++ set(DEFAULT_OFF_IF_SUBPROJECT)
++ set(TRUE_UNLESS_SUBPROJECT TRUE)
++ set(QUIET_IF_SUBPROJECT)
++ include(CreateDashboardScripts)
++endif()
++
++###
++# On Windows 7, it does not work to install in the default location,
++# which is the Program Files directory, because you have to not only have
++# file permission to write there but also "run as administrator." This
++# means that "make install" from a Visual Studio project fails. To get
++# around that, we need to set CMAKE_INSTALL_PREFIX to something other
++# than the default. However, it is a cache variable that has already been
++# set. If we make a local variable, it uses this rather than the cache
++# variable and never tells the poor user what happened (the GUI location
++# looks standard but the files end up somewhere else). If we make it a
++# non-forced cache variable, it already has a value so does not change.
++# If we make it a forced cache variable, it gets overwritten every time
++# and the user cannot change it on the GUI. So we have a workaround here.
++# We make a cache variable that records whether we have ever forced the
++# install prefix. If not, we force it. If so, we don't force it again.
++# This has the effect of setting it the first time cmake is run, showing
++# the change in the GUI, and also letting the user change the value in
++# the GUI if they don't like what we did. If I knew how to do this only
++# happen on Windows 7, I'd make the if(WIN32) more specific.
++if(WIN32 AND NOT SUBPROJECT)
++ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
++ AND
++ (NOT
++ ONCE_SET_CMAKE_INSTALL_PREFIX))
++ set(ONCE_SET_CMAKE_INSTALL_PREFIX
++ true
++ CACHE
++ INTERNAL
++ "Have we set the install prefix yet?"
++ FORCE)
++ set(CMAKE_INSTALL_PREFIX
++ C:/usr/local
++ CACHE
++ PATH
++ "Install path prefix, prepended onto install directories"
++ FORCE)
++ endif()
++endif()
++
++
++###
++# Basic packaging options and versioning
++
++if (VRPN_INSTALL)
++ include("${CMAKE_CURRENT_SOURCE_DIR}/ParseVersion.cmake")
++
++ message(STATUS
++ "Configuring the VRPN suite version ${CPACK_PACKAGE_VERSION} using the CMake-based build system\n")
++
++ set(CPACK_PACKAGE_VENDOR
++ "VRPN Community led by Sensics, Inc.")
++ set(CPACK_PACKAGE_FILE_NAME
++ "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
++ set(CPACK_SOURCE_PACKAGE_FILE_NAME
++ "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-src")
++ set(CPACK_PACKAGE_CONTACT "Sensics VRPN Contact <vrpn(a)sensics.com>")
++endif()
++
++if (NOT SUBPROJECT)
++ #-----------------------------------------------------------------------------
++ # Compiler flags we got from Hans for Windows and from Sheldon Andrews
++ # for other architectures.
++ if(MSVC) # MS-Windows Visual Studio, both 32 and 64 bits
++ set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows")
++ if(MSVC_VERSION GREATER 1310) # This compiler flag needs newer than VS.NET 2003 (7.1)
++ # Choose fast, possibly less accurate floating point
++ # See http://msdn.microsoft.com/en-us/library/e7s85ffb(v=vs.80).aspx
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:fast")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast")
++ endif()
++
++ # Do not assume fixed base address (probably for DLL integration?)
++ # http://msdn.microsoft.com/en-us/library/w368ysh2(v=vs.80).aspx
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FIXED:NO")
++ else()
++ # GCC compilers on 64-bit machines require -fPIC for shared libraries or libs
++ # linked into shared libraries.
++
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
++ set(CMAKE_CXX_FLAGS
++ "${CMAKE_CXX_FLAGS} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
++ endif()
++endif()
++
++set(SERVER_EXTRA_LIBS)
++set(SERVER_LINK_FLAGS)
++
++# Set up correct defines for Windows header compilation:
++# This theoretically sets the lower-bound on operating system compatibility
++# http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85)...
++# NT4 0x0400
++# Win2k 0x0500
++# WinXP 0x0501
++# WS2003SP1/WinXPSP2 0x0502
++# Vista 0x0600
++# Win7 0x0601
++# Win8 0x0602
++# Win8.1 0x0603 (though some docs say 0x0602 with NTDDI_VERSION 0x06030000)
++if(WIN32)
++ set(WIN_MIN_VER 0x0500) # Default to Windows 2000
++ if(MSVC AND MSVC_VERSION GREATER 1699)
++ # VS2012: defaults to vista+, update 1 added XP support in additional toolset.
++ if("${CMAKE_VS_PLATFORM_TOOLSET}" MATCHES "_xp")
++ set(WIN_MIN_VER 0x0501) # WinXP
++ else()
++ set(WIN_MIN_VER 0x0600) # Vista
++ endif()
++ endif()
++ add_definitions("-D_WIN32_WINNT=${WIN_MIN_VER}" "-DNTDDI_VERSION=${WIN_MIN_VER}0000")
++endif()
++
++#-----------------------------------------------------------------------------
++# Options that control what gets built and how.
++
++if(NOT SUBPROJECT)
++ # We can build two configurations (passing defs to the compile lines) - which ones do we want?
++ # Note that we can build both now, if desired!
++ option(VRPN_BUILD_CLIENT_LIBRARY
++ "Build the vrpn library including only client code"
++ ON)
++ option(VRPN_BUILD_SERVER_LIBRARY
++ "Build the vrpnserver library including client and server code"
++ ON)
++
++ # Build various applications if we want them.
++ option(VRPN_BUILD_CLIENTS "Build VRPN client apps and tests" ON)
++ option(VRPN_BUILD_SERVERS "Build VRPN servers" ON)
++
++ # Development tools
++ if(MSVC_IDE AND MSVC_VERSION LESS 1600)
++ # VS 2012 Express and newer has folder support...
++ option(VRPN_BUILD_WITH_PROJECT_FOLDERS
++ "Use project folders in build system - not compatible with Visual C++ Express editions!"
++ OFF)
++ else()
++ set(VRPN_BUILD_WITH_PROJECT_FOLDERS ON)
++ endif()
++
++ set_property(GLOBAL
++ PROPERTY
++ USE_FOLDERS
++ ${VRPN_BUILD_WITH_PROJECT_FOLDERS})
++
++ # Set a default build type
++ set_default_build_type("RelWithDebInfo")
++
++endif()
++
++# Force use of our CMake-processed configuration header before the stock one.
++include_directories("${PROJECT_BINARY_DIR}")
++
++
++# Include directory needed by all of the files
++include_directories(${VRPN_SOURCE_DIR}
++ ${VRPN_SOURCE_DIR}/atmellib
++ ${VRPN_SOURCE_DIR}/quat)
++
++
++#-----------------------------------------------------------------------------
++# Libraries we need to do our thing.
++#
++# CMake variables:
++# SERVER_EXTRA_LIBS - libraries to link against when building the server lib
++# EXTRA_LIBS - libraries to link against when building any VRPN lib
++#
++# Note that library linking is, by default, transitive:
++# Specify linking here (even though static libraries might not use it
++# directly - think of shared libs and your fellow developer) rather than
++# in the included apps.
++
++###
++# Quatlib
++###
++add_subdirectory(quat)
++list(APPEND EXTRA_LIBS quat)
++
++###
++# Threading (not on win32)
++###
++if(NOT WIN32)
++ find_package(Threads REQUIRED ${QUIET_IF_SUBPROJECT})
++ list(APPEND EXTRA_LIBS ${CMAKE_THREAD_LIBS_INIT})
++endif()
++
++###
++# Windows-specific (non-Cygwin) dependencies
++###
++if(WIN32 AND NOT UNIX)
++ # Winsock - needed for endianness conversion
++ list(APPEND EXTRA_LIBS ws2_32)
++
++ # Windows multimedia - needed for joywin32
++ list(APPEND EXTRA_LIBS winmm)
++endif()
++
++###
++# Optional packages
++###
++if(NOT SUBPROJECT)
++ message(STATUS
++ "Now searching for auto-configurable optional packages...\n")
++endif()
++
++###
++# Submodules - bundled libraries/sources
++###
++add_subdirectory(submodules)
++
++###
++# SWIG and Python Libs (for python wrappers)
++###
++find_package(SWIG ${QUIET_IF_SUBPROJECT})
++
++set(CurrentPythonSettings
++ "${VRPN_BUILD_PYTHON}${VRPN_BUILD_PYTHON_HANDCODED_2X}${VRPN_BUILD_PYTHON_HANDCODED_3X}")
++if(NOT CurrentPythonSettings STREQUAL _VRPN_PYTHON_SETTINGS)
++ set(vrpn_python_versionsearch)
++ set(vrpn_python_versionsearchargs)
++ if(VRPN_BUILD_PYTHON)
++ # Swig wants 2.x, I assume
++ set(vrpn_python_versionsearch 2)
++ set(Python_ADDITIONAL_VERSIONS "")
++ if(VRPN_BUILD_PYTHON_HANDCODED_3X)
++ message(FATAL_ERROR
++ "Can't build both SWIG (2.x) and hand-coded 3.x Python bindings. Disable either VRPN_BUILD_PYTHON or VRPN_BUILD_PYTHON_HANDCODED_3X.")
++ endif()
++ elseif(VRPN_BUILD_PYTHON_HANDCODED_3X
++ AND
++ VRPN_BUILD_PYTHON_HANDCODED_2X)
++ message(FATAL_ERROR
++ "Can't build handcoded Python bindings for both 2.x and 3.x versions. Pick one, please.")
++ elseif(VRPN_BUILD_PYTHON_HANDCODED_2X
++ AND
++ NOT
++ VRPN_BUILD_PYTHON_HANDCODED_3X)
++ set(vrpn_python_versionsearch 2)
++ set(Python_ADDITIONAL_VERSIONS "")
++ elseif(VRPN_BUILD_PYTHON_HANDCODED_3X
++ AND
++ NOT
++ VRPN_BUILD_PYTHON_HANDCODED_2X)
++ set(vrpn_python_versionsearch 3)
++ set(Python_ADDITIONAL_VERSIONS 3.4)
++ endif()
++ unset(PYTHON_INCLUDE_DIR CACHE)
++ unset(PYTHON_INCLUDE_DIR)
++ unset(PYTHON_LIBRARY CACHE)
++ unset(PYTHON_LIBRARY)
++
++ set(_VRPN_PYTHON_VERSIONSEARCH
++ ${vrpn_python_versionsearch}
++ CACHE
++ INTERNAL
++ ""
++ FORCE)
++ set(_VRPN_PYTHON_SETTINGS
++ ${CurrentPythonSettings}
++ CACHE
++ INTERNAL
++ ""
++ FORCE)
++endif()
++
++# Passing just the major version works with as desired multi-python-capable find module such
++# as in latest CMake (2.8.9)
++find_package(PythonLibs ${_VRPN_PYTHON_VERSIONSEARCH} ${QUIET_IF_SUBPROJECT})
++if(PYTHONLIBS_FOUND)
++ if(PYTHONLIBS_VERSION_STRING)
++ string(SUBSTRING
++ ${PYTHONLIBS_VERSION_STRING}
++ 0
++ 1
++ vrpn_python_majorver)
++ set(PYTHON${vrpn_python_majorver}_FOUND ON)
++ elseif(PYTHON_LIBRARY MATCHES "python([23])")
++ set(PYTHON${CMAKE_MATCH_1}_FOUND ON)
++ elseif(_VRPN_PYTHON_VERSIONSEARCH)
++ set(PYTHON${_VRPN_PYTHON_VERSIONSEARCH}_FOUND ON)
++ else()
++ message(STATUS
++ "Warning: found python but couldn't determine which version. Please set either VRPN_PYTHON_IS_3 or VRPN_PYTHON_IS_2")
++ option(VRPN_PYTHON_IS_3 "Python found is version 3.x" OFF)
++ option(VRPN_PYTHON_IS_2 "Python found is version 2.x" OFF)
++ if(VRPN_PYTHON_IS_3 AND VRPN_PYTHON_IS_2)
++ unset(VRPN_PYTHON_IS_2 CACHE)
++ unset(VRPN_PYTHON_IS_3 CACHE)
++ message(FATAL_ERROR
++ "If needed, please set either VRPN_PYTHON_IS_3 or VRPN_PYTHON_IS_2, not both!")
++ elseif(VRPN_PYTHON_IS_3)
++ set(PYTHON3_FOUND ON)
++ elseif(VRPN_PYTHON_IS_2)
++ set(PYTHON2_FOUND ON)
++ endif()
++ endif()
++endif()
++
++# If MSVC, and we don't have a debug lib, default to off, or the default (debug runtime) build is broken.
++if(MSVC AND NOT PYTHON_LIBRARY_DEBUG)
++ set(PYTHON_DEFAULT_OFF OFF_BY_DEFAULT)
++else()
++ set(PYTHON_DEFAULT_OFF ${DEFAULT_OFF_IF_SUBPROJECT})
++endif()
++option_requires(VRPN_BUILD_PYTHON
++ "Build VRPN Python 2.x SWIG-based bindings"
++ ${PYTHON_DEFAULT_OFF}
++ SWIG_FOUND
++ PYTHON2_FOUND)
++
++option_requires(VRPN_BUILD_PYTHON_HANDCODED_2X
++ "Build VRPN Python handcoded bindings for Python 2.x"
++ ${PYTHON_DEFAULT_OFF}
++ PYTHON2_FOUND)
++
++option_requires(VRPN_BUILD_PYTHON_HANDCODED_3X
++ "Build VRPN Python handcoded bindings for Python 3.x"
++ ${PYTHON_DEFAULT_OFF}
++ PYTHON3_FOUND)
++
++###
++# javac, jar, and javah (for java wrapper)
++###
++if(ANDROID AND DEFINED find_host_package)
++ find_host_package(Java COMPONENTS Development)
++ find_host_package(JNI)
++ find_host_program(JAVAH_EXECUTABLE NAMES javah)
++else()
++ find_package(Java COMPONENTS Development ${QUIET_IF_SUBPROJECT})
++ find_package(JNI ${QUIET_IF_SUBPROJECT})
++ find_program(JAVAH_EXECUTABLE NAMES javah)
++endif()
++mark_as_advanced(JAVAH_EXECUTABLE)
++option_requires(VRPN_BUILD_JAVA
++ "Build VRPN Java bindings"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ Java_JAVAC_EXECUTABLE
++ Java_JAR_EXECUTABLE
++ JNI_FOUND
++ JAVAH_EXECUTABLE)
++
++###
++# MPI
++###
++find_package(MPI ${QUIET_IF_SUBPROJECT})
++# XXX Safe to enable by default if we find it?
++option_requires(VRPN_USE_MPI
++ "Build with MPI support"
++ OFF_BY_DEFAULT
++ MPI_FOUND)
++
++if(VRPN_USE_MPI)
++ # XXX what else needs to be done here?
++ add_definitions(${MPI_COMPILE_FLAGS})
++ include_directories(${MPI_INCLUDE_PATH})
++ list(APPEND EXTRA_LIBS ${MPI_LIBRARIES})
++endif()
++
++###
++# Modbus library
++###
++find_package(Modbus ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_MODBUS
++ "Build with Modbus support"
++ OFF_BY_DEFAULT
++ MODBUS_FOUND)
++
++if(VRPN_USE_MODBUS)
++ # XXX what else needs to be done here?
++ include_directories(${MODBUS_INCLUDE_DIR})
++ list(APPEND EXTRA_LIBS ${MODBUS_LIBRARY})
++endif()
++
++###
++# Libusb1
++###
++find_package(Libusb1 ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_LIBUSB_1_0
++ "Attempt to use LibUSB-1.0 to talk directly to USB devices."
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ LIBUSB1_FOUND)
++
++if(VRPN_USE_LIBUSB_1_0)
++ include_directories(${LIBUSB1_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${LIBUSB1_LIBRARIES})
++endif()
++
++
++###
++# HID and HIDAPI
++###
++
++# Setting up the local HIDAPI was handled above, in the submodules directory
++if(NOT VRPN_USE_LOCAL_HIDAPI)
++ find_package(HIDAPI ${QUIET_IF_SUBPROJECT})
++endif()
++
++# HID requires either local or system-installed HIDAPI
++# Both set HIDAPI_FOUND, HIDAPI_LIBRARIES, and HIDAPI_INCLUDE_DIRS
++# If the user chose VRPN_USE_LOCAL_HIDAPI, the HIDAPI_SOURCES
++# variable, as included in the source list below, will also be set.
++option_requires(VRPN_USE_HID
++ "Build with support for HID devices using HIDAPI"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ HIDAPI_FOUND)
++
++if(VRPN_USE_HID)
++ include_directories(${HIDAPI_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${HIDAPI_LIBRARIES})
++ option(VRPN_BUILD_HID_GUI
++ "Should we build a GUI for analyzing live HID streams?"
++ OFF)
++ option(VRPN_HID_DEBUGGING
++ "Should verbose debugging messages be displayed during HID interactions?"
++ off)
++ if(VRPN_HID_DEBUGGING)
++ add_definitions(-DVRPN_HID_DEBUGGING)
++ endif()
++else()
++ # Clear this variable if they don't want HID after all.
++ if (VRPN_USE_LOCAL_HIDAPI)
++ message(STATUS
++ "NOTE: You have VRPN_USE_LOCAL_HIDAPI enabled, but "
++ "VRPN_USE_HID disabled: HIDAPI will only be built if you enable HID support for VRPN")
++ endif()
++ set(HIDAPI_SOURCES)
++endif()
++
++###
++# Sensable "OpenHaptics" HDAPI/HLAPI
++###
++find_package(OpenHaptics ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_HDAPI
++ "Allow SensAble Phantom support through HDAPI/HLAPI - VRPN_USE_PHANTOM_SERVER must still be set"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ OPENHAPTICS_FOUND)
++if(VRPN_USE_HDAPI)
++ set(PHANTOM_POSSIBLE ON)
++endif()
++
++###
++# Sensable GHOST
++###
++if(NOT VRPN_USE_HDAPI)
++ find_package(GHOST ${QUIET_IF_SUBPROJECT})
++ option_requires(VRPN_USE_GHOST
++ "Allow SensAble Phantom support through GHOST - VRPN_USE_PHANTOM_SERVER must still be set"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ GHOST_FOUND)
++ if(VRPN_USE_GHOST)
++ if(NOT ${GHOST_LIBRARIES} MATCHES ".*40.*")
++ message(STATUS "GHOST pre-4.0 detected - calling it 3.1.")
++ set(VRPN_USE_GHOST_31 ON)
++ endif()
++ set(PHANTOM_POSSIBLE ON)
++ endif()
++endif()
++
++###
++# Sensable PHANToM Support - Overall Option
++###
++option_requires(VRPN_USE_PHANTOM_SERVER
++ "Build with SensAble Phantom support"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ PHANTOM_POSSIBLE)
++
++if(VRPN_USE_PHANTOM_SERVER)
++ if(VRPN_USE_HDAPI)
++ include_directories(${OPENHAPTICS_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${OPENHAPTICS_LIBRARIES})
++ else()
++ # VRPN_USE_GHOST
++ include_directories(${GHOST_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${GHOST_LIBRARIES})
++ endif()
++endif()
++
++
++###
++# libi2c-dev
++###
++find_package(libi2c-dev ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_I2CDEV
++ "Build devices requiring libi2c-dev"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ I2CDEV_FOUND)
++
++if(VRPN_USE_I2CDEV)
++ include_directories(AFTER ${I2CDEV_INCLUDE_DIRS})
++endif()
++
++###
++# WiiUse
++###
++find_package(WiiUse ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_WIIUSE
++ "Build with WiiUse library support (makes servers GPL)"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ WIIUSE_FOUND)
++
++if(VRPN_USE_WIIUSE)
++ include_directories(${WIIUSE_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${WIIUSE_LIBRARIES})
++endif()
++
++###
++# JsonCpp
++##
++## Setting up the local JSONCPP was handled above, in the submodules directory
++if(NOT VRPN_USE_LOCAL_JSONCPP)
++ find_package(JsonCpp ${QUIET_IF_SUBPROJECT})
++endif()
++option_requires(VRPN_USE_JSONNET
++ "Build with JSONCPP (for Android widgets and other UDP JSON-based APIs)"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ JSONCPP_FOUND)
++
++if(VRPN_USE_JSONNET)
++ include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${JSONCPP_LIBRARY})
++else()
++ set(JSONCPP_SOURCES)
++endif()
++
++###
++# libnifalcon
++###
++find_package(LibNifalcon ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_LIBNIFALCON
++ "Build with libnifalcon support to access Novint Falcon devices"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ LIBNIFALCON_FOUND)
++
++if(VRPN_USE_LIBNIFALCON)
++ include_directories(${LIBNIFALCON_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${LIBNIFALCON_LIBRARIES})
++endif()
++
++###
++# DirectInput and XInput
++###
++if(WIN32)
++ find_package(DirectX ${QUIET_IF_SUBPROJECT})
++ option_requires(VRPN_USE_DIRECTINPUT
++ "Build with Microsoft DirectInput support"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ DIRECTX_DXGUID_LIBRARY
++ DIRECTX_DINPUT_LIBRARY
++ DIRECTX_DINPUT_INCLUDE_DIR
++ DIRECTX_SDK_SUPPORTS_COMPILER)
++ if(VRPN_USE_DIRECTINPUT)
++ include_directories(${DIRECTX_INCLUDE_DIRS})
++ list(APPEND
++ SERVER_EXTRA_LIBS
++ ${DIRECTX_DXGUID_LIBRARY}
++ ${DIRECTX_DINPUT_LIBRARY})
++ if(MSVC)
++ # Delay-load DirectInput DLL
++ # TODO is this always the right name
++ # TODO how to do this with MinGW? Can we? Do we need to?
++ list(APPEND SERVER_LINK_FLAGS "/DELAYLOAD:dinput8.dll")
++ list(APPEND SERVER_EXTRA_LIBS "delayimp.lib")
++ endif()
++ endif()
++
++ # XInput - enhanced API for XBOX 360 controllers and more.
++ find_directx_include(DIRECTX_XINPUT_INCLUDE_DIR
++ xinput.h)
++ option_requires(VRPN_USE_WINDOWS_XINPUT
++ "Build with Microsoft XInput support"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ DIRECTX_XINPUT_INCLUDE_DIR
++ DIRECTX_XINPUT_LIBRARY
++ DIRECTX_SDK_SUPPORTS_COMPILER) #TODO will this be a valid check here?
++ if(VRPN_USE_WINDOWS_XINPUT)
++ list(APPEND
++ SERVER_EXTRA_LIBS
++ ${DIRECTX_XINPUT_LIBRARY})
++ mark_as_advanced(DIRECTX_XINPUT_INCLUDE_DIR)
++
++ # Get name of DLL to delay-load.
++ include(GetDefineString)
++ get_define_string(NAME XINPUT_DLL
++ INCLUDES windows.h xinput.h
++ DEFINES "-D_WIN32_WINNT=${WIN_MIN_VER}"
++ INCLUDE_DIRS ${DIRECTX_DINPUT_INCLUDE_DIR} ${DIRECTX_XINPUT_INCLUDE_DIR}
++ RESULT VRPN_XINPUT_DLL)
++ if(VRPN_XINPUT_DLL AND MSVC)
++ # Delay-load XInput DLL
++ # TODO how to do this with MinGW? Can we? Do we need to?
++ list(APPEND SERVER_LINK_FLAGS "/DELAYLOAD:${VRPN_XINPUT_DLL}")
++ list(APPEND SERVER_EXTRA_LIBS "delayimp.lib")
++ endif()
++ endif()
++
++ # ATL is used for the vrpn_Tracker_zSight (which is based on DirectInput)
++ # to provide a smart pointer, but ATL isn't always available.
++ include(CheckIncludeFileCXX)
++ check_include_file_cxx(atlbase.h VRPN_HAVE_ATLBASE)
++endif()
++
++
++###
++# DirectShow
++###
++# Note that header removal makes this harder for VS10 and later - you need an earlier
++# version of MSVC also installed or an older Windows/Platform SDK with qedit.h in it.
++if(MSVC)
++ if(MSVC_VERSION GREATER 1500)
++ set(DIRECTSHOW_OFF_BY_DEFAULT OFF_BY_DEFAULT)
++ else()
++ set(DIRECTSHOW_OFF_BY_DEFAULT)
++ endif()
++ find_package(DirectShow ${QUIET_IF_SUBPROJECT})
++ option_requires(VRPN_USE_DIRECTSHOW
++ "Build with Microsoft DirectShow support"
++ ${DIRECTSHOW_OFF_BY_DEFAULT}
++ DIRECTSHOW_FOUND)
++ option_requires(VRPN_BUILD_DIRECTSHOW_VIDEO_SERVER
++ "Enable to build DirectShow Video Server (Windows)"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ VRPN_BUILD_DIRECTSHOW_VIDEO_SERVER
++ DIRECTSHOW_FOUND)
++endif()
++
++###
++# GPM
++###
++if(UNIX)
++ find_package(GPM ${QUIET_IF_SUBPROJECT})
++ option_requires(VRPN_USE_GPM_MOUSE
++ "Build with GPM Linux mouse interface support (makes servers GPL)"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ GPM_FOUND)
++endif()
++
++if(VRPN_USE_GPM_MOUSE)
++ list(APPEND SERVER_EXTRA_LIBS ${GPM_LIBRARIES})
++endif()
++
++###
++# INTERSENSE
++###
++find_package(InterSense ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_INCLUDE_INTERSENSE
++ "Build with InterSense support"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ INTERSENSE_FOUND)
++
++if(VRPN_INCLUDE_INTERSENSE)
++ include_directories(${INTERSENSE_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${INTERSENSE_LIBRARIES})
++endif()
++
++###
++# THALMICLABSMYO
++###
++if(WIN32)
++ find_package(ThalmicLabsMyo ${QUIET_IF_SUBPROJECT})
++ option_requires(VRPN_INCLUDE_THALMICLABSMYO
++ "Build with Thalmic Labs' Myo support"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ THALMICLABSMYO_FOUND)
++ if(VRPN_INCLUDE_THALMICLABSMYO)
++ include_directories(${THALMICLABSMYO_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${THALMICLABSMYO_LIBRARIES})
++ add_definitions(-DVRPN_INCLUDE_THALMICLABSMYO)
++ endif()
++endif()
++
++###
++# NIDAQMX
++###
++find_package(NIDAQmx ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_NATIONAL_INSTRUMENTS_MX
++ "Build with National Instruments NIDAQMX support"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ NIDAQMX_FOUND)
++
++if(VRPN_USE_NATIONAL_INSTRUMENTS_MX)
++ include_directories(${NIDAQMX_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${NIDAQMX_LIBRARIES})
++endif()
++
++###
++# Arrington Research ViewPoint EyeTracker
++###
++find_package(ViewPoint ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_VIEWPOINT
++ "Build with support for ViewPoint EyeTracker"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ VIEWPOINT_FOUND)
++
++if(VRPN_USE_VIEWPOINT)
++ include_directories(${VIEWPOINT_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${VIEWPOINT_LIBRARIES})
++
++ # Needed for the config file, apparently - it was added to the non-CMake one.
++ get_filename_component(VRPN_VIEWPOINT_LIB_PATH
++ "${VIEWPOINT_LIBRARY}"
++ PATH)
++ file(TO_CMAKE_PATH
++ "${VRPN_VIEWPOINT_LIB_PATH}"
++ VRPN_VIEWPOINT_LIB_PATH)
++endif()
++
++###
++# Adrienne timecode boards
++###
++if(WIN32 OR CYGWIN)
++ find_package(Adrienne ${QUIET_IF_SUBPROJECT})
++ option_requires(VRPN_INCLUDE_TIMECODE_SERVER
++ "Build with support for Adrienne timecode server"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ ADRIENNE_FOUND)
++else()
++ set(VRPN_INCLUDEE_TIMECODE_SERVER OFF)
++endif()
++
++if(VRPN_INCLUDE_TIMECODE_SERVER)
++ set(VRPN_ADRIENNE_INCLUDE_FILENAME "${ADRIENNE_INCLUDE_FILENAME}")
++ set(VRPN_ADRIENNE_INCLUDE_HAS_EXTERN_C
++ ${ADRIENNE_INCLUDE_HAS_EXTERN_C})
++endif()
++
++###
++# Linux kernel joystick interface
++###
++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++ check_include_file_cxx(linux/joystick.h HAVE_LINUX_JOYSTICK_H)
++ option_requires(VRPN_USE_JOYLIN
++ "Build with support for Linux kernel joystick interface (Uses kernel header - may make servers GPL)"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ HAVE_LINUX_JOYSTICK_H)
++else()
++ set(VRPN_USE_JOYLIN OFF)
++endif()
++
++###
++# /dev/input kernel joystick interface
++###
++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++ check_include_file_cxx(linux/input.h HAVE_LINUX_INPUT_H)
++ option_requires(VRPN_USE_DEV_INPUT
++ "Build with flags to enable the use of DevInput. (Uses kernel header - may make servers GPL)"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ HAVE_LINUX_INPUT_H)
++else()
++ set(VRPN_USE_DEV_INPUT OFF)
++endif()
++
++###
++# Perl, for vrpn_rpc_gen
++###
++if(NOT WIN32)
++ # TODO - a bit of a compatibility hack
++ # MiKTeX 2.9's perl is broken - missing libgcc-s-sjlj-1.dll -
++ # and can't seem to work around it without popping up dialogs
++ # which is no fun for automated builds.
++ find_package(Perl ${QUIET_IF_SUBPROJECT})
++ find_package(PerlModules ${QUIET_IF_SUBPROJECT} COMPONENTS Parse::RecDescent)
++endif()
++
++option_requires(VRPN_BUILD_TEST_RPC_GENERATION
++ "Build VRPN RPC generation"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ PERL_FOUND
++ PERLMODULES_FOUND)
++
++###
++# Polhemus PDI library
++###
++# TODO Generalize this to use a FindPDI.cmake - someone with access
++# to this library must do it.
++# Make this also work with debug (use PDID)
++option(VRPN_USE_PDI
++ "Build with flags to enable the use of Polhemus DVI library."
++ OFF)
++if(VRPN_USE_PDI)
++ find_path(POLHEMUS_PDI_DIR NAMES "Inc" "Lib" PATH_SUFFIXES "PDI_140" "PDI_110" "PDI_90" PATHS "C:/Polhemus/PDI" "C:/Program Files (x86)/Polhemus/PDI" NO_DEFAULT_PATH)
++ include_directories(${POLHEMUS_PDI_DIR}/Inc)
++ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
++ list(APPEND SERVER_EXTRA_LIBS "${POLHEMUS_PDI_DIR}/Lib/x64/PDI.lib")
++ else()
++ list(APPEND SERVER_EXTRA_LIBS "${POLHEMUS_PDI_DIR}/Lib/Win32/PDI.lib")
++ endif()
++endif()
++
++###
++# PhaseSpace API
++###
++# TODO Actually do a proper search for the PhaseSpace API headers and libraries
++# and not use link_directories.
++option(VRPN_INCLUDE_PHASESPACE
++ "Build with PhaseSpace library support"
++ OFF)
++set(PHASESPACE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/phasespace" CACHE PATH "location of PhaseSpace headers")
++set(PHASESPACE_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/phasespace" CACHE PATH "location of PhaseSpace libraries (libowlsock.so, etc")
++if(VRPN_INCLUDE_PHASESPACE)
++ include_directories(${PHASESPACE_INCLUDE_DIR})
++ link_directories(${PHASESPACE_LIBRARY_DIR})
++ if(WIN32)
++ list(APPEND SERVER_EXTRA_LIBS libowlsock)
++ else()
++ list(APPEND SERVER_EXTRA_LIBS owlsock)
++ endif()
++endif()
++
++###
++# Hillcrest Labs' Freespace
++###
++find_package(LibFreespace ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_FREESPACE
++ "Build with Hillcrest Labs' Freespace devices support"
++ ${DEFAULT_OFF_IF_SUBPROJECT}
++ LIBFREESPACE_FOUND)
++
++if(VRPN_USE_FREESPACE)
++ include_directories(${LIBFREESPACE_INCLUDE_DIRS})
++ list(APPEND SERVER_EXTRA_LIBS ${LIBFREESPACE_LIBRARIES})
++endif()
++
++###
++# MotionNode tracker support. Loads shared library dynamically if available
++###
++option(VRPN_USE_MOTIONNODE
++ "Build with MotionNode tracker support"
++ OFF)
++if(VRPN_USE_MOTIONNODE)
++ list(APPEND SERVER_EXTRA_LIBS ${CMAKE_DL_LIBS})
++endif()
++
++###
++# Trivisio ColibriAPI
++###
++find_package(ColibriApi ${QUIET_IF_SUBPROJECT})
++option_requires(VRPN_USE_COLIBRIAPI
++ "Build with Trivisio ColibriAPI support"
++ OFF_BY_DEFAULT
++ COLIBRIAPI_FOUND)
++if(VRPN_USE_COLIBRIAPI)
++ include_directories(${COLIBRIAPI_INCLUDE_DIR})
++ list(APPEND SERVER_EXTRA_LIBS ${COLIBRIAPI_LIBRARIES})
++endif()
++
++###
++# XXX Other libraries needing detection and handling (TODO)
++###
++# National Instruments Nidaq traditional
++# US Digital SEI/A2
++# microscribe3D library
++#
++# All include paths should be moved out of at least vrpn_Configure.h.cmake_in
++# as well as all #pragma comment (lib, "" ) lines, since cmake replaces
++# them more flexibly (include_directories and target_link_libraries)
++
++
++# Configuration options controlling what gets included in the build.
++# These are the default options for libraries we can't yet detect -
++# if a library can be detected above it will be pre-set to an appropriate
++# value by default.
++option(VRPN_USE_NATIONAL_INSTRUMENTS
++ "Build with National Instruments (old library) support"
++ OFF)
++option(VRPN_USE_NIDAQ "Build with NIDAQ support ca. 1999" OFF)
++option(VRPN_USE_USDIGITAL
++ "Build with US Digital SEI/A2 library support"
++ OFF)
++option(VRPN_USE_MICROSCRIBE
++ "Build with MicroScribe3D library support"
++ OFF)
++option(VRPN_USE_TRIVISIOCOLIBRI
++ "(OBSOLETE) Build with support for TrivisioColibri tracker"
++ OFF)
++if(WIN32)
++ option(VRPN_USE_WINSOCK2
++ "Use Winsock2 library, rather than Winsock."
++ OFF)
++ option(VRPN_USE_SHARED_LIBRARY
++ "Enable to use DLLs on Windows (see vrpn_Configure.h for more info)"
++ OFF)
++endif()
++
++if(UNIX)
++ option(VRPN_BUILD_PROFILING_SUPPORT
++ "Build with flags to enable profiling."
++ OFF)
++ if(VRPN_BUILD_PROFILING_SUPPORT)
++ include(EnableProfiling)
++ globally_enable_profiling()
++ endif()
++
++endif()
++
++if(WIN32 AND NOT CYGWIN)
++ # Only intended for Windows, known not needed on Cygwin,
++ # but potentially hazardous on other Windows build environments.
++ option(VRPN_EXPORT_GETTIMEOFDAY "Use a #define to make gettimeofday a synonym for vrpn_gettimeofday." OFF)
++else()
++ set(VRPN_EXPORT_GETTIMEOFDAY OFF)
++endif()
++
++# This will only work on compilers that support C++-11.
++# We could check for this and turn it on by default.
++set(VRPN_CHRONO_DEFAULT OFF)
++if(MSVC AND MSVC_VERSION GREATER 1800)
++ # On MSVC 2015 and newer, std::chrono provides the best time implementation.
++ set(VRPN_CHRONO_DEFAULT ON)
++endif()
++
++option(VRPN_USE_STD_CHRONO "Use the std::chrono class for time" ${VRPN_CHRONO_DEFAULT})
++
++option(VRPN_USE_STATIC_ASSERTIONS "Use some compile-time assertions" ON)
++option(VRPN_BUILD_EXTRA_COMPILER_WARNINGS
++ "Build with flags to enable extra warnings."
++ OFF)
++if(VRPN_BUILD_EXTRA_COMPILER_WARNINGS)
++ include(EnableExtraCompilerWarnings)
++ globally_enable_extra_compiler_warnings()
++ if(NOT MSVC)
++ # shadowing virtual functions is pretty much unavoidable with the
++ # multiple inheritance design and methods like "report_changes"
++ check_cxx_compiler_flag(-Wno-overloaded-virtual SUPPORTS_WNO_OVERLOADED_VIRTUAL_FLAG)
++ if(SUPPORTS_WNO_OVERLOADED_VIRTUAL_FLAG)
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
++ endif()
++ endif()
++endif()
++
++set(VRPN_CLIENT_ONLY OFF)
++if(VRPN_BUILD_CLIENT_LIBRARY AND NOT VRPN_BUILD_SERVER_LIBRARY)
++ # We can define VRPN_CLIENT_ONLY in the header in this case!
++ set(VRPN_CLIENT_ONLY ON)
++endif()
++
++#-----------------------------------------------------------------------------
++# configure a header file to pass some of the CMake settings
++# to the source code
++configure_file("${PROJECT_SOURCE_DIR}/vrpn_Configure.h.cmake_in"
++ "${PROJECT_BINARY_DIR}/vrpn_Configure.h")
++set(VRPN_PATH_TO_CMAKE_CONFIG "${PROJECT_BINARY_DIR}/vrpn_Configure.h")
++add_definitions("-DVRPN_USING_CMAKE=\"${VRPN_PATH_TO_CMAKE_CONFIG}\"")
++
++if(SUBPROJECT)
++ set(BUILD_TESTING FALSE)
++endif()
++
++if(APPLE)
++ # XXX Is this still needed?
++ if(NOT CMAKE_INSTALL_NAME_DIR)
++ set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++ endif()
++endif()
++
++#-----------------------------------------------------------------------------
++# Build the library itself and declare what bits need to be installed
++
++set(VRPN_CLIENT_SOURCES
++ vrpn_Analog.C
++ vrpn_Analog_Output.C
++ vrpn_Assert.C
++ vrpn_Auxiliary_Logger.C
++ vrpn_BaseClass.C
++ vrpn_Button.C
++ vrpn_Connection.C
++ vrpn_Dial.C
++ vrpn_EndpointContainer.C
++ vrpn_FileConnection.C
++ vrpn_FileController.C
++ vrpn_ForceDevice.C
++ vrpn_Forwarder.C
++ vrpn_ForwarderController.C
++ vrpn_FunctionGenerator.C
++ vrpn_Imager.C
++ vrpn_LamportClock.C
++ vrpn_Mutex.C
++ vrpn_Poser.C
++ vrpn_RedundantTransmission.C
++ vrpn_Serial.C
++ vrpn_SerialPort.C
++ vrpn_Shared.C
++ vrpn_SharedObject.C
++ vrpn_Sound.C
++ vrpn_Text.C
++ vrpn_Thread.C
++ vrpn_Tracker.C)
++
++set(VRPN_CLIENT_PUBLIC_HEADERS
++ "${PROJECT_BINARY_DIR}/vrpn_Configure.h"
++ vrpn_Analog.h
++ vrpn_Analog_Output.h
++ vrpn_Assert.h
++ vrpn_Auxiliary_Logger.h
++ vrpn_BaseClass.h
++ vrpn_Button.h
++ vrpn_Connection.h
++ vrpn_ConnectionPtr.h
++ vrpn_Dial.h
++ vrpn_EndpointContainer.h
++ vrpn_FileConnection.h
++ vrpn_FileController.h
++ vrpn_ForceDevice.h
++ vrpn_ForwarderController.h
++ vrpn_Forwarder.h
++ vrpn_FunctionGenerator.h
++ vrpn_Imager.h
++ vrpn_LamportClock.h
++ vrpn_Log.h
++ vrpn_MainloopContainer.h
++ vrpn_MainloopObject.h
++ vrpn_Mutex.h
++ vrpn_OwningPtr.h
++ vrpn_RedundantTransmission.h
++ vrpn_SendTextMessageStreamProxy.h
++ vrpn_Serial.h
++ vrpn_SerialPort.h
++ vrpn_Shared.h
++ vrpn_SharedObject.h
++ vrpn_Sound.h
++ vrpn_Text.h
++ vrpn_Thread.h
++ vrpn_Tracker.h
++ vrpn_Types.h
++ vrpn_WindowsH.h)
++
++set(VRPN_SERVER_SOURCES
++ ${VRPN_CLIENT_SOURCES}
++ vrpn_3DConnexion.C
++ vrpn_3DMicroscribe.C
++ vrpn_3Space.C
++ vrpn_5DT16.C
++ vrpn_Adafruit.C
++ vrpn_ADBox.C
++ vrpn_Analog_5dt.C
++ vrpn_Analog_5dtUSB.C
++ vrpn_Analog_Radamec_SPI.C
++ vrpn_Analog_USDigital_A2.C
++ vrpn_Atmel.C
++ vrpn_BiosciencesTools.C
++ vrpn_Button_NI_DIO24.C
++ vrpn_Button_USB.cpp
++ vrpn_CerealBox.C
++ vrpn_CHProducts_Controller_Raw.C
++ vrpn_Contour.C
++ vrpn_DevInput.C
++ vrpn_DirectXFFJoystick.C
++ vrpn_DirectXRumblePad.C
++ vrpn_DreamCheeky.C
++ vrpn_Dyna.C
++ vrpn_Event_Analog.C
++ vrpn_Event.C
++ vrpn_Event_Mouse.C
++ vrpn_Flock.C
++ vrpn_Flock_Parallel.C
++ vrpn_ForceDeviceServer.C
++ vrpn_Freespace.C
++ vrpn_FunctionGenerator.C
++ vrpn_Futaba.C
++ vrpn_GlobalHapticsOrb.C
++ vrpn_Griffin.C
++ vrpn_HumanInterface.C
++ vrpn_IDEA.C
++ vrpn_Imager_Stream_Buffer.C
++ vrpn_ImmersionBox.C
++ vrpn_inertiamouse.C
++ vrpn_JoyFly.C
++ vrpn_Joylin.C
++ vrpn_Joywin32.C
++ vrpn_Keyboard.C
++ vrpn_Laputa.C
++ vrpn_LUDL.C
++ vrpn_Logitech_Controller_Raw.C
++ vrpn_Magellan.C
++ vrpn_Microsoft_Controller_Raw.C
++ vrpn_Mouse.C
++ vrpn_NationalInstruments.C
++ vrpn_Nidaq.C
++ vrpn_nikon_controls.C
++ vrpn_nVidia_shield_controller.C
++ vrpn_Oculus.C
++ vrpn_OzzMaker.C
++ vrpn_OmegaTemperature.C
++ vrpn_Poser_Analog.C
++ vrpn_Poser_Tek4662.C
++ vrpn_raw_sgibox.C
++ vrpn_Retrolink.C
++ vrpn_Saitek_Controller_Raw.C
++ vrpn_sgibox.C
++ vrpn_Spaceball.C
++ vrpn_Streaming_Arduino.C
++ vrpn_Tng3.C
++ vrpn_Tracker_3DMouse.C
++ vrpn_Tracker_AnalogFly.C
++ vrpn_Tracker_ButtonFly.C
++ vrpn_Tracker_Crossbow.C
++ vrpn_Tracker_DTrack.C
++ vrpn_Tracker_Fastrak.C
++ vrpn_Tracker_Filter.C
++ vrpn_Tracker_GameTrak.C
++ vrpn_Tracker_GPS.C
++ vrpn_Tracker_IMU.C
++ vrpn_Tracker_isense.C
++ vrpn_Tracker_Isotrak.C
++ vrpn_Tracker_JsonNet.C
++ vrpn_Tracker_Liberty.C
++ vrpn_Tracker_MotionNode.C
++ vrpn_Tracker_NDI_Polaris.C
++ vrpn_Tracker_NovintFalcon.C
++ vrpn_Tracker_OSVRHackerDevKit.C
++ vrpn_Tracker_PDI.C
++ vrpn_Tracker_PhaseSpace.C
++ vrpn_Tracker_RazerHydra.C
++ vrpn_Tracker_ThalmicLabsMyo.C
++ vrpn_Tracker_SpacePoint.C
++ vrpn_Tracker_Wintracker.C
++ vrpn_Tracker_Colibri.C
++ vrpn_Tracker_TrivisioColibri.C
++ vrpn_Tracker_WiimoteHead.C
++ vrpn_Tracker_zSight.C
++ vrpn_Tracker_ViewPoint.C
++ vrpn_UNC_Joystick.C
++ vrpn_VPJoystick.C
++ vrpn_Wanda.C
++ vrpn_WiiMote.C
++ vrpn_XInputGamepad.C
++ vrpn_Xkeys.C
++ vrpn_Tracker_LibertyHS.C
++ vrpn_Vality.C
++ vrpn_YEI_3Space.C
++ vrpn_Zaber.C
++ server_src/vrpn_Generic_server_object.C
++ ${HIDAPI_SOURCES}
++ ${JSONCPP_SOURCES}
++ ${PDI_SOURCES})
++
++set(VRPN_SERVER_PUBLIC_HEADERS
++ ${VRPN_CLIENT_PUBLIC_HEADERS}
++ vrpn_3DConnexion.h
++ vrpn_3DMicroscribe.h
++ vrpn_3Space.h
++ vrpn_5DT16.h
++ vrpn_Adafruit.h
++ vrpn_ADBox.h
++ vrpn_Analog_5dt.h
++ vrpn_Analog_5dtUSB.h
++ vrpn_Analog_Radamec_SPI.h
++ vrpn_Analog_USDigital_A2.h
++ vrpn_Atmel.h
++ vrpn_BiosciencesTools.h
++ vrpn_Button_NI_DIO24.h
++ vrpn_Button_USB.h
++ vrpn_CerealBox.h
++ vrpn_CHProducts_Controller_Raw.h
++ vrpn_Contour.h
++ vrpn_DevInput.h
++ vrpn_DirectXFFJoystick.h
++ vrpn_DirectXRumblePad.h
++ vrpn_DreamCheeky.h
++ vrpn_Dyna.h
++ vrpn_Event_Analog.h
++ vrpn_Event.h
++ vrpn_Event_Mouse.h
++ vrpn_Flock.h
++ vrpn_Flock_Parallel.h
++ vrpn_ForceDeviceServer.h
++ vrpn_Freespace.h
++ vrpn_FunctionGenerator.h
++ vrpn_Futaba.h
++ vrpn_GlobalHapticsOrb.h
++ vrpn_Griffin.h
++ vrpn_HashST.h
++ vrpn_HumanInterface.h
++ vrpn_IDEA.h
++ vrpn_Imager_Stream_Buffer.h
++ vrpn_ImmersionBox.h
++ vrpn_inertiamouse.h
++ vrpn_JoyFly.h
++ vrpn_Joylin.h
++ vrpn_Joywin32.h
++ vrpn_Keyboard.h
++ vrpn_Logitech_Controller_Raw.h
++ vrpn_Laputa.h
++ vrpn_LUDL.h
++ vrpn_Magellan.h
++ vrpn_MessageMacros.h
++ vrpn_Microsoft_Controller_Raw.h
++ vrpn_Mouse.h
++ vrpn_NationalInstruments.h
++ vrpn_Nidaq.h
++ vrpn_nikon_controls.h
++ vrpn_nVidia_shield_controller.h
++ vrpn_Oculus.h
++ vrpn_OmegaTemperature.h
++ vrpn_OneEuroFilter.h
++ vrpn_OzzMaker.h
++ vrpn_Poser_Analog.h
++ vrpn_Poser.h
++ vrpn_Poser_Tek4662.h
++ vrpn_raw_sgibox.h
++ vrpn_Retrolink.h
++ vrpn_Saitek_Controller_Raw.h
++ vrpn_sgibox.h
++ vrpn_Spaceball.h
++ vrpn_Streaming_Arduino.h
++ vrpn_Tng3.h
++ vrpn_Tracker_3DMouse.h
++ vrpn_Tracker_AnalogFly.h
++ vrpn_Tracker_ButtonFly.h
++ vrpn_Tracker_Crossbow.h
++ vrpn_Tracker_DTrack.h
++ vrpn_Tracker_Fastrak.h
++ vrpn_Tracker_Filter.h
++ vrpn_Tracker_GameTrak.h
++ vrpn_Tracker_GPS.h
++ vrpn_Tracker_IMU.h
++ vrpn_Tracker_isense.h
++ vrpn_Tracker_Isotrak.h
++ vrpn_Tracker_JsonNet.h
++ vrpn_Tracker_Liberty.h
++ vrpn_Tracker_MotionNode.h
++ vrpn_Tracker_NDI_Polaris.h
++ vrpn_Tracker_NovintFalcon.h
++ vrpn_Tracker_OSVRHackerDevKit.h
++ vrpn_Tracker_PDI.h
++ vrpn_Tracker_PhaseSpace.h
++ vrpn_Tracker_RazerHydra.h
++ vrpn_Tracker_ThalmicLabsMyo.h
++ vrpn_Tracker_SpacePoint.h
++ vrpn_Tracker_Wintracker.h
++ vrpn_Tracker_Colibri.h
++ vrpn_Tracker_TrivisioColibri.h
++ vrpn_Tracker_WiimoteHead.h
++ vrpn_Tracker_zSight.h
++ vrpn_Tracker_ViewPoint.h
++ vrpn_UNC_Joystick.h
++ vrpn_VPJoystick.h
++ vrpn_Wanda.h
++ vrpn_WiiMote.h
++ vrpn_XInputGamepad.h
++ vrpn_Xkeys.h
++ vrpn_Tracker_LibertyHS.h
++ vrpn_Vality.h
++ vrpn_YEI_3Space.h
++ vrpn_Zaber.h
++ server_src/vrpn_Generic_server_object.h)
++
++set(VRPN_SERVER_LIBRARY)
++set(VRPN_CLIENT_LIBRARY)
++
++if(VRPN_BUILD_SERVER_LIBRARY)
++ add_library(vrpnserver
++ ${VRPN_SERVER_SOURCES}
++ ${VRPN_SERVER_PUBLIC_HEADERS})
++ target_link_libraries(vrpnserver ${EXTRA_LIBS} ${SERVER_EXTRA_LIBS})
++ set(VRPN_CLIENT_LIBRARY vrpnserver)
++ set(VRPN_SERVER_LIBRARY vrpnserver)
++ set_property(TARGET
++ vrpnserver
++ PROPERTY
++ PUBLIC_HEADER
++ ${VRPN_SERVER_PUBLIC_HEADERS})
++ set_property(TARGET
++ vrpnserver
++ PROPERTY
++ SOVERSION
++ 0)
++ set_property(TARGET
++ vrpnserver
++ PROPERTY
++ PROJECT_LABEL
++ "Core VRPN Server Library")
++ set_property(TARGET
++ vrpnserver
++ PROPERTY
++ FOLDER
++ "Library")
++ string(REPLACE ";" " " SERVER_LINK_FLAGS "${SERVER_LINK_FLAGS}")
++ set_property(TARGET
++ vrpnserver
++ PROPERTY
++ LINK_FLAGS
++ ${SERVER_LINK_FLAGS})
++
++ if(UNIX)
++ add_subdirectory(atmellib)
++ target_link_libraries(vrpnserver vrpn_atmel)
++ endif()
++
++ add_subdirectory(gpsnmealib)
++ target_link_libraries(vrpnserver gpsnmea)
++ if(VRPN_INSTALL)
++ install(TARGETS
++ vrpnserver
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
++ endif()
++ add_cppcheck(vrpnserver STYLE UNUSED_FUNCTIONS)
++endif()
++
++
++if(VRPN_BUILD_CLIENT_LIBRARY)
++ add_library(vrpn ${VRPN_CLIENT_SOURCES} ${VRPN_CLIENT_PUBLIC_HEADERS})
++ target_link_libraries(vrpn ${EXTRA_LIBS})
++ set(VRPN_CLIENT_LIBRARY vrpn)
++
++ set_property(TARGET
++ vrpn
++ PROPERTY
++ PUBLIC_HEADER
++ ${VRPN_CLIENT_PUBLIC_HEADERS})
++ set_property(TARGET
++ vrpn
++ PROPERTY
++ SOVERSION
++ 0)
++
++ # Always compile code the client library with VRPN_CLIENT_ONLY defined.
++ set_property(TARGET
++ vrpn
++ PROPERTY
++ COMPILE_DEFINITIONS
++ "VRPN_CLIENT_ONLY")
++
++ set_property(TARGET
++ vrpn
++ PROPERTY
++ PROJECT_LABEL
++ "Core VRPN Client Library")
++ set_property(TARGET
++ vrpn
++ PROPERTY
++ FOLDER
++ "Library")
++
++ if(VRPN_INSTALL)
++ install(TARGETS
++ vrpn
++ RUNTIME DESTINATION bin COMPONENT clientsdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
++ endif()
++ add_cppcheck(vrpn STYLE UNUSED_FUNCTIONS)
++endif()
++
++add_subdirectory(client_src)
++
++#-----------------------------------------------------------------------------
++# Set some internal cache variables to make life easier if we're a subproject
++
++set(VRPN_DEFINITIONS "-DVRPN_USING_CMAKE=\"${CMAKE_CURRENT_BINARY_DIR}/vrpn_Configure.h\""
++ CACHE INTERNAL "Definition to add if using as a subproject" FORCE)
++set(VRPN_CLIENT_LIBRARY ${VRPN_CLIENT_LIBRARY} CACHE INTERNAL "" FORCE)
++set(VRPN_SERVER_LIBRARY ${VRPN_SERVER_LIBRARY} CACHE INTERNAL "" FORCE)
++set(VRPN_SERVER_LINK_FLAGS ${SERVER_LINK_FLAGS} CACHE INTERNAL "" FORCE)
++set(VRPN_INCLUDE_DIRS
++ "${CMAKE_CURRENT_BINARY_DIR}"
++ "${VRPN_SOURCE_DIR}"
++ "${VRPN_SOURCE_DIR}/atmellib"
++ "${VRPN_SOURCE_DIR}/quat"
++ CACHE INTERNAL "" FORCE)
++
++#-----------------------------------------------------------------------------
++# Build the server applications if we've been asked to and we didn't build
++# the library client-only.
++
++if(VRPN_BUILD_SERVERS AND VRPN_BUILD_SERVER_LIBRARY)
++ add_subdirectory(server_src)
++endif()
++
++#-----------------------------------------------------------------------------
++# Build the RPC generation if we've been asked to
++
++if(VRPN_BUILD_TEST_RPC_GENERATION)
++ add_subdirectory(util/gen_rpc)
++endif()
++
++if(VRPN_BUILD_CLIENTS)
++ add_subdirectory(util/printStream)
++endif()
++
++#-----------------------------------------------------------------------------
++# Create documentation
++if(NOT SUBPROJECT)
++ add_subdirectory(doxygen)
++endif()
++
++#-----------------------------------------------------------------------------
++# Python wrappers
++add_subdirectory(python_vrpn)
++add_subdirectory(python)
++
++#-----------------------------------------------------------------------------
++# Java wrappers
++add_subdirectory(java_vrpn)
++
++#-----------------------------------------------------------------------------
++# HID Gui
++if(VRPN_BUILD_HID_GUI)
++ add_subdirectory(hid_gui)
++endif()
++
++#-----------------------------------------------------------------------------
++# Testing applications that live in the main directory.
++if(BUILD_TESTING AND NOT VRPN_CLIENT_ONLY)
++ foreach(SOURCE time_test.cpp)
++ get_filename_component(APP ${SOURCE} NAME_WE)
++ add_executable(${APP} ${SOURCE})
++ target_link_libraries(${APP} vrpnserver)
++ set_target_properties(${APP} PROPERTIES FOLDER Tests)
++ if(VRPN_INSTALL)
++ install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
++ endif()
++ endforeach()
++endif()
++
++#-----------------------------------------------------------------------------
++# Do a little check for GPL and GPL-incompatible libraries
++
++# What flags cause us to link against GPL libraries?
++
++# TODO: Figure out about the kernel headers we use.
++# Conflicting stories:
++# ML post by Linus: https://lkml.org/lkml/2003/12/5/13
++# Interview of Linus: http://www.itworld.com/open-source/140916/android-sued-microsoft-not-linux
++
++set(ALL_GPL_SERVER_FLAGS
++ #VRPN_USE_DEV_INPUT # Kernel header: GPL2
++ #VRPN_USE_JOYLIN # Kernel header: GPL2
++ VRPN_USE_GPM_MOUSE # GPL2+
++ VRPN_USE_WIIUSE # GPL3
++)
++
++# What flags cause us to link against GPL-incompatible libraries?
++set(ALL_GPLINCOMPAT_SERVER_FLAGS
++ VRPN_INCLUDE_INTERSENSE
++ VRPN_INCLUDE_TIMECODE_SERVER
++ VRPN_USE_PHANTOM_SERVER)
++
++set(GPL_SERVER_FLAGS)
++foreach(POSSIBLE_GPL_FLAG ${ALL_GPL_SERVER_FLAGS})
++ if(${POSSIBLE_GPL_FLAG})
++ list(APPEND GPL_SERVER_FLAGS "${POSSIBLE_GPL_FLAG}")
++ endif()
++endforeach()
++
++set(GPLINCOMPAT_SERVER_FLAGS)
++foreach(POSSIBLE_GPLINCOMPAT_FLAG ${ALL_GPLINCOMPAT_SERVER_FLAGS})
++ if(${POSSIBLE_GPLINCOMPAT_FLAG})
++ list(APPEND GPLINCOMPAT_SERVER_FLAGS "${POSSIBLE_GPLINCOMPAT_FLAG}")
++ endif()
++endforeach()
++
++
++if(GPL_SERVER_FLAGS)
++ # Some GPL options are enabled
++ message(STATUS "")
++ message(STATUS
++ "NOTE: The following build options may produce a GPL-licensed server library/binary.")
++ message(STATUS " ${GPL_SERVER_FLAGS}")
++ message(STATUS
++ "NOTE: I am not a lawyer, and this is not legal advice!")
++
++ option(VRPN_GPL_SERVER
++ "Check this to accept the possibility of linking GPL libraries with the server."
++ OFF)
++endif()
++
++if(GPLINCOMPAT_SERVER_FLAGS)
++ # Some GPL-incompatible options are enabled
++ message(STATUS "")
++ message(STATUS
++ "NOTE: The following build options may produce a server library/binary")
++ message(STATUS
++ " that is incompatible with the GPL/undistributable if linked with GPL libraries.")
++ message(STATUS " ${GPLINCOMPAT_SERVER_FLAGS}")
++ message(STATUS
++ "NOTE: I am not a lawyer, and this is not legal advice!")
++endif()
++
++# Check for errors.
++if(VRPN_BUILD_SERVER_LIBRARY)
++ if(GPL_SERVER_FLAGS AND NOT VRPN_GPL_SERVER)
++ message(STATUS "")
++ message(STATUS "Selected build options produce a GPL server library.")
++ message(STATUS
++ "You may disable them, otherwise set VRPN_GPL_SERVER to acknowledge this and build anyway.")
++ message(FATAL_ERROR
++ "Need VRPN_GPL_SERVER to build server library with GPL options enabled!")
++ endif()
++
++ if(GPL_SERVER_FLAGS AND GPLINCOMPAT_SERVER_FLAGS)
++ message(STATUS "")
++ message(STATUS "IMPORTANT LICENSING NOTE!")
++ message(STATUS
++ "Building with the current settings may produce a legally non-distributable server binary!")
++ message(STATUS
++ "NOTE: I am not a lawyer, and this is not legal advice!")
++ endif()
++endif()
++
++#-----------------------------------------------------------------------------
++# Enable testing/dashboards
++if(NOT SUBPROJECT)
++ create_dashboard_scripts("${CMAKE_CURRENT_SOURCE_DIR}/DashboardBuildInitialCache.cmake.in")
++endif()
++
++#-----------------------------------------------------------------------------
++# If we succeeded, we can go on and include packaging!
++if(VRPN_INSTALL)
++ include(CPack)
++ cpack_add_component(serversdk
++ DISPLAY_NAME
++ "VRPN Server Library and C++ Headers")
++ cpack_add_component(clientsdk
++ DISPLAY_NAME
++ "VRPN Client Library and C++ Headers")
++ cpack_add_component(tests DISPLAY_NAME "Test applications")
++ cpack_add_component(clients DISPLAY_NAME "Client applications")
++ cpack_add_component(servers DISPLAY_NAME "Server applications")
++ cpack_add_component(mainserver
++ DISPLAY_NAME
++ "VRPN main server application")
++ cpack_add_component(python DISPLAY_NAME "Python bindings")
++ cpack_add_component(java DISPLAY_NAME "Java bindings")
++ cpack_add_component(doc DISPLAY_NAME "C++ API Documentation")
++endif()
+diff -Naur a/gpsnmealib/CMakeLists.txt b/gpsnmealib/CMakeLists.txt
+--- a/gpsnmealib/CMakeLists.txt 2022-05-30 10:26:37.000000000 -0700
++++ b/gpsnmealib/CMakeLists.txt 2023-10-28 09:03:00.886526616 -0700
+@@ -21,6 +21,10 @@
PUBLIC_HEADER
${GPSNMEALIB_PUBLIC_HEADERS})
set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
@@ -13,12 +1626,11 @@ Index: vrpn-version_07.33/gpsnmealib/CMakeLists.txt
if(VRPN_INSTALL)
install(TARGETS
-Index: vrpn-version_07.33/quat/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/quat/CMakeLists.txt
-+++ vrpn-version_07.33/quat/CMakeLists.txt
-@@ -35,6 +35,10 @@ set(QUATLIB_HEADER quat.h)
- add_library(quat ${QUATLIB_SOURCES} ${QUATLIB_HEADER})
+diff -Naur a/quat/CMakeLists.txt b/quat/CMakeLists.txt
+--- a/quat/CMakeLists.txt 2022-05-30 10:26:37.000000000 -0700
++++ b/quat/CMakeLists.txt 2023-10-28 09:03:00.887526627 -0700
+@@ -18,6 +18,10 @@
+ endif()
set_property(TARGET quat PROPERTY PUBLIC_HEADER ${QUATLIB_HEADER})
set_target_properties(quat PROPERTIES FOLDER Library)
+set_target_properties(quat
@@ -28,11 +1640,50 @@ Index: vrpn-version_07.33/quat/CMakeLists.txt
if(VRPN_INSTALL)
install(TARGETS
quat
-Index: vrpn-version_07.33/server_src/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/server_src/CMakeLists.txt
-+++ vrpn-version_07.33/server_src/CMakeLists.txt
-@@ -59,6 +59,10 @@ if(VRPN_USE_PHANTOM_SERVER AND OPENGL_FO
+diff -Naur a/quat/CMakeLists.txt.orig b/quat/CMakeLists.txt.orig
+--- a/quat/CMakeLists.txt.orig 1969-12-31 16:00:00.000000000 -0800
++++ b/quat/CMakeLists.txt.orig 2022-05-30 10:26:37.000000000 -0700
+@@ -0,0 +1,36 @@
++cmake_minimum_required(VERSION 2.6)
++project(quatlib)
++
++if(APPLE)
++ # XXX Is this still needed?
++ if(NOT CMAKE_INSTALL_NAME_DIR)
++ set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++ endif()
++endif()
++
++set(QUATLIB_SOURCES matrix.c quat.c vector.c xyzquat.c)
++set(QUATLIB_HEADER quat.h)
++
++# Build the library itself and declare what bits need to be installed
++add_library(quat ${QUATLIB_SOURCES} ${QUATLIB_HEADER})
++if(UNIX)
++ target_link_libraries(quat -lm)
++endif()
++set_property(TARGET quat PROPERTY PUBLIC_HEADER ${QUATLIB_HEADER})
++set_target_properties(quat PROPERTIES FOLDER Library)
++if(VRPN_INSTALL)
++ install(TARGETS
++ quat
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
++ install(TARGETS
++ quat
++ RUNTIME DESTINATION bin COMPONENT clientsdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
++endif()
++
++add_subdirectory(testapps)
+diff -Naur a/server_src/CMakeLists.txt b/server_src/CMakeLists.txt
+--- a/server_src/CMakeLists.txt 2022-05-30 10:26:37.000000000 -0700
++++ b/server_src/CMakeLists.txt 2023-10-28 09:03:00.888526638 -0700
+@@ -59,6 +59,10 @@
PUBLIC_HEADER
${PHANTOM_HEADERS})
set_target_properties(vrpn_phantom PROPERTIES FOLDER Library)
@@ -43,11 +1694,10 @@ Index: vrpn-version_07.33/server_src/CMakeLists.txt
if(VRPN_INSTALL)
install(TARGETS
-Index: vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/server_src/timecode_generator_server/CMakeLists.txt
-+++ vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
-@@ -20,7 +20,11 @@ target_link_libraries(vrpn_timecode_gene
+diff -Naur a/server_src/timecode_generator_server/CMakeLists.txt b/server_src/timecode_generator_server/CMakeLists.txt
+--- a/server_src/timecode_generator_server/CMakeLists.txt 2022-05-30 10:26:37.000000000 -0700
++++ b/server_src/timecode_generator_server/CMakeLists.txt 2023-10-28 09:03:00.889526649 -0700
+@@ -20,7 +20,11 @@
set_target_properties(vrpn_timecode_generator
PROPERTIES
FOLDER
@@ -60,50 +1710,3 @@ Index: vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
if(VRPN_INSTALL)
install(TARGETS
-Index: vrpn-version_07.33/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/CMakeLists.txt
-+++ vrpn-version_07.33/CMakeLists.txt
-@@ -1244,6 +1244,12 @@ if(VRPN_BUILD_SERVER_LIBRARY)
- PROPERTY
- LINK_FLAGS
- ${SERVER_LINK_FLAGS})
-+ set_target_properties(vrpnserver
-+ PROPERTIES
-+ VERSION
-+ ${CPACK_PACKAGE_VERSION}
-+ SOVERSION
-+ ${CPACK_PACKAGE_VERSION_MAJOR})
-
- if(UNIX)
- add_subdirectory(atmellib)
-@@ -1298,6 +1304,12 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
- PROPERTY
- FOLDER
- "Library")
-+ set_target_properties(vrpn
-+ PROPERTIES
-+ VERSION
-+ ${CPACK_PACKAGE_VERSION}
-+ SOVERSION
-+ ${CPACK_PACKAGE_VERSION_MAJOR})
-
- if(VRPN_INSTALL)
- install(TARGETS
-Index: vrpn-version_07.33/atmellib/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/atmellib/CMakeLists.txt
-+++ vrpn-version_07.33/atmellib/CMakeLists.txt
-@@ -21,6 +21,12 @@ set_property(TARGET
- PROPERTY
- FOLDER
- "Library")
-+set_target_properties(vrpn_atmel
-+ PROPERTIES
-+ VERSION
-+ ${CPACK_PACKAGE_VERSION}
-+ SOVERSION
-+ ${CPACK_PACKAGE_VERSION_MAJOR})
- if(VRPN_INSTALL)
- install(TARGETS
- vrpn_atmel
diff --git a/vrpn-wait.patch b/vrpn-wait.patch
deleted file mode 100644
index 9dd04d0..0000000
--- a/vrpn-wait.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: vrpn-version_07.33/vrpn_Connection.C
-===================================================================
---- vrpn-version_07.33.orig/vrpn_Connection.C
-+++ vrpn-version_07.33/vrpn_Connection.C
-@@ -2486,11 +2486,7 @@ static int vrpn_start_server(const char
- for (waitloop = 0; waitloop < (SERVCOUNT); waitloop++) {
- int ret;
- pid_t deadkid;
--#if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
-- int status; // doesn't exist on sparc_solaris or FreeBSD
--#else
-- union wait status;
--#endif
-+ int status;
-
- /* Check to see if they called back yet. */
- ret = vrpn_poll_for_accept(server_sock, &child_socket, SERVWAIT);
-@@ -2504,13 +2500,7 @@ static int vrpn_start_server(const char
- }
-
- /* Check to see if the child is dead yet */
--#if defined(hpux) || defined(sgi) || defined(__hpux) || defined(__CYGWIN__) || \
-- defined(__APPLE__)
-- /* hpux include files have the wrong declaration */
-- deadkid = wait3((int *)&status, WNOHANG, NULL);
--#else
- deadkid = wait3(&status, WNOHANG, NULL);
--#endif
- if (deadkid == pid) {
- fprintf(stderr, "vrpn_start_server: server process exited\n");
- vrpn_closeSocket(server_sock);
diff --git a/vrpn.spec b/vrpn.spec
index 74a92c9..e4fc39d 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,58 +1,67 @@
-%undefine __cmake_in_source_build
-
-Name: vrpn
-Version: 07.33
-Release: 26%{?dist}
-Summary: The Virtual-Reality Peripheral Network
-
-# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
-# (libvrpnserver.so and vrpn_server binary, as well as python and java modules)
-# GPLv3+-licensed. The rest of files is supplied under the Boost license.
-License: Boost and GPLv3+
-URL: https://github.com/vrpn/vrpn/
-Source0: https://github.com/vrpn/vrpn/archive/version_%{version}.tar.gz#/%{name}-v...
-Source1: vrpn.service
-Patch0: vrpn-find_modbus.patch
-Patch1: vrpn-find_hidapi.patch
-Patch2: vrpn-find_jsoncpp.patch
-# patch3 from upstream commit 7f961a3
-Patch3: vrpn-fix_library_install_rules.patch
-Patch4: vrpn-java_install.patch
-Patch5: vrpn-python_install.patch
-Patch6: vrpn-soversion.patch
-Patch7: vrpn-config_install.patch
-Patch8: vrpn-dont_install_garbage.patch
-Patch9: vrpn-wait.patch
+# Some of the tests randomly hang, others attempt to spin up various network
+# services that don't work properly in mock
+%bcond_with tests
-BuildRequires: gcc-c++
-BuildRequires: cmake
-BuildRequires: doxygen
-BuildRequires: gcc
-BuildRequires: glut-devel
-BuildRequires: gpm-devel
-BuildRequires: graphviz
-BuildRequires: help2man
-BuildRequires: hidapi-devel
-BuildRequires: java-devel
-BuildRequires: jsoncpp-devel
-BuildRequires: libGL-devel
-BuildRequires: libmodbus-devel
-BuildRequires: libudev-devel
-BuildRequires: libusb-devel
-BuildRequires: perl-Parse-RecDescent
-BuildRequires: python3-devel
-BuildRequires: systemd
-BuildRequires: swig
-BuildRequires: wiiuse-devel
-
-%{?systemd_requires}
-
-%description
+%global common_description %{expand:
The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
library and a set of servers that are designed to implement a
network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system. The
-idea is to have a PC or other host at each VR station that controls the
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.}
+
+Name: vrpn
+Version: 07.35
+Release: 1%{?dist}
+Summary: Virtual-Reality Peripheral Network
+
+# According to upstream, linking to the wiiuse (GPLv3+) and gpm (GPLv2+)
+# libraries makes the vrpn server (libvrpnserver.so and vrpn_server binary, as
+# well as the language bindings) GPLv3+. See
+# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/384#note_160...
+# for the other licenses.
+License: BSL-1.0 AND LicenseRef-Fedora-Public-Domain AND GPL-3.0-or-later
+URL: https://github.com/vrpn/vrpn
+Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1: vrpn.service
+
+# Extending range of Python version search to support two-digit minor versions
+Patch: %{url}/commit/1b4676b3cf8bbaff2f75c8e41b005401b189b2e2.patch
+# Fix modbus libraries detection
+Patch: vrpn-find_modbus.patch
+# Fix Python modules installation
+Patch: vrpn-python_install.patch
+# Add soversion to all libraries
+Patch: vrpn-soversion.patch
+# Do not install binaries only used for unit tests
+Patch: vrpn-dont-install-tests.patch
+
+BuildRequires: chrpath
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: perl
+BuildRequires: perl-Parse-RecDescent
+BuildRequires: sed
+BuildRequires: systemd-rpm-macros
+BuildRequires: swig
+
+BuildRequires: glut-devel
+BuildRequires: gpm-devel
+BuildRequires: hidapi-devel
+BuildRequires: jsoncpp-devel
+BuildRequires: libGL-devel
+%ifnarch s390x
+BuildRequires: libi2c-devel
+%endif
+BuildRequires: libmodbus-devel
+BuildRequires: libudev-devel
+BuildRequires: libusb1-devel
+BuildRequires: python3-devel
+BuildRequires: wiiuse-devel
+
+%description %{common_description}
+
+The idea is to have a PC or other host at each VR station that controls the
peripherals (tracker, button device, haptic device, analog inputs, sound, etc).
VRPN provides connections between the application and all of the devices using
the appropriate class-of-service for each type of device sharing this link. The
@@ -61,108 +70,69 @@ to use VRPN with devices that are directly connected to the machine that the
application is running on, either using separate control programs or running
all as a single program.
-
%package devel
-Summary: Development files for the Virtual-Reality Peripheral Network
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+Summary: Development files for the Virtual-Reality Peripheral Network
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: gpm-devel
+Requires: hidapi-devel
+Requires: jsoncpp-devel
+Requires: libudev-devel
+Requires: libusb1-devel
+Requires: wiiuse-devel
-This package contains development files for VRPN libraries.
+%description devel %{common_description}
+This package contains development files for the VRPN libraries.
%package doc
-Summary: Developer's documentation for VRPN
-BuildArch: noarch
+Summary: Developer's documentation for VRPN
+BuildArch: noarch
-%description doc
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+%description doc %{common_description}
This package contains generated VRPN source code documentation.
-
-%package java
-Summary: Java bindings for the Virtual-Reality Peripheral Network
-License: GPLv3+
-
-Requires: java-headless
-Requires: javapackages-tools
-
-%description java
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
-
-This package contains Java bindings for VRPN libraries.
-
-
%package -n python3-%{name}
-Summary: Python 3 bindings for the Virtual-Reality Peripheral Network
-License: GPLv3+
-
-%{?python_provide:%python_provide python3-%{name}}
-
-%description -n python3-%{name}
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+Summary: Python 3 bindings for the Virtual-Reality Peripheral Network
-This package contains Python 3 bindings for VRPN libraries.
+%description -n python3-%{name} %{common_description}
+This package contains Python 3 bindings for the VRPN libraries.
%prep
-%autosetup -n %{name}-version_%{version} -p1
+%autosetup -p1
+# Fix binaries path
+sed -i 's:/usr/local/bin:%{_bindir}:g' vrpn_Connection.C
%build
%cmake \
+ -DOpenGL_GL_PREFERENCE=GLVND \
-DVRPN_GPL_SERVER=ON \
-DBUILD_TESTING=ON \
-DVRPN_BUILD_PYTHON_HANDCODED_3X=ON \
-DVRPN_PYTHON_INSTALL_DIR=%{python3_sitearch} \
- -DJAVA_INSTALL_LIBDIR=%{_libdir}/%{name} \
- -DJAVA_INSTALL_JNIDIR=%{_jnidir} \
-%ifarch %{arm}
- -DJAVA_AWT_LIBRARY=%{_libdir}/jvm/java/lib/aarch32/libjawt.so \
-%endif # arch %%{arm}
%{nil}
%cmake_build
%cmake_build --target doc
-
%install
%cmake_install
-install -D %{_vpath_builddir}/python/vrpn.so %{buildroot}%{python3_sitearch}/vrpn.so
-install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-
-# generate man pages
-mkdir -p %{buildroot}%{_mandir}/man1
-for prog in ./%{_vpath_builddir}/server_src/vrpn_server \
- ./%{_vpath_builddir}/client_src/run_auxiliary_logger \
- ./%{_vpath_builddir}/client_src/vrpn_print_{devices,messages,performance}
-do
- progname=$(basename "$prog")
- help2man \
- --version-string=%{version} \
- --no-info \
- --no-discard-stderr \
- --output="%{buildroot}%{_mandir}/man1/$progname.1" \
- "$prog"
-done
+# Install Python module and strip broken rpath
+chrpath -d %{_vpath_builddir}/python/vrpn.so
+install -Dpm0755 -t %{buildroot}%{python3_sitearch} %{_vpath_builddir}/python/vrpn.so
+
+# Install systemd service
+install -Dpm644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+# Move sample config out of the way
+mv %{buildroot}/%{_datadir}/%{name}-%{version}/%{name}.cfg.sample .
+
+%if %{with tests}
%check
%ctest
-
+%endif
%post
%systemd_post %{name}.service
@@ -173,35 +143,48 @@ done
%postun
%systemd_postun_with_restart %{name}.service
-
%files
-%doc ChangeLog Format
+%doc ChangeLog %{name}.cfg.sample
%license README.Legal
-%{_libdir}/*.so.*
-%{_bindir}/*
-%{_datadir}/%{name}-%{version}
-%config(noreplace) %{_sysconfdir}/vrpn.cfg
+%{_libdir}/lib%{name}*.so.07{,.*}
+%{_libdir}/libgpsnmea.so.07{,.*}
+%{_libdir}/libquat.so.07{,.*}
+%{_bindir}/%{name}*
+%{_bindir}/run_auxiliary_logger
+%config(noreplace) %{_sysconfdir}/%{name}.cfg
%{_unitdir}/%{name}.service
-%{_mandir}/man1/*
%files devel
-%{_includedir}/*
-%{_libdir}/*.so
+%{_includedir}/latLonCoord.h
+%{_includedir}/nmeaParser.h
+%{_includedir}/quat.h
+%{_includedir}/utmCoord.h
+%{_includedir}/%{name}*
+%{_libdir}/lib%{name}*.so
+%{_libdir}/libgpsnmea.so
+%{_libdir}/libquat.so
%files doc
+%doc Format_Of_Protocol.txt
%doc %{_docdir}/%{name}-%{version}
%exclude %{_docdir}/%{name}-%{version}/source-docs/html/*.map
%exclude %{_docdir}/%{name}-%{version}/source-docs/html/*.md5
-%files java
-%{_libdir}/%{name}/libjava_%{name}.so
-%{_jnidir}/*.jar
-
%files -n python3-%{name}
%{python3_sitearch}/*.so
-
%changelog
+* Sat Oct 28 2023 Davide Cavalca <dcavalca(a)fedoraproject.org> - 07.35-1
+- Unretire and update to 07.35; Fixes: RHBZ#2246766
+- Rework specfile to comply with the latest packaging guidelines
+- Update license tag and convert to SPDX
+- Rework package descriptions
+- Preserve timestamps when installing files
+- Refresh patches and backport and upstream Python fix
+- Drop manpage generation because it hangs the build
+- Disable tests by default due to flakiness
+- Drop the Java bindings, nothing uses them and they don't install properly
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-26
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit c8f5ab52f1ff81d2db3aa8701a7e45a30d0062c2
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Tue Oct 31 11:19:46 2023 +0100
Unretirement request: https://pagure.io/releng/issue/11750
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..897c42a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/vrpn-version_07.33.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 5204a84..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Orphaned for 6+ weeks
diff --git a/sources b/sources
new file mode 100644
index 0000000..90e342c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+ad1475cdcc2572fcf447f8e88404f753 vrpn-version_07.33.tar.gz
diff --git a/vrpn-config_install.patch b/vrpn-config_install.patch
new file mode 100644
index 0000000..68b4c81
--- /dev/null
+++ b/vrpn-config_install.patch
@@ -0,0 +1,24 @@
+Index: vrpn-version_07.33/server_src/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/server_src/CMakeLists.txt
++++ vrpn-version_07.33/server_src/CMakeLists.txt
+@@ -143,13 +143,18 @@ configure_file("${CMAKE_CURRENT_SOURCE_D
+ @ONLY)
+
+ if(VRPN_INSTALL)
++ set(SYSCONF_INSTALL_DIR
++ etc
++ CACHE
++ PATH
++ "Directory to install configuration files")
+ if(WIN32)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.cfg"
+ DESTINATION bin
+ COMPONENT mainserver)
+ else()
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.cfg"
+- DESTINATION etc
++ DESTINATION ${SYSCONF_INSTALL_DIR}
+ COMPONENT mainserver)
+ endif()
+
diff --git a/vrpn-dont_install_garbage.patch b/vrpn-dont_install_garbage.patch
new file mode 100644
index 0000000..13aaf98
--- /dev/null
+++ b/vrpn-dont_install_garbage.patch
@@ -0,0 +1,103 @@
+Index: vrpn-version_07.33/client_src/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/client_src/CMakeLists.txt
++++ vrpn-version_07.33/client_src/CMakeLists.txt
+@@ -74,9 +74,9 @@ if(VRPN_BUILD_CLIENTS)
+ target_link_libraries(${APP} ${VRPN_CLIENT_LIBRARY})
+
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
++ #endif()
+ endforeach()
+
+ if(GLUT_FOUND AND OPENGL_FOUND)
+@@ -89,15 +89,15 @@ if(VRPN_BUILD_CLIENTS)
+
+ set_target_properties(testimager_client PROPERTIES FOLDER Tests)
+
+- if(VRPN_INSTALL)
+- install(TARGETS
+- testimager_client
+- RUNTIME
+- DESTINATION
+- bin
+- COMPONENT
+- tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS
++ # testimager_client
++ # RUNTIME
++ # DESTINATION
++ # bin
++ # COMPONENT
++ # tests)
++ #endif()
+ option(VRPN_GLUT_IS_STATIC_FREEGLUT
+ "Is the GLUT used for the imaging test client a static build of FreeGLUT?"
+ NO)
+@@ -121,15 +121,15 @@ if(VRPN_BUILD_CLIENTS)
+
+ set_target_properties(c_interface_example PROPERTIES FOLDER Tests)
+
+- if(VRPN_INSTALL)
+- install(TARGETS
+- c_interface_example
+- RUNTIME
+- DESTINATION
+- bin
+- COMPONENT
+- tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS
++ # c_interface_example
++ # RUNTIME
++ # DESTINATION
++ # bin
++ # COMPONENT
++ # tests)
++ #endif()
+
+
+ ###
+Index: vrpn-version_07.33/server_src/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/server_src/CMakeLists.txt
++++ vrpn-version_07.33/server_src/CMakeLists.txt
+@@ -219,10 +219,10 @@ if(BUILD_TESTING)
+ target_link_libraries(${APP} ${VRPN_SERVER_LIBRARY})
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP}
+- RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS ${APP}
++ # RUNTIME DESTINATION bin COMPONENT tests)
++ #endif()
+ endforeach()
+ add_test(test_loopback test_loopback)
+ add_test(test_vrpn test_vrpn)
+Index: vrpn-version_07.33/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/CMakeLists.txt
++++ vrpn-version_07.33/CMakeLists.txt
+@@ -1393,9 +1393,9 @@ if(VRPN_BUILD_SERVERS AND VRPN_BUILD_SER
+ add_executable(${APP} ${SOURCE})
+ target_link_libraries(${APP} vrpnserver)
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
++ #endif()
+ endforeach()
+ endif()
+
diff --git a/vrpn-find_hidapi.patch b/vrpn-find_hidapi.patch
new file mode 100644
index 0000000..b2d596d
--- /dev/null
+++ b/vrpn-find_hidapi.patch
@@ -0,0 +1,20 @@
+Index: vrpn-version_07.33/cmake/FindHIDAPI.cmake
+===================================================================
+--- vrpn-version_07.33.orig/cmake/FindHIDAPI.cmake
++++ vrpn-version_07.33/cmake/FindHIDAPI.cmake
+@@ -24,10 +24,13 @@
+ # http://www.boost.org/LICENSE_1_0.txt)
+
+ find_library(HIDAPI_LIBRARY
+- NAMES hidapi)
++ NAMES hidapi hidapi-libusb)
+
+ find_path(HIDAPI_INCLUDE_DIR
+- NAMES hidapi.h)
++ NAMES hidapi.h
++ PATH_SUFFIXES
++ include
++ include/hidapi)
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(HIDAPI
diff --git a/vrpn-find_jsoncpp.patch b/vrpn-find_jsoncpp.patch
new file mode 100644
index 0000000..003966e
--- /dev/null
+++ b/vrpn-find_jsoncpp.patch
@@ -0,0 +1,12 @@
+Index: vrpn-version_07.33/cmake/FindJsonCpp.cmake
+===================================================================
+--- vrpn-version_07.33.orig/cmake/FindJsonCpp.cmake
++++ vrpn-version_07.33/cmake/FindJsonCpp.cmake
+@@ -69,6 +69,7 @@ list(APPEND _jsoncppnames
+
+ find_library(JSONCPP_LIBRARY
+ NAMES
++ jsoncpp
+ ${_jsoncppnames}
+ PATHS
+ "${JSONCPP_ROOT_DIR}/libs"
diff --git a/vrpn-find_modbus.patch b/vrpn-find_modbus.patch
new file mode 100644
index 0000000..8fa2e29
--- /dev/null
+++ b/vrpn-find_modbus.patch
@@ -0,0 +1,25 @@
+Index: vrpn-version_07.33/cmake/FindModbus.cmake
+===================================================================
+--- vrpn-version_07.33.orig/cmake/FindModbus.cmake
++++ vrpn-version_07.33/cmake/FindModbus.cmake
+@@ -46,16 +46,16 @@ find_path(MODBUS_INCLUDE_DIR
+ "${MODBUS_ROOT_DIR}"
+ PATH_SUFFIXES
+ include
++ include/modbus
+ PATHS
+ "${_progfiles}/libmodbus"
+ C:/usr/local
+- /usr/local)
++ /usr/local
++ /usr)
+
+ # Look for the library.
+ find_library(MODBUS_LIBRARY
+- NAMES
+- libmodbus.lib
+- libmodbus.a
++ modbus
+ HINTS
+ "${MODBUS_ROOT_DIR}"
+ PATH_SUFFIXES
diff --git a/vrpn-fix_library_install_rules.patch b/vrpn-fix_library_install_rules.patch
new file mode 100644
index 0000000..8f12fca
--- /dev/null
+++ b/vrpn-fix_library_install_rules.patch
@@ -0,0 +1,160 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a03978b..0ad0c6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1245,16 +1245,10 @@ if(VRPN_BUILD_SERVER_LIBRARY)
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpnserver
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
+ endif()
+ add_cppcheck(vrpnserver STYLE UNUSED_FUNCTIONS)
+ endif()
+@@ -1292,16 +1286,10 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- clientsdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- clientsdk)
++ RUNTIME DESTINATION bin COMPONENT clientsdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
+ endif()
+ add_cppcheck(vrpn STYLE UNUSED_FUNCTIONS)
+ endif()
+diff --git a/atmellib/CMakeLists.txt b/atmellib/CMakeLists.txt
+index 30d51f1..003785c 100644
+--- a/atmellib/CMakeLists.txt
++++ b/atmellib/CMakeLists.txt
+@@ -24,14 +24,8 @@ set_property(TARGET
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn_atmel
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
+ endif()
+diff --git a/gpsnmealib/CMakeLists.txt b/gpsnmealib/CMakeLists.txt
+index fee7b3a..9a34e2d 100644
+--- a/gpsnmealib/CMakeLists.txt
++++ b/gpsnmealib/CMakeLists.txt
+@@ -25,14 +25,8 @@ set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
+ if(VRPN_INSTALL)
+ install(TARGETS
+ gpsnmea
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
+-endif()
+\ No newline at end of file
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
++endif()
+diff --git a/quat/CMakeLists.txt b/quat/CMakeLists.txt
+index 597776e..8d48c94 100644
+--- a/quat/CMakeLists.txt
++++ b/quat/CMakeLists.txt
+@@ -38,28 +38,16 @@ set_target_properties(quat PROPERTIES FOLDER Library)
+ if(VRPN_INSTALL)
+ install(TARGETS
+ quat
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
+ install(TARGETS
+ quat
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- clientsdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- clientsdk)
++ RUNTIME DESTINATION bin COMPONENT clientsdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
+ endif()
+
+ add_subdirectory(testapps)
+diff --git a/server_src/timecode_generator_server/CMakeLists.txt b/server_src/timecode_generator_server/CMakeLists.txt
+index 5f8dce6..925bc44 100644
+--- a/server_src/timecode_generator_server/CMakeLists.txt
++++ b/server_src/timecode_generator_server/CMakeLists.txt
+@@ -25,14 +25,8 @@ set_target_properties(vrpn_timecode_generator
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn_timecode_generator
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
+-endif()
+\ No newline at end of file
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
++endif()
diff --git a/vrpn-java_install.patch b/vrpn-java_install.patch
new file mode 100644
index 0000000..b095105
--- /dev/null
+++ b/vrpn-java_install.patch
@@ -0,0 +1,177 @@
+Index: vrpn-version_07.33/java_vrpn/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/java_vrpn/CMakeLists.txt
++++ vrpn-version_07.33/java_vrpn/CMakeLists.txt
+@@ -6,6 +6,29 @@
+
+ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EXECUTABLE AND VRPN_BUILD_JAVA)
+
++ set(JAVA_INSTALL_LIBDIR
++ lib
++ CACHE PATH
++ "Where to install java shared objects")
++ set(JAVA_INSTALL_JNIDIR
++ share/java
++ CACHE PATH
++ "Where to install JNI jar files")
++
++ if("${JAVA_INSTALL_LIBDIR}" STREQUAL lib)
++ set(JAVA_LOAD_VRPN
++ "System.loadLibrary(\"java_vrpn\")")
++ else()
++ if(IS_ABSOLUTE "${JAVA_INSTALL_LIBDIR}")
++ set(JAVA_LOAD_VRPN
++ "System.load(\"${JAVA_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}java_vrpn${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
++ else()
++ set(JAVA_LOAD_VRPN
++ "System.load(\"${CMAKE_INSTALL_PREFIX}/${JAVA_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}java_vrpn${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
++ endif()
++ endif()
++ configure_file("vrpn/VRPN.java.in" "vrpn/VRPN.java")
++
+ # Set up file lists
+ set(JAVA_CLASSES
+ AnalogOutputRemote
+@@ -22,7 +45,6 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
+ TextSender
+ TrackerRemote
+ TrackerRemoteListener
+- VRPN
+ VRPNDevice)
+ set(JAVAC_OUTPUT)
+ set(JAVAC_INPUT)
+@@ -38,6 +60,15 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
+ JAVA_JNI_HEADERS
+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_${class}.h")
+ endforeach()
++ list(APPEND
++ JAVAC_OUTPUT
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.class")
++ list(APPEND
++ JAVAC_INPUT
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.java")
++ list(APPEND
++ JAVA_JNI_HEADERS
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_VRPN.h")
+
+ # *.java -> *.class
+ add_custom_command(OUTPUT
+@@ -87,6 +118,20 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
+ COMMENT
+ "Generating JNI header file for vrpn.${in}")
+ endforeach()
++ add_custom_command(OUTPUT
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_VRPN.h"
++ DEPENDS
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.class"
++ COMMAND
++ "${JAVAH_EXECUTABLE}"
++ -d
++ "${CMAKE_CURRENT_BINARY_DIR}"
++ -jni
++ -classpath
++ "${CMAKE_CURRENT_BINARY_DIR}"
++ vrpn.VRPN
++ COMMENT
++ "Generating JNI header file for vrpn.${in}")
+
+ # target for vrpn.jar
+ add_custom_target(java_vrpn_jar
+@@ -120,12 +165,15 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
+
+ if(VRPN_INSTALL)
+ install(TARGETS java_vrpn
+- ARCHIVE DESTINATION lib COMPONENT java
+- LIBRARY DESTINATION lib COMPONENT java
+- RUNTIME DESTINATION lib COMPONENT java)
++ ARCHIVE DESTINATION "${JAVA_INSTALL_LIBDIR}"
++ COMPONENT java
++ LIBRARY DESTINATION "${JAVA_INSTALL_LIBDIR}"
++ COMPONENT java
++ RUNTIME DESTINATION "${JAVA_INSTALL_LIBDIR}"
++ COMPONENT java)
+
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.jar"
+- DESTINATION share/java
++ DESTINATION "${JAVA_INSTALL_JNIDIR}"
+ COMPONENT java
+ RENAME vrpn-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.jar)
+ endif()
+Index: vrpn-version_07.33/java_vrpn/vrpn/VRPN.java
+===================================================================
+--- vrpn-version_07.33.orig/java_vrpn/vrpn/VRPN.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-
+-
+-package vrpn;
+-
+-public class VRPN
+-{
+-
+- /**
+- * All VRPN objects must assert this lock before making any calls
+- * into native code. A corollary of this is that no native methods
+- * may be public; all native methods must be wrapped by other methods
+- * that first synchronize on this lock before calling the native
+- * method.
+- */
+- protected final static Object downInVrpnLock = new Object( );
+-
+- static
+- {
+- try { System.loadLibrary( "java_vrpn" ); }
+- catch( UnsatisfiedLinkError e )
+- {
+- System.out.println( e.getMessage( ) );
+- System.out.println( "Error initializing java_vrpn." );
+- System.out.println( " -- Unable to find native library." );
+- }
+- catch( SecurityException e )
+- {
+- System.out.println( e.getMessage( ) );
+- System.out.println( "Security exception: you couldn't load the native vrpn dll." );
+- }
+- } // end static initializer block
+-
+-
+-} // end class VRPN
+Index: vrpn-version_07.33/java_vrpn/vrpn/VRPN.java.in
+===================================================================
+--- /dev/null
++++ vrpn-version_07.33/java_vrpn/vrpn/VRPN.java.in
+@@ -0,0 +1,34 @@
++
++
++package vrpn;
++
++public class VRPN
++{
++
++ /**
++ * All VRPN objects must assert this lock before making any calls
++ * into native code. A corollary of this is that no native methods
++ * may be public; all native methods must be wrapped by other methods
++ * that first synchronize on this lock before calling the native
++ * method.
++ */
++ protected final static Object downInVrpnLock = new Object( );
++
++ static
++ {
++ try { @JAVA_LOAD_VRPN@; }
++ catch( UnsatisfiedLinkError e )
++ {
++ System.out.println( e.getMessage( ) );
++ System.out.println( "Error initializing java_vrpn." );
++ System.out.println( " -- Unable to find native library." );
++ }
++ catch( SecurityException e )
++ {
++ System.out.println( e.getMessage( ) );
++ System.out.println( "Security exception: you couldn't load the native vrpn dll." );
++ }
++ } // end static initializer block
++
++
++} // end class VRPN
diff --git a/vrpn-python_install.patch b/vrpn-python_install.patch
new file mode 100644
index 0000000..f9b56e9
--- /dev/null
+++ b/vrpn-python_install.patch
@@ -0,0 +1,64 @@
+Index: vrpn-version_07.33/python/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/python/CMakeLists.txt
++++ vrpn-version_07.33/python/CMakeLists.txt
+@@ -52,14 +52,19 @@ if(PYTHONLIBS_FOUND AND (VRPN_BUILD_PYTH
+ OUTPUT_NAME vrpn)
+
+ if(VRPN_INSTALL)
++ set(VRPN_PYTHON_INSTALL_DIR
++ lib/${PYTHONVERSIONDIR}dist-packages/
++ CACHE
++ PATH
++ "Directory to install python modules")
+ if(WIN32)
+ # install(TARGETS vrpn-python
+-# RUNTIME DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python
+-# LIBRARY DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python)
++# RUNTIME DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python
++# LIBRARY DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python)
+ else()
+ install(TARGETS vrpn-python
+- RUNTIME DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python
+- LIBRARY DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python)
++ RUNTIME DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python
++ LIBRARY DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python)
+ endif()
+ endif()
+ endif()
+Index: vrpn-version_07.33/python_vrpn/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/python_vrpn/CMakeLists.txt
++++ vrpn-version_07.33/python_vrpn/CMakeLists.txt
+@@ -68,23 +68,28 @@ if(SWIG_FOUND AND PYTHONLIBS_FOUND AND V
+ swig_link_libraries(${module} ${PYTHON_LIBRARIES} ${LIBS} ${SERVER_EXTRA_LIBS})
+ set_target_properties(_${module} PROPERTIES FOLDER "Python Bindings")
+
++ set(VRPN_PYTHON_INSTALL_DIR
++ lib/${PYTHONVERSIONDIR}dist-packages/
++ CACHE
++ PATH
++ "Directory to install python modules")
+ if(VRPN_INSTALL)
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/${module}.py"
+ DESTINATION
+- lib/${PYTHONVERSIONDIR}dist-packages/
++ "${VRPN_PYTHON_INSTALL_DIR}"
+ COMPONENT
+ python)
+ install(TARGETS
+ ${SWIG_MODULE_${module}_REAL_NAME}
+ RUNTIME
+ DESTINATION
+- lib/${PYTHONVERSIONDIR}dist-packages/
++ "${VRPN_PYTHON_INSTALL_DIR}"
+ COMPONENT
+ python
+ LIBRARY
+ DESTINATION
+- lib/${PYTHONVERSIONDIR}dist-packages/
++ "${VRPN_PYTHON_INSTALL_DIR}"
+ COMPONENT
+ python)
+ endif()
diff --git a/vrpn-soversion.patch b/vrpn-soversion.patch
new file mode 100644
index 0000000..e10ed23
--- /dev/null
+++ b/vrpn-soversion.patch
@@ -0,0 +1,109 @@
+Index: vrpn-version_07.33/gpsnmealib/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/gpsnmealib/CMakeLists.txt
++++ vrpn-version_07.33/gpsnmealib/CMakeLists.txt
+@@ -21,6 +21,10 @@ set_property(TARGET
+ PUBLIC_HEADER
+ ${GPSNMEALIB_PUBLIC_HEADERS})
+ set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
++set_target_properties(gpsnmea
++ PROPERTIES
++ VERSION ${CPACK_PACKAGE_VERSION}
++ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+Index: vrpn-version_07.33/quat/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/quat/CMakeLists.txt
++++ vrpn-version_07.33/quat/CMakeLists.txt
+@@ -35,6 +35,10 @@ set(QUATLIB_HEADER quat.h)
+ add_library(quat ${QUATLIB_SOURCES} ${QUATLIB_HEADER})
+ set_property(TARGET quat PROPERTY PUBLIC_HEADER ${QUATLIB_HEADER})
+ set_target_properties(quat PROPERTIES FOLDER Library)
++set_target_properties(quat
++ PROPERTIES
++ VERSION ${CPACK_PACKAGE_VERSION}
++ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+ if(VRPN_INSTALL)
+ install(TARGETS
+ quat
+Index: vrpn-version_07.33/server_src/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/server_src/CMakeLists.txt
++++ vrpn-version_07.33/server_src/CMakeLists.txt
+@@ -59,6 +59,10 @@ if(VRPN_USE_PHANTOM_SERVER AND OPENGL_FO
+ PUBLIC_HEADER
+ ${PHANTOM_HEADERS})
+ set_target_properties(vrpn_phantom PROPERTIES FOLDER Library)
++ set_target_properties(vrpn_phantom
++ PROPERTIES
++ VERSION ${CPACK_PACKAGE_VERSION}
++ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+Index: vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/server_src/timecode_generator_server/CMakeLists.txt
++++ vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
+@@ -20,7 +20,11 @@ target_link_libraries(vrpn_timecode_gene
+ set_target_properties(vrpn_timecode_generator
+ PROPERTIES
+ FOLDER
+- "Main Server")
++ "Main Server"
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+Index: vrpn-version_07.33/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/CMakeLists.txt
++++ vrpn-version_07.33/CMakeLists.txt
+@@ -1244,6 +1244,12 @@ if(VRPN_BUILD_SERVER_LIBRARY)
+ PROPERTY
+ LINK_FLAGS
+ ${SERVER_LINK_FLAGS})
++ set_target_properties(vrpnserver
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(UNIX)
+ add_subdirectory(atmellib)
+@@ -1298,6 +1304,12 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
+ PROPERTY
+ FOLDER
+ "Library")
++ set_target_properties(vrpn
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+Index: vrpn-version_07.33/atmellib/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/atmellib/CMakeLists.txt
++++ vrpn-version_07.33/atmellib/CMakeLists.txt
+@@ -21,6 +21,12 @@ set_property(TARGET
+ PROPERTY
+ FOLDER
+ "Library")
++set_target_properties(vrpn_atmel
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn_atmel
diff --git a/vrpn-wait.patch b/vrpn-wait.patch
new file mode 100644
index 0000000..9dd04d0
--- /dev/null
+++ b/vrpn-wait.patch
@@ -0,0 +1,31 @@
+Index: vrpn-version_07.33/vrpn_Connection.C
+===================================================================
+--- vrpn-version_07.33.orig/vrpn_Connection.C
++++ vrpn-version_07.33/vrpn_Connection.C
+@@ -2486,11 +2486,7 @@ static int vrpn_start_server(const char
+ for (waitloop = 0; waitloop < (SERVCOUNT); waitloop++) {
+ int ret;
+ pid_t deadkid;
+-#if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
+- int status; // doesn't exist on sparc_solaris or FreeBSD
+-#else
+- union wait status;
+-#endif
++ int status;
+
+ /* Check to see if they called back yet. */
+ ret = vrpn_poll_for_accept(server_sock, &child_socket, SERVWAIT);
+@@ -2504,13 +2500,7 @@ static int vrpn_start_server(const char
+ }
+
+ /* Check to see if the child is dead yet */
+-#if defined(hpux) || defined(sgi) || defined(__hpux) || defined(__CYGWIN__) || \
+- defined(__APPLE__)
+- /* hpux include files have the wrong declaration */
+- deadkid = wait3((int *)&status, WNOHANG, NULL);
+-#else
+ deadkid = wait3(&status, WNOHANG, NULL);
+-#endif
+ if (deadkid == pid) {
+ fprintf(stderr, "vrpn_start_server: server process exited\n");
+ vrpn_closeSocket(server_sock);
diff --git a/vrpn.service b/vrpn.service
new file mode 100644
index 0000000..57c5607
--- /dev/null
+++ b/vrpn.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=VRPN server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/vrpn_server -f /etc/vrpn.cfg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/vrpn.spec b/vrpn.spec
new file mode 100644
index 0000000..74a92c9
--- /dev/null
+++ b/vrpn.spec
@@ -0,0 +1,284 @@
+%undefine __cmake_in_source_build
+
+Name: vrpn
+Version: 07.33
+Release: 26%{?dist}
+Summary: The Virtual-Reality Peripheral Network
+
+# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
+# (libvrpnserver.so and vrpn_server binary, as well as python and java modules)
+# GPLv3+-licensed. The rest of files is supplied under the Boost license.
+License: Boost and GPLv3+
+URL: https://github.com/vrpn/vrpn/
+Source0: https://github.com/vrpn/vrpn/archive/version_%{version}.tar.gz#/%{name}-v...
+Source1: vrpn.service
+Patch0: vrpn-find_modbus.patch
+Patch1: vrpn-find_hidapi.patch
+Patch2: vrpn-find_jsoncpp.patch
+# patch3 from upstream commit 7f961a3
+Patch3: vrpn-fix_library_install_rules.patch
+Patch4: vrpn-java_install.patch
+Patch5: vrpn-python_install.patch
+Patch6: vrpn-soversion.patch
+Patch7: vrpn-config_install.patch
+Patch8: vrpn-dont_install_garbage.patch
+Patch9: vrpn-wait.patch
+
+BuildRequires: gcc-c++
+BuildRequires: cmake
+BuildRequires: doxygen
+BuildRequires: gcc
+BuildRequires: glut-devel
+BuildRequires: gpm-devel
+BuildRequires: graphviz
+BuildRequires: help2man
+BuildRequires: hidapi-devel
+BuildRequires: java-devel
+BuildRequires: jsoncpp-devel
+BuildRequires: libGL-devel
+BuildRequires: libmodbus-devel
+BuildRequires: libudev-devel
+BuildRequires: libusb-devel
+BuildRequires: perl-Parse-RecDescent
+BuildRequires: python3-devel
+BuildRequires: systemd
+BuildRequires: swig
+BuildRequires: wiiuse-devel
+
+%{?systemd_requires}
+
+%description
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system. The
+idea is to have a PC or other host at each VR station that controls the
+peripherals (tracker, button device, haptic device, analog inputs, sound, etc).
+VRPN provides connections between the application and all of the devices using
+the appropriate class-of-service for each type of device sharing this link. The
+application remains unaware of the network topology. Note that it is possible
+to use VRPN with devices that are directly connected to the machine that the
+application is running on, either using separate control programs or running
+all as a single program.
+
+
+%package devel
+Summary: Development files for the Virtual-Reality Peripheral Network
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains development files for VRPN libraries.
+
+
+%package doc
+Summary: Developer's documentation for VRPN
+BuildArch: noarch
+
+%description doc
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains generated VRPN source code documentation.
+
+
+%package java
+Summary: Java bindings for the Virtual-Reality Peripheral Network
+License: GPLv3+
+
+Requires: java-headless
+Requires: javapackages-tools
+
+%description java
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains Java bindings for VRPN libraries.
+
+
+%package -n python3-%{name}
+Summary: Python 3 bindings for the Virtual-Reality Peripheral Network
+License: GPLv3+
+
+%{?python_provide:%python_provide python3-%{name}}
+
+%description -n python3-%{name}
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains Python 3 bindings for VRPN libraries.
+
+
+%prep
+%autosetup -n %{name}-version_%{version} -p1
+
+
+%build
+%cmake \
+ -DVRPN_GPL_SERVER=ON \
+ -DBUILD_TESTING=ON \
+ -DVRPN_BUILD_PYTHON_HANDCODED_3X=ON \
+ -DVRPN_PYTHON_INSTALL_DIR=%{python3_sitearch} \
+ -DJAVA_INSTALL_LIBDIR=%{_libdir}/%{name} \
+ -DJAVA_INSTALL_JNIDIR=%{_jnidir} \
+%ifarch %{arm}
+ -DJAVA_AWT_LIBRARY=%{_libdir}/jvm/java/lib/aarch32/libjawt.so \
+%endif # arch %%{arm}
+ %{nil}
+%cmake_build
+%cmake_build --target doc
+
+
+%install
+%cmake_install
+install -D %{_vpath_builddir}/python/vrpn.so %{buildroot}%{python3_sitearch}/vrpn.so
+install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+
+# generate man pages
+mkdir -p %{buildroot}%{_mandir}/man1
+for prog in ./%{_vpath_builddir}/server_src/vrpn_server \
+ ./%{_vpath_builddir}/client_src/run_auxiliary_logger \
+ ./%{_vpath_builddir}/client_src/vrpn_print_{devices,messages,performance}
+do
+ progname=$(basename "$prog")
+ help2man \
+ --version-string=%{version} \
+ --no-info \
+ --no-discard-stderr \
+ --output="%{buildroot}%{_mandir}/man1/$progname.1" \
+ "$prog"
+done
+
+
+%check
+%ctest
+
+
+%post
+%systemd_post %{name}.service
+
+%preun
+%systemd_preun %{name}.service
+
+%postun
+%systemd_postun_with_restart %{name}.service
+
+
+%files
+%doc ChangeLog Format
+%license README.Legal
+%{_libdir}/*.so.*
+%{_bindir}/*
+%{_datadir}/%{name}-%{version}
+%config(noreplace) %{_sysconfdir}/vrpn.cfg
+%{_unitdir}/%{name}.service
+%{_mandir}/man1/*
+
+%files devel
+%{_includedir}/*
+%{_libdir}/*.so
+
+%files doc
+%doc %{_docdir}/%{name}-%{version}
+%exclude %{_docdir}/%{name}-%{version}/source-docs/html/*.map
+%exclude %{_docdir}/%{name}-%{version}/source-docs/html/*.md5
+
+%files java
+%{_libdir}/%{name}/libjava_%{name}.so
+%{_jnidir}/*.jar
+
+%files -n python3-%{name}
+%{python3_sitearch}/*.so
+
+
+%changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-26
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 07.33-24
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Sat May 30 2020 Björn Esser <besser82(a)fedoraproject.org> - 07.33-23
+- Rebuild (jsoncpp)
+
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-22
+- Rebuilt for Python 3.9
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Nov 14 2019 Björn Esser <besser82(a)fedoraproject.org> - 07.33-20
+- Rebuild (jsoncpp)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-19
+- Rebuilt for Python 3.8
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 03 2019 Björn Esser <besser82(a)fedoraproject.org> - 07.33-17
+- Rebuild (jsoncpp)
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 14 2019 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-15
+- Subpackage python2-vrpn has been removed
+ See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-13
+- Rebuilt for Python 3.7
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Dec 26 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-11
+- Rebuilt for jsoncpp.so.20
+
+* Sat Sep 02 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-10
+- Fix problems with finding JNI on %%arm
+
+* Fri Sep 01 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-9
+- Rebuilt for jsoncpp-1.8.3
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-5
+- Rebuild for Python 3.6
+
+* Mon Oct 03 2016 Björn Esser <fedora(a)besser82.io> - 07.33-4
+- Rebuilt for libjsoncpp.so.11
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 07.33-3
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
+
+* Wed Jun 8 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-2
+- Fix build for fc25 (#1341988)
+- Fix installation of python 3 module (#1342509)
+
+* Wed Feb 24 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-1
+- Initial package
commit baf215cbb0f8ef487d6fc97a19a31d95aa82b35e
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Dec 1 22:19:55 2020 +0100
Orphaned for 6+ weeks
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 897c42a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/vrpn-version_07.33.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5204a84
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Orphaned for 6+ weeks
diff --git a/sources b/sources
deleted file mode 100644
index 90e342c..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-ad1475cdcc2572fcf447f8e88404f753 vrpn-version_07.33.tar.gz
diff --git a/vrpn-config_install.patch b/vrpn-config_install.patch
deleted file mode 100644
index 68b4c81..0000000
--- a/vrpn-config_install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: vrpn-version_07.33/server_src/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/server_src/CMakeLists.txt
-+++ vrpn-version_07.33/server_src/CMakeLists.txt
-@@ -143,13 +143,18 @@ configure_file("${CMAKE_CURRENT_SOURCE_D
- @ONLY)
-
- if(VRPN_INSTALL)
-+ set(SYSCONF_INSTALL_DIR
-+ etc
-+ CACHE
-+ PATH
-+ "Directory to install configuration files")
- if(WIN32)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.cfg"
- DESTINATION bin
- COMPONENT mainserver)
- else()
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.cfg"
-- DESTINATION etc
-+ DESTINATION ${SYSCONF_INSTALL_DIR}
- COMPONENT mainserver)
- endif()
-
diff --git a/vrpn-dont_install_garbage.patch b/vrpn-dont_install_garbage.patch
deleted file mode 100644
index 13aaf98..0000000
--- a/vrpn-dont_install_garbage.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: vrpn-version_07.33/client_src/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/client_src/CMakeLists.txt
-+++ vrpn-version_07.33/client_src/CMakeLists.txt
-@@ -74,9 +74,9 @@ if(VRPN_BUILD_CLIENTS)
- target_link_libraries(${APP} ${VRPN_CLIENT_LIBRARY})
-
- set_target_properties(${APP} PROPERTIES FOLDER Tests)
-- if(VRPN_INSTALL)
-- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
-+ #endif()
- endforeach()
-
- if(GLUT_FOUND AND OPENGL_FOUND)
-@@ -89,15 +89,15 @@ if(VRPN_BUILD_CLIENTS)
-
- set_target_properties(testimager_client PROPERTIES FOLDER Tests)
-
-- if(VRPN_INSTALL)
-- install(TARGETS
-- testimager_client
-- RUNTIME
-- DESTINATION
-- bin
-- COMPONENT
-- tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS
-+ # testimager_client
-+ # RUNTIME
-+ # DESTINATION
-+ # bin
-+ # COMPONENT
-+ # tests)
-+ #endif()
- option(VRPN_GLUT_IS_STATIC_FREEGLUT
- "Is the GLUT used for the imaging test client a static build of FreeGLUT?"
- NO)
-@@ -121,15 +121,15 @@ if(VRPN_BUILD_CLIENTS)
-
- set_target_properties(c_interface_example PROPERTIES FOLDER Tests)
-
-- if(VRPN_INSTALL)
-- install(TARGETS
-- c_interface_example
-- RUNTIME
-- DESTINATION
-- bin
-- COMPONENT
-- tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS
-+ # c_interface_example
-+ # RUNTIME
-+ # DESTINATION
-+ # bin
-+ # COMPONENT
-+ # tests)
-+ #endif()
-
-
- ###
-Index: vrpn-version_07.33/server_src/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/server_src/CMakeLists.txt
-+++ vrpn-version_07.33/server_src/CMakeLists.txt
-@@ -219,10 +219,10 @@ if(BUILD_TESTING)
- target_link_libraries(${APP} ${VRPN_SERVER_LIBRARY})
- set_target_properties(${APP} PROPERTIES FOLDER Tests)
-
-- if(VRPN_INSTALL)
-- install(TARGETS ${APP}
-- RUNTIME DESTINATION bin COMPONENT tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS ${APP}
-+ # RUNTIME DESTINATION bin COMPONENT tests)
-+ #endif()
- endforeach()
- add_test(test_loopback test_loopback)
- add_test(test_vrpn test_vrpn)
-Index: vrpn-version_07.33/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/CMakeLists.txt
-+++ vrpn-version_07.33/CMakeLists.txt
-@@ -1393,9 +1393,9 @@ if(VRPN_BUILD_SERVERS AND VRPN_BUILD_SER
- add_executable(${APP} ${SOURCE})
- target_link_libraries(${APP} vrpnserver)
- set_target_properties(${APP} PROPERTIES FOLDER Tests)
-- if(VRPN_INSTALL)
-- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
-- endif()
-+ #if(VRPN_INSTALL)
-+ # install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
-+ #endif()
- endforeach()
- endif()
-
diff --git a/vrpn-find_hidapi.patch b/vrpn-find_hidapi.patch
deleted file mode 100644
index b2d596d..0000000
--- a/vrpn-find_hidapi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: vrpn-version_07.33/cmake/FindHIDAPI.cmake
-===================================================================
---- vrpn-version_07.33.orig/cmake/FindHIDAPI.cmake
-+++ vrpn-version_07.33/cmake/FindHIDAPI.cmake
-@@ -24,10 +24,13 @@
- # http://www.boost.org/LICENSE_1_0.txt)
-
- find_library(HIDAPI_LIBRARY
-- NAMES hidapi)
-+ NAMES hidapi hidapi-libusb)
-
- find_path(HIDAPI_INCLUDE_DIR
-- NAMES hidapi.h)
-+ NAMES hidapi.h
-+ PATH_SUFFIXES
-+ include
-+ include/hidapi)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(HIDAPI
diff --git a/vrpn-find_jsoncpp.patch b/vrpn-find_jsoncpp.patch
deleted file mode 100644
index 003966e..0000000
--- a/vrpn-find_jsoncpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vrpn-version_07.33/cmake/FindJsonCpp.cmake
-===================================================================
---- vrpn-version_07.33.orig/cmake/FindJsonCpp.cmake
-+++ vrpn-version_07.33/cmake/FindJsonCpp.cmake
-@@ -69,6 +69,7 @@ list(APPEND _jsoncppnames
-
- find_library(JSONCPP_LIBRARY
- NAMES
-+ jsoncpp
- ${_jsoncppnames}
- PATHS
- "${JSONCPP_ROOT_DIR}/libs"
diff --git a/vrpn-find_modbus.patch b/vrpn-find_modbus.patch
deleted file mode 100644
index 8fa2e29..0000000
--- a/vrpn-find_modbus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: vrpn-version_07.33/cmake/FindModbus.cmake
-===================================================================
---- vrpn-version_07.33.orig/cmake/FindModbus.cmake
-+++ vrpn-version_07.33/cmake/FindModbus.cmake
-@@ -46,16 +46,16 @@ find_path(MODBUS_INCLUDE_DIR
- "${MODBUS_ROOT_DIR}"
- PATH_SUFFIXES
- include
-+ include/modbus
- PATHS
- "${_progfiles}/libmodbus"
- C:/usr/local
-- /usr/local)
-+ /usr/local
-+ /usr)
-
- # Look for the library.
- find_library(MODBUS_LIBRARY
-- NAMES
-- libmodbus.lib
-- libmodbus.a
-+ modbus
- HINTS
- "${MODBUS_ROOT_DIR}"
- PATH_SUFFIXES
diff --git a/vrpn-fix_library_install_rules.patch b/vrpn-fix_library_install_rules.patch
deleted file mode 100644
index 8f12fca..0000000
--- a/vrpn-fix_library_install_rules.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a03978b..0ad0c6d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1245,16 +1245,10 @@ if(VRPN_BUILD_SERVER_LIBRARY)
- if(VRPN_INSTALL)
- install(TARGETS
- vrpnserver
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
- endif()
- add_cppcheck(vrpnserver STYLE UNUSED_FUNCTIONS)
- endif()
-@@ -1292,16 +1286,10 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
- if(VRPN_INSTALL)
- install(TARGETS
- vrpn
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- clientsdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- clientsdk)
-+ RUNTIME DESTINATION bin COMPONENT clientsdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
- endif()
- add_cppcheck(vrpn STYLE UNUSED_FUNCTIONS)
- endif()
-diff --git a/atmellib/CMakeLists.txt b/atmellib/CMakeLists.txt
-index 30d51f1..003785c 100644
---- a/atmellib/CMakeLists.txt
-+++ b/atmellib/CMakeLists.txt
-@@ -24,14 +24,8 @@ set_property(TARGET
- if(VRPN_INSTALL)
- install(TARGETS
- vrpn_atmel
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
- endif()
-diff --git a/gpsnmealib/CMakeLists.txt b/gpsnmealib/CMakeLists.txt
-index fee7b3a..9a34e2d 100644
---- a/gpsnmealib/CMakeLists.txt
-+++ b/gpsnmealib/CMakeLists.txt
-@@ -25,14 +25,8 @@ set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
- if(VRPN_INSTALL)
- install(TARGETS
- gpsnmea
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
--endif()
-\ No newline at end of file
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
-+endif()
-diff --git a/quat/CMakeLists.txt b/quat/CMakeLists.txt
-index 597776e..8d48c94 100644
---- a/quat/CMakeLists.txt
-+++ b/quat/CMakeLists.txt
-@@ -38,28 +38,16 @@ set_target_properties(quat PROPERTIES FOLDER Library)
- if(VRPN_INSTALL)
- install(TARGETS
- quat
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
- install(TARGETS
- quat
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- clientsdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- clientsdk)
-+ RUNTIME DESTINATION bin COMPONENT clientsdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
- endif()
-
- add_subdirectory(testapps)
-diff --git a/server_src/timecode_generator_server/CMakeLists.txt b/server_src/timecode_generator_server/CMakeLists.txt
-index 5f8dce6..925bc44 100644
---- a/server_src/timecode_generator_server/CMakeLists.txt
-+++ b/server_src/timecode_generator_server/CMakeLists.txt
-@@ -25,14 +25,8 @@ set_target_properties(vrpn_timecode_generator
- if(VRPN_INSTALL)
- install(TARGETS
- vrpn_timecode_generator
-- ARCHIVE
-- DESTINATION
-- lib
-- COMPONENT
-- serversdk
-- PUBLIC_HEADER
-- DESTINATION
-- include
-- COMPONENT
-- serversdk)
--endif()
-\ No newline at end of file
-+ RUNTIME DESTINATION bin COMPONENT serversdk
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
-+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
-+endif()
diff --git a/vrpn-java_install.patch b/vrpn-java_install.patch
deleted file mode 100644
index b095105..0000000
--- a/vrpn-java_install.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Index: vrpn-version_07.33/java_vrpn/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/java_vrpn/CMakeLists.txt
-+++ vrpn-version_07.33/java_vrpn/CMakeLists.txt
-@@ -6,6 +6,29 @@
-
- if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EXECUTABLE AND VRPN_BUILD_JAVA)
-
-+ set(JAVA_INSTALL_LIBDIR
-+ lib
-+ CACHE PATH
-+ "Where to install java shared objects")
-+ set(JAVA_INSTALL_JNIDIR
-+ share/java
-+ CACHE PATH
-+ "Where to install JNI jar files")
-+
-+ if("${JAVA_INSTALL_LIBDIR}" STREQUAL lib)
-+ set(JAVA_LOAD_VRPN
-+ "System.loadLibrary(\"java_vrpn\")")
-+ else()
-+ if(IS_ABSOLUTE "${JAVA_INSTALL_LIBDIR}")
-+ set(JAVA_LOAD_VRPN
-+ "System.load(\"${JAVA_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}java_vrpn${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
-+ else()
-+ set(JAVA_LOAD_VRPN
-+ "System.load(\"${CMAKE_INSTALL_PREFIX}/${JAVA_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}java_vrpn${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
-+ endif()
-+ endif()
-+ configure_file("vrpn/VRPN.java.in" "vrpn/VRPN.java")
-+
- # Set up file lists
- set(JAVA_CLASSES
- AnalogOutputRemote
-@@ -22,7 +45,6 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
- TextSender
- TrackerRemote
- TrackerRemoteListener
-- VRPN
- VRPNDevice)
- set(JAVAC_OUTPUT)
- set(JAVAC_INPUT)
-@@ -38,6 +60,15 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
- JAVA_JNI_HEADERS
- "${CMAKE_CURRENT_BINARY_DIR}/vrpn_${class}.h")
- endforeach()
-+ list(APPEND
-+ JAVAC_OUTPUT
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.class")
-+ list(APPEND
-+ JAVAC_INPUT
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.java")
-+ list(APPEND
-+ JAVA_JNI_HEADERS
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_VRPN.h")
-
- # *.java -> *.class
- add_custom_command(OUTPUT
-@@ -87,6 +118,20 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
- COMMENT
- "Generating JNI header file for vrpn.${in}")
- endforeach()
-+ add_custom_command(OUTPUT
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_VRPN.h"
-+ DEPENDS
-+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.class"
-+ COMMAND
-+ "${JAVAH_EXECUTABLE}"
-+ -d
-+ "${CMAKE_CURRENT_BINARY_DIR}"
-+ -jni
-+ -classpath
-+ "${CMAKE_CURRENT_BINARY_DIR}"
-+ vrpn.VRPN
-+ COMMENT
-+ "Generating JNI header file for vrpn.${in}")
-
- # target for vrpn.jar
- add_custom_target(java_vrpn_jar
-@@ -120,12 +165,15 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
-
- if(VRPN_INSTALL)
- install(TARGETS java_vrpn
-- ARCHIVE DESTINATION lib COMPONENT java
-- LIBRARY DESTINATION lib COMPONENT java
-- RUNTIME DESTINATION lib COMPONENT java)
-+ ARCHIVE DESTINATION "${JAVA_INSTALL_LIBDIR}"
-+ COMPONENT java
-+ LIBRARY DESTINATION "${JAVA_INSTALL_LIBDIR}"
-+ COMPONENT java
-+ RUNTIME DESTINATION "${JAVA_INSTALL_LIBDIR}"
-+ COMPONENT java)
-
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.jar"
-- DESTINATION share/java
-+ DESTINATION "${JAVA_INSTALL_JNIDIR}"
- COMPONENT java
- RENAME vrpn-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.jar)
- endif()
-Index: vrpn-version_07.33/java_vrpn/vrpn/VRPN.java
-===================================================================
---- vrpn-version_07.33.orig/java_vrpn/vrpn/VRPN.java
-+++ /dev/null
-@@ -1,34 +0,0 @@
--
--
--package vrpn;
--
--public class VRPN
--{
--
-- /**
-- * All VRPN objects must assert this lock before making any calls
-- * into native code. A corollary of this is that no native methods
-- * may be public; all native methods must be wrapped by other methods
-- * that first synchronize on this lock before calling the native
-- * method.
-- */
-- protected final static Object downInVrpnLock = new Object( );
--
-- static
-- {
-- try { System.loadLibrary( "java_vrpn" ); }
-- catch( UnsatisfiedLinkError e )
-- {
-- System.out.println( e.getMessage( ) );
-- System.out.println( "Error initializing java_vrpn." );
-- System.out.println( " -- Unable to find native library." );
-- }
-- catch( SecurityException e )
-- {
-- System.out.println( e.getMessage( ) );
-- System.out.println( "Security exception: you couldn't load the native vrpn dll." );
-- }
-- } // end static initializer block
--
--
--} // end class VRPN
-Index: vrpn-version_07.33/java_vrpn/vrpn/VRPN.java.in
-===================================================================
---- /dev/null
-+++ vrpn-version_07.33/java_vrpn/vrpn/VRPN.java.in
-@@ -0,0 +1,34 @@
-+
-+
-+package vrpn;
-+
-+public class VRPN
-+{
-+
-+ /**
-+ * All VRPN objects must assert this lock before making any calls
-+ * into native code. A corollary of this is that no native methods
-+ * may be public; all native methods must be wrapped by other methods
-+ * that first synchronize on this lock before calling the native
-+ * method.
-+ */
-+ protected final static Object downInVrpnLock = new Object( );
-+
-+ static
-+ {
-+ try { @JAVA_LOAD_VRPN@; }
-+ catch( UnsatisfiedLinkError e )
-+ {
-+ System.out.println( e.getMessage( ) );
-+ System.out.println( "Error initializing java_vrpn." );
-+ System.out.println( " -- Unable to find native library." );
-+ }
-+ catch( SecurityException e )
-+ {
-+ System.out.println( e.getMessage( ) );
-+ System.out.println( "Security exception: you couldn't load the native vrpn dll." );
-+ }
-+ } // end static initializer block
-+
-+
-+} // end class VRPN
diff --git a/vrpn-python_install.patch b/vrpn-python_install.patch
deleted file mode 100644
index f9b56e9..0000000
--- a/vrpn-python_install.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: vrpn-version_07.33/python/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/python/CMakeLists.txt
-+++ vrpn-version_07.33/python/CMakeLists.txt
-@@ -52,14 +52,19 @@ if(PYTHONLIBS_FOUND AND (VRPN_BUILD_PYTH
- OUTPUT_NAME vrpn)
-
- if(VRPN_INSTALL)
-+ set(VRPN_PYTHON_INSTALL_DIR
-+ lib/${PYTHONVERSIONDIR}dist-packages/
-+ CACHE
-+ PATH
-+ "Directory to install python modules")
- if(WIN32)
- # install(TARGETS vrpn-python
--# RUNTIME DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python
--# LIBRARY DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python)
-+# RUNTIME DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python
-+# LIBRARY DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python)
- else()
- install(TARGETS vrpn-python
-- RUNTIME DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python
-- LIBRARY DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python)
-+ RUNTIME DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python
-+ LIBRARY DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python)
- endif()
- endif()
- endif()
-Index: vrpn-version_07.33/python_vrpn/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/python_vrpn/CMakeLists.txt
-+++ vrpn-version_07.33/python_vrpn/CMakeLists.txt
-@@ -68,23 +68,28 @@ if(SWIG_FOUND AND PYTHONLIBS_FOUND AND V
- swig_link_libraries(${module} ${PYTHON_LIBRARIES} ${LIBS} ${SERVER_EXTRA_LIBS})
- set_target_properties(_${module} PROPERTIES FOLDER "Python Bindings")
-
-+ set(VRPN_PYTHON_INSTALL_DIR
-+ lib/${PYTHONVERSIONDIR}dist-packages/
-+ CACHE
-+ PATH
-+ "Directory to install python modules")
- if(VRPN_INSTALL)
- install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/${module}.py"
- DESTINATION
-- lib/${PYTHONVERSIONDIR}dist-packages/
-+ "${VRPN_PYTHON_INSTALL_DIR}"
- COMPONENT
- python)
- install(TARGETS
- ${SWIG_MODULE_${module}_REAL_NAME}
- RUNTIME
- DESTINATION
-- lib/${PYTHONVERSIONDIR}dist-packages/
-+ "${VRPN_PYTHON_INSTALL_DIR}"
- COMPONENT
- python
- LIBRARY
- DESTINATION
-- lib/${PYTHONVERSIONDIR}dist-packages/
-+ "${VRPN_PYTHON_INSTALL_DIR}"
- COMPONENT
- python)
- endif()
diff --git a/vrpn-soversion.patch b/vrpn-soversion.patch
deleted file mode 100644
index e10ed23..0000000
--- a/vrpn-soversion.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Index: vrpn-version_07.33/gpsnmealib/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/gpsnmealib/CMakeLists.txt
-+++ vrpn-version_07.33/gpsnmealib/CMakeLists.txt
-@@ -21,6 +21,10 @@ set_property(TARGET
- PUBLIC_HEADER
- ${GPSNMEALIB_PUBLIC_HEADERS})
- set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
-+set_target_properties(gpsnmea
-+ PROPERTIES
-+ VERSION ${CPACK_PACKAGE_VERSION}
-+ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
-
- if(VRPN_INSTALL)
- install(TARGETS
-Index: vrpn-version_07.33/quat/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/quat/CMakeLists.txt
-+++ vrpn-version_07.33/quat/CMakeLists.txt
-@@ -35,6 +35,10 @@ set(QUATLIB_HEADER quat.h)
- add_library(quat ${QUATLIB_SOURCES} ${QUATLIB_HEADER})
- set_property(TARGET quat PROPERTY PUBLIC_HEADER ${QUATLIB_HEADER})
- set_target_properties(quat PROPERTIES FOLDER Library)
-+set_target_properties(quat
-+ PROPERTIES
-+ VERSION ${CPACK_PACKAGE_VERSION}
-+ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
- if(VRPN_INSTALL)
- install(TARGETS
- quat
-Index: vrpn-version_07.33/server_src/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/server_src/CMakeLists.txt
-+++ vrpn-version_07.33/server_src/CMakeLists.txt
-@@ -59,6 +59,10 @@ if(VRPN_USE_PHANTOM_SERVER AND OPENGL_FO
- PUBLIC_HEADER
- ${PHANTOM_HEADERS})
- set_target_properties(vrpn_phantom PROPERTIES FOLDER Library)
-+ set_target_properties(vrpn_phantom
-+ PROPERTIES
-+ VERSION ${CPACK_PACKAGE_VERSION}
-+ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
-
- if(VRPN_INSTALL)
- install(TARGETS
-Index: vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/server_src/timecode_generator_server/CMakeLists.txt
-+++ vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
-@@ -20,7 +20,11 @@ target_link_libraries(vrpn_timecode_gene
- set_target_properties(vrpn_timecode_generator
- PROPERTIES
- FOLDER
-- "Main Server")
-+ "Main Server"
-+ VERSION
-+ ${CPACK_PACKAGE_VERSION}
-+ SOVERSION
-+ ${CPACK_PACKAGE_VERSION_MAJOR})
-
- if(VRPN_INSTALL)
- install(TARGETS
-Index: vrpn-version_07.33/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/CMakeLists.txt
-+++ vrpn-version_07.33/CMakeLists.txt
-@@ -1244,6 +1244,12 @@ if(VRPN_BUILD_SERVER_LIBRARY)
- PROPERTY
- LINK_FLAGS
- ${SERVER_LINK_FLAGS})
-+ set_target_properties(vrpnserver
-+ PROPERTIES
-+ VERSION
-+ ${CPACK_PACKAGE_VERSION}
-+ SOVERSION
-+ ${CPACK_PACKAGE_VERSION_MAJOR})
-
- if(UNIX)
- add_subdirectory(atmellib)
-@@ -1298,6 +1304,12 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
- PROPERTY
- FOLDER
- "Library")
-+ set_target_properties(vrpn
-+ PROPERTIES
-+ VERSION
-+ ${CPACK_PACKAGE_VERSION}
-+ SOVERSION
-+ ${CPACK_PACKAGE_VERSION_MAJOR})
-
- if(VRPN_INSTALL)
- install(TARGETS
-Index: vrpn-version_07.33/atmellib/CMakeLists.txt
-===================================================================
---- vrpn-version_07.33.orig/atmellib/CMakeLists.txt
-+++ vrpn-version_07.33/atmellib/CMakeLists.txt
-@@ -21,6 +21,12 @@ set_property(TARGET
- PROPERTY
- FOLDER
- "Library")
-+set_target_properties(vrpn_atmel
-+ PROPERTIES
-+ VERSION
-+ ${CPACK_PACKAGE_VERSION}
-+ SOVERSION
-+ ${CPACK_PACKAGE_VERSION_MAJOR})
- if(VRPN_INSTALL)
- install(TARGETS
- vrpn_atmel
diff --git a/vrpn-wait.patch b/vrpn-wait.patch
deleted file mode 100644
index 9dd04d0..0000000
--- a/vrpn-wait.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: vrpn-version_07.33/vrpn_Connection.C
-===================================================================
---- vrpn-version_07.33.orig/vrpn_Connection.C
-+++ vrpn-version_07.33/vrpn_Connection.C
-@@ -2486,11 +2486,7 @@ static int vrpn_start_server(const char
- for (waitloop = 0; waitloop < (SERVCOUNT); waitloop++) {
- int ret;
- pid_t deadkid;
--#if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
-- int status; // doesn't exist on sparc_solaris or FreeBSD
--#else
-- union wait status;
--#endif
-+ int status;
-
- /* Check to see if they called back yet. */
- ret = vrpn_poll_for_accept(server_sock, &child_socket, SERVWAIT);
-@@ -2504,13 +2500,7 @@ static int vrpn_start_server(const char
- }
-
- /* Check to see if the child is dead yet */
--#if defined(hpux) || defined(sgi) || defined(__hpux) || defined(__CYGWIN__) || \
-- defined(__APPLE__)
-- /* hpux include files have the wrong declaration */
-- deadkid = wait3((int *)&status, WNOHANG, NULL);
--#else
- deadkid = wait3(&status, WNOHANG, NULL);
--#endif
- if (deadkid == pid) {
- fprintf(stderr, "vrpn_start_server: server process exited\n");
- vrpn_closeSocket(server_sock);
diff --git a/vrpn.service b/vrpn.service
deleted file mode 100644
index 57c5607..0000000
--- a/vrpn.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=VRPN server
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/vrpn_server -f /etc/vrpn.cfg
-
-[Install]
-WantedBy=multi-user.target
diff --git a/vrpn.spec b/vrpn.spec
deleted file mode 100644
index 74a92c9..0000000
--- a/vrpn.spec
+++ /dev/null
@@ -1,284 +0,0 @@
-%undefine __cmake_in_source_build
-
-Name: vrpn
-Version: 07.33
-Release: 26%{?dist}
-Summary: The Virtual-Reality Peripheral Network
-
-# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
-# (libvrpnserver.so and vrpn_server binary, as well as python and java modules)
-# GPLv3+-licensed. The rest of files is supplied under the Boost license.
-License: Boost and GPLv3+
-URL: https://github.com/vrpn/vrpn/
-Source0: https://github.com/vrpn/vrpn/archive/version_%{version}.tar.gz#/%{name}-v...
-Source1: vrpn.service
-Patch0: vrpn-find_modbus.patch
-Patch1: vrpn-find_hidapi.patch
-Patch2: vrpn-find_jsoncpp.patch
-# patch3 from upstream commit 7f961a3
-Patch3: vrpn-fix_library_install_rules.patch
-Patch4: vrpn-java_install.patch
-Patch5: vrpn-python_install.patch
-Patch6: vrpn-soversion.patch
-Patch7: vrpn-config_install.patch
-Patch8: vrpn-dont_install_garbage.patch
-Patch9: vrpn-wait.patch
-
-BuildRequires: gcc-c++
-BuildRequires: cmake
-BuildRequires: doxygen
-BuildRequires: gcc
-BuildRequires: glut-devel
-BuildRequires: gpm-devel
-BuildRequires: graphviz
-BuildRequires: help2man
-BuildRequires: hidapi-devel
-BuildRequires: java-devel
-BuildRequires: jsoncpp-devel
-BuildRequires: libGL-devel
-BuildRequires: libmodbus-devel
-BuildRequires: libudev-devel
-BuildRequires: libusb-devel
-BuildRequires: perl-Parse-RecDescent
-BuildRequires: python3-devel
-BuildRequires: systemd
-BuildRequires: swig
-BuildRequires: wiiuse-devel
-
-%{?systemd_requires}
-
-%description
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system. The
-idea is to have a PC or other host at each VR station that controls the
-peripherals (tracker, button device, haptic device, analog inputs, sound, etc).
-VRPN provides connections between the application and all of the devices using
-the appropriate class-of-service for each type of device sharing this link. The
-application remains unaware of the network topology. Note that it is possible
-to use VRPN with devices that are directly connected to the machine that the
-application is running on, either using separate control programs or running
-all as a single program.
-
-
-%package devel
-Summary: Development files for the Virtual-Reality Peripheral Network
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
-
-This package contains development files for VRPN libraries.
-
-
-%package doc
-Summary: Developer's documentation for VRPN
-BuildArch: noarch
-
-%description doc
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
-
-This package contains generated VRPN source code documentation.
-
-
-%package java
-Summary: Java bindings for the Virtual-Reality Peripheral Network
-License: GPLv3+
-
-Requires: java-headless
-Requires: javapackages-tools
-
-%description java
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
-
-This package contains Java bindings for VRPN libraries.
-
-
-%package -n python3-%{name}
-Summary: Python 3 bindings for the Virtual-Reality Peripheral Network
-License: GPLv3+
-
-%{?python_provide:%python_provide python3-%{name}}
-
-%description -n python3-%{name}
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
-
-This package contains Python 3 bindings for VRPN libraries.
-
-
-%prep
-%autosetup -n %{name}-version_%{version} -p1
-
-
-%build
-%cmake \
- -DVRPN_GPL_SERVER=ON \
- -DBUILD_TESTING=ON \
- -DVRPN_BUILD_PYTHON_HANDCODED_3X=ON \
- -DVRPN_PYTHON_INSTALL_DIR=%{python3_sitearch} \
- -DJAVA_INSTALL_LIBDIR=%{_libdir}/%{name} \
- -DJAVA_INSTALL_JNIDIR=%{_jnidir} \
-%ifarch %{arm}
- -DJAVA_AWT_LIBRARY=%{_libdir}/jvm/java/lib/aarch32/libjawt.so \
-%endif # arch %%{arm}
- %{nil}
-%cmake_build
-%cmake_build --target doc
-
-
-%install
-%cmake_install
-install -D %{_vpath_builddir}/python/vrpn.so %{buildroot}%{python3_sitearch}/vrpn.so
-install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-
-# generate man pages
-mkdir -p %{buildroot}%{_mandir}/man1
-for prog in ./%{_vpath_builddir}/server_src/vrpn_server \
- ./%{_vpath_builddir}/client_src/run_auxiliary_logger \
- ./%{_vpath_builddir}/client_src/vrpn_print_{devices,messages,performance}
-do
- progname=$(basename "$prog")
- help2man \
- --version-string=%{version} \
- --no-info \
- --no-discard-stderr \
- --output="%{buildroot}%{_mandir}/man1/$progname.1" \
- "$prog"
-done
-
-
-%check
-%ctest
-
-
-%post
-%systemd_post %{name}.service
-
-%preun
-%systemd_preun %{name}.service
-
-%postun
-%systemd_postun_with_restart %{name}.service
-
-
-%files
-%doc ChangeLog Format
-%license README.Legal
-%{_libdir}/*.so.*
-%{_bindir}/*
-%{_datadir}/%{name}-%{version}
-%config(noreplace) %{_sysconfdir}/vrpn.cfg
-%{_unitdir}/%{name}.service
-%{_mandir}/man1/*
-
-%files devel
-%{_includedir}/*
-%{_libdir}/*.so
-
-%files doc
-%doc %{_docdir}/%{name}-%{version}
-%exclude %{_docdir}/%{name}-%{version}/source-docs/html/*.map
-%exclude %{_docdir}/%{name}-%{version}/source-docs/html/*.md5
-
-%files java
-%{_libdir}/%{name}/libjava_%{name}.so
-%{_jnidir}/*.jar
-
-%files -n python3-%{name}
-%{python3_sitearch}/*.so
-
-
-%changelog
-* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-26
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 07.33-24
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Sat May 30 2020 Björn Esser <besser82(a)fedoraproject.org> - 07.33-23
-- Rebuild (jsoncpp)
-
-* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-22
-- Rebuilt for Python 3.9
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 14 2019 Björn Esser <besser82(a)fedoraproject.org> - 07.33-20
-- Rebuild (jsoncpp)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-19
-- Rebuilt for Python 3.8
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 03 2019 Björn Esser <besser82(a)fedoraproject.org> - 07.33-17
-- Rebuild (jsoncpp)
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 14 2019 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-15
-- Subpackage python2-vrpn has been removed
- See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-13
-- Rebuilt for Python 3.7
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Dec 26 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-11
-- Rebuilt for jsoncpp.so.20
-
-* Sat Sep 02 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-10
-- Fix problems with finding JNI on %%arm
-
-* Fri Sep 01 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-9
-- Rebuilt for jsoncpp-1.8.3
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-5
-- Rebuild for Python 3.6
-
-* Mon Oct 03 2016 Björn Esser <fedora(a)besser82.io> - 07.33-4
-- Rebuilt for libjsoncpp.so.11
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 07.33-3
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
-
-* Wed Jun 8 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-2
-- Fix build for fc25 (#1341988)
-- Fix installation of python 3 module (#1342509)
-
-* Wed Feb 24 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-1
-- Initial package
commit a1c1e0b0ce6d87f590d749214f3896e51fc9de8c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Aug 1 09:37:05 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vrpn.spec b/vrpn.spec
index 4b7523e..74a92c9 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -2,7 +2,7 @@
Name: vrpn
Version: 07.33
-Release: 25%{?dist}
+Release: 26%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -202,6 +202,10 @@ done
%changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-26
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 819b331bbdcf71b05eb3b67b2f99f5111ca7ff33
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 13:53:52 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vrpn.spec b/vrpn.spec
index 13cdb8e..4b7523e 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -2,7 +2,7 @@
Name: vrpn
Version: 07.33
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -202,6 +202,9 @@ done
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 07.33-24
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
commit 9a33765cac24ff66cfdfea4a0ee852478978452a
Author: Jiri <jvanek(a)redhat.com>
Date: Sat Jul 11 08:16:00 2020 +0200
Rebuilt for JDK-11
diff --git a/vrpn.spec b/vrpn.spec
index 8508a8d..13cdb8e 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -2,7 +2,7 @@
Name: vrpn
Version: 07.33
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -202,6 +202,9 @@ done
%changelog
+* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 07.33-24
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
* Sat May 30 2020 Björn Esser <besser82(a)fedoraproject.org> - 07.33-23
- Rebuild (jsoncpp)
commit be8a3932873a19c0ffdbe9c94c648fcbbfd537ec
Author: Igor Raits <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jul 6 09:41:18 2020 +0200
Improve compatibility with new CMake macro
Signed-off-by: Igor Raits <ignatenkobrain(a)fedoraproject.org>
diff --git a/vrpn.spec b/vrpn.spec
index 782a31f..8508a8d 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
Name: vrpn
Version: 07.33
Release: 23%{?dist}
@@ -122,9 +124,6 @@ This package contains Python 3 bindings for VRPN libraries.
%build
-mkdir build
-pushd build
-
%cmake \
-DVRPN_GPL_SERVER=ON \
-DBUILD_TESTING=ON \
@@ -135,21 +134,21 @@ pushd build
%ifarch %{arm}
-DJAVA_AWT_LIBRARY=%{_libdir}/jvm/java/lib/aarch32/libjawt.so \
%endif # arch %%{arm}
- ..
-%make_build all doc
-popd
+ %{nil}
+%cmake_build
+%cmake_build --target doc
%install
-%make_install -C build
-install -D build/python/vrpn.so %{buildroot}%{python3_sitearch}/vrpn.so
+%cmake_install
+install -D %{_vpath_builddir}/python/vrpn.so %{buildroot}%{python3_sitearch}/vrpn.so
install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
# generate man pages
mkdir -p %{buildroot}%{_mandir}/man1
-for prog in ./build/server_src/vrpn_server \
- ./build/client_src/run_auxiliary_logger \
- ./build/client_src/vrpn_print_{devices,messages,performance}
+for prog in ./%{_vpath_builddir}/server_src/vrpn_server \
+ ./%{_vpath_builddir}/client_src/run_auxiliary_logger \
+ ./%{_vpath_builddir}/client_src/vrpn_print_{devices,messages,performance}
do
progname=$(basename "$prog")
help2man \
@@ -162,20 +161,16 @@ done
%check
-pushd build
-ctest -VV
-popd
+%ctest
%post
-/sbin/ldconfig
%systemd_post %{name}.service
%preun
%systemd_preun %{name}.service
%postun
-/sbin/ldconfig
%systemd_postun_with_restart %{name}.service
commit f29d1b0258a5423f1c0e4c9719e6184bffe7895c
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sat May 30 15:02:29 2020 +0200
Rebuild (jsoncpp)
diff --git a/vrpn.spec b/vrpn.spec
index 768865e..782a31f 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -207,6 +207,9 @@ popd
%changelog
+* Sat May 30 2020 Björn Esser <besser82(a)fedoraproject.org> - 07.33-23
+- Rebuild (jsoncpp)
+
* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-22
- Rebuilt for Python 3.9
commit 58ce99798e7ab07ab38911b04536f50c3003e64a
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue May 26 03:54:44 2020 +0200
Rebuilt for Python 3.9
diff --git a/vrpn.spec b/vrpn.spec
index d245c0b..768865e 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -207,6 +207,9 @@ popd
%changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-22
+- Rebuilt for Python 3.9
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit eb8dc9ae083554d464663a436fa2acb1eaee2314
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 31 03:24:01 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vrpn.spec b/vrpn.spec
index ba94651..d245c0b 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -207,6 +207,9 @@ popd
%changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Thu Nov 14 2019 Björn Esser <besser82(a)fedoraproject.org> - 07.33-20
- Rebuild (jsoncpp)
commit bcc848c6258915afb9163e5f2878842773245460
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Thu Nov 14 20:39:22 2019 +0100
Rebuild (jsoncpp)
diff --git a/vrpn.spec b/vrpn.spec
index 3143b0f..ba94651 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -207,6 +207,9 @@ popd
%changelog
+* Thu Nov 14 2019 Björn Esser <besser82(a)fedoraproject.org> - 07.33-20
+- Rebuild (jsoncpp)
+
* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-19
- Rebuilt for Python 3.8
commit 4c39a0f4752bb911877c085b912aa1bcb1feda70
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Aug 19 11:09:22 2019 +0200
Rebuilt for Python 3.8
diff --git a/vrpn.spec b/vrpn.spec
index b034d3e..3143b0f 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -207,6 +207,9 @@ popd
%changelog
+* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-19
+- Rebuilt for Python 3.8
+
* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 28a1a2b964fce23eb21b02af72db121033eea40f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 27 03:11:41 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vrpn.spec b/vrpn.spec
index 029c729..b034d3e 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -207,6 +207,9 @@ popd
%changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Wed Jul 03 2019 Björn Esser <besser82(a)fedoraproject.org> - 07.33-17
- Rebuild (jsoncpp)
commit b78d1418c64f46346108d7b45f131eed5aba71ef
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Wed Jul 3 13:30:27 2019 +0200
Rebuild (jsoncpp)
diff --git a/vrpn.spec b/vrpn.spec
index f7bfb82..029c729 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -207,6 +207,9 @@ popd
%changelog
+* Wed Jul 03 2019 Björn Esser <besser82(a)fedoraproject.org> - 07.33-17
+- Rebuild (jsoncpp)
+
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit d691864e7c001b4169d8644fefc2176f148cbe60
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Feb 3 11:27:31 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vrpn.spec b/vrpn.spec
index eda04b2..f7bfb82 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -207,6 +207,9 @@ popd
%changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Mon Jan 14 2019 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-15
- Subpackage python2-vrpn has been removed
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
commit 310c46f411476235e2cd16c0b0efbe839d35f761
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Jan 14 16:19:05 2019 +0100
Subpackage python2-vrpn has been removed
diff --git a/vrpn.spec b/vrpn.spec
index 5af613e..eda04b2 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -38,7 +38,6 @@ BuildRequires: libmodbus-devel
BuildRequires: libudev-devel
BuildRequires: libusb-devel
BuildRequires: perl-Parse-RecDescent
-BuildRequires: python2-devel
BuildRequires: python3-devel
BuildRequires: systemd
BuildRequires: swig
@@ -103,21 +102,6 @@ physical devices (tracker, etc.) used in a virtual-reality (VR) system.
This package contains Java bindings for VRPN libraries.
-%package -n python2-%{name}
-Summary: Python 2 bindings for the Virtual-Reality Peripheral Network
-License: GPLv3+
-
-%{?python_provide:%python_provide python2-%{name}}
-
-%description -n python2-%{name}
-The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
-library and a set of servers that are designed to implement a
-network-transparent interface between application programs and the set of
-physical devices (tracker, etc.) used in a virtual-reality (VR) system.
-
-This package contains Python 2 bindings for VRPN libraries.
-
-
%package -n python3-%{name}
Summary: Python 3 bindings for the Virtual-Reality Peripheral Network
License: GPLv3+
@@ -153,23 +137,12 @@ pushd build
%endif # arch %%{arm}
..
%make_build all doc
-
-# now build modules for python2
-mv python python3
-%cmake \
- -DVRPN_BUILD_PYTHON_HANDCODED_3X=OFF \
- -DVRPN_BUILD_PYTHON=ON \
- -DVRPN_BUILD_PYTHON_HANDCODED_2X=ON \
- -DVRPN_PYTHON_INSTALL_DIR=%{python2_sitearch} \
- ..
-%make_build
-
popd
%install
%make_install -C build
-install -D build/python3/vrpn.so %{buildroot}%{python3_sitearch}/vrpn.so
+install -D build/python/vrpn.so %{buildroot}%{python3_sitearch}/vrpn.so
install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
# generate man pages
@@ -229,15 +202,15 @@ popd
%{_libdir}/%{name}/libjava_%{name}.so
%{_jnidir}/*.jar
-%files -n python2-%{name}
-%{python2_sitearch}/*.so
-%{python2_sitearch}/*.py*
-
%files -n python3-%{name}
%{python3_sitearch}/*.so
%changelog
+* Mon Jan 14 2019 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-15
+- Subpackage python2-vrpn has been removed
+ See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 8c58cca786fd431cddb19b354f7c6acbe1d775fa
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 08:39:47 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vrpn.spec b/vrpn.spec
index eda98ee..5af613e 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -238,6 +238,9 @@ popd
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-13
- Rebuilt for Python 3.7
commit daa65b5184cb060df7aa4e1ac1515fbadb1296cc
Author: Igor Gnatenko <ignatenko(a)redhat.com>
Date: Mon Jul 9 19:06:53 2018 +0200
add BuildRequires: gcc-c++
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
diff --git a/vrpn.spec b/vrpn.spec
index 1720db0..eda98ee 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -22,6 +22,7 @@ Patch7: vrpn-config_install.patch
Patch8: vrpn-dont_install_garbage.patch
Patch9: vrpn-wait.patch
+BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: gcc
commit 196ef142174ceffa1e8c0a4a800074930d940dc2
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Jun 19 11:30:23 2018 +0200
Rebuilt for Python 3.7
diff --git a/vrpn.spec b/vrpn.spec
index 53da469..1720db0 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -237,6 +237,9 @@ popd
%changelog
+* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-13
+- Rebuilt for Python 3.7
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 4b4df700807d509146b9b3602baf7baa5f1ae76e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 9 20:40:54 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vrpn.spec b/vrpn.spec
index af87aea..53da469 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -237,6 +237,9 @@ popd
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Tue Dec 26 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-11
- Rebuilt for jsoncpp.so.20
commit ffcba85b6b49d54528c8c20ed15688e46c1abfb5
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Tue Dec 26 09:22:36 2017 +0100
Rebuilt for jsoncpp.so.20
diff --git a/vrpn.spec b/vrpn.spec
index 0509f6c..af87aea 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -237,6 +237,9 @@ popd
%changelog
+* Tue Dec 26 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-11
+- Rebuilt for jsoncpp.so.20
+
* Sat Sep 02 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-10
- Fix problems with finding JNI on %%arm
commit 53fa76e72aa3a6507720febe37aa988cd1668687
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sat Sep 2 13:17:38 2017 +0200
Fix problems with finding JNI on %%arm
diff --git a/vrpn.spec b/vrpn.spec
index 9bb158b..0509f6c 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -147,6 +147,9 @@ pushd build
-DVRPN_PYTHON_INSTALL_DIR=%{python3_sitearch} \
-DJAVA_INSTALL_LIBDIR=%{_libdir}/%{name} \
-DJAVA_INSTALL_JNIDIR=%{_jnidir} \
+%ifarch %{arm}
+ -DJAVA_AWT_LIBRARY=%{_libdir}/jvm/java/lib/aarch32/libjawt.so \
+%endif # arch %%{arm}
..
%make_build all doc
@@ -234,6 +237,9 @@ popd
%changelog
+* Sat Sep 02 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-10
+- Fix problems with finding JNI on %%arm
+
* Fri Sep 01 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-9
- Rebuilt for jsoncpp-1.8.3
commit 19ab2b8685ae9f134cc055a157adaf954edfc5a4
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Fri Sep 1 22:49:05 2017 +0200
Rebuilt for jsoncpp-1.8.3
diff --git a/vrpn.spec b/vrpn.spec
index dd2f5d5..9bb158b 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -234,6 +234,9 @@ popd
%changelog
+* Fri Sep 01 2017 Björn Esser <besser82(a)fedoraproject.org> - 07.33-9
+- Rebuilt for jsoncpp-1.8.3
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 86a4a21df6a4e859f90d763332181e8088419bac
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 10:08:40 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/vrpn.spec b/vrpn.spec
index ed18b78..dd2f5d5 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -234,6 +234,9 @@ popd
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit c07d9a9a4b9ac27242e9e86ebbc251bfb10ee982
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 21:26:01 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/vrpn.spec b/vrpn.spec
index fb4f891..ed18b78 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -234,6 +234,9 @@ popd
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit b766e4831b55d088fa449e0688ccd138c8561458
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 17:11:41 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/vrpn.spec b/vrpn.spec
index aac75a3..fb4f891 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -234,6 +234,9 @@ popd
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 07.33-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Mon Dec 19 2016 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-5
- Rebuild for Python 3.6
commit 03f218861f75b6c2ebc4af4f05b3445444b90965
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Dec 19 18:20:38 2016 +0100
Rebuild for Python 3.6
diff --git a/vrpn.spec b/vrpn.spec
index 010767d..aac75a3 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -234,6 +234,9 @@ popd
%changelog
+* Mon Dec 19 2016 Miro Hrončok <mhroncok(a)redhat.com> - 07.33-5
+- Rebuild for Python 3.6
+
* Mon Oct 03 2016 Björn Esser <fedora(a)besser82.io> - 07.33-4
- Rebuilt for libjsoncpp.so.11
commit 713aae6ed1e4e9c507abcef21263b9ffe63ce69b
Author: Björn Esser <me(a)besser82.io>
Date: Mon Oct 3 06:01:59 2016 +0200
Rebuilt for libjsoncpp.so.11
diff --git a/vrpn.spec b/vrpn.spec
index 72a640a..010767d 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -234,6 +234,9 @@ popd
%changelog
+* Mon Oct 03 2016 Björn Esser <fedora(a)besser82.io> - 07.33-4
+- Rebuilt for libjsoncpp.so.11
+
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 07.33-3
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
commit c6a64cae115644de5e321a9d8fca30f96262184a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 19 13:07:58 2016 +0000
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
diff --git a/vrpn.spec b/vrpn.spec
index 614be8d..72a640a 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -234,6 +234,9 @@ popd
%changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 07.33-3
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
+
* Wed Jun 8 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-2
- Fix build for fc25 (#1341988)
- Fix installation of python 3 module (#1342509)
commit daf3d58065aee6c8a94bce02950f208647566f49
Author: Dmitry Mikhirev <mikhirev(a)gmail.com>
Date: Wed Jun 8 21:46:28 2016 +0300
fix installation of python3 module (#1342509)
diff --git a/vrpn.spec b/vrpn.spec
index 406623b..614be8d 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -165,7 +165,7 @@ popd
%install
%make_install -C build
-%make_install -C build/python3
+install -D build/python3/vrpn.so %{buildroot}%{python3_sitearch}/vrpn.so
install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
# generate man pages
@@ -236,6 +236,7 @@ popd
%changelog
* Wed Jun 8 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-2
- Fix build for fc25 (#1341988)
+- Fix installation of python 3 module (#1342509)
* Wed Feb 24 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-1
- Initial package
commit 64caaaaa5a241da12645cd84b3eab7bfadec0330
Author: Dmitry Mikhirev <mikhirev(a)gmail.com>
Date: Wed Jun 8 21:17:06 2016 +0300
fix build in fc25 (#1341988)
diff --git a/vrpn-wait.patch b/vrpn-wait.patch
new file mode 100644
index 0000000..9dd04d0
--- /dev/null
+++ b/vrpn-wait.patch
@@ -0,0 +1,31 @@
+Index: vrpn-version_07.33/vrpn_Connection.C
+===================================================================
+--- vrpn-version_07.33.orig/vrpn_Connection.C
++++ vrpn-version_07.33/vrpn_Connection.C
+@@ -2486,11 +2486,7 @@ static int vrpn_start_server(const char
+ for (waitloop = 0; waitloop < (SERVCOUNT); waitloop++) {
+ int ret;
+ pid_t deadkid;
+-#if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
+- int status; // doesn't exist on sparc_solaris or FreeBSD
+-#else
+- union wait status;
+-#endif
++ int status;
+
+ /* Check to see if they called back yet. */
+ ret = vrpn_poll_for_accept(server_sock, &child_socket, SERVWAIT);
+@@ -2504,13 +2500,7 @@ static int vrpn_start_server(const char
+ }
+
+ /* Check to see if the child is dead yet */
+-#if defined(hpux) || defined(sgi) || defined(__hpux) || defined(__CYGWIN__) || \
+- defined(__APPLE__)
+- /* hpux include files have the wrong declaration */
+- deadkid = wait3((int *)&status, WNOHANG, NULL);
+-#else
+ deadkid = wait3(&status, WNOHANG, NULL);
+-#endif
+ if (deadkid == pid) {
+ fprintf(stderr, "vrpn_start_server: server process exited\n");
+ vrpn_closeSocket(server_sock);
diff --git a/vrpn.spec b/vrpn.spec
index 58019a8..406623b 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -1,6 +1,6 @@
Name: vrpn
Version: 07.33
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Virtual-Reality Peripheral Network
# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
@@ -20,6 +20,7 @@ Patch5: vrpn-python_install.patch
Patch6: vrpn-soversion.patch
Patch7: vrpn-config_install.patch
Patch8: vrpn-dont_install_garbage.patch
+Patch9: vrpn-wait.patch
BuildRequires: cmake
BuildRequires: doxygen
@@ -233,5 +234,8 @@ popd
%changelog
+* Wed Jun 8 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-2
+- Fix build for fc25 (#1341988)
+
* Wed Feb 24 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-1
- Initial package
commit 1d43dde9d0684b68bcc348a8673f23b13ee1cb6f
Author: Dmitry Mikhirev <mikhirev(a)gmail.com>
Date: Sat Mar 26 20:54:19 2016 +0300
fix building srpm on koji
diff --git a/vrpn.spec b/vrpn.spec
index b3b1043..58019a8 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -42,7 +42,7 @@ BuildRequires: systemd
BuildRequires: swig
BuildRequires: wiiuse-devel
-%systemd_requires
+%{?systemd_requires}
%description
The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
@@ -105,7 +105,7 @@ This package contains Java bindings for VRPN libraries.
Summary: Python 2 bindings for the Virtual-Reality Peripheral Network
License: GPLv3+
-%python_provide python2-%{name}
+%{?python_provide:%python_provide python2-%{name}}
%description -n python2-%{name}
The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
@@ -120,7 +120,7 @@ This package contains Python 2 bindings for VRPN libraries.
Summary: Python 3 bindings for the Virtual-Reality Peripheral Network
License: GPLv3+
-%python_provide python3-%{name}
+%{?python_provide:%python_provide python3-%{name}}
%description -n python3-%{name}
The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
commit c91b454adc62f91f48fa814129835965485352e9
Author: Dmitry Mikhirev <mikhirev(a)gmail.com>
Date: Tue Mar 22 22:33:26 2016 +0300
Initial import (#1311752)
diff --git a/.gitignore b/.gitignore
index e69de29..897c42a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/vrpn-version_07.33.tar.gz
diff --git a/sources b/sources
index e69de29..90e342c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ad1475cdcc2572fcf447f8e88404f753 vrpn-version_07.33.tar.gz
diff --git a/vrpn-config_install.patch b/vrpn-config_install.patch
new file mode 100644
index 0000000..68b4c81
--- /dev/null
+++ b/vrpn-config_install.patch
@@ -0,0 +1,24 @@
+Index: vrpn-version_07.33/server_src/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/server_src/CMakeLists.txt
++++ vrpn-version_07.33/server_src/CMakeLists.txt
+@@ -143,13 +143,18 @@ configure_file("${CMAKE_CURRENT_SOURCE_D
+ @ONLY)
+
+ if(VRPN_INSTALL)
++ set(SYSCONF_INSTALL_DIR
++ etc
++ CACHE
++ PATH
++ "Directory to install configuration files")
+ if(WIN32)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.cfg"
+ DESTINATION bin
+ COMPONENT mainserver)
+ else()
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.cfg"
+- DESTINATION etc
++ DESTINATION ${SYSCONF_INSTALL_DIR}
+ COMPONENT mainserver)
+ endif()
+
diff --git a/vrpn-dont_install_garbage.patch b/vrpn-dont_install_garbage.patch
new file mode 100644
index 0000000..13aaf98
--- /dev/null
+++ b/vrpn-dont_install_garbage.patch
@@ -0,0 +1,103 @@
+Index: vrpn-version_07.33/client_src/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/client_src/CMakeLists.txt
++++ vrpn-version_07.33/client_src/CMakeLists.txt
+@@ -74,9 +74,9 @@ if(VRPN_BUILD_CLIENTS)
+ target_link_libraries(${APP} ${VRPN_CLIENT_LIBRARY})
+
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
++ #endif()
+ endforeach()
+
+ if(GLUT_FOUND AND OPENGL_FOUND)
+@@ -89,15 +89,15 @@ if(VRPN_BUILD_CLIENTS)
+
+ set_target_properties(testimager_client PROPERTIES FOLDER Tests)
+
+- if(VRPN_INSTALL)
+- install(TARGETS
+- testimager_client
+- RUNTIME
+- DESTINATION
+- bin
+- COMPONENT
+- tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS
++ # testimager_client
++ # RUNTIME
++ # DESTINATION
++ # bin
++ # COMPONENT
++ # tests)
++ #endif()
+ option(VRPN_GLUT_IS_STATIC_FREEGLUT
+ "Is the GLUT used for the imaging test client a static build of FreeGLUT?"
+ NO)
+@@ -121,15 +121,15 @@ if(VRPN_BUILD_CLIENTS)
+
+ set_target_properties(c_interface_example PROPERTIES FOLDER Tests)
+
+- if(VRPN_INSTALL)
+- install(TARGETS
+- c_interface_example
+- RUNTIME
+- DESTINATION
+- bin
+- COMPONENT
+- tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS
++ # c_interface_example
++ # RUNTIME
++ # DESTINATION
++ # bin
++ # COMPONENT
++ # tests)
++ #endif()
+
+
+ ###
+Index: vrpn-version_07.33/server_src/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/server_src/CMakeLists.txt
++++ vrpn-version_07.33/server_src/CMakeLists.txt
+@@ -219,10 +219,10 @@ if(BUILD_TESTING)
+ target_link_libraries(${APP} ${VRPN_SERVER_LIBRARY})
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP}
+- RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS ${APP}
++ # RUNTIME DESTINATION bin COMPONENT tests)
++ #endif()
+ endforeach()
+ add_test(test_loopback test_loopback)
+ add_test(test_vrpn test_vrpn)
+Index: vrpn-version_07.33/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/CMakeLists.txt
++++ vrpn-version_07.33/CMakeLists.txt
+@@ -1393,9 +1393,9 @@ if(VRPN_BUILD_SERVERS AND VRPN_BUILD_SER
+ add_executable(${APP} ${SOURCE})
+ target_link_libraries(${APP} vrpnserver)
+ set_target_properties(${APP} PROPERTIES FOLDER Tests)
+- if(VRPN_INSTALL)
+- install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
+- endif()
++ #if(VRPN_INSTALL)
++ # install(TARGETS ${APP} RUNTIME DESTINATION bin COMPONENT tests)
++ #endif()
+ endforeach()
+ endif()
+
diff --git a/vrpn-find_hidapi.patch b/vrpn-find_hidapi.patch
new file mode 100644
index 0000000..b2d596d
--- /dev/null
+++ b/vrpn-find_hidapi.patch
@@ -0,0 +1,20 @@
+Index: vrpn-version_07.33/cmake/FindHIDAPI.cmake
+===================================================================
+--- vrpn-version_07.33.orig/cmake/FindHIDAPI.cmake
++++ vrpn-version_07.33/cmake/FindHIDAPI.cmake
+@@ -24,10 +24,13 @@
+ # http://www.boost.org/LICENSE_1_0.txt)
+
+ find_library(HIDAPI_LIBRARY
+- NAMES hidapi)
++ NAMES hidapi hidapi-libusb)
+
+ find_path(HIDAPI_INCLUDE_DIR
+- NAMES hidapi.h)
++ NAMES hidapi.h
++ PATH_SUFFIXES
++ include
++ include/hidapi)
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(HIDAPI
diff --git a/vrpn-find_jsoncpp.patch b/vrpn-find_jsoncpp.patch
new file mode 100644
index 0000000..003966e
--- /dev/null
+++ b/vrpn-find_jsoncpp.patch
@@ -0,0 +1,12 @@
+Index: vrpn-version_07.33/cmake/FindJsonCpp.cmake
+===================================================================
+--- vrpn-version_07.33.orig/cmake/FindJsonCpp.cmake
++++ vrpn-version_07.33/cmake/FindJsonCpp.cmake
+@@ -69,6 +69,7 @@ list(APPEND _jsoncppnames
+
+ find_library(JSONCPP_LIBRARY
+ NAMES
++ jsoncpp
+ ${_jsoncppnames}
+ PATHS
+ "${JSONCPP_ROOT_DIR}/libs"
diff --git a/vrpn-find_modbus.patch b/vrpn-find_modbus.patch
new file mode 100644
index 0000000..8fa2e29
--- /dev/null
+++ b/vrpn-find_modbus.patch
@@ -0,0 +1,25 @@
+Index: vrpn-version_07.33/cmake/FindModbus.cmake
+===================================================================
+--- vrpn-version_07.33.orig/cmake/FindModbus.cmake
++++ vrpn-version_07.33/cmake/FindModbus.cmake
+@@ -46,16 +46,16 @@ find_path(MODBUS_INCLUDE_DIR
+ "${MODBUS_ROOT_DIR}"
+ PATH_SUFFIXES
+ include
++ include/modbus
+ PATHS
+ "${_progfiles}/libmodbus"
+ C:/usr/local
+- /usr/local)
++ /usr/local
++ /usr)
+
+ # Look for the library.
+ find_library(MODBUS_LIBRARY
+- NAMES
+- libmodbus.lib
+- libmodbus.a
++ modbus
+ HINTS
+ "${MODBUS_ROOT_DIR}"
+ PATH_SUFFIXES
diff --git a/vrpn-fix_library_install_rules.patch b/vrpn-fix_library_install_rules.patch
new file mode 100644
index 0000000..8f12fca
--- /dev/null
+++ b/vrpn-fix_library_install_rules.patch
@@ -0,0 +1,160 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a03978b..0ad0c6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1245,16 +1245,10 @@ if(VRPN_BUILD_SERVER_LIBRARY)
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpnserver
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
+ endif()
+ add_cppcheck(vrpnserver STYLE UNUSED_FUNCTIONS)
+ endif()
+@@ -1292,16 +1286,10 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- clientsdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- clientsdk)
++ RUNTIME DESTINATION bin COMPONENT clientsdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
+ endif()
+ add_cppcheck(vrpn STYLE UNUSED_FUNCTIONS)
+ endif()
+diff --git a/atmellib/CMakeLists.txt b/atmellib/CMakeLists.txt
+index 30d51f1..003785c 100644
+--- a/atmellib/CMakeLists.txt
++++ b/atmellib/CMakeLists.txt
+@@ -24,14 +24,8 @@ set_property(TARGET
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn_atmel
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
+ endif()
+diff --git a/gpsnmealib/CMakeLists.txt b/gpsnmealib/CMakeLists.txt
+index fee7b3a..9a34e2d 100644
+--- a/gpsnmealib/CMakeLists.txt
++++ b/gpsnmealib/CMakeLists.txt
+@@ -25,14 +25,8 @@ set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
+ if(VRPN_INSTALL)
+ install(TARGETS
+ gpsnmea
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
+-endif()
+\ No newline at end of file
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
++endif()
+diff --git a/quat/CMakeLists.txt b/quat/CMakeLists.txt
+index 597776e..8d48c94 100644
+--- a/quat/CMakeLists.txt
++++ b/quat/CMakeLists.txt
+@@ -38,28 +38,16 @@ set_target_properties(quat PROPERTIES FOLDER Library)
+ if(VRPN_INSTALL)
+ install(TARGETS
+ quat
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
+ install(TARGETS
+ quat
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- clientsdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- clientsdk)
++ RUNTIME DESTINATION bin COMPONENT clientsdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
++ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
+ endif()
+
+ add_subdirectory(testapps)
+diff --git a/server_src/timecode_generator_server/CMakeLists.txt b/server_src/timecode_generator_server/CMakeLists.txt
+index 5f8dce6..925bc44 100644
+--- a/server_src/timecode_generator_server/CMakeLists.txt
++++ b/server_src/timecode_generator_server/CMakeLists.txt
+@@ -25,14 +25,8 @@ set_target_properties(vrpn_timecode_generator
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn_timecode_generator
+- ARCHIVE
+- DESTINATION
+- lib
+- COMPONENT
+- serversdk
+- PUBLIC_HEADER
+- DESTINATION
+- include
+- COMPONENT
+- serversdk)
+-endif()
+\ No newline at end of file
++ RUNTIME DESTINATION bin COMPONENT serversdk
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
++ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
++endif()
diff --git a/vrpn-java_install.patch b/vrpn-java_install.patch
new file mode 100644
index 0000000..b095105
--- /dev/null
+++ b/vrpn-java_install.patch
@@ -0,0 +1,177 @@
+Index: vrpn-version_07.33/java_vrpn/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/java_vrpn/CMakeLists.txt
++++ vrpn-version_07.33/java_vrpn/CMakeLists.txt
+@@ -6,6 +6,29 @@
+
+ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EXECUTABLE AND VRPN_BUILD_JAVA)
+
++ set(JAVA_INSTALL_LIBDIR
++ lib
++ CACHE PATH
++ "Where to install java shared objects")
++ set(JAVA_INSTALL_JNIDIR
++ share/java
++ CACHE PATH
++ "Where to install JNI jar files")
++
++ if("${JAVA_INSTALL_LIBDIR}" STREQUAL lib)
++ set(JAVA_LOAD_VRPN
++ "System.loadLibrary(\"java_vrpn\")")
++ else()
++ if(IS_ABSOLUTE "${JAVA_INSTALL_LIBDIR}")
++ set(JAVA_LOAD_VRPN
++ "System.load(\"${JAVA_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}java_vrpn${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
++ else()
++ set(JAVA_LOAD_VRPN
++ "System.load(\"${CMAKE_INSTALL_PREFIX}/${JAVA_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}java_vrpn${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
++ endif()
++ endif()
++ configure_file("vrpn/VRPN.java.in" "vrpn/VRPN.java")
++
+ # Set up file lists
+ set(JAVA_CLASSES
+ AnalogOutputRemote
+@@ -22,7 +45,6 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
+ TextSender
+ TrackerRemote
+ TrackerRemoteListener
+- VRPN
+ VRPNDevice)
+ set(JAVAC_OUTPUT)
+ set(JAVAC_INPUT)
+@@ -38,6 +60,15 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
+ JAVA_JNI_HEADERS
+ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_${class}.h")
+ endforeach()
++ list(APPEND
++ JAVAC_OUTPUT
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.class")
++ list(APPEND
++ JAVAC_INPUT
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.java")
++ list(APPEND
++ JAVA_JNI_HEADERS
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_VRPN.h")
+
+ # *.java -> *.class
+ add_custom_command(OUTPUT
+@@ -87,6 +118,20 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
+ COMMENT
+ "Generating JNI header file for vrpn.${in}")
+ endforeach()
++ add_custom_command(OUTPUT
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn_VRPN.h"
++ DEPENDS
++ "${CMAKE_CURRENT_BINARY_DIR}/vrpn/VRPN.class"
++ COMMAND
++ "${JAVAH_EXECUTABLE}"
++ -d
++ "${CMAKE_CURRENT_BINARY_DIR}"
++ -jni
++ -classpath
++ "${CMAKE_CURRENT_BINARY_DIR}"
++ vrpn.VRPN
++ COMMENT
++ "Generating JNI header file for vrpn.${in}")
+
+ # target for vrpn.jar
+ add_custom_target(java_vrpn_jar
+@@ -120,12 +165,15 @@ if(JAVA_FOUND AND JNI_FOUND AND JAVAH_EX
+
+ if(VRPN_INSTALL)
+ install(TARGETS java_vrpn
+- ARCHIVE DESTINATION lib COMPONENT java
+- LIBRARY DESTINATION lib COMPONENT java
+- RUNTIME DESTINATION lib COMPONENT java)
++ ARCHIVE DESTINATION "${JAVA_INSTALL_LIBDIR}"
++ COMPONENT java
++ LIBRARY DESTINATION "${JAVA_INSTALL_LIBDIR}"
++ COMPONENT java
++ RUNTIME DESTINATION "${JAVA_INSTALL_LIBDIR}"
++ COMPONENT java)
+
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vrpn.jar"
+- DESTINATION share/java
++ DESTINATION "${JAVA_INSTALL_JNIDIR}"
+ COMPONENT java
+ RENAME vrpn-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.jar)
+ endif()
+Index: vrpn-version_07.33/java_vrpn/vrpn/VRPN.java
+===================================================================
+--- vrpn-version_07.33.orig/java_vrpn/vrpn/VRPN.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-
+-
+-package vrpn;
+-
+-public class VRPN
+-{
+-
+- /**
+- * All VRPN objects must assert this lock before making any calls
+- * into native code. A corollary of this is that no native methods
+- * may be public; all native methods must be wrapped by other methods
+- * that first synchronize on this lock before calling the native
+- * method.
+- */
+- protected final static Object downInVrpnLock = new Object( );
+-
+- static
+- {
+- try { System.loadLibrary( "java_vrpn" ); }
+- catch( UnsatisfiedLinkError e )
+- {
+- System.out.println( e.getMessage( ) );
+- System.out.println( "Error initializing java_vrpn." );
+- System.out.println( " -- Unable to find native library." );
+- }
+- catch( SecurityException e )
+- {
+- System.out.println( e.getMessage( ) );
+- System.out.println( "Security exception: you couldn't load the native vrpn dll." );
+- }
+- } // end static initializer block
+-
+-
+-} // end class VRPN
+Index: vrpn-version_07.33/java_vrpn/vrpn/VRPN.java.in
+===================================================================
+--- /dev/null
++++ vrpn-version_07.33/java_vrpn/vrpn/VRPN.java.in
+@@ -0,0 +1,34 @@
++
++
++package vrpn;
++
++public class VRPN
++{
++
++ /**
++ * All VRPN objects must assert this lock before making any calls
++ * into native code. A corollary of this is that no native methods
++ * may be public; all native methods must be wrapped by other methods
++ * that first synchronize on this lock before calling the native
++ * method.
++ */
++ protected final static Object downInVrpnLock = new Object( );
++
++ static
++ {
++ try { @JAVA_LOAD_VRPN@; }
++ catch( UnsatisfiedLinkError e )
++ {
++ System.out.println( e.getMessage( ) );
++ System.out.println( "Error initializing java_vrpn." );
++ System.out.println( " -- Unable to find native library." );
++ }
++ catch( SecurityException e )
++ {
++ System.out.println( e.getMessage( ) );
++ System.out.println( "Security exception: you couldn't load the native vrpn dll." );
++ }
++ } // end static initializer block
++
++
++} // end class VRPN
diff --git a/vrpn-python_install.patch b/vrpn-python_install.patch
new file mode 100644
index 0000000..f9b56e9
--- /dev/null
+++ b/vrpn-python_install.patch
@@ -0,0 +1,64 @@
+Index: vrpn-version_07.33/python/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/python/CMakeLists.txt
++++ vrpn-version_07.33/python/CMakeLists.txt
+@@ -52,14 +52,19 @@ if(PYTHONLIBS_FOUND AND (VRPN_BUILD_PYTH
+ OUTPUT_NAME vrpn)
+
+ if(VRPN_INSTALL)
++ set(VRPN_PYTHON_INSTALL_DIR
++ lib/${PYTHONVERSIONDIR}dist-packages/
++ CACHE
++ PATH
++ "Directory to install python modules")
+ if(WIN32)
+ # install(TARGETS vrpn-python
+-# RUNTIME DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python
+-# LIBRARY DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python)
++# RUNTIME DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python
++# LIBRARY DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python)
+ else()
+ install(TARGETS vrpn-python
+- RUNTIME DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python
+- LIBRARY DESTINATION lib/${PYTHONVERSIONDIR}dist-packages/ COMPONENT python)
++ RUNTIME DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python
++ LIBRARY DESTINATION "${VRPN_PYTHON_INSTALL_DIR}" COMPONENT python)
+ endif()
+ endif()
+ endif()
+Index: vrpn-version_07.33/python_vrpn/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/python_vrpn/CMakeLists.txt
++++ vrpn-version_07.33/python_vrpn/CMakeLists.txt
+@@ -68,23 +68,28 @@ if(SWIG_FOUND AND PYTHONLIBS_FOUND AND V
+ swig_link_libraries(${module} ${PYTHON_LIBRARIES} ${LIBS} ${SERVER_EXTRA_LIBS})
+ set_target_properties(_${module} PROPERTIES FOLDER "Python Bindings")
+
++ set(VRPN_PYTHON_INSTALL_DIR
++ lib/${PYTHONVERSIONDIR}dist-packages/
++ CACHE
++ PATH
++ "Directory to install python modules")
+ if(VRPN_INSTALL)
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/${module}.py"
+ DESTINATION
+- lib/${PYTHONVERSIONDIR}dist-packages/
++ "${VRPN_PYTHON_INSTALL_DIR}"
+ COMPONENT
+ python)
+ install(TARGETS
+ ${SWIG_MODULE_${module}_REAL_NAME}
+ RUNTIME
+ DESTINATION
+- lib/${PYTHONVERSIONDIR}dist-packages/
++ "${VRPN_PYTHON_INSTALL_DIR}"
+ COMPONENT
+ python
+ LIBRARY
+ DESTINATION
+- lib/${PYTHONVERSIONDIR}dist-packages/
++ "${VRPN_PYTHON_INSTALL_DIR}"
+ COMPONENT
+ python)
+ endif()
diff --git a/vrpn-soversion.patch b/vrpn-soversion.patch
new file mode 100644
index 0000000..e10ed23
--- /dev/null
+++ b/vrpn-soversion.patch
@@ -0,0 +1,109 @@
+Index: vrpn-version_07.33/gpsnmealib/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/gpsnmealib/CMakeLists.txt
++++ vrpn-version_07.33/gpsnmealib/CMakeLists.txt
+@@ -21,6 +21,10 @@ set_property(TARGET
+ PUBLIC_HEADER
+ ${GPSNMEALIB_PUBLIC_HEADERS})
+ set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
++set_target_properties(gpsnmea
++ PROPERTIES
++ VERSION ${CPACK_PACKAGE_VERSION}
++ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+Index: vrpn-version_07.33/quat/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/quat/CMakeLists.txt
++++ vrpn-version_07.33/quat/CMakeLists.txt
+@@ -35,6 +35,10 @@ set(QUATLIB_HEADER quat.h)
+ add_library(quat ${QUATLIB_SOURCES} ${QUATLIB_HEADER})
+ set_property(TARGET quat PROPERTY PUBLIC_HEADER ${QUATLIB_HEADER})
+ set_target_properties(quat PROPERTIES FOLDER Library)
++set_target_properties(quat
++ PROPERTIES
++ VERSION ${CPACK_PACKAGE_VERSION}
++ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+ if(VRPN_INSTALL)
+ install(TARGETS
+ quat
+Index: vrpn-version_07.33/server_src/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/server_src/CMakeLists.txt
++++ vrpn-version_07.33/server_src/CMakeLists.txt
+@@ -59,6 +59,10 @@ if(VRPN_USE_PHANTOM_SERVER AND OPENGL_FO
+ PUBLIC_HEADER
+ ${PHANTOM_HEADERS})
+ set_target_properties(vrpn_phantom PROPERTIES FOLDER Library)
++ set_target_properties(vrpn_phantom
++ PROPERTIES
++ VERSION ${CPACK_PACKAGE_VERSION}
++ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+Index: vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/server_src/timecode_generator_server/CMakeLists.txt
++++ vrpn-version_07.33/server_src/timecode_generator_server/CMakeLists.txt
+@@ -20,7 +20,11 @@ target_link_libraries(vrpn_timecode_gene
+ set_target_properties(vrpn_timecode_generator
+ PROPERTIES
+ FOLDER
+- "Main Server")
++ "Main Server"
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+Index: vrpn-version_07.33/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/CMakeLists.txt
++++ vrpn-version_07.33/CMakeLists.txt
+@@ -1244,6 +1244,12 @@ if(VRPN_BUILD_SERVER_LIBRARY)
+ PROPERTY
+ LINK_FLAGS
+ ${SERVER_LINK_FLAGS})
++ set_target_properties(vrpnserver
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(UNIX)
+ add_subdirectory(atmellib)
+@@ -1298,6 +1304,12 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
+ PROPERTY
+ FOLDER
+ "Library")
++ set_target_properties(vrpn
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+
+ if(VRPN_INSTALL)
+ install(TARGETS
+Index: vrpn-version_07.33/atmellib/CMakeLists.txt
+===================================================================
+--- vrpn-version_07.33.orig/atmellib/CMakeLists.txt
++++ vrpn-version_07.33/atmellib/CMakeLists.txt
+@@ -21,6 +21,12 @@ set_property(TARGET
+ PROPERTY
+ FOLDER
+ "Library")
++set_target_properties(vrpn_atmel
++ PROPERTIES
++ VERSION
++ ${CPACK_PACKAGE_VERSION}
++ SOVERSION
++ ${CPACK_PACKAGE_VERSION_MAJOR})
+ if(VRPN_INSTALL)
+ install(TARGETS
+ vrpn_atmel
diff --git a/vrpn.service b/vrpn.service
new file mode 100644
index 0000000..57c5607
--- /dev/null
+++ b/vrpn.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=VRPN server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/vrpn_server -f /etc/vrpn.cfg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/vrpn.spec b/vrpn.spec
new file mode 100644
index 0000000..b3b1043
--- /dev/null
+++ b/vrpn.spec
@@ -0,0 +1,237 @@
+Name: vrpn
+Version: 07.33
+Release: 1%{?dist}
+Summary: The Virtual-Reality Peripheral Network
+
+# linking to wiiuse (GPLv3+) and gpm (GPLv2+) libraries makes the vrpn server
+# (libvrpnserver.so and vrpn_server binary, as well as python and java modules)
+# GPLv3+-licensed. The rest of files is supplied under the Boost license.
+License: Boost and GPLv3+
+URL: https://github.com/vrpn/vrpn/
+Source0: https://github.com/vrpn/vrpn/archive/version_%{version}.tar.gz#/%{name}-v...
+Source1: vrpn.service
+Patch0: vrpn-find_modbus.patch
+Patch1: vrpn-find_hidapi.patch
+Patch2: vrpn-find_jsoncpp.patch
+# patch3 from upstream commit 7f961a3
+Patch3: vrpn-fix_library_install_rules.patch
+Patch4: vrpn-java_install.patch
+Patch5: vrpn-python_install.patch
+Patch6: vrpn-soversion.patch
+Patch7: vrpn-config_install.patch
+Patch8: vrpn-dont_install_garbage.patch
+
+BuildRequires: cmake
+BuildRequires: doxygen
+BuildRequires: gcc
+BuildRequires: glut-devel
+BuildRequires: gpm-devel
+BuildRequires: graphviz
+BuildRequires: help2man
+BuildRequires: hidapi-devel
+BuildRequires: java-devel
+BuildRequires: jsoncpp-devel
+BuildRequires: libGL-devel
+BuildRequires: libmodbus-devel
+BuildRequires: libudev-devel
+BuildRequires: libusb-devel
+BuildRequires: perl-Parse-RecDescent
+BuildRequires: python2-devel
+BuildRequires: python3-devel
+BuildRequires: systemd
+BuildRequires: swig
+BuildRequires: wiiuse-devel
+
+%systemd_requires
+
+%description
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system. The
+idea is to have a PC or other host at each VR station that controls the
+peripherals (tracker, button device, haptic device, analog inputs, sound, etc).
+VRPN provides connections between the application and all of the devices using
+the appropriate class-of-service for each type of device sharing this link. The
+application remains unaware of the network topology. Note that it is possible
+to use VRPN with devices that are directly connected to the machine that the
+application is running on, either using separate control programs or running
+all as a single program.
+
+
+%package devel
+Summary: Development files for the Virtual-Reality Peripheral Network
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains development files for VRPN libraries.
+
+
+%package doc
+Summary: Developer's documentation for VRPN
+BuildArch: noarch
+
+%description doc
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains generated VRPN source code documentation.
+
+
+%package java
+Summary: Java bindings for the Virtual-Reality Peripheral Network
+License: GPLv3+
+
+Requires: java-headless
+Requires: javapackages-tools
+
+%description java
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains Java bindings for VRPN libraries.
+
+
+%package -n python2-%{name}
+Summary: Python 2 bindings for the Virtual-Reality Peripheral Network
+License: GPLv3+
+
+%python_provide python2-%{name}
+
+%description -n python2-%{name}
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains Python 2 bindings for VRPN libraries.
+
+
+%package -n python3-%{name}
+Summary: Python 3 bindings for the Virtual-Reality Peripheral Network
+License: GPLv3+
+
+%python_provide python3-%{name}
+
+%description -n python3-%{name}
+The Virtual-Reality Peripheral Network (VRPN) is a set of classes within a
+library and a set of servers that are designed to implement a
+network-transparent interface between application programs and the set of
+physical devices (tracker, etc.) used in a virtual-reality (VR) system.
+
+This package contains Python 3 bindings for VRPN libraries.
+
+
+%prep
+%autosetup -n %{name}-version_%{version} -p1
+
+
+%build
+mkdir build
+pushd build
+
+%cmake \
+ -DVRPN_GPL_SERVER=ON \
+ -DBUILD_TESTING=ON \
+ -DVRPN_BUILD_PYTHON_HANDCODED_3X=ON \
+ -DVRPN_PYTHON_INSTALL_DIR=%{python3_sitearch} \
+ -DJAVA_INSTALL_LIBDIR=%{_libdir}/%{name} \
+ -DJAVA_INSTALL_JNIDIR=%{_jnidir} \
+ ..
+%make_build all doc
+
+# now build modules for python2
+mv python python3
+%cmake \
+ -DVRPN_BUILD_PYTHON_HANDCODED_3X=OFF \
+ -DVRPN_BUILD_PYTHON=ON \
+ -DVRPN_BUILD_PYTHON_HANDCODED_2X=ON \
+ -DVRPN_PYTHON_INSTALL_DIR=%{python2_sitearch} \
+ ..
+%make_build
+
+popd
+
+
+%install
+%make_install -C build
+%make_install -C build/python3
+install -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+
+# generate man pages
+mkdir -p %{buildroot}%{_mandir}/man1
+for prog in ./build/server_src/vrpn_server \
+ ./build/client_src/run_auxiliary_logger \
+ ./build/client_src/vrpn_print_{devices,messages,performance}
+do
+ progname=$(basename "$prog")
+ help2man \
+ --version-string=%{version} \
+ --no-info \
+ --no-discard-stderr \
+ --output="%{buildroot}%{_mandir}/man1/$progname.1" \
+ "$prog"
+done
+
+
+%check
+pushd build
+ctest -VV
+popd
+
+
+%post
+/sbin/ldconfig
+%systemd_post %{name}.service
+
+%preun
+%systemd_preun %{name}.service
+
+%postun
+/sbin/ldconfig
+%systemd_postun_with_restart %{name}.service
+
+
+%files
+%doc ChangeLog Format
+%license README.Legal
+%{_libdir}/*.so.*
+%{_bindir}/*
+%{_datadir}/%{name}-%{version}
+%config(noreplace) %{_sysconfdir}/vrpn.cfg
+%{_unitdir}/%{name}.service
+%{_mandir}/man1/*
+
+%files devel
+%{_includedir}/*
+%{_libdir}/*.so
+
+%files doc
+%doc %{_docdir}/%{name}-%{version}
+%exclude %{_docdir}/%{name}-%{version}/source-docs/html/*.map
+%exclude %{_docdir}/%{name}-%{version}/source-docs/html/*.md5
+
+%files java
+%{_libdir}/%{name}/libjava_%{name}.so
+%{_jnidir}/*.jar
+
+%files -n python2-%{name}
+%{python2_sitearch}/*.so
+%{python2_sitearch}/*.py*
+
+%files -n python3-%{name}
+%{python3_sitearch}/*.so
+
+
+%changelog
+* Wed Feb 24 2016 Dmitry Mikhirev <mikhirev(a)gmail.com> 07.33-1
+- Initial package
1 month, 1 week
Architecture specific change in rpms/Macaulay2.git
by githook-noreply@fedoraproject.org
The package rpms/Macaulay2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/Macaulay2.git/commit/?id=d2d3d3bb....
Change:
+%ifarch %{valgrind_arches}
Thanks.
Full change:
============
commit d2d3d3bb3cf63e8a3855a6c675fdcf99943e193d
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Oct 26 12:44:35 2023 -0600
Version 1.22
Drop upstreamed Macaulay2-configure-c99.patch
diff --git a/Macaulay2-configure-c99.patch b/Macaulay2-configure-c99.patch
deleted file mode 100644
index 2cdc1c6..0000000
--- a/Macaulay2-configure-c99.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Avoid an implicit int, which was removed from the C99 revision of the
-C language. This prevents altering the outcome of the check with
-future compilers.
-
-Submitted upstream: <https://github.com/Macaulay2/M2/pull/2814>
-
-diff -ur M2-release-1.21.orig/M2/configure.ac M2-release-1.21/M2/configure.ac
---- M2-release-1.21.orig/M2/configure.ac 2023-04-15 19:52:33.823153026 +0200
-+++ M2-release-1.21/M2/configure.ac 2023-04-15 20:00:57.701024623 +0200
-@@ -1719,7 +1719,7 @@
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
-- main() {
-+ int main(void) {
- struct addrinfo *addr;
- return 0 != getaddrinfo("1.2.3.4", "80", 0, &addr) ? 99 : 0 ;
- }
diff --git a/Macaulay2.spec b/Macaulay2.spec
index 40eea01..a98c4cb 100644
--- a/Macaulay2.spec
+++ b/Macaulay2.spec
@@ -23,7 +23,7 @@
%global m2url https://github.com/Macaulay2/M2
-%global emacscommit 86150290208bd9e468511b4b69a187ce870f303e
+%global emacscommit 2bac85883e2edd479f606ef8eedbbf2869770200
%global emacsurl https://github.com/Macaulay2/M2-emacs
%global emacsshort %(cut -b -7 <<< %{emacscommit})
@@ -51,8 +51,8 @@
Summary: System for algebraic geometry and commutative algebra
Name: Macaulay2
-Version: 1.21
-Release: 6%{?dist}
+Version: 1.22
+Release: 1%{?dist}
# GPL-2.0-only OR GPL-3.0-only:
# - the project as a whole
@@ -202,7 +202,7 @@ Provides: bundled(factory) = %{factoryver}
# MATHICGB is bundled because it must be built with different threading options
%global mathicgbver 1.0
-%global mathicgbcommit f3a05da1494843b5e4e7baa18e644cc6f32baeca
+%global mathicgbcommit de9cc70d7f6d72fe35fc832d7ab478f5debbc90f
Source104: https://github.com/Macaulay2/mathicgb/tarball/%{mathicgbcommit}/mathicgb-...
Provides: bundled(mathicgb) = %{mathicgbver}
@@ -212,24 +212,25 @@ Source105: https://faculty.math.illinois.edu/Macaulay2/Downloads/OtherSourceCode
# MEMTAILOR is bundled because it causes garbage collector crashes otherwise
%global memtailorver 1.0
-%global memtailorcommit 95dbac776c475f4b1c2b08a8e8c6def14c8aaf9a
+%global memtailorcommit f785005b92a54463dbd5377ab80855a3d2a5f92d
Source106: https://github.com/Macaulay2/memtailor/tarball/%{memtailorcommit}/memtail...
Provides: bundled(memtailor) = %{memtailorver}
# MATHIC is bundled because it causes garbage collector crashes otherwise
%global mathicver 1.0
-%global mathiccommit 18ff8de1f5b5102ef291e450522c4930cf9eb7f2
+%global mathiccommit 07e8df4ded6b586c0ce9eec0f9096690379749cb
Source107: https://github.com/Macaulay2/mathic/tarball/%{mathiccommit}/mathic-%{math...
Provides: bundled(mathic) = %{mathicver}
# LINBOX is bundled because it introduces static global objects
-%global linboxver 1.6.3
+%global linboxver 1.7.0
Source108: https://github.com/linbox-team/linbox/releases/download/v%{linboxver}/lin...
Provides: bundled(linbox) = %{linboxver}
## PATCHES FOR BUNDLED code
-# Work around an ambiguous overload on 32-bit platforms
-Source200: linbox-1.6.3.patch
+# Fix a buffer overflow
+# https://github.com/linbox-team/linbox/pull/307
+Source200: linbox-1.7.0.patch
# MPFR bug fixes from mpfr upstream.
Source201: mpfr-4.1.0.patch
@@ -264,7 +265,6 @@ Patch5: %{name}-1.17-configure.patch
Patch6: %{name}-1.16-rightarrow.patch
# Fix LTO warnings about mismatched declarations and definitions
Patch7: %{name}-1.18-lto.patch
-Patch8: Macaulay2-configure-c99.patch
BuildRequires: 4ti2
BuildRequires: appstream
@@ -307,9 +307,11 @@ BuildRequires: lrslib-devel
BuildRequires: lrslib-utils
BuildRequires: make
BuildRequires: mpsolve-devel
+BuildRequires: msolve-devel
BuildRequires: nauty
BuildRequires: normaliz
BuildRequires: ntl-devel
+BuildRequires: ocl-icd-devel
BuildRequires: pari-devel
BuildRequires: pkgconfig(atomic_ops)
BuildRequires: pkgconfig(bdw-gc) >= 8.0.4
@@ -320,10 +322,10 @@ BuildRequires: pkgconfig(flexiblas)
BuildRequires: pkgconfig(gmp)
BuildRequires: pkgconfig(gtest)
BuildRequires: pkgconfig(libffi)
+BuildRequires: pkgconfig(libmariadb)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(m4ri)
BuildRequires: pkgconfig(m4rie)
-BuildRequires: pkgconfig(libmariadb)
BuildRequires: pkgconfig(mpfi)
BuildRequires: pkgconfig(nauty)
BuildRequires: pkgconfig(ncurses)
@@ -331,13 +333,16 @@ BuildRequires: pkgconfig(qd)
BuildRequires: pkgconfig(readline)
BuildRequires: pkgconfig(tbb)
BuildRequires: pkgconfig(tinyxml2)
-BuildRequires: polymake
+# Polymake is currently uninstallable
+#BuildRequires: polymake
BuildRequires: python3-devel
BuildRequires: texinfo
BuildRequires: time
BuildRequires: TOPCOM
BuildRequires: transfig
+%ifarch %{valgrind_arches}
BuildRequires: valgrind
+%endif
Requires: 4ti2
Requires: cohomCalg
@@ -402,11 +407,11 @@ install -p -m755 %{SOURCE20} ./etags
install -p -m644 %{SOURCE100} BUILD/tarfiles/
%endif
install -p -m644 %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE105} \
- %{SOURCE108} BUILD/tarfiles/
+ BUILD/tarfiles/
+install -p -m644 %{SOURCE108} BUILD/tarfiles/v%{linboxver}.tar.gz
sed -i 's/\(VERSION = \).*/\1%{mpfrver}/' libraries/mpfr/Makefile.in
sed -e 's/\(VERSION = \).*/\1%{linboxver}/' \
- -e 's/^#\(PATCHFILE\)/\1/' \
- -e 's,--with-gmp.*,GIVARO_CFLAGS=-I$(LIBRARIESDIR) GIVARO_LIBS="%{_libdir}/libgivaro.a",' \
+ -e 's,--with-gmp.*,--without-archnative GIVARO_CFLAGS=-I$(LIBRARIESDIR) GIVARO_LIBS="%{_libdir}/libgivaro.a",' \
-i libraries/linbox/Makefile.in
tar -C submodules/mathicgb -xf %{SOURCE104} --strip-components=1
tar -C submodules/memtailor -xf %{SOURCE106} --strip-components=1
@@ -414,7 +419,6 @@ tar -C submodules/mathic -xf %{SOURCE107} --strip-components=1
## patches for bundled code
sed -e 's,--with-blas,&=%{_includedir}/flexiblas --with-ntl,' \
- -e 's,2\.6\.0,%{flintver},' \
-i libraries/flint/Makefile.in
cp -p %{SOURCE200} libraries/linbox/patch-%{linboxver}
sed -e '/^TARFILE =/iPATCHFILE = @abs_srcdir@/patch-$(VERSION)' \
@@ -434,19 +438,18 @@ sed -i 's,install \(lib.*\.a\),ln -s %{_libdir}/\1,' libraries/lapack/Makefile.i
## fake givaro submodule
tar -C submodules/givaro --strip-components=1 -xzf %{SOURCE306}
-%patch0 -p1 -b .optflags
-%patch1 -p1 -b .ulimit
-%patch2 -p1 -b .default_make_targets
-%patch3 -p1 -b .no_gftables
+%patch -P0 -p1 -b .optflags
+%patch -P1 -p1 -b .ulimit
+%patch -P2 -p1 -b .default_make_targets
+%patch -P3 -p1 -b .no_gftables
# factory-gftables symlink
mkdir -p BUILD/%{_target_platform}/usr-dist/common/share/Macaulay2/Core
ln -s %{_datadir}/factory \
BUILD/%{_target_platform}/usr-dist/common/share/Macaulay2/Core/factory
-%patch4 -p1 -b .fplll
-%patch5 -p1 -b .configure
-%patch6 -p1 -b .rightarrow
-%patch7 -p1 -b .lto
-%patch8 -p2 -b .configure-c99
+%patch -P4 -p1 -b .fplll
+%patch -P5 -p1 -b .configure
+%patch -P6 -p1 -b .rightarrow
+%patch -P7 -p1 -b .lto
# repeatable builds: inject a node name
sed -i 's,`uname -n`,build.fedoraproject.org,' configure.ac
@@ -475,6 +478,11 @@ sed -i 's/\(LIBNAME = flint\)2/\1/' libraries/flint/Makefile.in
# Cannot do git submodule operations on a koji builder
sed -i 's/git-checkout-in-\$1, git-checkout-warning-for-\$1//' GNUmakefile.in
+# Avoid obsolescence warnings
+sed -i 's/egrep/grep -E/g' GNUmakefile.in Makefile Macaulay2/bin/Makefile.in \
+ Macaulay2/tests/Makefile{,.test}.in libraries/Makefile.library.in
+sed -i 's/fgrep/grep -F/g' Macaulay2/util/linkexec-alternative
+
# (re)generate configure
autoreconf -fi .
@@ -485,19 +493,12 @@ autoreconf -fi .
# level -O2 on s390x, the mathicgb code accesses out-of-bounds array elements.
# In addition, valgrind shows accesses to uninitialized elements of arrays
# that should not have any uninitialized elements. The code eventually
-# segfaults. When built with -O1 and LTO, the linker segfaults. Until we can
-# diagnose and fix these issues, we build with -O1 and without LTO on s390x.
-%define _lto_cflags %{nil}
+# segfaults.
optflags=$(sed 's/-O2/-O/g' <<< "%{build_cflags}")
%else
optflags="%{build_cflags}"
%endif
-# Possible bug in Macaulay2 1.19: the memtailor, mathic, and mathicgb headers
-# cannot be found. We work around this here. See if the problem has been fixed
-# in later versions.
-CPPFLAGS="-I$PWD/submodules/memtailor/src -I$PWD/submodules/mathic/src -I$PWD/submodules/mathicgb/src"
-
## configure macro currently broken, due to some odd prefix-checks. probably fixable -- Rex
mkdir -p BUILD/%{_target_platform}
pushd BUILD/%{_target_platform}
@@ -615,6 +616,11 @@ make check -C BUILD/%{_target_platform}/Macaulay2/bin
%changelog
+* Thu Oct 26 2023 Jerry James <loganjerry(a)gmail.com> - 1.22-1
+- Version 1.22
+- Drop upstreamed Macaulay2-configure-c99.patch
+- Build against mariadb-connector-c instead of the server package
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.21-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
@@ -627,7 +633,7 @@ make check -C BUILD/%{_target_platform}/Macaulay2/bin
* Wed Jan 18 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.21-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-* Thu Jan 12 2022 Jerry James <loganjerry(a)gmail.com> - 1.21-2
+* Thu Jan 12 2023 Jerry James <loganjerry(a)gmail.com> - 1.21-2
- Rebuild for libfplll 5.4.4
* Thu Dec 22 2022 Jerry James <loganjerry(a)gmail.com> - 1.21-1
diff --git a/com.macaulay2.macaulay2.metainfo.xml b/com.macaulay2.macaulay2.metainfo.xml
index 2ae837e..0de35f5 100644
--- a/com.macaulay2.macaulay2.metainfo.xml
+++ b/com.macaulay2.macaulay2.metainfo.xml
@@ -23,7 +23,7 @@
<caption>Macaulay2 with Emacs</caption>
</screenshot>
</screenshots>
- <update_contact>loganjerry(a)gmail.com</update_contact>
+ <update_contact>Macaulay2-maintainers(a)fedoraproject.org</update_contact>
<url type="homepage">https://macaulay2.com/</url>
<url type="bugtracker">https://github.com/Macaulay2/M2/issues</url>
<url type="contact">https://groups.google.com/g/macaulay2</url>
diff --git a/linbox-1.6.3.patch b/linbox-1.6.3.patch
deleted file mode 100644
index f2481c0..0000000
--- a/linbox-1.6.3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- linbox-1.6.3/configure.ac.orig 2019-06-07 07:22:08.000000000 -0600
-+++ linbox-1.6.3/configure.ac 2020-06-05 12:24:32.920910975 -0600
-@@ -65,9 +65,8 @@ AC_PROG_CXX
-
- AC_COMPILER_NAME
-
--STDFLAG=${CXXFLAGS}
-+STDFLAG=""
-
--CXXFLAGS=""
-
- # We need a C++11 compiler now - AB 2014-12-12
- # clang-3.8 does not support __float128 without explicitly passing it -std=c++11
-@@ -187,10 +186,6 @@ echo "----------------------------------
- echo " START LINBOX CONFIG "
- echo "-----------------------------------------------"
-
--# Checks which SIMD optimization flags to use and set SIMD_CFLAGS accordingly
--INSTR_SET
--AC_SUBST(SIMD_FLAGS)
--
- dnl gcc-4.9.2 bug See https://trac.sagemath.org/ticket/17635#comment:178
- AS_IF([ test "x$CCNAM" = "xgcc492" ],[CXXFLAGS="${CXXFLAGS} -fpermissive"],[])
-
---- linbox-1.6.3/linbox/algorithms/gauss/gauss-solve-gf2.inl.orig 2019-06-07 07:22:08.000000000 -0600
-+++ linbox-1.6.3/linbox/algorithms/gauss/gauss-solve-gf2.inl 2020-02-01 16:19:20.692143829 -0700
-@@ -72,7 +72,7 @@ namespace LinBox
-
- Vector1 w(F2, A.coldim());
-
-- for(typename Vector1::iterator it=w.begin()+(ptrdiff_t)Rank;it!=w.end();++it)
-+ for(typename Vector1::iterator it=w.begin()+(long)Rank;it!=w.end();++it)
- F2.assign(*it,F2.zero);
-
- return this->solve(x, w, Rank, Q, L, A, P, b);
diff --git a/linbox-1.7.0.patch b/linbox-1.7.0.patch
new file mode 100644
index 0000000..70edb8c
--- /dev/null
+++ b/linbox-1.7.0.patch
@@ -0,0 +1,15 @@
+--- linbox-1.7.0/linbox/blackbox/apply.h.orig 2021-12-13 13:01:21.000000000 -0700
++++ linbox-1.7.0/linbox/blackbox/apply.h 2023-10-20 13:30:15.295959186 -0600
+@@ -593,8 +593,10 @@ namespace LinBox
+ */
+ int rclen = (int)num_chunks*2 + 5;
+
+- unsigned char* combined = new unsigned char[(size_t)rc*_n*(size_t)rclen];
+- memset(combined, 0, (size_t)rc*_n*(size_t)rclen);
++ // https://github.com/linbox-team/linbox/issues/304#issuecomment-1766621021
++ size_t combined_size = (size_t)rc*_n*(size_t)rclen + 1;
++ unsigned char* combined = new unsigned char[combined_size];
++ memset(combined, 0, combined_size);
+
+ //order from major index to minor: combining index, component of sol'n, byte
+ //compute a product (chunk times x) for each chunk
diff --git a/sources b/sources
index b8c7c11..4bf407c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
SHA512 (Macaulay2-icons.tar.xz) = 069aa0ad70a0253583b00091c094da9b79d2a2f0f2d38aa97f543081f5df5fd3b5a9e1463febd6947c3151cf01844133174c7372f57e158c2d3faba6baed5d1d
-SHA512 (Macaulay2-1.21.tar.gz) = 79760d1b6362ba2b89966b5ebcdf3ae9f40579db2fa3fbdde146b178a6b802b1bca546d78f12c5a67d14d8b8a8fb70553fb0903d6b91490f366d114e54a5ce0e
+SHA512 (Macaulay2-1.22.tar.gz) = c66e29ea0cbc824dc2310d7ffca22858719526388ccd1914e11e37e231192e3c96310a4819ed951f9df59f50058dd7a7c041b792ecbf352110659ed1e02ebe49
SHA512 (4ti2-1.6.9.tar.gz) = f02b61ba04d7512e86d9574574669ec764d053fc5d01744dc6b521518d4165b41355ae12344923f1549b323406130c6562a4d9272b1b88de2ecc2c20d3d892d5
SHA512 (cddlib-094m.tar.gz) = d140d57391b1c963d68ca2e344fbda723a5077004bace322a18362fdc1fff8b50fdc4b598ca8cdf131158e07afc96c5d9aafd7abde082a9e241701e403310b9f
SHA512 (cohomCalg-0.32.tar.gz) = b76d8de00b13a8fe8881222178247c5e99c15075c46290830f6c3afffb9dfc18af0d57f738ac5a0d7c00044db81b4465d1e0563c95f7f656a2440be5765c6818
@@ -13,12 +13,12 @@ SHA512 (glpk-4.59.tar.gz) = ca05bd085880143acf4a440cf7efd2392d4dde89bed53a0e5726
SHA512 (gtest-1.10.0.tar.gz) = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
SHA512 (lapack-3.9.0.tgz) = afa4eb05f2b1dc2f9588ec58bd32f90b78c01185f328e71f2baf6adec6622f557c332f09e7eb46f71e5e3f2e852f25a640bde2bf9f4be7205cecf01cb07b6bc8
SHA512 (libfplll-5.2.0.tar.gz) = 67d1a8deb92d3f9245983b09b7593b19c5d43c8fe77cfea893ea9dfb744bcb77b7239d73e4f619450cc6960f4c48fb1c6ba46268208b0f31f855cf1af6bfaa29
-SHA512 (linbox-1.6.3.tar.gz) = 7585f51b46b65a90328b4ff82f7c74eb59510c912a0bb0ce49263f4c7c1e777c0f9961e4672fa36be6fb84035a019b8e212615c363fd62d632e37c327d6ed3c0
+SHA512 (linbox-1.7.0.tar.gz) = cb4e848186d1f6357f498d1e3bda6484b4c789c02440f9614a227a2ae206a31fb20b32be40bda74da3f2f8f981bbd58d80fc97c95499b5151bb06eafb867ef9e
SHA512 (lrslib-071a.tar.gz) = f33639c593769722a37262d6a90073076a4a8a7453ed81d948ebed6f0a5ee826b80c9211e5a601ca177b776c5388aa4e46efd55e8b219f1b6ce633232aa6b001
-SHA512 (M2-emacs-8615029.tar.gz) = 557343ae4e2200583533954336ccfa4e3907138cf953cd4d44eadc1b52865ef080ddec775450cec0da1e720765cba6d106b8c5216cf8a9668219f4a9efada7f5
-SHA512 (mathic-1.0.tar.gz) = e95c2397cdea3bbff1c8cd52273277183535f07443c222e38659861c25d392b09cbfb33c9cc2a482f8dc9c1b6bc1754e86934fe5a833f8f19ef0edf0cd2e7165
-SHA512 (mathicgb-1.0.tar.gz) = e3b05385f67c42302fba22b9a7d391eb1fca5a56c0eec02ab3e37a28e1d4de6d734b803d5d5701acac8663bbe391afd6ffc40ab5c5e6f11e8fff22fd5f07a2ea
-SHA512 (memtailor-1.0.tar.gz) = 50eded674dc33d3c55f5ec0f250586106f7e16995baa4e46f21684016066cb41e02ace7d82b38305029b947f474835598a972c39dcb0ead6679566b53549a0df
+SHA512 (M2-emacs-2bac858.tar.gz) = 3b44dab7e54e323a3b7f69fa8fe42890d91c9855680af4c10b771446701c268501fcf6362d0b1ba2da6f409f91ff589ad465c2c88ec852c86763d4e6a7a40ab9
+SHA512 (mathic-1.0.tar.gz) = 9eb2fe94d266ffda4624c89021e08526e073286635dd5439042e744f07ba053534bc9476ab81d37f7622d62d8ce40c3eedbc5f7013cd529584f46d3685f15d3a
+SHA512 (mathicgb-1.0.tar.gz) = aea24832681c40c92cad012211ed647ed4e8287964481f36a62d6f0fb0d053fb07c17c49385b4782b380576a92aa387f67fa2843437a0e7b315c74288e65d5a8
+SHA512 (memtailor-1.0.tar.gz) = 147ef22f322a82d5336c004ba9cce055ee94eb7ad93d4271524cbee4713f94b258342f4e31569abac2e29472fdd25df2fad94000496ce46e469b7e074af3c86e
SHA512 (mpfr-4.1.0.tar.xz) = 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
SHA512 (mpsolve-3.2.1.tar.gz) = 8f0cb1be303767bf5a68c150df01c98f7f5e17bfaee685ea4cb9300c0dbf740069c774d647f141a4a1eb46fa54f23d9e75a800ce195cd522527c72e3c6aeed0f
SHA512 (TOPCOM-0.17.8.tar.gz) = 8611e8bd36eda00646fb40794435f23e6af81ecbee93c40e8fe5f73905e673e6244cb0f8cc1fe5c29050e40c7d53a44c615c60cbbecc8452b3c85f1d8a816d7a
commit 17aeaa02c07216881023b0faf7f3792c35b3d185
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Thu Sep 28 12:23:08 2023 +0200
Build against the 'mariadb-connector-c-devel' package
https://bugzilla.redhat.com/show_bug.cgi?id=2241091
diff --git a/Macaulay2.spec b/Macaulay2.spec
index ef26d79..40eea01 100644
--- a/Macaulay2.spec
+++ b/Macaulay2.spec
@@ -323,7 +323,7 @@ BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(m4ri)
BuildRequires: pkgconfig(m4rie)
-BuildRequires: pkgconfig(mariadb)
+BuildRequires: pkgconfig(libmariadb)
BuildRequires: pkgconfig(mpfi)
BuildRequires: pkgconfig(nauty)
BuildRequires: pkgconfig(ncurses)
1 month, 1 week
Architecture specific change in rpms/rust-colored_json.git
by githook-noreply@fedoraproject.org
The package rpms/rust-colored_json.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-colored_json.git/commit/?id=....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 072fa9401d4d9779e2d174101220bc0b72ad2c23
Author: blinxen <h-k-81(a)hotmail.com>
Date: Mon Oct 30 15:29:02 2023 +0100
Update to version 3.3.0 (rhbz#2127979)
diff --git a/.gitignore b/.gitignore
index 18604f5..f40364b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/colored_json-1.0.0.crate
/colored_json-2.0.0.crate
/colored_json-2.1.0.crate
+/colored_json-3.3.0.crate
diff --git a/rust-colored_json.spec b/rust-colored_json.spec
index 515c9a6..807cf8d 100644
--- a/rust-colored_json.spec
+++ b/rust-colored_json.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate colored_json
Name: rust-colored_json
-Version: 2.1.0
+Version: 3.3.0
Release: %autorelease
Summary: Colorize JSON, for printing it out on the command line
@@ -13,7 +13,7 @@ License: EPL-2.0
URL: https://crates.io/crates/colored_json
Source: %{crates_source}
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Colorize JSON, for printing it out on the command line.}
@@ -31,7 +31,6 @@ use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE
-%doc %{crate_instdir}/CRATE-README.md
%doc %{crate_instdir}/README.md
%{crate_instdir}/
@@ -48,7 +47,7 @@ use the "default" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/sources b/sources
index 678e6d7..485b7d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (colored_json-2.1.0.crate) = f2e4ce51c16aadc930930791a3bc5f7c042372927c3a05261b6f8bd5c83d72849f6d6832f3eb883352655c58262807272f8a43b528807adfd1e45520afdb3649
+SHA512 (colored_json-3.3.0.crate) = 1e9f980319508d2e4f279ae681577b2e50d7b8809477c51e16aeff3e178687cacf17b2540cab8d9cf6afbe50ac68cb8c36d81d50e75b98b575540936b07610ed
commit b4e589ddcfaeafaada63b4c527489c2852b9993a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 19:34:59 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 956fe02d552a75ae7e057c872e8942bbb2549bde
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Apr 12 19:34:53 2023 +0200
Regenerate with rust2rpm v24
diff --git a/README.md b/README.md
deleted file mode 100644
index 7e278ce..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-colored_json
-
-The rust-colored_json package
\ No newline at end of file
diff --git a/rust-colored_json.spec b/rust-colored_json.spec
index 15fd8de..515c9a6 100644
--- a/rust-colored_json.spec
+++ b/rust-colored_json.spec
@@ -1,25 +1,19 @@
-# Generated by rust2rpm 10
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate colored_json
-Name: rust-%{crate}
+Name: rust-colored_json
Version: 2.1.0
Release: %autorelease
Summary: Colorize JSON, for printing it out on the command line
-# Upstream license specification: EPL-2.0
License: EPL-2.0
URL: https://crates.io/crates/colored_json
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Colorize JSON, for printing it out on the command line.}
@@ -32,13 +26,14 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%license LICENSE
-%doc CRATE-README.md README.md
-%{cargo_registry}/%{crate}-%{version}/
+%license %{crate_instdir}/LICENSE
+%doc %{crate_instdir}/CRATE-README.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,11 +41,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
commit 08e54f86e437999171556553c73373ef5946d30b
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Apr 12 19:33:15 2023 +0200
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..4c8fe5e
--- /dev/null
+++ b/changelog
@@ -0,0 +1,44 @@
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Nov 10 11:10:46 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Feb 11 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.0.0-1
+- Update to 2.0.0
+
+* Mon Feb 11 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.0.0-3
+- Run tests in infrastructure
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Dec 06 2018 Josh Stone <jistone(a)redhat.com> - 1.0.0-1
+- Update to 1.0.0
+
+* Mon Dec 03 2018 Josh Stone <jistone(a)redhat.com> - 0.6.2-1
+- Update to 0.6.2
+
+* Thu Nov 29 2018 Josh Stone <jistone(a)redhat.com> - 0.5.0-1
+- Initial package
diff --git a/rust-colored_json.spec b/rust-colored_json.spec
index 017c344..15fd8de 100644
--- a/rust-colored_json.spec
+++ b/rust-colored_json.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 2.1.0
-Release: 8%{?dist}
+Release: %autorelease
Summary: Colorize JSON, for printing it out on the command line
# Upstream license specification: EPL-2.0
@@ -71,47 +71,4 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Nov 10 11:10:46 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.1.0-1
-- Update to 2.1.0
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Feb 11 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.0.0-1
-- Update to 2.0.0
-
-* Mon Feb 11 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.0.0-3
-- Run tests in infrastructure
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 06 2018 Josh Stone <jistone(a)redhat.com> - 1.0.0-1
-- Update to 1.0.0
-
-* Mon Dec 03 2018 Josh Stone <jistone(a)redhat.com> - 0.6.2-1
-- Update to 0.6.2
-
-* Thu Nov 29 2018 Josh Stone <jistone(a)redhat.com> - 0.5.0-1
-- Initial package
+%autochangelog
commit e6367598d72dfb992b0c32856a5537a68e08092b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 22:05:18 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-colored_json.spec b/rust-colored_json.spec
index 15641bd..017c344 100644
--- a/rust-colored_json.spec
+++ b/rust-colored_json.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 2.1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Colorize JSON, for printing it out on the command line
# Upstream license specification: EPL-2.0
@@ -71,6 +71,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
1 month, 1 week
Architecture specific change in rpms/rust-colored_json.git
by githook-noreply@fedoraproject.org
The package rpms/rust-colored_json.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-colored_json.git/commit/?id=....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 072fa9401d4d9779e2d174101220bc0b72ad2c23
Author: blinxen <h-k-81(a)hotmail.com>
Date: Mon Oct 30 15:29:02 2023 +0100
Update to version 3.3.0 (rhbz#2127979)
diff --git a/.gitignore b/.gitignore
index 18604f5..f40364b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/colored_json-1.0.0.crate
/colored_json-2.0.0.crate
/colored_json-2.1.0.crate
+/colored_json-3.3.0.crate
diff --git a/rust-colored_json.spec b/rust-colored_json.spec
index 515c9a6..807cf8d 100644
--- a/rust-colored_json.spec
+++ b/rust-colored_json.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate colored_json
Name: rust-colored_json
-Version: 2.1.0
+Version: 3.3.0
Release: %autorelease
Summary: Colorize JSON, for printing it out on the command line
@@ -13,7 +13,7 @@ License: EPL-2.0
URL: https://crates.io/crates/colored_json
Source: %{crates_source}
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Colorize JSON, for printing it out on the command line.}
@@ -31,7 +31,6 @@ use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE
-%doc %{crate_instdir}/CRATE-README.md
%doc %{crate_instdir}/README.md
%{crate_instdir}/
@@ -48,7 +47,7 @@ use the "default" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/sources b/sources
index 678e6d7..485b7d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (colored_json-2.1.0.crate) = f2e4ce51c16aadc930930791a3bc5f7c042372927c3a05261b6f8bd5c83d72849f6d6832f3eb883352655c58262807272f8a43b528807adfd1e45520afdb3649
+SHA512 (colored_json-3.3.0.crate) = 1e9f980319508d2e4f279ae681577b2e50d7b8809477c51e16aeff3e178687cacf17b2540cab8d9cf6afbe50ac68cb8c36d81d50e75b98b575540936b07610ed
commit b4e589ddcfaeafaada63b4c527489c2852b9993a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 19:34:59 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 956fe02d552a75ae7e057c872e8942bbb2549bde
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Apr 12 19:34:53 2023 +0200
Regenerate with rust2rpm v24
diff --git a/README.md b/README.md
deleted file mode 100644
index 7e278ce..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-colored_json
-
-The rust-colored_json package
\ No newline at end of file
diff --git a/rust-colored_json.spec b/rust-colored_json.spec
index 15fd8de..515c9a6 100644
--- a/rust-colored_json.spec
+++ b/rust-colored_json.spec
@@ -1,25 +1,19 @@
-# Generated by rust2rpm 10
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate colored_json
-Name: rust-%{crate}
+Name: rust-colored_json
Version: 2.1.0
Release: %autorelease
Summary: Colorize JSON, for printing it out on the command line
-# Upstream license specification: EPL-2.0
License: EPL-2.0
URL: https://crates.io/crates/colored_json
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Colorize JSON, for printing it out on the command line.}
@@ -32,13 +26,14 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%license LICENSE
-%doc CRATE-README.md README.md
-%{cargo_registry}/%{crate}-%{version}/
+%license %{crate_instdir}/LICENSE
+%doc %{crate_instdir}/CRATE-README.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,11 +41,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
commit 08e54f86e437999171556553c73373ef5946d30b
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Apr 12 19:33:15 2023 +0200
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..4c8fe5e
--- /dev/null
+++ b/changelog
@@ -0,0 +1,44 @@
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Nov 10 11:10:46 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Feb 11 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.0.0-1
+- Update to 2.0.0
+
+* Mon Feb 11 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.0.0-3
+- Run tests in infrastructure
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Dec 06 2018 Josh Stone <jistone(a)redhat.com> - 1.0.0-1
+- Update to 1.0.0
+
+* Mon Dec 03 2018 Josh Stone <jistone(a)redhat.com> - 0.6.2-1
+- Update to 0.6.2
+
+* Thu Nov 29 2018 Josh Stone <jistone(a)redhat.com> - 0.5.0-1
+- Initial package
diff --git a/rust-colored_json.spec b/rust-colored_json.spec
index 017c344..15fd8de 100644
--- a/rust-colored_json.spec
+++ b/rust-colored_json.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 2.1.0
-Release: 8%{?dist}
+Release: %autorelease
Summary: Colorize JSON, for printing it out on the command line
# Upstream license specification: EPL-2.0
@@ -71,47 +71,4 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Nov 10 11:10:46 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.1.0-1
-- Update to 2.1.0
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Feb 11 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.0.0-1
-- Update to 2.0.0
-
-* Mon Feb 11 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.0.0-3
-- Run tests in infrastructure
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 06 2018 Josh Stone <jistone(a)redhat.com> - 1.0.0-1
-- Update to 1.0.0
-
-* Mon Dec 03 2018 Josh Stone <jistone(a)redhat.com> - 0.6.2-1
-- Update to 0.6.2
-
-* Thu Nov 29 2018 Josh Stone <jistone(a)redhat.com> - 0.5.0-1
-- Initial package
+%autochangelog
1 month, 1 week
Architecture specific change in rpms/volk.git
by githook-noreply@fedoraproject.org
The package rpms/volk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/volk.git/commit/?id=9a6a90294bd0b....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 9a6a90294bd0bd94a0e77284d9ccb1d50207cf32
Author: Marcus Müller <marcus(a)hostalia.de>
Date: Thu Oct 19 13:48:19 2023 +0200
Add BuildRequires on cpu_features, fix rhbz#2245047
diff --git a/volk.spec b/volk.spec
index 244c683..895b6ea 100644
--- a/volk.spec
+++ b/volk.spec
@@ -1,6 +1,6 @@
Name: volk
Version: 3.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Vector Optimized Library of Kernels
License: GPLv3+
URL: https://github.com/gnuradio/%{name}
@@ -17,6 +17,9 @@ BuildRequires: python3-devel
BuildRequires: python3-mako
BuildRequires: orc-devel
BuildRequires: sed
+%ifnarch s390x
+BuildRequires: google-cpu_features-devel
+%endif
Conflicts: python3-gnuradio < 3.9.0.0
Conflicts: gnuradio-devel < 3.9.0.0
@@ -35,6 +38,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
%{summary}.
+%ifarch s390x
+Conflicts: google-cpu_features-devel
+%endif
%package doc
@@ -82,14 +88,6 @@ export CXXFLAGS="$CFLAGS"
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -a %{__cmake_builddir}/html %{buildroot}%{_docdir}/%{name}
-# drop list_cpu_features, not needed, just some demo binary,
-# unavailable on s390x, for details see:
-# https://github.com/gnuradio/volk/issues/442#issuecomment-772059840
-rm -f %{buildroot}%{_bindir}/list_cpu_features
-
-# drop static objects
-rm -f %{buildroot}%{_libdir}/libcpu_features.a
-
%files
%license COPYING
%doc README.md docs/CHANGELOG.md
@@ -102,10 +100,6 @@ rm -f %{buildroot}%{_libdir}/libcpu_features.a
%files devel
%{_includedir}/volk
-%ifnarch s390x
-%{_includedir}/cpu_features
-%{_libdir}/cmake/CpuFeatures
-%endif
%{_libdir}/libvolk.so
%{_libdir}/cmake/volk
%{_libdir}/pkgconfig/*.pc
@@ -116,6 +110,10 @@ rm -f %{buildroot}%{_libdir}/libcpu_features.a
%changelog
+* Thu Oct 19 2023 Marcus Müller <marcus_fedora(a)baseband.digital> - 3.0.0-4
+- Depend on system google-cpu_features-devel instead of using the vendored
+- Fixes rhbz#2245047
+
* Sat Jul 22 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
commit b08f14d1e37a2706d6876a3afcd110ffc87b635f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 22 17:50:18 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/volk.spec b/volk.spec
index c206508..244c683 100644
--- a/volk.spec
+++ b/volk.spec
@@ -1,6 +1,6 @@
Name: volk
Version: 3.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Vector Optimized Library of Kernels
License: GPLv3+
URL: https://github.com/gnuradio/%{name}
@@ -116,6 +116,9 @@ rm -f %{buildroot}%{_libdir}/libcpu_features.a
%changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
* Tue Jun 13 2023 Python Maint <python-maint(a)redhat.com> - 3.0.0-2
- Rebuilt for Python 3.12
commit 4be22755e8ab631c759feb31da32d0d742cd255e
Author: Python Maint <python-maint(a)redhat.com>
Date: Tue Jun 13 23:53:24 2023 +0200
Rebuilt for Python 3.12
diff --git a/volk.spec b/volk.spec
index 9644406..c206508 100644
--- a/volk.spec
+++ b/volk.spec
@@ -1,6 +1,6 @@
Name: volk
Version: 3.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Vector Optimized Library of Kernels
License: GPLv3+
URL: https://github.com/gnuradio/%{name}
@@ -116,6 +116,9 @@ rm -f %{buildroot}%{_libdir}/libcpu_features.a
%changelog
+* Tue Jun 13 2023 Python Maint <python-maint(a)redhat.com> - 3.0.0-2
+- Rebuilt for Python 3.12
+
* Thu Jan 19 2023 Jaroslav Škarvada <jskarvad(a)redhat.com> - 3.0.0-1
- New version
Resolves: rhbz#2161009
1 month, 1 week
Architecture specific change in rpms/volk.git
by githook-noreply@fedoraproject.org
The package rpms/volk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/volk.git/commit/?id=9a6a90294bd0b....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 9a6a90294bd0bd94a0e77284d9ccb1d50207cf32
Author: Marcus Müller <marcus(a)hostalia.de>
Date: Thu Oct 19 13:48:19 2023 +0200
Add BuildRequires on cpu_features, fix rhbz#2245047
diff --git a/volk.spec b/volk.spec
index 244c683..895b6ea 100644
--- a/volk.spec
+++ b/volk.spec
@@ -1,6 +1,6 @@
Name: volk
Version: 3.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Vector Optimized Library of Kernels
License: GPLv3+
URL: https://github.com/gnuradio/%{name}
@@ -17,6 +17,9 @@ BuildRequires: python3-devel
BuildRequires: python3-mako
BuildRequires: orc-devel
BuildRequires: sed
+%ifnarch s390x
+BuildRequires: google-cpu_features-devel
+%endif
Conflicts: python3-gnuradio < 3.9.0.0
Conflicts: gnuradio-devel < 3.9.0.0
@@ -35,6 +38,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
%{summary}.
+%ifarch s390x
+Conflicts: google-cpu_features-devel
+%endif
%package doc
@@ -82,14 +88,6 @@ export CXXFLAGS="$CFLAGS"
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -a %{__cmake_builddir}/html %{buildroot}%{_docdir}/%{name}
-# drop list_cpu_features, not needed, just some demo binary,
-# unavailable on s390x, for details see:
-# https://github.com/gnuradio/volk/issues/442#issuecomment-772059840
-rm -f %{buildroot}%{_bindir}/list_cpu_features
-
-# drop static objects
-rm -f %{buildroot}%{_libdir}/libcpu_features.a
-
%files
%license COPYING
%doc README.md docs/CHANGELOG.md
@@ -102,10 +100,6 @@ rm -f %{buildroot}%{_libdir}/libcpu_features.a
%files devel
%{_includedir}/volk
-%ifnarch s390x
-%{_includedir}/cpu_features
-%{_libdir}/cmake/CpuFeatures
-%endif
%{_libdir}/libvolk.so
%{_libdir}/cmake/volk
%{_libdir}/pkgconfig/*.pc
@@ -116,6 +110,10 @@ rm -f %{buildroot}%{_libdir}/libcpu_features.a
%changelog
+* Thu Oct 19 2023 Marcus Müller <marcus_fedora(a)baseband.digital> - 3.0.0-4
+- Depend on system google-cpu_features-devel instead of using the vendored
+- Fixes rhbz#2245047
+
* Sat Jul 22 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
1 month, 1 week
[Report] Packages Restricting Arches
by root
List of packages currently excluding arches (1134)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr-maven-plugin
ExclusiveArch: %{java_arches} noarch
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt5_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- belle-sip
ExclusiveArch: %{java_arches}
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghc-GLUT
ExclusiveArch: %{ghc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.30
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-askalono-cli
ExclusiveArch: %{rust_arches}
- rust-bootupd
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-ordered-float2
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-tree-sitter
ExclusiveArch: %{rust_arches}
- rust-tree-sitter-cli
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- s390utils
ExclusiveArch: s390 s390x
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scalacheck
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1 month, 1 week
Architecture specific change in rpms/wine.git
by githook-noreply@fedoraproject.org
The package rpms/wine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=1710080362647....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 1710080362647b1f68545cddc6f34294f4c201c9
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Oct 30 12:04:30 2023 -0500
Upstream only builds vcruntime140_1 on x86-64 starting with 8.19
diff --git a/wine.spec b/wine.spec
index daca90b..9f53d47 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1661,7 +1661,9 @@ fi
%{_libdir}/wine/%{winepedir}/vcomp120.dll
%{_libdir}/wine/%{winepedir}/vcomp140.dll
%{_libdir}/wine/%{winepedir}/vcruntime140.dll
+%ifarch x86_64
%{_libdir}/wine/%{winepedir}/vcruntime140_1.dll
+%endif
%{_libdir}/wine/%{winepedir}/vdmdbg.dll
%{_libdir}/wine/%{winepedir}/version.dll
%{_libdir}/wine/%{winepedir}/vga.dll
commit 38d5389de5701f63f3bdd45a16429dc069fdae12
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Oct 30 11:39:14 2023 -0500
Update to 8.19
diff --git a/sources b/sources
index 0102728..5569b3d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (wine-8.18.tar.xz) = 0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
-SHA512 (wine-8.18.tar.xz.sign) = a474013e2ebe8643670421b047c26829238a274bd30ca4bcd3cd07c530afb3e50956e186c25a01e03986345299d664bd9a2fa0e790b0a14d2a6acb3cdd5187d9
-SHA512 (wine-staging-8.18.tar.gz) = 1016849b3381a3ac039c2376517a5c7857f632eb1e49e9e3d6feedbc8c4e182da1a7117e89a1a1e4798121176e04b8f91cf3f3c001abf767398a3c3cd38850fb
+SHA512 (wine-8.19.tar.xz) = ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
+SHA512 (wine-8.19.tar.xz.sign) = d89e0cc1d6bbee93805906a7071e60044c9d9c3a9d5fedc270d7d85f0f167157afa047183ba1f4a801df11fa879168402097bb8a88e3c88ca77f2e6608046308
+SHA512 (wine-staging-8.19.tar.gz) = 764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1
diff --git a/wine.spec b/wine.spec
index 28ce66d..daca90b 100644
--- a/wine.spec
+++ b/wine.spec
@@ -3,7 +3,7 @@
%global no64bit 0
%global winegecko 2.47.4
-%global winemono 8.0.0
+%global winemono 8.1.0
#global _default_patch_fuzz 2
%ifarch %{ix86}
%global winepedir i386-windows
@@ -40,7 +40,7 @@
%endif
Name: wine
-Version: 8.18
+Version: 8.19
Release: 1%{?dist}
Summary: A compatibility layer for windows applications
@@ -2807,6 +2807,9 @@ fi
%endif
%changelog
+* Mon Oct 30 2023 Michael Cronenworth <mike(a)cchtml.com> - 8.19-1
+- version update
+
* Sun Oct 15 2023 Michael Cronenworth <mike(a)cchtml.com> - 8.18-1
- version update
1 month, 1 week
Architecture specific change in rpms/wine.git
by githook-noreply@fedoraproject.org
The package rpms/wine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=1710080362647....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 1710080362647b1f68545cddc6f34294f4c201c9
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Oct 30 12:04:30 2023 -0500
Upstream only builds vcruntime140_1 on x86-64 starting with 8.19
diff --git a/wine.spec b/wine.spec
index daca90b..9f53d47 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1661,7 +1661,9 @@ fi
%{_libdir}/wine/%{winepedir}/vcomp120.dll
%{_libdir}/wine/%{winepedir}/vcomp140.dll
%{_libdir}/wine/%{winepedir}/vcruntime140.dll
+%ifarch x86_64
%{_libdir}/wine/%{winepedir}/vcruntime140_1.dll
+%endif
%{_libdir}/wine/%{winepedir}/vdmdbg.dll
%{_libdir}/wine/%{winepedir}/version.dll
%{_libdir}/wine/%{winepedir}/vga.dll
commit 38d5389de5701f63f3bdd45a16429dc069fdae12
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Oct 30 11:39:14 2023 -0500
Update to 8.19
diff --git a/sources b/sources
index 0102728..5569b3d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (wine-8.18.tar.xz) = 0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
-SHA512 (wine-8.18.tar.xz.sign) = a474013e2ebe8643670421b047c26829238a274bd30ca4bcd3cd07c530afb3e50956e186c25a01e03986345299d664bd9a2fa0e790b0a14d2a6acb3cdd5187d9
-SHA512 (wine-staging-8.18.tar.gz) = 1016849b3381a3ac039c2376517a5c7857f632eb1e49e9e3d6feedbc8c4e182da1a7117e89a1a1e4798121176e04b8f91cf3f3c001abf767398a3c3cd38850fb
+SHA512 (wine-8.19.tar.xz) = ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
+SHA512 (wine-8.19.tar.xz.sign) = d89e0cc1d6bbee93805906a7071e60044c9d9c3a9d5fedc270d7d85f0f167157afa047183ba1f4a801df11fa879168402097bb8a88e3c88ca77f2e6608046308
+SHA512 (wine-staging-8.19.tar.gz) = 764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1
diff --git a/wine.spec b/wine.spec
index 28ce66d..daca90b 100644
--- a/wine.spec
+++ b/wine.spec
@@ -3,7 +3,7 @@
%global no64bit 0
%global winegecko 2.47.4
-%global winemono 8.0.0
+%global winemono 8.1.0
#global _default_patch_fuzz 2
%ifarch %{ix86}
%global winepedir i386-windows
@@ -40,7 +40,7 @@
%endif
Name: wine
-Version: 8.18
+Version: 8.19
Release: 1%{?dist}
Summary: A compatibility layer for windows applications
@@ -2807,6 +2807,9 @@ fi
%endif
%changelog
+* Mon Oct 30 2023 Michael Cronenworth <mike(a)cchtml.com> - 8.19-1
+- version update
+
* Sun Oct 15 2023 Michael Cronenworth <mike(a)cchtml.com> - 8.18-1
- version update
1 month, 1 week