Mercurial > mxe-octave
changeset 5819:9cddbf0c85fa
biosig: Update to version 2.3.2
* src/libbiosig.mk: Update version and checksum.
* src/opkg-biosig.mk: Update version and checksum.
* src/libbiosig-1-mingw-install.patch, src/opkg-biosig-1-Makefile.patch: Remove
patches.
* dist-files.mk: Remove files from list.
* Makefile.in: Re-enable opkg-biosig.
See: https://octave.discourse.group/t/1380
author | Alois Schlögl <alois.schloegl@gmx.net> |
---|---|
date | Mon, 02 Aug 2021 19:21:31 +0200 |
parents | ef468742d054 |
children | 6bcf5c550648 |
files | Makefile.in dist-files.mk src/libbiosig-1-mingw-install.patch src/libbiosig.mk src/opkg-biosig-1-Makefile.patch src/opkg-biosig.mk |
diffstat | 6 files changed, 6 insertions(+), 83 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sat Jul 31 12:01:46 2021 +0200 +++ b/Makefile.in Mon Aug 02 19:21:31 2021 +0200 @@ -533,8 +533,7 @@ ## Packages removed from list because build is broken: ## None. OCTAVE_FORGE_PACKAGES := $(addprefix of-,audio communications control database dataframe data-smoothing dicom financial fits fuzzy-logic-toolkit ga general generate_html geometry gsl image instrument-control interval io linear-algebra lssa ltfat mapping matgeom miscellaneous nan netcdf nurbs ocs octproj optim optiminterp quaternion queueing signal sockets sparsersb splines statistics stk strings struct symbolic tisean tsa video windows zeromq) -## Package "biosig" removed for security concerns. -OCTAVE_OTHER_PACKAGES := $(addprefix opkg-,) +OCTAVE_OTHER_PACKAGES := $(addprefix opkg-,biosig) # get ALL deps for all of- packages, regardless of whether building the actual forge package in the installer OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_FORGE_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p))) OCTAVE_OTHER_PKG_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_OTHER_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p)))
--- a/dist-files.mk Sat Jul 31 12:01:46 2021 +0200 +++ b/dist-files.mk Mon Aug 02 19:21:31 2021 +0200 @@ -224,7 +224,6 @@ libass-test.c \ libass.mk \ libb64.mk \ - libbiosig-1-mingw-install.patch \ libbiosig.mk \ libcdio.mk \ libcroco.mk \ @@ -562,7 +561,6 @@ openscenegraph.mk \ openssl-1-fixes.patch \ openssl.mk \ - opkg-biosig-1-Makefile.patch \ opkg-biosig.mk \ opus.mk \ pango-1-fixes.patch \
--- a/src/libbiosig-1-mingw-install.patch Sat Jul 31 12:01:46 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -diff --git "a/biosig4c++/Makefile.in" "b/biosig4c++/Makefile.in" -index c05e4d1..8fd7aad 100644 ---- "a/biosig4c++/Makefile.in" -+++ "b/biosig4c++/Makefile.in" -@@ -139,6 +139,7 @@ endif - SONAMEVERSION ?= 3 - - ### TODO: DLEXT does not work correctly on MXE/MINGW -+DLDIR = $(libdir) - ifneq (,$(findstring Darwin, $(shell uname))) - ## Homebrew: - ## brew install gawk -@@ -183,11 +184,17 @@ else ifneq (,$(findstring MINGW, $(shell uname))) - LDLIBS += -liconv -lws2_32 - LDFLAGS += -Wl,-subsystem,windows - LDFLAGS += -L$(prefix)/lib/ -+ DLDIR = $(bindir) - - else - TAR = tar - LD = $(CXX) -- FULLDLEXT = .so.${SONAMEVERSION} -+ ifneq (,$(findstring mingw,$(TARGET))) -+ FULLDLEXT = ${SONAMEVERSION}.dll -+ DLDIR = $(bindir) -+ else -+ FULLDLEXT = .so.${SONAMEVERSION} -+ endif - SONAME_PREFIX = -Wl,-soname= - endif - -@@ -937,12 +944,11 @@ install_libbiosig.a: libbiosig.a libphysicalunits.a libbiosig.pc - install libphysicalunits.a $(DESTDIR)$(libdir) - install libbiosig.pc $(DESTDIR)$(libdir)/pkgconfig/ - --install_libbiosig.$(DLEXT): libbiosig$(FULLDLEXT) libbiosig.$(DLEXT) -- install -d $(DESTDIR)$(libdir)/pkgconfig/ -- install libbiosig$(FULLDLEXT) $(DESTDIR)$(libdir) -- (cd $(DESTDIR)$(libdir) && ln -sf libbiosig$(FULLDLEXT) libbiosig${SONAMEVERSION}.$(DLEXT)) -+install_libbiosig.$(DLEXT): libbiosig.$(DLEXT) -+ install -d $(DESTDIR)$(DLDIR)/pkgconfig/ -+ install libbiosig.$(DLEXT) $(DESTDIR)$(DLDIR)/libbiosig$(FULLDLEXT) - ifneq (Darwin,$(shell uname)) -- cd $(DESTDIR)$(libdir) && ln -sf libbiosig$(FULLDLEXT) libbiosig.$(DLEXT) -+ cd $(DESTDIR)$(DLDIR) && ln -sf libbiosig$(FULLDLEXT) libbiosig.$(DLEXT) - endif - -ldconfig -
--- a/src/libbiosig.mk Sat Jul 31 12:01:46 2021 +0200 +++ b/src/libbiosig.mk Mon Aug 02 19:21:31 2021 +0200 @@ -4,8 +4,8 @@ PKG := libbiosig $(PKG)_WEBSITE := http://biosig.sf.net/ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.1 -$(PKG)_CHECKSUM := adaa0c2f8fb4e8ae0f7d96a79967b7ffae6a9848 +$(PKG)_VERSION := 2.3.2 +$(PKG)_CHECKSUM := 51b20ea75e927966cc14cf5d88e6cc9aa7ab06ea $(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) @@ -52,12 +52,9 @@ $($(PKG)_MAKE_FLAGS) $(MAKE) -C '$(1)' lib tools $($(PKG)_MAKE_FLAGS) $(MAKE) -C '$(1)/biosig4c++' install DESTDIR='$(3)' - # FIXME: These files aren't installed by the Makefile rule. - # Do we really need them? + # FIXME: These files should be installed by the Makefile rule. if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ $(INSTALL) '$(1)/biosig4c++/libbiosig.dll.a' '$(3)$(HOST_LIBDIR)'; \ - $(INSTALL) '$(1)/biosig4c++/libgdf.dll' '$(3)$(HOST_BINDIR)'; \ - $(INSTALL) '$(1)/biosig4c++/libgdf.dll.a' '$(3)$(HOST_LIBDIR)'; \ $(INSTALL) '$(1)/biosig4c++/libphysicalunits.dll' '$(3)$(HOST_BINDIR)'; \ $(INSTALL) '$(1)/biosig4c++/libphysicalunits.dll.a' '$(3)$(HOST_LIBDIR)'; \ fi
--- a/src/opkg-biosig-1-Makefile.patch Sat Jul 31 12:01:46 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -Use $(MKOCTFILE) variable instead of hardcoded "mkoctfile" - -$ diff -Naup ./src/Makefile.orig ./src/Makefile ---- ./src/Makefile.orig 2021-07-20 07:01:49.000000000 +0200 -+++ ./src/Makefile 2021-07-26 09:59:22.601812600 +0200 -@@ -200,10 +200,10 @@ endif - - ifneq (:,/usr/bin/octave) - %.mex: %.cpp -- mkoctfile $(DEFINES) -I.. -v -g --mex "$<" -L.. -lbiosig -o "$@" -+ $(MKOCTFILE) $(DEFINES) -I.. -v -g --mex "$<" -L.. -lbiosig -o "$@" - - %.oct: %.cpp -- mkoctfile $(DEFINES) -I.. "$<" -L.. -lbiosig -o "$@" -+ $(MKOCTFILE) $(DEFINES) -I.. "$<" -L.. -lbiosig -o "$@" - endif - - %.mexw32: %.cpp -@@ -219,4 +219,3 @@ endif - - clean: - -$(DELETE) *.o *.obj *.o64 core octave-core *.oct *.mex* mexSOPEN.cpp --
--- a/src/opkg-biosig.mk Sat Jul 31 12:01:46 2021 +0200 +++ b/src/opkg-biosig.mk Mon Aug 02 19:21:31 2021 +0200 @@ -3,8 +3,8 @@ PKG := opkg-biosig $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.1 -$(PKG)_CHECKSUM := 69b317a5a1ee973e46d7d1eb76467d5ee4a3f92a +$(PKG)_VERSION := 2.3.2 +$(PKG)_CHECKSUM := 184c28c0625caafc3c8fb1e820ed7336bb218473 $(PKG)_SUBDIR := biosig4octave-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).src.tar.gz $(PKG)_URL := https://pub.ist.ac.at/~schloegl/biosig/prereleases/$($(PKG)_FILE)