Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
Fedora Release Engineering
f9cfd1a17c Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:44:14 +00:00
Fedora Release Engineering
da283a9908 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:09:49 +00:00
Jaroslav Škarvada
855eed35eb Dropped isa requirement for docs
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-09-22 17:51:55 +02:00
Jaroslav Škarvada
8d7d42425d Switched to new upstream
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-09-22 17:05:44 +02:00
Fedora Release Engineering
983df69420 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:20:13 +00:00
Fedora Release Engineering
80ea872234 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:50:53 +00:00
Miroslav Suchý
7fa5146068 convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:38:29 +02:00
Fedora Release Engineering
f9030fd9cd Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:12:05 +00:00
4 changed files with 62 additions and 93 deletions

View file

@ -1 +1 @@
SHA512 (wdsp-20210705gitc55342c5.tar.gz) = 82fe1c2c4b2f94401f69e16fbd41fc8f91c31110d2d0719ffdf98ec5068a874d75044a34ce0f92af6f8bd74e04a6fcbf3bc94e31690ec1bee2212f6bdda314d5
SHA512 (wdsp-20250922git18782be8.tar.gz) = e98f345bcce6157a379d9363d744bb6d7a61edb991fa97bd84e32db18d8724b01acc6c3b01c55fe29033a729ac193ad2f132230b05c0745ed3f1ce5e05991e31

View file

@ -1,52 +0,0 @@
diff --git a/Makefile b/Makefile
index 037ef82..904614a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
#
# libwdsp.so Makefile (Linux)
#
+PREFIX=/usr/local
+LIBDIR=$(DESTDIR)$(PREFIX)/lib
+INCLUDEDIR=$(DESTDIR)$(PREFIX)/include
CC=gcc
LINK=gcc
OPTIONS=-g -fPIC -O3 -D _GNU_SOURCE
@@ -213,24 +216,27 @@ all: $(PROGRAM) $(HEADERS) $(SOURCES)
java: $(JAVA_PROGRAM) $(JAVA_HEADERS) $(JAVA_SOURCES)
$(PROGRAM): $(OBJS)
- $(LINK) -shared -z noexecstack -o $(PROGRAM) $(OBJS) $(LIBS) $(GTKLIBS)
+ $(LINK) -shared -z noexecstack $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(GTKLIBS)
$(JAVA_PROGRAM): $(JAVA_OBJS)
- $(LINK) -shared -z noexecstack -o $(JAVA_PROGRAM) $(JAVA_OBJS) $(JAVA_LIBS)
+ $(LINK) -shared -z noexecstack $(LDFLAGS) -o $(JAVA_PROGRAM) $(JAVA_OBJS) $(JAVA_LIBS)
.c.o:
- $(COMPILE) $(OPTIONS) $(GTKOPTIONS) -c -o $@ $<
+ $(COMPILE) $(OPTIONS) $(GTKOPTIONS) $(CFLAGS) -c -o $@ $<
-install: $(PROGRAM)
- cp wdsp.h /usr/local/include
- cp $(PROGRAM) /usr/local/lib
- ldconfig
+install-dirs:
+ mkdir -p $(LIBDIR) $(INCLUDEDIR)
-install_java: $(JAVA_PROGRAM)
- cp $(JAVA_PROGRAM) /usr/local/lib
+install: $(PROGRAM) install-dirs
+ cp -a wdsp.h $(INCLUDEDIR)
+ cp -a $(PROGRAM) $(LIBDIR)
+ ldconfig || :
+
+install_java: $(JAVA_PROGRAM) install-dirs
+ cp -a $(JAVA_PROGRAM) $(LIBDIR)
release: $(PROGRAM)
- cp $(PROGRAM) ../pihpsdr.src/release/pihpsdr
+ cp -a $(PROGRAM) ../pihpsdr.src/release/pihpsdr
clean:
-rm -f *.o

View file

@ -1,23 +1,14 @@
diff --git a/Makefile b/Makefile
index a2f0416..ecd7218 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,8 @@ all: $(PROGRAM) $(HEADERS) $(SOURCES)
java: $(JAVA_PROGRAM) $(JAVA_HEADERS) $(JAVA_SOURCES)
diff --git a/build_shared/makefile b/build_shared/makefile
index 4872ba1..a7983da 100644
--- a/build_shared/makefile
+++ b/build_shared/makefile
@@ -73,7 +73,8 @@ wisdom.o\
zetahat.o
$(PROGRAM): $(OBJS)
- $(LINK) -shared -z noexecstack $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(GTKLIBS)
+ $(LINK) -shared -fPIC -Wl,-soname,$(PROGRAM).0.1 -z noexecstack $(LDFLAGS) -o $(PROGRAM).0.1 $(OBJS) $(LIBS) $(GTKLIBS)
+ ln -s $(PROGRAM).0.1 $(PROGRAM)
$(JAVA_PROGRAM): $(JAVA_OBJS)
$(LINK) -shared -z noexecstack $(LDFLAGS) -o $(JAVA_PROGRAM) $(JAVA_OBJS) $(JAVA_LIBS)
@@ -229,7 +231,7 @@ install-dirs:
install: $(PROGRAM) install-dirs
cp -a wdsp.h $(INCLUDEDIR)
- cp -a $(PROGRAM) $(LIBDIR)
+ cp -a $(PROGRAM)* $(LIBDIR)
ldconfig || :
install_java: $(JAVA_PROGRAM) install-dirs
libwdsp.so: $(OBJS)
- $(CC) -shared -o ../libwdsp.so $(OBJS) $(LIBS)
+ $(CC) -shared -Wl,-soname,libwdsp.so.0.1 -z noexecstack $(LDFLAGS) -o ../libwdsp.so.0.1 $(OBJS) $(LIBS)
+ ln -s ./libwdsp.so.0.1 ../libwdsp.so
# Define the location for dependency files
DEPDIR = deps

View file

@ -1,25 +1,23 @@
# git ls-remote git://github.com/g0orx/wdsp.git
%global git_commit c55342c5b15354a9ac2b8b16eb8748d5518f723c
%global git_date 20210705
# git ls-remote git://github.com/jimahlstrom/wdsp
%global git_commit 18782be8d7e75bf7e41e1f23e912640de8d6ce58
%global git_date 20250922
%global git_short_commit %(echo %{git_commit} | cut -c -8)
%global git_suffix %{git_date}git%{git_short_commit}
Name: wdsp
Version: 0
Release: 0.7.%{git_suffix}%{?dist}
Release: 0.14.%{git_suffix}%{?dist}
Summary: DSP library for LinHPSDR
License: GPLv2+
URL: https://github.com/g0orx/%{name}
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: https://github.com/jimahlstrom/%{name}
Source0: %{url}/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz
BuildRequires: make
BuildRequires: gcc
BuildRequires: fftw-devel
BuildRequires: pkgconfig(gtk+-3.0)
# https://github.com/g0orx/wdsp/pull/15
Patch0: wdsp-0-distro-makefile.patch
# Encouraged upstream to add SONAME (https://github.com/g0orx/wdsp/pull/15)
Patch1: wdsp-0-soname-add.patch
Patch0: wdsp-0-soname-add.patch
%description
DSP library for LinHPSDR.
@ -31,29 +29,61 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Development files for wdsp.
%package doc
Summary: Documentation files for wdsp
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description doc
Documentation files for wdsp.
%prep
%autosetup -n %{name}-%{git_commit} -p1
# unbundle fftw
rm -f fftw/*
rmdir fftw
%build
%make_build OPTIONS="-fPIC -D _GNU_SOURCE" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" GTK_INCLUDE=GTK
cd build_shared
%make_build CFLAGS="%{build_cflags} -fPIC -D _GNU_SOURCE" LDFLAGS="%{build_ldflags}"
%install
%make_install LIBDIR="%{buildroot}%{_libdir}" INCLUDEDIR="%{buildroot}%{_includedir}"
install -Dpm 0775 -t %{buildroot}%{_libdir} ./libwdsp.so.0.*
cp ./libwdsp.so "%{buildroot}%{_libdir}/libwdsp.so"
install -Dpm 0664 src/wdsp.h "%{buildroot}%{_includedir}/wdsp.h"
install -Dpm 0664 "WDSP Guide, Rev 1.25.pdf" %{buildroot}/%{_docdir}/%{name}/"WDSP Guide, Rev 1.25.pdf"
%files
%doc README.md
%license COPYING
%license GNU_GENERAL_PUBLIC_LICENSE.txt
%{_libdir}/libwdsp.so.0*
%files devel
%{_includedir}/wdsp.h
%{_libdir}/libwdsp.so
%files doc
%{_docdir}/%{name}/WDSP\ Guide\,\ Rev\ 1.25.pdf
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.14.20250922git18782be8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.13.20250922git18782be8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Sep 22 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 0-0.12.20250922git18782be8
- Switched to new upstream
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.11.20210705gitc55342c5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.10.20210705gitc55342c5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 0-0.9.20210705gitc55342c5
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.8.20210705gitc55342c5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.7.20210705gitc55342c5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild