diff --git a/CHANGES.md b/CHANGES.md index 6e4bff1..73d8278 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -33,6 +33,8 @@ for that release. https://github.com/cnpem/epics-in-docker/pull/146 * base: add rgamv2 module and image. by @guirodrigueslima in https://github.com/cnpem/epics-in-docker/pull/143 +* base: add ADEiger module. by @gustavosr8 in + https://github.com/cnpem/epics-in-docker/pull/141 ## v0.14.1 diff --git a/base/Dockerfile b/base/Dockerfile index 7861d90..650502a 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -26,6 +26,7 @@ RUN apt update -y && \ libsnmp-dev \ libssl-dev \ libtirpc-dev \ + libzmq3-dev \ re2c \ unzip \ wget \ @@ -60,6 +61,7 @@ RUN NEEDS_TIRPC=YES $EPICS_IN_DOCKER/install_modules.sh COPY cagateway_versions.sh install_cagateway.sh $EPICS_IN_DOCKER RUN $EPICS_IN_DOCKER/install_cagateway.sh +COPY adeiger-remove-lz4.patch $EPICS_IN_DOCKER COPY area_detector_versions.sh install_area_detector.sh $EPICS_IN_DOCKER RUN $EPICS_IN_DOCKER/install_area_detector.sh diff --git a/base/adeiger-remove-lz4.patch b/base/adeiger-remove-lz4.patch new file mode 100644 index 0000000..3d9fdce --- /dev/null +++ b/base/adeiger-remove-lz4.patch @@ -0,0 +1,17 @@ +Adapted from: https://github.com/areaDetector/ADEiger/pull/91 +diff --git a/eigerApp/src/Makefile b/eigerApp/src/Makefile +index b6cbe2f..db9de56 100755 +--- a/eigerApp/src/Makefile ++++ b/eigerApp/src/Makefile +@@ -31,11 +31,6 @@ else + LIB_SYS_LIBS += hdf5_hl + endif + +-PROD += test_lz4 +-test_lz4_SRCS += test_lz4.cpp +-test_lz4_LIBS += dectrisCompression +-test_lz4_SYS_LIBS += lz4 +- + include $(ADCORE)/ADApp/commonLibraryMakefile + + #============================= diff --git a/base/area_detector_versions.sh b/base/area_detector_versions.sh index acba440..3181f9a 100644 --- a/base/area_detector_versions.sh +++ b/base/area_detector_versions.sh @@ -1,3 +1,4 @@ AREA_DETECTOR_VERSION=R3-14 NDSSCPIMEGA_VERSION=1.0.0 LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523 +ADEIGER_VERSION=083243fd71b38a8c7d0bbd99d300077f4d65e441 diff --git a/base/install_area_detector.sh b/base/install_area_detector.sh index 8d43d53..638e0b8 100755 --- a/base/install_area_detector.sh +++ b/base/install_area_detector.sh @@ -17,6 +17,9 @@ git submodule update --init --depth 1 -j ${JOBS} \ ADSupport \ ADCore +download_from_github areaDetector ADEiger $ADEIGER_VERSION +patch -d ADEiger -Np1 < ${EPICS_IN_DOCKER}/adeiger-remove-lz4.patch + rm -rf .git echo 'ADSupport/lib/linux*/libHDF5*plugin.so' > .lnls-keep-paths @@ -26,6 +29,7 @@ cd configure module_releases=" AREA_DETECTOR=${EPICS_MODULES_PATH}/areaDetector ADARAVIS=${EPICS_MODULES_PATH}/areaDetector/ADAravis +ADEIGER=${EPICS_MODULES_PATH}/areaDetector/ADEiger ADGENICAM=${EPICS_MODULES_PATH}/areaDetector/ADGenICam ADSIMDETECTOR=${EPICS_MODULES_PATH}/areaDetector/ADSimDetector ADSUPPORT=${EPICS_MODULES_PATH}/areaDetector/ADSupport