From 580382233d00d1c94305dc5dbd2e68288c474ad9 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Sat, 14 Sep 2024 00:25:31 +0200 Subject: [PATCH] Update to 0.2.42 --- .gitignore | 1 + sources | 2 +- zvbi-0.2.42-fix_sincos_declaration.patch | 51 ++++++++++++++++++++++ zvbi.spec | 55 +++++++++++++++--------- 4 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 zvbi-0.2.42-fix_sincos_declaration.patch diff --git a/.gitignore b/.gitignore index a86439d..a05bce2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ zvbi-0.2.33.tar.bz2 +/zvbi-0.2.42.tar.gz diff --git a/sources b/sources index c88e027..5d9c577 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95e53eb208c65ba6667fd4341455fa27 zvbi-0.2.35.tar.bz2 +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 813dfb1..ccc226d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,25 +2,31 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.35 -Release: 23%{?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: http://zapping.sourceforge.net/ZVBI/index.html -Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 +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: make -BuildRequires: gcc-c++ +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bdftopcf BuildRequires: doxygen BuildRequires: fontconfig -BuildRequires: gettext >= 0.16.1 -BuildRequires: libpng-devel +BuildRequires: gcc-c++ +BuildRequires: gettext-devel BuildRequires: libICE-devel -BuildRequires: bdftopcf +BuildRequires: libpng-devel +BuildRequires: libtool +BuildRequires: make BuildRequires: mkfontdir BuildRequires: systemd-units +BuildRequires: tzdata %description @@ -43,7 +49,7 @@ Development files for zvbi %package fonts Summary: Fonts from zvbi converted to X11 -BuildArch: noarch +BuildArch: noarch Obsoletes: xawtv-tv-fonts < 3.95 Provides: xawtv-tv-fonts >= 3.95 @@ -55,9 +61,7 @@ Fonts from zvbi converted for use with X11 %setup -q %patch -P 0 -p1 %patch -P 1 -p1 - -# Fix character encodings -iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README +%patch -P 2 -p1 # systemd service file cat >zvbid.service < - 0.2.42-1 +- Update to 0.2.42 + * Sat Jul 20 2024 Fedora Release Engineering - 0.2.35-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild