biosig: merge libbiosig and biosig into one package, upgrade pkg biosig to commit ab653353

4 years ago · 96768c3675
parent 4eeecd54e2
commit 96768c3675
3 changed files with 85 additions and 19 deletions
--- a/src/biosig.mk
+++ b/src/biosig.mk
@ -3,13 +3,14 @@

 PKG             := biosig
 $(PKG)_WEBSITE  := http://biosig.sf.net/
-$(PKG)_DESCR    := Biosig
-$(PKG)_VERSION  := 2.0.2
-$(PKG)_CHECKSUM := e94e6b4843d17b59eb5f2bb6d8508c63a2ab29ef6a712b8df5e2a6c3e3ed2db8
-$(PKG)_SUBDIR   := biosig4c++-$($(PKG)_VERSION)
-$(PKG)_FILE     := biosig4c++-$($(PKG)_VERSION).src.tar.gz
-$(PKG)_URL      := https://sourceforge.net/projects/biosig/files/BioSig%20for%20C_C%2B%2B/src/$($(PKG)_FILE)/download
-$(PKG)_DEPS     := cc libbiosig libb64
+$(PKG)_DESCR    := biosig
+$(PKG)_VERSION  := ab653353dd80b4cc2a8affb1fd7523e9c052ecd8
+$(PKG)_CHECKSUM := 8c41eb44dad8e4ba4aec08f3178e4747219b3fdcb610feabfccf8a4254e6bd7c
+$(PKG)_SUBDIR   := biosig-code-$($(PKG)_VERSION)
+$(PKG)_FILE     := biosig-code-$($(PKG)_VERSION).zip
+$(PKG)_URL      := https://sourceforge.net/code-snapshots/git/b/bi/biosig/code.git/biosig-code-ab653353dd80b4cc2a8affb1fd7523e9c052ecd8.zip
+# http://sourceforge.net/projects/biosig/files/BioSig%20for%20C_C%2B%2B/src/$($(PKG)_FILE)
+$(PKG)_DEPS     := cc suitesparse zlib libiberty libiconv libb64 lapack dcmtk tinyxml

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://biosig.sourceforge.io/download.html' | \
@ -21,35 +22,100 @@ endef

 define $(PKG)_BUILD_PRE

+    #rm -rf '$(1)'
+    #rsync -avL  ~/src/biosig-code/biosig4c++/* '$(1)/'
+
+    cd '$(1)' && autoreconf -fi
+
+    #echo $(MXE_CONFIGURE_OPTS)
+
    cd '$(1)' && ./configure \
        ac_cv_func_malloc_0_nonnull=yes \
        ac_cv_func_realloc_0_nonnull=yes \
        $(MXE_CONFIGURE_OPTS)

    # make sure NDEBUG is defined
-    $(SED) -i '/NDEBUG/ s|#||g' '$(1)'/Makefile
+    $(SED) -i '/NDEBUG/ s|#||g' '$(1)'/biosig4c++/Makefile

    ### disables declaration of sopen from io.h (imported through unistd.h)
-    if [ "$(MXE_SYSTEM)" == "mingw" ]; then \
-        $(SED) -i '/ sopen/ s#^/*#//#g' $(HOST_INCDIR)/io.h; \
-    fi
+
+    $(SED) -i '/ sopen/ s|^/*|//|g' $(PREFIX)/$(TARGET)/include/io.h

    TARGET='$(TARGET)' $(MAKE) -C '$(1)' clean
-    TARGET='$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' tools
+    TARGET='$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' lib tools
+	#	libbiosig.a libgdf.a  libphysicalunits.a \
+	#	libbiosig.dll libgdf.dll libphysicalunits.dll

 endef

 define $(PKG)_BUILD_POST

-    TARGET='$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install_tools
+    $(INSTALL) -m644 '$(1)/biosig4c++/biosig.h'             '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/biosig2.h'            '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/gdftime.h'            '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/biosig-dev.h'         '$(PREFIX)/$(TARGET)/include/'
+
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.a'          '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.def' 	 '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll.a' 	 '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll' 	 '$(PREFIX)/$(TARGET)/bin/'
+
+    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.a'             '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.def' 		 '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll.a' 	 '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll'	 	 '$(PREFIX)/$(TARGET)/bin/'
+
+
+    $(INSTALL) -m644 '$(1)/biosig4c++/physicalunits.h'      '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.a'   '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.def' '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll.a' '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll' '$(PREFIX)/$(TARGET)/bin/'
+
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.pc'         '$(PREFIX)/$(TARGET)/lib/pkgconfig/'
+
+    $(INSTALL) -m644 '$(1)/biosig4c++/save2gdf.exe' '$(PREFIX)/$(TARGET)/bin/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/biosig_fhir.exe' '$(PREFIX)/$(TARGET)/bin/'
+
+    ### make release file
+    rm -f $(PREFIX)/$($(PKG)_SUBDIR).$(TARGET).zip
+    cd $(PREFIX)/$(TARGET) && zip $(PREFIX)/$($(PKG)_SUBDIR).$(TARGET).zip \
+		include/biosig.h include/biosig-dev.h include/biosig2.h include/gdftime.h  \
+		lib/libbiosig.a lib/libbiosig.def bin/libbiosig.dll lib/libbiosig.dll.a \
+		lib/libgdf.a lib/libgdf.def bin/libgdf.dll lib/libgdf.dll.a \
+		lib/libz.a lib/libcholmod.a lib/liblapack.a lib/libiconv.a lib/libiberty.a  \
+		include/libiberty/*.h include/iconv.h \
+		include/physicalunits.h \
+		lib/libphysicalunits.a lib/libphysicalunits.def bin/libphysicalunits.dll lib/libphysicalunits.dll.a
+
+    mkdir -p $(PREFIX)/release/$(TARGET)/include/
+    cd $(PREFIX)/$(TARGET) && cp -r \
+		include/biosig.h include/biosig-dev.h include/biosig2.h include/gdftime.h \
+		include/libiberty include/iconv.h \
+		include/physicalunits.h \
+		$(PREFIX)/release/$(TARGET)/include/
+
+    mkdir -p $(PREFIX)/release/$(TARGET)/lib/
+    cd $(PREFIX)/$(TARGET) && cp -r \
+		lib/libbiosig.a lib/libbiosig.def bin/libbiosig.dll lib/libbiosig.dll.a \
+		lib/libgdf.a lib/libgdf.def bin/libgdf.dll lib/libgdf.dll.a \
+		lib/libz.a lib/libcholmod.a lib/liblapack.a lib/libiconv.a lib/libiberty.a  \
+		lib/libphysicalunits.a lib/libphysicalunits.def bin/libphysicalunits.dll lib/libphysicalunits.dll.a \
+		$(PREFIX)/release/$(TARGET)/lib/

    mkdir -p $(PREFIX)/release/$(TARGET)/bin/
    -cp $(PREFIX)/$(TARGET)/bin/save2gdf.exe $(PREFIX)/release/$(TARGET)/bin/

    mkdir -p $(PREFIX)/release/matlab/
-    -cp $(1)/mex/mex* $(PREFIX)/release/matlab/
+    -cp $(1)/biosig4c++/mex/mex* $(PREFIX)/release/matlab/
+
+    cd '$(1)/biosig4c++/win32' && zip $(PREFIX)/$($(PKG)_SUBDIR).$(TARGET).zip *.bat README

-    cd '$(1)/win32' && zip $(PREFIX)/$($(PKG)_SUBDIR).$(TARGET).zip *.bat README
+    #exit -1
+    ### these cause problems when compiling stimfit
+    #rm -rf '$(PREFIX)/$(TARGET)/lib/libphysicalunits.dll.a' \
+    #	'$(PREFIX)/$(TARGET)/lib/libbiosig.dll.a' \
+    #	'$(PREFIX)/$(TARGET)/lib/libgdf.dll.a'

 endef

@ -62,13 +128,13 @@ endef

 define $(PKG)_BUILD_i686-w64-mingw32
 	$($(PKG)_BUILD_PRE)
-	#TARGET=$(TARGET) $(MAKE) -C '$(1)' tools
+	#TARGET=$(TARGET) $(MAKE) -C '$(1)' mexw32
 	$($(PKG)_BUILD_POST)
 endef

 define $(PKG)_BUILD_x86_64-w64-mingw32
 	$($(PKG)_BUILD_PRE)
-	#TARGET=$(TARGET) $(MAKE) -C '$(1)' tools
+	#TARGET=$(TARGET) $(MAKE) -C '$(1)' mexw64
 	$($(PKG)_BUILD_POST)
 endef

--- a/src/sigviewer.mk
+++ b/src/sigviewer.mk
@ -9,7 +9,7 @@ $(PKG)_SUBDIR   := sigviewer-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/cbrnr/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
 $(PKG)_QT_DIR   := qt5
-$(PKG)_DEPS     := libbiosig libxdf qtbase
+$(PKG)_DEPS     := biosig libxdf qtbase

 define $(PKG)_UPDATE
    wget -q -O- 'http://biosig.sourceforge.net/download.html' | \
--- a/src/stimfit.mk
+++ b/src/stimfit.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 8a5330612245d3f442ed640b0df91028aa4798301bb6844eaf1cf9b463dfc
 $(PKG)_SUBDIR   := stimfit-$($(PKG)_VERSION)windows
 $(PKG)_FILE     := stimfit-$($(PKG)_VERSION)windows.tar.gz
 $(PKG)_URL      := https://github.com/neurodroid/$(PKG)/archive/v$($(PKG)_VERSION)windows.tar.gz
-$(PKG)_DEPS     := cc libbiosig wxwidgets hdf5 tinyxml fftw levmar openblas
+$(PKG)_DEPS     := cc biosig wxwidgets hdf5 tinyxml fftw levmar openblas

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://github.com/neurodroid/stimfit/releases' | \