Compare commits

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

14 commits

Author SHA1 Message Date
Fedora Release Engineering
e573b9fbce Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 06:24:49 +00:00
Fedora Release Engineering
ea7b109025 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 17:54:33 +00:00
Fedora Release Engineering
287f409d37 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 18:09:52 +00:00
Fedora Release Engineering
e4494db8bb Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 10:26:26 +00:00
Miroslav Suchý
6e33051445 convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 02:54:18 +02:00
Fedora Release Engineering
43219e59f1 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 05:16:43 +00:00
Hans de Goede
4ca64e978b Fix FTBFS (rhbz#2261689) 2024-06-26 11:34:18 +02:00
Fedora Release Engineering
b5baa821f1 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 02:37:48 +00:00
Fedora Release Engineering
644247dd15 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 01:26:33 +00:00
Fedora Release Engineering
cf7d1e5a62 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 03:01:51 +00:00
Florian Weimer
4f87242b49 Port configure script to C99
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2023-01-03 16:52:08 +01:00
Hans de Goede
74842a57ba Fix FTBFS (rhbz#2113727) 2022-08-15 00:54:10 +02:00
Fedora Release Engineering
e006188514 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 08:24:10 +00:00
Fedora Release Engineering
e64264f8be - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 00:42:28 +00:00
4 changed files with 123 additions and 10 deletions

View file

@ -0,0 +1,24 @@
diff -up serdisplib-1.97.9/src/serdisp_fctptr.c~ serdisplib-1.97.9/src/serdisp_fctptr.c
--- serdisplib-1.97.9/src/serdisp_fctptr.c~ 2010-02-21 20:49:29.000000000 +0100
+++ serdisplib-1.97.9/src/serdisp_fctptr.c 2024-06-26 11:21:13.672014507 +0200
@@ -58,7 +58,7 @@ struct usb_bus* (*fp_usb_get_busses)
int (*fp_usb_claim_interface) (usb_dev_handle* dev, int interface);
int (*fp_usb_bulk_read) (usb_dev_handle* dev, int ep, char* bytes, int size, int timeout);
-int (*fp_usb_bulk_write) (usb_dev_handle* dev, int ep, char* bytes, int size, int timeout);
+int (*fp_usb_bulk_write) (usb_dev_handle* dev, int ep, const char* bytes, int size, int timeout);
int (*fp_usb_control_msg) (usb_dev_handle* dev, int requesttype, int request,
int value, int index, char *bytes, int size, int timeout);
int (*fp_usb_clear_halt) (usb_dev_handle *dev, unsigned int ep);
diff -up serdisplib-1.97.9/include/serdisplib/serdisp_fctptr.h~ serdisplib-1.97.9/include/serdisplib/serdisp_fctptr.h
--- serdisplib-1.97.9/include/serdisplib/serdisp_fctptr.h~ 2010-02-21 20:49:28.000000000 +0100
+++ serdisplib-1.97.9/include/serdisplib/serdisp_fctptr.h 2024-06-26 11:23:53.806110999 +0200
@@ -76,7 +76,7 @@ extern struct usb_bus* (*fp_usb_get_buss
extern int (*fp_usb_claim_interface) (usb_dev_handle* dev, int interface);
extern int (*fp_usb_bulk_read) (usb_dev_handle* dev, int ep, char* bytes, int size, int timeout);
-extern int (*fp_usb_bulk_write) (usb_dev_handle* dev, int ep, char* bytes, int size, int timeout);
+extern int (*fp_usb_bulk_write) (usb_dev_handle* dev, int ep, const char* bytes, int size, int timeout);
extern int (*fp_usb_control_msg) (usb_dev_handle* dev, int requesttype, int request,
int value, int index, char *bytes, int size, int timeout);
extern int (*fp_usb_clear_halt) (usb_dev_handle *dev, unsigned int ep);

View file

@ -0,0 +1,40 @@
Fix historic C99 compatibility issues in the configure script.
No need to upstream this patch because it has been fixed on the
autoconf side, and the issues will go away once autoconf is re-run
by upstream.
diff --git a/configure b/configure
index 07e4c16ab5573f54..656e19c8212030ee 100755
--- a/configure
+++ b/configure
@@ -2258,7 +2258,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- '' \
+ '#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -3106,8 +3106,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
@@ -5694,8 +5694,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext

4
serdisplib.rpmlintrc Normal file
View file

@ -0,0 +1,4 @@
# These are all a bit meh warnings, ignore them
addFilter("W: no-documentation")
addFilter("W: no-manual-page-for-binary")
addFilter("E: incorrect-fsf-address")

View file

@ -1,13 +1,16 @@
Name: serdisplib
Version: 1.97.9
Release: 21%{?dist}
Release: 35%{?dist}
Summary: Library to drive serial displays with built-in controllers
License: GPLv2+
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: http://serdisplib.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRequires: make
BuildRequires: gcc
BuildRequires: gd-devel libusb-devel SDL-devel
Patch0: serdisplib-configure-c99.patch
Patch1: serdisplib-1.97.9-build-fix.patch
BuildRequires: make gcc gd-devel SDL-devel
# serdisplib only supports the old libusb-0.1 API
BuildRequires: libusb-compat-0.1-devel
%description
serdisplib started as a library to drive serial displays with built-in
@ -30,7 +33,7 @@ developing applications that use %{name}.
%package tools
Summary: serdisplib tools (testserdisp, multidisplay)
Summary: Serdisplib tools (testserdisp, multidisplay)
Requires: %{name} = %{version}-%{release}
%description tools
@ -38,17 +41,16 @@ This package contains the tools for serdisplib
%prep
%setup -q
%autosetup -p1
%build
%configure --enable-libusb --enable-libSDL --disable-statictools
# STATIC_LDFLAGS: work around broken non static utils linking
make %{?_smp_mflags} STATIC_LDFLAGS="-lusb -lSDL -lpthread"
make %{?_smp_mflags} STATIC_LDFLAGS="$RPM_LD_FLAGS -lusb -lSDL -lpthread"
%install
rm -rf $RPM_BUILD_ROOT
# Ugh no DESTDIR support, how lame
%makeinstall
rm $RPM_BUILD_ROOT%{_libdir}/libserdisp.a
@ -59,7 +61,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/libserdisp.a
%files
%doc doc COPYING HISTORY README TODO
%doc doc HISTORY README TODO
%license COPYING
%{_libdir}/*.so.*
%files devel
@ -71,6 +74,48 @@ rm $RPM_BUILD_ROOT%{_libdir}/libserdisp.a
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.97.9-31
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jun 26 2024 Hans de Goede <hdegoede@redhat.com> - 1.97.9-29
- Fix FTBFS (rhbz#2261689)
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jan 03 2023 Florian Weimer <fweimer@redhat.com> - 1.97.9-25
- Port configure script to C99
* Sun Aug 14 2022 Hans de Goede <hdegoede@redhat.com> - 1.97.9-24
- Fix FTBFS (rhbz#2113727)
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild