Upgrade from xdrfile 1.1b to 1.1.4

RBVI · Jan 17, 2025 · 57a244a · 57a244a
1 parent 897f947
commit 57a244a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 70 deletions.
diff --git a/src/bundles/md_crds/bundle_info.xml b/src/bundles/md_crds/bundle_info.xml
@@ -18,11 +18,11 @@
   </Categories>
 
   <CModule name="_gromacs" usesNumpy="true">
-    <IncludeDir>gromacs/xdrfile-1.1b/include</IncludeDir>
+    <IncludeDir>gromacs/xdrfile-1.1.4/include</IncludeDir>
     <SourceFile>gromacs/gromacs.cpp</SourceFile>
-    <LinkArgument platform="win32">gromacs/xdrfile-1.1b/src/.libs/libxdrfile.lib</LinkArgument>
-    <LinkArgument platform="mac">gromacs/xdrfile-1.1b/src/.libs/libxdrfile.a</LinkArgument>
-    <LinkArgument platform="linux">gromacs/xdrfile-1.1b/src/.libs/libxdrfile.a</LinkArgument>
+    <LinkArgument platform="win32">gromacs/xdrfile-1.1.4/src/.libs/libxdrfile.lib</LinkArgument>
+    <LinkArgument platform="mac">gromacs/xdrfile-1.1.4/src/.libs/libxdrfile.a</LinkArgument>
+    <LinkArgument platform="linux">gromacs/xdrfile-1.1.4/src/.libs/libxdrfile.a</LinkArgument>
   </CModule>
 
   <Dependencies>

diff --git a/src/bundles/md_crds/gromacs/Makefile.common b/src/bundles/md_crds/gromacs/Makefile.common
@@ -9,8 +9,8 @@
 # or derivations thereof.
 # === UCSF ChimeraX Copyright ===
 
-XDRFILE_VERSION = 1.1
-XDRFILE_MINOR_VERSION = b
+XDRFILE_VERSION = 1.1.4
+XDRFILE_MINOR_VERSION = 
 XDRFILE_LIB_SOURCE = xdrfile-$(XDRFILE_VERSION)$(XDRFILE_MINOR_VERSION)
 XDRFILE_ARCHIVE = xdrfile-$(XDRFILE_VERSION).tar.gz
 XDRFILE_LIB = $(XDRFILE_LIB_SOURCE)/src/.libs/libxdrfile.$(LIB_EXT)
diff --git a/src/bundles/md_crds/gromacs/Makefile.xdrfile b/src/bundles/md_crds/gromacs/Makefile.xdrfile
@@ -21,7 +21,7 @@ QUOTE_CXX := $(subst ','\'',$(CXX) $(TARGET_ARCH))
 # Make xdrfile use our compiler options
 ENV_CONFIGURE = env CC='$(QUOTE_CC)' CXX='$(QUOTE_CXX)' LDFLAGS="$(TARGET_ARCH) $(LDFLAGS)"
 
-PATCHES = patch
+PATCHES =
 
 all: $(XDRFILE_LIB)
 

diff --git a/src/bundles/md_crds/gromacs/patch b/src/bundles/md_crds/gromacs/patch
diff --git a/src/bundles/md_crds/gromacs/xdrfile-1.1.4.tar.gz b/src/bundles/md_crds/gromacs/xdrfile-1.1.4.tar.gz
diff --git a/src/bundles/md_crds/gromacs/xdrfile-1.1.tar.gz b/src/bundles/md_crds/gromacs/xdrfile-1.1.tar.gz