diff --git a/.gitignore b/.gitignore index b7cf58c..a05bce2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ zvbi-0.2.33.tar.bz2 /zvbi-0.2.42.tar.gz -/zvbi-0.2.43.tar.gz -/zvbi-0.2.44.tar.gz diff --git a/sources b/sources index 0c6fcd7..5d9c577 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zvbi-0.2.44.tar.gz) = 74b7d44faf42f919ebd3ccb69f8567f56909075d3acf4a3b4dfcbdf85489492f27d8a04173e0010f59706356e4078cd10911945f87e2596de2b897672d1e55cb +SHA512 (zvbi-0.2.42.tar.gz) = 65ebbab09d0180f62c2016fe3462786a6f89d0ee414f9983d1a89582bff0c17e58fcb8f45690add0314bd3b7d2de86f82e97fd49c93842e0a4f294b2b5508687 diff --git a/zvbi-0.2.42-fix_sincos_declaration.patch b/zvbi-0.2.42-fix_sincos_declaration.patch new file mode 100644 index 0000000..be243e2 --- /dev/null +++ b/zvbi-0.2.42-fix_sincos_declaration.patch @@ -0,0 +1,51 @@ +From 429cf9337588d6e028bd1dc4633953b4eff09597 Mon Sep 17 00:00:00 2001 +From: Ileana Dumitrescu +Date: Wed, 13 Mar 2024 17:42:18 +0200 +Subject: [PATCH] configure.ac: Move sincos function check to AC_CHECK_FUNCS + +--- + configure.ac | 24 +----------------------- + 1 file changed, 1 insertion(+), 23 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ba6f385..476fd69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,7 +89,7 @@ AC_CHECK_FUNCS([alarm dup2 gethostbyaddr gethostbyname getopt_long gettimeofday + inet_ntoa localtime_r memmove memset mkdir modf munmap + nl_langinfo putenv select setenv setlocale socket strcasecmp + strchr strdup strerror strncasecmp strndup strrchr strstr +- strtol strtoul tzset strptime getaddrinfo]) ++ strtol strtoul tzset strptime getaddrinfo sincos]) + + AM_CONDITIONAL(HAVE_STRPTIME, [test "x$HAVE_STRPTIME" = xyes]) + +@@ -112,28 +112,6 @@ dnl autoconf 2.71 required additional quotations and usages of "AC_LANG_SOURCE". + dnl "Noteworthy changes in autoconf version 2.66 through 2.68" + dnl + +-dnl sincos() is a GNU extension (a macro, not a function). +-dnl If not present we use a replacement. +-AC_MSG_CHECKING([for sincos]) +-AC_LINK_IFELSE([AC_LANG_SOURCE([ +-#include +-#include +-int main (void) { +-double s, c; +-/* Make sure the compiler does not optimize sincos() away +- so the linker can confirm its availability. */ +-scanf ("%f", &s); +-sincos (s, &s, &c); +-printf ("%f %f", s, c); +-return 0; +-} +-])],[ +- AC_MSG_RESULT([yes]) +- AC_DEFINE(HAVE_SINCOS, 1, [Define if the sincos() function is available]) +-],[ +- AC_MSG_RESULT([no]) +-]) +- + dnl log2() is a GNU extension (a macro, not a function). + dnl If not present we use a replacement. + AC_MSG_CHECKING([for log2]) diff --git a/zvbi.spec b/zvbi.spec index 55b88a0..ccc226d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,14 +2,16 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.44 -Release: 2%{?dist} +Version: 0.2.42 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT URL: https://github.com/zapping-vbi/zvbi Source0: https://github.com/zapping-vbi/zvbi/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch +# slightly adapted from https://github.com/zapping-vbi/zvbi/commit/ae74ae513714f81b9b8abdb12e1b235d16fad74e.patch +Patch2: zvbi-0.2.42-fix_sincos_declaration.patch BuildRequires: autoconf BuildRequires: automake @@ -59,6 +61,7 @@ Fonts from zvbi converted for use with X11 %setup -q %patch -P 0 -p1 %patch -P 1 -p1 +%patch -P 2 -p1 # systemd service file cat >zvbid.service <= 42) %{_sbindir}/zvbid -%endif %{_unitdir}/zvbid.service %{_libdir}/libzvbi.so.0* %{_libdir}/libzvbi-chains.so.0* @@ -168,19 +169,6 @@ make check %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 0.2.44-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Mar 14 2025 Xavier Bachelot - 0.2.44-1 -- Update to 0.2.44 (RHBZ#2351225) -- Acknowledge for bin/sbin merge in F42+ - -* Sun Jan 19 2025 Fedora Release Engineering - 0.2.43-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Dec 10 2024 Xavier Bachelot - 0.2.43-1 -- Update to 0.2.43 (RHBZ#2330170) - * Fri Sep 13 2024 Xavier Bachelot - 0.2.42-1 - Update to 0.2.42