upgpkg: wpimath 2024.1.1

3 files changed, 6 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 248ba41e0bcc..f7770f08e7b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wpimath
 	pkgdesc = WPILib's mathematics and controls library
-	pkgver = 2024.1.1b4
+	pkgver = 2024.1.1
 	pkgrel = 1
 	url = https://github.com/wpilibsuite/allwpilib
 	arch = x86_64
@@ -12,9 +12,7 @@ pkgbase = wpimath
 	depends = protobuf
 	options = !strip
 	options = staticlibs
-	source = git+https://github.com/wpilibsuite/allwpilib#tag=v2024.1.1-beta-4
-	source = Don_t-treat-warnings-as-errors.patch
+	source = git+https://github.com/wpilibsuite/allwpilib#tag=v2024.1.1
 	md5sums = SKIP
-	md5sums = 7a36b8167adea15c6d5be822a5b2a025
 
 pkgname = wpimath
diff --git a/Don_t-treat-warnings-as-errors.patch b/Don_t-treat-warnings-as-errors.patch
deleted file mode 100644
index fadd82ca9663..000000000000
--- a/Don_t-treat-warnings-as-errors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake
-index af21d1d001..932ff0f369 100644
---- a/cmake/modules/CompileWarnings.cmake
-+++ b/cmake/modules/CompileWarnings.cmake
-@@ -2,7 +2,7 @@ macro(wpilib_target_warnings target)
-     if(NOT MSVC)
-         target_compile_options(
-             ${target}
--            PRIVATE -Wall -pedantic -Wextra -Werror -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS}
-+            PRIVATE -Wall -pedantic -Wextra -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS}
-         )
-     else()
-         target_compile_options(
diff --git a/PKGBUILD b/PKGBUILD
index f96359438d15..f92bf5665119 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tyler Veness <calcmogul at gmail dot com>
 
 pkgname=wpimath
-pkgver=2024.1.1b4
+pkgver=2024.1.1
 pkgrel=1
 pkgdesc="WPILib's mathematics and controls library"
 arch=('x86_64')
@@ -10,15 +10,8 @@ depends=('fmt' 'eigen' 'protobuf')
 makedepends=('cmake')
 license=('BSD' 'MIT')
 options=('!strip' 'staticlibs')
-source=('git+https://github.com/wpilibsuite/allwpilib#tag=v2024.1.1-beta-4'
-        'Don_t-treat-warnings-as-errors.patch')
-md5sums=('SKIP'
-         '7a36b8167adea15c6d5be822a5b2a025')
-
-prepare() {
-  cd allwpilib
-  patch -p1 < "$srcdir"/Don_t-treat-warnings-as-errors.patch
-}
+source=('git+https://github.com/wpilibsuite/allwpilib#tag=v2024.1.1')
+md5sums=('SKIP')
 
 build() {
   cmake -B build -S "allwpilib" \
@@ -33,6 +26,7 @@ build() {
     -DWITH_TESTS=ON \
     -DWITH_GUI=OFF \
     -DWITH_SIMULATION_MODULES=OFF \
+    -DNO_WERROR=ON \
     -Wno-dev
   cmake --build build
 }