diff --git a/hls-fix.patch b/hls-fix.patch
deleted file mode 100644
index b7845fa65ad..00000000000
--- a/hls-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/include/ap_int_base.h b/include/ap_int_base.h
-index 091552a..1d30fea 100644
---- a/include/ap_int_base.h
-+++ b/include/ap_int_base.h
-@@ -122,7 +122,7 @@ struct ap_int_base : public _AP_ROOT_TYPE<_AP_W, _AP_S> {
-    */
-   typedef typename retval<AP_MAX((_AP_W + 7) / 8, 8), _AP_S>::Type RetType;
- 
--  static const int width = _AP_W;
-+  constexpr static int width = _AP_W;
- 
-   template <int _AP_W2, bool _AP_S2>
-   struct RType {
-diff --git a/include/etc/ap_private.h b/include/etc/ap_private.h
-index 0c29a0a..1684b13 100644
---- a/include/etc/ap_private.h
-+++ b/include/etc/ap_private.h
-@@ -1590,7 +1590,7 @@ ASSIGN_OP_FROM_INT(double)
-   }
- 
-  public:
--  INLINE ap_private() {
-+  INLINE ap_private(): VAL(0) {
-     set_canary();
-     clearUnusedBits();
-     check_canary();
-@@ -3022,8 +3022,9 @@ class ap_private<_AP_W, _AP_S, false> {
- #pragma warning(disable : 4521 4522)
- #endif
-  public:
--  enum { BitWidth = _AP_W, _AP_N = (_AP_W + 63) / 64 };
--  static const int width = _AP_W;
-+  static constexpr uint32_t BitWidth = _AP_W;
-+  static constexpr uint32_t _AP_N = (_AP_W + 63) / 64;
-+  constexpr static int width = _AP_W;
- 
-  private:
-   /// This constructor is used only internally for speed of construction of
-@@ -3157,10 +3158,8 @@ class ap_private<_AP_W, _AP_S, false> {
-   INLINE void set_pVal(int i, uint64_t value) { pVal[i] = value; }
- 
-   /// This enum is used to hold the constants we needed for ap_private.
--  enum {
--    APINT_BITS_PER_WORD = sizeof(uint64_t) * 8, ///< Bits in a word
--    APINT_WORD_SIZE = sizeof(uint64_t)          ///< Byte size of a word
--  };
-+  static constexpr int APINT_BITS_PER_WORD = sizeof(uint64_t) * 8;
-+  static constexpr int APINT_WORD_SIZE = sizeof(uint64_t);
- 
-   enum {
-     excess_bits = (_AP_W % APINT_BITS_PER_WORD)
-@@ -3302,6 +3301,7 @@ class ap_private<_AP_W, _AP_S, false> {
-   ///  for object deserialization (pair this with the static method Read).
-   INLINE ap_private() {
-     set_canary();
-+    memset(pVal, 0, _AP_N * sizeof(uint64_t));
-     clearUnusedBits();
-     check_canary();
-   }
diff --git a/hls.spec b/hls.spec
index cbf1b440f7a..fc736edf8f2 100644
--- a/hls.spec
+++ b/hls.spec
@@ -1,15 +1,13 @@
-### RPM external hls 2019.08
-%define tag 200a9aecaadf471592558540dc5a88256cbf880f
-%define branch master
-%define github_user Xilinx
+### RPM external hls 2025.05
+%define tag a3c0b0b444984aadba245a3b1fdffacaccea3141
+%define branch cms/200a9ae
+%define github_user cms-externals
 %define runpath_opts -m examples
 Source: git+https://github.com/%{github_user}/HLS_arbitrary_Precision_Types.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
-Patch0: hls-fix
-Requires: gmake
+BuildRequires: gmake
 
 %prep
 %setup -n %{n}-%{realversion}
-%patch0 -p1
 
 %build
 
diff --git a/root.spec b/root.spec
index a48563815d4..a5784445aca 100644
--- a/root.spec
+++ b/root.spec
@@ -3,8 +3,8 @@
 ## INITENV SET ROOTSYS %{i}
 ## INCLUDE compilation_flags
 ## INCLUDE cpp-standard
-%define tag 4e50d5412e654c757fe78cb5475b30363541951a
-%define branch cms/v6-32-00-patches/4467b6916f
+%define tag 63c27767f1be350ef3d684242da34f0d396cf97d
+%define branch cms/v6-32-00-patches/69384a6a78
 
 %define github_user cms-sw
 Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
@@ -12,6 +12,7 @@ Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&expo
 BuildRequires: cmake ninja
 
 Requires: gsl libjpeg-turbo libpng libtiff giflib pcre2 python3 fftw3 xz xrootd libxml2 zlib davix tbb OpenBLAS py3-numpy lz4 freetype zstd
+%{!?without_cuda:Requires: cuda}
 
 %ifos linux
 Requires: dcap
@@ -178,6 +179,11 @@ export ROOTSYS="%{i}"
 
 ninja -v %{makeprocesses} install
 
+# Generate cuda.pcm if CUDA is available
+%if 0%{!?without_cuda:1}
+echo '#include <cuda_runtime.h>' | %{i}/bin/root -b -n -l
+%endif
+
 find %{i} -type f -name '*.py' | xargs chmod -x
 grep -rlI '#!.*python' %{i} | xargs chmod +x
 for p in $(grep -rlI -m1 '^#\!.*python' %i/bin %i/etc) ; do