Compare commits
No commits in common. "rawhide" and "f28" have entirely different histories.
4 changed files with 17 additions and 145 deletions
|
|
@ -1,24 +0,0 @@
|
|||
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);
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
# 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")
|
||||
|
|
@ -1,16 +1,12 @@
|
|||
Name: serdisplib
|
||||
Version: 1.97.9
|
||||
Release: 35%{?dist}
|
||||
Release: 14%{?dist}
|
||||
Summary: Library to drive serial displays with built-in controllers
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
Group: System Environment/Libraries
|
||||
License: GPLv2+
|
||||
URL: http://serdisplib.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
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
|
||||
BuildRequires: gd-devel libusb-devel SDL-devel
|
||||
|
||||
%description
|
||||
serdisplib started as a library to drive serial displays with built-in
|
||||
|
|
@ -25,6 +21,7 @@ input line. several (few) other lines are controlling things like timing
|
|||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -33,7 +30,8 @@ developing applications that use %{name}.
|
|||
|
||||
|
||||
%package tools
|
||||
Summary: Serdisplib tools (testserdisp, multidisplay)
|
||||
Summary: serdisplib tools (testserdisp, multidisplay)
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description tools
|
||||
|
|
@ -41,102 +39,44 @@ This package contains the tools for serdisplib
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
|
||||
|
||||
%build
|
||||
%configure --enable-libusb --enable-libSDL --disable-statictools
|
||||
# STATIC_LDFLAGS: work around broken non static utils linking
|
||||
make %{?_smp_mflags} STATIC_LDFLAGS="$RPM_LD_FLAGS -lusb -lSDL -lpthread"
|
||||
make %{?_smp_mflags} STATIC_LDFLAGS="-lusb -lSDL -lpthread"
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# Ugh no DESTDIR support, how lame
|
||||
%makeinstall
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/libserdisp.a
|
||||
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%doc doc HISTORY README TODO
|
||||
%license COPYING
|
||||
%defattr(-,root,root,-)
|
||||
%doc doc COPYING HISTORY README TODO
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/serdisplib
|
||||
%{_libdir}/*.so
|
||||
|
||||
%files tools
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/*
|
||||
|
||||
|
||||
%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
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.97.9-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue