From 4bd2131aa3e1c9d93ef84ab9606abbfb2f28c02d Mon Sep 17 00:00:00 2001
From: jonzarling <jonzarling@gmail.com>
Date: Mon, 7 Apr 2025 11:30:29 -0400
Subject: [PATCH 1/2] Evio version 4.4.6 and later now downloads and builds
 from github instead. The evio branch on github has an updated SConstruct and
 coda.py, so that the patches previously applied are not needed anymore (no
 changes to source code libraries).

---
 Makefile_evio | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile_evio b/Makefile_evio
index a244d16..e6a03e5 100644
--- a/Makefile_evio
+++ b/Makefile_evio
@@ -18,13 +18,18 @@ MAJOR_MINOR = $(shell perl -e '$$v = "$(EVIO_VERSION)"; @t = split(/\./, $$v); p
 DIR_NAME = evio-$(EVIO_VERSION)
 TARFILE = evio-$(EVIO_VERSION).tgz
 EVIO_HOME = $(PWD)/$(DIR_NAME)
-EVIO_DOWNLOAD_URL_BASE = https://coda.jlab.org/drupal/system/files/coda/evio
 SCONS = $(shell $(BUILD_SCRIPTS)/python_chooser.sh scons)
 
 all: $(EVIO_HOME)/.scons_done
 
+# Version evio-4.3: retrieve from coda website
+# Version evio-4.4 and later: retrieve from github
 $(TARFILE):
-	wget --no-verbose --no-check-certificate $(EVIO_DOWNLOAD_URL_BASE)/evio-$(MAJOR_MINOR)/$(TARFILE)
+ifeq ($(MAJOR_MINOR),4.3)
+	wget --no-verbose --no-check-certificate https://coda.jlab.org/drupal/system/files/coda/evio/evio-$(MAJOR_MINOR)/$(TARFILE)
+else
+	wget --no-verbose --no-check-certificate -O $@ https://github.com/JeffersonLab/evio/archive/v$(EVIO_VERSION).tar.gz
+endif
 
 $(EVIO_HOME)/.untar_done: $(TARFILE)
 	mkdir -p temp
@@ -36,9 +41,9 @@ $(EVIO_HOME)/.untar_done: $(TARFILE)
 $(EVIO_HOME)/.patch_done: $(EVIO_HOME)/.untar_done
 ifeq ($(MAJOR_MINOR),4.3)
 	cd $(EVIO_HOME) ; patch -p1 < $(BUILD_SCRIPTS)/patches/evio/evio-4.3.patch
-endif
 	cd $(EVIO_HOME) ; patch SConstruct < $(BUILD_SCRIPTS)/patches/evio/SConstruct.patch
 	cd $(EVIO_HOME) ; patch coda.py < $(BUILD_SCRIPTS)/patches/evio/coda.py.patch
+endif
 	date > $@
 
 $(EVIO_HOME)/.scons_done: $(EVIO_HOME)/.patch_done

From 414a96538a5b18add7886a3260494fabaf65c86e Mon Sep 17 00:00:00 2001
From: jonzarling <jonzarling@gmail.com>
Date: Tue, 8 Apr 2025 13:30:04 -0400
Subject: [PATCH 2/2] Add option to build evio from github branch.

IMPORTANT: note that you have to set both branch and home in your version.xml with the expected form:

`<package name="evio" branch="evio-5.3" home="[gluex-top]/evio/evio-5.3/Linux-x86_64"/>`
---
 Makefile_evio | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Makefile_evio b/Makefile_evio
index e6a03e5..e48b8a0 100644
--- a/Makefile_evio
+++ b/Makefile_evio
@@ -12,14 +12,23 @@
 PWD = $(shell pwd)
 
 ifndef EVIO_VERSION
-EVIO_VERSION=4.3.1
+EVIO_VERSION=4.4.6
 endif
+
 MAJOR_MINOR = $(shell perl -e '$$v = "$(EVIO_VERSION)"; @t = split(/\./, $$v); print "$$t[0].$$t[1]";')
 DIR_NAME = evio-$(EVIO_VERSION)
 TARFILE = evio-$(EVIO_VERSION).tgz
 EVIO_HOME = $(PWD)/$(DIR_NAME)
 SCONS = $(shell $(BUILD_SCRIPTS)/python_chooser.sh scons)
 
+# Grab from tagged release unless EVIO_BRANCH is defined
+ifdef EVIO_BRANCH
+WGET_URL = https://github.com/JeffersonLab/evio/archive/$(EVIO_BRANCH).tar.gz
+DIR_NAME = $(EVIO_BRANCH)
+else
+WGET_URL = https://github.com/JeffersonLab/evio/archive/v$(EVIO_VERSION).tar.gz
+endif
+
 all: $(EVIO_HOME)/.scons_done
 
 # Version evio-4.3: retrieve from coda website
@@ -28,13 +37,13 @@ $(TARFILE):
 ifeq ($(MAJOR_MINOR),4.3)
 	wget --no-verbose --no-check-certificate https://coda.jlab.org/drupal/system/files/coda/evio/evio-$(MAJOR_MINOR)/$(TARFILE)
 else
-	wget --no-verbose --no-check-certificate -O $@ https://github.com/JeffersonLab/evio/archive/v$(EVIO_VERSION).tar.gz
+	wget --no-verbose --no-check-certificate -O $@ $(WGET_URL)
 endif
 
 $(EVIO_HOME)/.untar_done: $(TARFILE)
 	mkdir -p temp
 	cd temp ; tar zxf ../$(TARFILE)
-	mv -v temp/evio-$(MAJOR_MINOR)* $(DIR_NAME)
+	mv -v temp/evio** $(DIR_NAME)
 	rmdir -v temp
 	date > $@