Mercurial > mxe-octave

changeset 5743:4e99aee38edb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename biosig to libbiosig * src/libbiosig.mk: Rename from src/biosig.mk. * src/opkg-biosig.mk: Rename package in dependencies. * dist-files.mk, index.html: Adapt for renamed file.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 20 Apr 2021 20:40:44 +0200
parents b532d40c63d8
children b4dd33ef5d97
files dist-files.mk index.html src/biosig.mk src/libbiosig.mk src/opkg-biosig.mk
diffstat 5 files changed, 74 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sun Apr 18 11:14:17 2021 +0200
+++ b/dist-files.mk	Tue Apr 20 20:40:44 2021 +0200
@@ -14,7 +14,6 @@
   aubio-1-fix-pkg-config.patch \
   aubio.mk \
   bfd.mk \
-  biosig.mk \
   blas.mk \
   blas_switch.mk \
   boost-1-intrinsics-fix.patch \
@@ -227,6 +226,7 @@
   libass-test.c \
   libass.mk \
   libb64.mk \
+  libbiosig.mk \
   libcdio.mk \
   libcroco.mk \
   libdnet-1-fixes.patch \
--- a/index.html	Sun Apr 18 11:14:17 2021 +0200
+++ b/index.html	Tue Apr 20 20:40:44 2021 +0200
@@ -966,10 +966,6 @@
         <td class="website"><a href="http://www.gnu.org/software/binutils/">Binary File Descriptor library</a></td>
     </tr>
     <tr>
-        <td class="package">biosig</td>
-        <td class="website"><a href="https://biosig.sourceforge.io/">Biosig</a></td>
-    </tr>
-    <tr>
         <td class="package">blas</td>
         <td class="website"><a href="http://www.netlib.org/blas/">blas</a></td>
     </tr>
@@ -1514,6 +1510,10 @@
         <td class="website"><a  href="https://libb64.sourceforge.io/">libb64</a></td>
     </tr>
     <tr>
+        <td class="package">libbiosig</td>
+        <td class="website"><a href="https://biosig.sourceforge.io/">Biosig library</a></td>
+    </tr>
+    <tr>
         <td class="package">libcdio</td>
         <td class="website"><a href="http://ftp.gnu.org/gnu/libcdio">Libcdio</a></td>
     </tr>
--- a/src/biosig.mk	Sun Apr 18 11:14:17 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := biosig
-$(PKG)_WEBSITE  := http://biosig.sf.net/
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.1
-$(PKG)_CHECKSUM := f16bfc7e0f05901e09283020d7cd565bed13c75e
-$(PKG)_SUBDIR   := biosig-$($(PKG)_VERSION)
-$(PKG)_FILE     := biosig-$($(PKG)_VERSION).src.tar.gz
-$(PKG)_URL      := https://sourceforge.net/projects/biosig/files/BioSig%20for%20C_C%2B%2B/src/$($(PKG)_FILE)
-$(PKG)_DEPS     := suitesparse zlib libb64 libiberty libiconv lapack tinyxml dcmtk
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://biosig.sourceforge.io/download.html' | \
-        $(SED) -n 's_.*>v\([0-9]\.[0-9]\.[0-9]\)<.*_\1_p' | \
-        head -1
-endef
-
-
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        ac_cv_func_malloc_0_nonnull=yes \
-        ac_cv_func_realloc_0_nonnull=yes \
-        --prefix=$(HOST_PREFIX) \
-        $(HOST_AND_BUILD_CONFIGURE_OPTIONS)
-
-    # make sure NDEBUG is defined
-    $(SED) -i '/NDEBUG/ s|#||g' '$(1)'/biosig4c++/Makefile
-
-    TARGET=$(TARGET) CROSS=$(TARGET) $(MAKE) -C '$(1)' lib tools
-
-    # build mexbiosig package (does not install package)
-    # TARGET='$(TARGET)' $(MAKE) -C '$(1)'/biosig4c++ mexbiosig
-
-    # install library files
-    $(INSTALL) -m644 '$(1)/biosig4c++/biosig.h'             '$(HOST_INCDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/biosig2.h'            '$(HOST_INCDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/gdftime.h'            '$(HOST_INCDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/biosig-dev.h'         '$(HOST_INCDIR)/'
-
-    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.a'          '$(HOST_LIBDIR)/'
-    #$(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.def'        '$(HOST_LIBDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll.a'      '$(HOST_LIBDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll'        '$(HOST_BINDIR)/'
-
-    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.a'             '$(HOST_LIBDIR)/'
-    #$(INSTALL) -m644 '$(1)/biosig4c++/libgdf.def'           '$(HOST_LIBDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll.a'         '$(HOST_LIBDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll'           '$(HOST_BINDIR)/'
-
-
-    $(INSTALL) -m644 '$(1)/biosig4c++/physicalunits.h'      '$(HOST_INCDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.a'   '$(HOST_LIBDIR)/'
-    #$(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.def' '$(HOST_LIBDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll.a' '$(HOST_LIBDIR)/'
-    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll' '$(HOST_BINDIR)/'
-
-    if [ "$(MXE_WINDOWS_BUILD)" == "yes" ]; then \
-        $(SED) -i '/^Libs:/ s/$$/ -liconv -lws2_32/' $(1)/biosig4c++/libbiosig.pc; \
-    fi
-    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.pc'         '$(HOST_LIBDIR)/pkgconfig/'
-
-    # install biosig4matlab
-    # $(INSTALL) -d $(HOST_PREFIX)/share/biosig/matlab
-    # cp -r '$(1)'/biosig4matlab/* $(HOST_PREFIX)/share/biosig/matlab/
-endef
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libbiosig.mk	Tue Apr 20 20:40:44 2021 +0200
@@ -0,0 +1,68 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := libbiosig
+$(PKG)_WEBSITE  := http://biosig.sf.net/
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.2.1
+$(PKG)_CHECKSUM := f16bfc7e0f05901e09283020d7cd565bed13c75e
+$(PKG)_SUBDIR   := biosig-$($(PKG)_VERSION)
+$(PKG)_FILE     := biosig-$($(PKG)_VERSION).src.tar.gz
+$(PKG)_URL      := https://sourceforge.net/projects/biosig/files/BioSig%20for%20C_C%2B%2B/src/$($(PKG)_FILE)
+$(PKG)_DEPS     := suitesparse zlib libb64 libiberty libiconv lapack tinyxml dcmtk
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://biosig.sourceforge.io/download.html' | \
+        $(SED) -n 's_.*>v\([0-9]\.[0-9]\.[0-9]\)<.*_\1_p' | \
+        head -1
+endef
+
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        ac_cv_func_malloc_0_nonnull=yes \
+        ac_cv_func_realloc_0_nonnull=yes \
+        --prefix=$(HOST_PREFIX) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS)
+
+    # make sure NDEBUG is defined
+    $(SED) -i '/NDEBUG/ s|#||g' '$(1)'/biosig4c++/Makefile
+
+    TARGET=$(TARGET) CROSS=$(TARGET) $(MAKE) -C '$(1)' lib tools
+
+    # build mexbiosig package (does not install package)
+    # TARGET='$(TARGET)' $(MAKE) -C '$(1)'/biosig4c++ mexbiosig
+
+    # install library files
+    $(INSTALL) -m644 '$(1)/biosig4c++/biosig.h'             '$(HOST_INCDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/biosig2.h'            '$(HOST_INCDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/gdftime.h'            '$(HOST_INCDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/biosig-dev.h'         '$(HOST_INCDIR)/'
+
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.a'          '$(HOST_LIBDIR)/'
+    #$(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.def'        '$(HOST_LIBDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll.a'      '$(HOST_LIBDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll'        '$(HOST_BINDIR)/'
+
+    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.a'             '$(HOST_LIBDIR)/'
+    #$(INSTALL) -m644 '$(1)/biosig4c++/libgdf.def'           '$(HOST_LIBDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll.a'         '$(HOST_LIBDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll'           '$(HOST_BINDIR)/'
+
+
+    $(INSTALL) -m644 '$(1)/biosig4c++/physicalunits.h'      '$(HOST_INCDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.a'   '$(HOST_LIBDIR)/'
+    #$(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.def' '$(HOST_LIBDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll.a' '$(HOST_LIBDIR)/'
+    $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll' '$(HOST_BINDIR)/'
+
+    if [ "$(MXE_WINDOWS_BUILD)" == "yes" ]; then \
+        $(SED) -i '/^Libs:/ s/$$/ -liconv -lws2_32/' $(1)/biosig4c++/libbiosig.pc; \
+    fi
+    $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.pc'         '$(HOST_LIBDIR)/pkgconfig/'
+
+    # install biosig4matlab
+    # $(INSTALL) -d $(HOST_PREFIX)/share/biosig/matlab
+    # cp -r '$(1)'/biosig4matlab/* $(HOST_PREFIX)/share/biosig/matlab/
+endef
+
--- a/src/opkg-biosig.mk	Sun Apr 18 11:14:17 2021 +0200
+++ b/src/opkg-biosig.mk	Tue Apr 20 20:40:44 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := biosig4octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).src.tar.gz
 $(PKG)_URL      := https://pub.ist.ac.at/~schloegl/biosig/prereleases/$($(PKG)_FILE)
-$(PKG)_DEPS     := biosig
+$(PKG)_DEPS     := libbiosig
 
 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
   $(PKG)_DEPS += $(OCTAVE_TARGET)