From 075990cdcdf90ec4e6c6f33c8af0b0d51d4b7c86 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 9 Aug 2019 08:45:47 -0500 Subject: [PATCH 01/14] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 3b6c803c954d6f92488d3ab6f6281faac44ed4f1 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Fri, 9 Aug 2019 21:03:23 +0300 Subject: [PATCH 02/14] Port to EPEL8 --- .cvsignore | 0 Makefile | 21 --- sources | 1 + zvbi-0.2.24-tvfonts.patch | 128 +++++++++++++++++ zvbi-0.2.25-openfix.patch | 11 ++ zvbi.spec | 287 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 427 insertions(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 zvbi-0.2.24-tvfonts.patch create mode 100644 zvbi-0.2.25-openfix.patch create mode 100644 zvbi.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 1cd9b80..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zvbi -# $Id$ -NAME := zvbi -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index e69de29..c88e027 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +95e53eb208c65ba6667fd4341455fa27 zvbi-0.2.35.tar.bz2 diff --git a/zvbi-0.2.24-tvfonts.patch b/zvbi-0.2.24-tvfonts.patch new file mode 100644 index 0000000..8d74388 --- /dev/null +++ b/zvbi-0.2.24-tvfonts.patch @@ -0,0 +1,128 @@ +diff -Nrbu zvbi-0.2.22/contrib/x11font.c zvbi-0.2.22-OK/contrib/x11font.c +--- zvbi-0.2.24/contrib/x11font.c.orig 2006-02-10 09:25:36.000000000 +0300 ++++ zvbi-0.2.24/contrib/x11font.c 2007-03-12 16:55:06.000000000 +0300 +@@ -12,31 +12,31 @@ + { + fprintf(fp, + "STARTFONT 2.1\n" +- "FONT -%s-%s-medium-%s-normal--%d-%d-75-75-c-%d-iso10646-1\n" ++ "FONT -%s-%s-Medium-%s-Normal--%d-%d-75-75-C-%d-ISO10646-1\n" + "SIZE %d 75 75\n" +- "FONTBOUNDINGBOX 6 13 0 -2\n" ++ "FONTBOUNDINGBOX %d %d 0 0\n" + "STARTPROPERTIES 25\n" + "FONTNAME_REGISTRY \"\"\n" + "FOUNDRY \"%s\"\n" + "FAMILY_NAME \"%s\"\n" +- "WEIGHT_NAME \"medium\"\n" ++ "WEIGHT_NAME \"Medium\"\n" + "SLANT \"%s\"\n" +- "SETWIDTH_NAME \"normal\"\n" ++ "SETWIDTH_NAME \"Normal\"\n" + "ADD_STYLE_NAME \"\"\n" + "PIXEL_SIZE %d\n" + "POINT_SIZE %d\n" + "RESOLUTION_X 75\n" + "RESOLUTION_Y 75\n" +- "SPACING \"c\"\n" ++ "SPACING \"C\"\n" + "AVERAGE_WIDTH %d\n" +- "CHARSET_REGISTRY \"iso10646\"\n" ++ "CHARSET_REGISTRY \"ISO10646\"\n" + "CHARSET_ENCODING \"1\"\n" + "COPYRIGHT \"fixme\"\n" + "CAP_HEIGHT 9\n" + "X_HEIGHT 18\n" +- "FONT \"-%s-%s-medium-%s-normal--%d-%d-75-75-c-%d-iso10646-1\"\n" ++ "FONT \"-%s-%s-Medium-%s-Normal--%d-%d-75-75-C-%d-ISO10646-1\"\n" + "WEIGHT 10\n" +- "RESOLUTION 103\n" ++ "RESOLUTION 75\n" + "QUAD_WIDTH %d\n" + "DEFAULT_CHAR 0\n" + "FONT_ASCENT %d\n" +@@ -44,6 +44,7 @@ + "ENDPROPERTIES\n", + foundry,name,slant,height,height*10,width*10, + height, ++ width,height, + foundry,name,slant,height,height*10,width*10, + foundry,name,slant,height,height*10,width*10, + width,height); +@@ -53,11 +54,11 @@ + print_font(const char *filename, + const char *foundry, + const char *name, int italic, +- uint8_t *font, int cw, int ch, int cpl, ++ uint8_t *font, int cw, int ch, int cpl, int hs, + int count, unsigned int (*map)(unsigned int,int), int invalid) + { + FILE *fp; +- int x,y,i,c,on,bit,byte,mask1,mask2; ++ int x,y,s,i,c,on,bit,byte,mask1,mask2; + + fp = stdout; + if (NULL != filename) { +@@ -67,7 +68,7 @@ + fprintf(stderr,"writing %s\n",filename); + } + +- print_head(fp, foundry, name, italic ? "i" : "r", cw, ch); ++ print_head(fp, foundry, name, italic ? "I" : "R", cw, ch*hs); + fprintf(fp,"CHARS %d\n", count); + + for (i = 0; i < 0xffff; i++) { +@@ -82,8 +83,9 @@ + "BBX %d %d 0 0\n" + "BITMAP\n", + i,cw*10,cw, +- cw,ch); ++ cw,ch*hs); + for (y = 0; y < ch; y++) { ++ for (s = 0; s < hs; s++) { + bit = cpl * cw * y + cw * c; + byte = 0; + for (x = 0; x < cw; x++) { +@@ -100,6 +102,7 @@ + } + fprintf(fp,"%02x\n",byte); + } ++ } + fprintf(fp,"ENDCHAR\n"); + } + fprintf(fp,"ENDFONT\n"); +@@ -109,17 +112,23 @@ + } + + int +-main () ++main(int argc, char *argv[]) + { +- print_font("teletext.bdf","ets","teletext",0,(uint8_t *) wstfont2_bits, +- TCW,TCH,TCPL,1448,unicode_wstfont2,357); +- print_font("teletexti.bdf","ets","teletext",1,(uint8_t *) wstfont2_bits, +- TCW,TCH,TCPL,1449,unicode_wstfont2,357); +- print_font("caption.bdf","ets","caption",0,(uint8_t *) ccfont2_bits, +- CCW,CCH,CCPL,120,unicode_ccfont2,15); +- print_font("captioni.bdf","ets","caption",1,(uint8_t *) ccfont2_bits, +- CCW,CCH,CCPL,120,unicode_ccfont2,15 + 4 * 32); ++ print_font("teletext1.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,1,1448,unicode_wstfont2,357); ++ print_font("teletext2.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,2,1448,unicode_wstfont2,357); ++ print_font("teletext4.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,4,1448,unicode_wstfont2,357); ++ print_font("teletext1i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,1,1449,unicode_wstfont2,357); ++ print_font("teletext2i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,2,1449,unicode_wstfont2,357); ++ print_font("teletext4i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,4,1449,unicode_wstfont2,357); ++ print_font("caption.bdf","Ets","Caption",0,ccfont2_bits, ++ CCW,CCH,CCPL,1,120,unicode_ccfont2,15); ++ print_font("captioni.bdf","Ets","Caption",1,ccfont2_bits, ++ CCW,CCH,CCPL,1,120,unicode_ccfont2,15 + 4 * 32); + return 0; + } +- +- diff --git a/zvbi-0.2.25-openfix.patch b/zvbi-0.2.25-openfix.patch new file mode 100644 index 0000000..5d8ab6f --- /dev/null +++ b/zvbi-0.2.25-openfix.patch @@ -0,0 +1,11 @@ +--- zvbi-0.2.25/src/chains.c.orig 2007-03-09 05:11:52.000000000 +0000 ++++ zvbi-0.2.25/src/chains.c 2007-08-23 21:29:44.000000000 +0100 +@@ -168,7 +168,7 @@ + return 0; + } + +-int open(const char *pathname, int flags, ...) ++int (open)(const char *pathname, int flags, ...) + { + va_list args; + mode_t mode = 0; diff --git a/zvbi.spec b/zvbi.spec new file mode 100644 index 0000000..98138fc --- /dev/null +++ b/zvbi.spec @@ -0,0 +1,287 @@ +%define fontdir %{_datadir}/fonts/%{name} +%define catalogue %{_sysconfdir}/X11/fontpath.d + +Name: zvbi +Version: 0.2.35 +Release: 9%{?dist} +Summary: Raw VBI, Teletext and Closed Caption decoding library +# See NEWS for a full breakdown of licensing. +License: LGPLv2+ and GPLv2+ and BSD +URL: http://zapping.sourceforge.net/ZVBI/index.html +Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.2.24-tvfonts.patch +Patch1: %{name}-0.2.25-openfix.patch + +BuildRequires: gcc-c++ +BuildRequires: doxygen +BuildRequires: fontconfig +BuildRequires: gettext >= 0.16.1 +BuildRequires: libpng-devel +BuildRequires: libICE-devel +BuildRequires: xorg-x11-font-utils +BuildRequires: systemd-units + +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + + +%description +ZVBI provides functions to capture and decode VBI data. The vertical blanking +interval (VBI) is an interval in a television signal that temporarily suspends +transmission of the signal for the electron gun to move back up to the first +line of the television screen to trace the next screen field. The vertical +blanking interval can be used to carry data, since anything sent during the VBI +would naturally not be displayed; various test signals, closed captioning, and +other digital data can be sent during this time period. + + +%package devel +Summary: Development files for zvbi +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development files for zvbi + + +%package fonts +Summary: Fonts from zvbi converted to X11 +BuildArch: noarch +Obsoletes: xawtv-tv-fonts < 3.95 +Provides: xawtv-tv-fonts >= 3.95 + +%description fonts +Fonts from zvbi converted for use with X11 + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +# Fix character encodings +iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README + +# systemd service file +cat >zvbid.service < ${font%.bdf}.pcf.gz +done +mkfontdir -x .bdf . +cat >fonts.alias < - 0.2.35-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Feb 12 2019 Igor Gnatenko - 0.2.35-8 +- Remove obsolete scriptlets + +* Sun Feb 03 2019 Fedora Release Engineering - 0.2.35-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.2.35-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.2.35-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.2.35-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.2.35-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.2.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Feb 14 2016 Dmitry Butskoy - 0.2.35-1 +- Update to 0.2.35 + +* Fri Feb 05 2016 Fedora Release Engineering - 0.2.33-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.2.33-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 0.2.33-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.2.33-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.2.33-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 0.2.33-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 24 2012 Dmitry Butskoy - 0.2.33-14 +- new systemd-rpm macros (#850382) +- drop sysv triggerun migration + +* Sun Jul 22 2012 Fedora Release Engineering - 0.2.33-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.2.33-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Hans de Goede - 0.2.33-11 +- Fix build with libpng-1.5 + +* Tue Dec 06 2011 Adam Jackson - 0.2.33-10 +- Rebuild for new libpng + +* Fri Sep 23 2011 Tom Callaway - 0.2.33-9 +- add missing triggerun for systemd migration + +* Tue Sep 6 2011 Dmitry Butskoy - 0.2.33-8 +- Drop chkconfig stuff completely + +* Wed Aug 17 2011 Dmitry Butskoy - 0.2.33-7 +- Migration from SysV to Systemd init system (#730154) + +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.33-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Feb 21 2010 Dmitry Butskoy - 0.2.33-5 +- add patch to fix compiling under rawhide (#564991) +- make fonts subpackage arch independent + +* Mon Jul 27 2009 Fedora Release Engineering - 0.2.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Mar 25 2009 Dmitry Butskoy - 0.2.33-3 +- Rebuilt for #491975 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.2.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Nov 14 2008 Subhodip Biswas - 0.2.33-1 +- Package update . +* Sun Sep 21 2008 Ville Skyttä - 0.2.30-2 +- Fix Patch0:/%%patch mismatch. + +* Wed Mar 05 2008 Ian Chapman 0.2.30-1 +- Update to 0.2.30 +- Updated license field due to license change GPLv2+ -> LGPLv2+ +- Dropped encoding fixes for ChangeLog. No longer needed. + +* Tue Feb 19 2008 Fedora Release Engineering - 0.2.26-3 +- Autorebuild for GCC 4.3 + +* Sun Jan 06 2008 Ian Chapman 0.2.26-2 +- Release bump + +* Sun Jan 06 2008 Ian Chapman 0.2.26-1 +- Upgrade to 0.2.26 + +* Wed Aug 22 2007 Ian Chapman 0.2.25-2 +- Release bump for F8 mass rebuild +- License change due to new guidelines +- Use fontpath.d for F8+ +- Added patch to fix compilation with open() macro on F8+ + +* Sun May 27 2007 Ian Chapman 0.2.25-1 +- Upgrade to 0.2.25 + +* Tue Mar 13 2007 Ian Chapman 0.2.24-1 +- Upgrade to 0.2.24 +- Convert README and ChangeLog to UTF-8 +- Added patch for x11font to generate more font sizes useful for other + applications such as xawtv (courtesy of Dmitry Butskoy) +- Fonts sub-rpm now obsoletes and provides xawtv-tv-fonts +- Split font generation and font installation into separate sections +- Various other minor changes to the spec +- Added xfs support for the fonts + +* Fri Sep 01 2006 Ian Chapman 0.2.22-2 +- Minor spec cleanups + +* Tue Aug 29 2006 Ian Chapman 0.2.22-1 +- Initial release From bacde458ad3b30c0f9ff8908501aaddd237d85f3 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:14:00 +0000 Subject: [PATCH 03/14] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 3d972b4827acc75397a76d7ce892d40c0c2e6ff0 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Tue, 14 Dec 2021 00:21:37 +0300 Subject: [PATCH 04/14] Port to epel9 --- .cvsignore | 0 .gitignore | 1 + Makefile | 21 --- sources | 1 + zvbi-0.2.24-tvfonts.patch | 128 ++++++++++++++++ zvbi-0.2.25-openfix.patch | 11 ++ zvbi.spec | 313 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 454 insertions(+), 21 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile create mode 100644 zvbi-0.2.24-tvfonts.patch create mode 100644 zvbi-0.2.25-openfix.patch create mode 100644 zvbi.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a86439d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +zvbi-0.2.33.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 1cd9b80..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zvbi -# $Id$ -NAME := zvbi -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index e69de29..c88e027 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +95e53eb208c65ba6667fd4341455fa27 zvbi-0.2.35.tar.bz2 diff --git a/zvbi-0.2.24-tvfonts.patch b/zvbi-0.2.24-tvfonts.patch new file mode 100644 index 0000000..8d74388 --- /dev/null +++ b/zvbi-0.2.24-tvfonts.patch @@ -0,0 +1,128 @@ +diff -Nrbu zvbi-0.2.22/contrib/x11font.c zvbi-0.2.22-OK/contrib/x11font.c +--- zvbi-0.2.24/contrib/x11font.c.orig 2006-02-10 09:25:36.000000000 +0300 ++++ zvbi-0.2.24/contrib/x11font.c 2007-03-12 16:55:06.000000000 +0300 +@@ -12,31 +12,31 @@ + { + fprintf(fp, + "STARTFONT 2.1\n" +- "FONT -%s-%s-medium-%s-normal--%d-%d-75-75-c-%d-iso10646-1\n" ++ "FONT -%s-%s-Medium-%s-Normal--%d-%d-75-75-C-%d-ISO10646-1\n" + "SIZE %d 75 75\n" +- "FONTBOUNDINGBOX 6 13 0 -2\n" ++ "FONTBOUNDINGBOX %d %d 0 0\n" + "STARTPROPERTIES 25\n" + "FONTNAME_REGISTRY \"\"\n" + "FOUNDRY \"%s\"\n" + "FAMILY_NAME \"%s\"\n" +- "WEIGHT_NAME \"medium\"\n" ++ "WEIGHT_NAME \"Medium\"\n" + "SLANT \"%s\"\n" +- "SETWIDTH_NAME \"normal\"\n" ++ "SETWIDTH_NAME \"Normal\"\n" + "ADD_STYLE_NAME \"\"\n" + "PIXEL_SIZE %d\n" + "POINT_SIZE %d\n" + "RESOLUTION_X 75\n" + "RESOLUTION_Y 75\n" +- "SPACING \"c\"\n" ++ "SPACING \"C\"\n" + "AVERAGE_WIDTH %d\n" +- "CHARSET_REGISTRY \"iso10646\"\n" ++ "CHARSET_REGISTRY \"ISO10646\"\n" + "CHARSET_ENCODING \"1\"\n" + "COPYRIGHT \"fixme\"\n" + "CAP_HEIGHT 9\n" + "X_HEIGHT 18\n" +- "FONT \"-%s-%s-medium-%s-normal--%d-%d-75-75-c-%d-iso10646-1\"\n" ++ "FONT \"-%s-%s-Medium-%s-Normal--%d-%d-75-75-C-%d-ISO10646-1\"\n" + "WEIGHT 10\n" +- "RESOLUTION 103\n" ++ "RESOLUTION 75\n" + "QUAD_WIDTH %d\n" + "DEFAULT_CHAR 0\n" + "FONT_ASCENT %d\n" +@@ -44,6 +44,7 @@ + "ENDPROPERTIES\n", + foundry,name,slant,height,height*10,width*10, + height, ++ width,height, + foundry,name,slant,height,height*10,width*10, + foundry,name,slant,height,height*10,width*10, + width,height); +@@ -53,11 +54,11 @@ + print_font(const char *filename, + const char *foundry, + const char *name, int italic, +- uint8_t *font, int cw, int ch, int cpl, ++ uint8_t *font, int cw, int ch, int cpl, int hs, + int count, unsigned int (*map)(unsigned int,int), int invalid) + { + FILE *fp; +- int x,y,i,c,on,bit,byte,mask1,mask2; ++ int x,y,s,i,c,on,bit,byte,mask1,mask2; + + fp = stdout; + if (NULL != filename) { +@@ -67,7 +68,7 @@ + fprintf(stderr,"writing %s\n",filename); + } + +- print_head(fp, foundry, name, italic ? "i" : "r", cw, ch); ++ print_head(fp, foundry, name, italic ? "I" : "R", cw, ch*hs); + fprintf(fp,"CHARS %d\n", count); + + for (i = 0; i < 0xffff; i++) { +@@ -82,8 +83,9 @@ + "BBX %d %d 0 0\n" + "BITMAP\n", + i,cw*10,cw, +- cw,ch); ++ cw,ch*hs); + for (y = 0; y < ch; y++) { ++ for (s = 0; s < hs; s++) { + bit = cpl * cw * y + cw * c; + byte = 0; + for (x = 0; x < cw; x++) { +@@ -100,6 +102,7 @@ + } + fprintf(fp,"%02x\n",byte); + } ++ } + fprintf(fp,"ENDCHAR\n"); + } + fprintf(fp,"ENDFONT\n"); +@@ -109,17 +112,23 @@ + } + + int +-main () ++main(int argc, char *argv[]) + { +- print_font("teletext.bdf","ets","teletext",0,(uint8_t *) wstfont2_bits, +- TCW,TCH,TCPL,1448,unicode_wstfont2,357); +- print_font("teletexti.bdf","ets","teletext",1,(uint8_t *) wstfont2_bits, +- TCW,TCH,TCPL,1449,unicode_wstfont2,357); +- print_font("caption.bdf","ets","caption",0,(uint8_t *) ccfont2_bits, +- CCW,CCH,CCPL,120,unicode_ccfont2,15); +- print_font("captioni.bdf","ets","caption",1,(uint8_t *) ccfont2_bits, +- CCW,CCH,CCPL,120,unicode_ccfont2,15 + 4 * 32); ++ print_font("teletext1.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,1,1448,unicode_wstfont2,357); ++ print_font("teletext2.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,2,1448,unicode_wstfont2,357); ++ print_font("teletext4.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,4,1448,unicode_wstfont2,357); ++ print_font("teletext1i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,1,1449,unicode_wstfont2,357); ++ print_font("teletext2i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,2,1449,unicode_wstfont2,357); ++ print_font("teletext4i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,4,1449,unicode_wstfont2,357); ++ print_font("caption.bdf","Ets","Caption",0,ccfont2_bits, ++ CCW,CCH,CCPL,1,120,unicode_ccfont2,15); ++ print_font("captioni.bdf","Ets","Caption",1,ccfont2_bits, ++ CCW,CCH,CCPL,1,120,unicode_ccfont2,15 + 4 * 32); + return 0; + } +- +- diff --git a/zvbi-0.2.25-openfix.patch b/zvbi-0.2.25-openfix.patch new file mode 100644 index 0000000..5d8ab6f --- /dev/null +++ b/zvbi-0.2.25-openfix.patch @@ -0,0 +1,11 @@ +--- zvbi-0.2.25/src/chains.c.orig 2007-03-09 05:11:52.000000000 +0000 ++++ zvbi-0.2.25/src/chains.c 2007-08-23 21:29:44.000000000 +0100 +@@ -168,7 +168,7 @@ + return 0; + } + +-int open(const char *pathname, int flags, ...) ++int (open)(const char *pathname, int flags, ...) + { + va_list args; + mode_t mode = 0; diff --git a/zvbi.spec b/zvbi.spec new file mode 100644 index 0000000..995ed78 --- /dev/null +++ b/zvbi.spec @@ -0,0 +1,313 @@ +%define fontdir %{_datadir}/fonts/%{name} +%define catalogue %{_sysconfdir}/X11/fontpath.d + +Name: zvbi +Version: 0.2.35 +Release: 15%{?dist} +Summary: Raw VBI, Teletext and Closed Caption decoding library +# See NEWS for a full breakdown of licensing. +License: LGPLv2+ and GPLv2+ and BSD +URL: http://zapping.sourceforge.net/ZVBI/index.html +Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.2.24-tvfonts.patch +Patch1: %{name}-0.2.25-openfix.patch + +BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: doxygen +BuildRequires: fontconfig +BuildRequires: gettext >= 0.16.1 +BuildRequires: libpng-devel +BuildRequires: libICE-devel +BuildRequires: bdftopcf +BuildRequires: mkfontdir +BuildRequires: systemd-units + +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + + +%description +ZVBI provides functions to capture and decode VBI data. The vertical blanking +interval (VBI) is an interval in a television signal that temporarily suspends +transmission of the signal for the electron gun to move back up to the first +line of the television screen to trace the next screen field. The vertical +blanking interval can be used to carry data, since anything sent during the VBI +would naturally not be displayed; various test signals, closed captioning, and +other digital data can be sent during this time period. + + +%package devel +Summary: Development files for zvbi +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development files for zvbi + + +%package fonts +Summary: Fonts from zvbi converted to X11 +BuildArch: noarch +Obsoletes: xawtv-tv-fonts < 3.95 +Provides: xawtv-tv-fonts >= 3.95 + +%description fonts +Fonts from zvbi converted for use with X11 + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +# Fix character encodings +iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README + +# systemd service file +cat >zvbid.service < ${font%.bdf}.pcf.gz +done +mkfontdir -x .bdf . +cat >fonts.alias < - 0.2.35-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +- avoid rpath in binaries + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.2.35-14 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Mon Mar 1 2021 Dmitry Butskoy - 0.2.35-13 +- Fix BuildRequires (#1933652) + +* Thu Jan 28 2021 Fedora Release Engineering - 0.2.35-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.2.35-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.2.35-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.2.35-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Feb 12 2019 Igor Gnatenko - 0.2.35-8 +- Remove obsolete scriptlets + +* Sun Feb 03 2019 Fedora Release Engineering - 0.2.35-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.2.35-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.2.35-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.2.35-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.2.35-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.2.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Feb 14 2016 Dmitry Butskoy - 0.2.35-1 +- Update to 0.2.35 + +* Fri Feb 05 2016 Fedora Release Engineering - 0.2.33-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.2.33-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 0.2.33-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.2.33-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.2.33-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 0.2.33-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 24 2012 Dmitry Butskoy - 0.2.33-14 +- new systemd-rpm macros (#850382) +- drop sysv triggerun migration + +* Sun Jul 22 2012 Fedora Release Engineering - 0.2.33-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.2.33-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Hans de Goede - 0.2.33-11 +- Fix build with libpng-1.5 + +* Tue Dec 06 2011 Adam Jackson - 0.2.33-10 +- Rebuild for new libpng + +* Fri Sep 23 2011 Tom Callaway - 0.2.33-9 +- add missing triggerun for systemd migration + +* Tue Sep 6 2011 Dmitry Butskoy - 0.2.33-8 +- Drop chkconfig stuff completely + +* Wed Aug 17 2011 Dmitry Butskoy - 0.2.33-7 +- Migration from SysV to Systemd init system (#730154) + +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.33-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Feb 21 2010 Dmitry Butskoy - 0.2.33-5 +- add patch to fix compiling under rawhide (#564991) +- make fonts subpackage arch independent + +* Mon Jul 27 2009 Fedora Release Engineering - 0.2.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Mar 25 2009 Dmitry Butskoy - 0.2.33-3 +- Rebuilt for #491975 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.2.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Nov 14 2008 Subhodip Biswas - 0.2.33-1 +- Package update . +* Sun Sep 21 2008 Ville Skyttä - 0.2.30-2 +- Fix Patch0:/%%patch mismatch. + +* Wed Mar 05 2008 Ian Chapman 0.2.30-1 +- Update to 0.2.30 +- Updated license field due to license change GPLv2+ -> LGPLv2+ +- Dropped encoding fixes for ChangeLog. No longer needed. + +* Tue Feb 19 2008 Fedora Release Engineering - 0.2.26-3 +- Autorebuild for GCC 4.3 + +* Sun Jan 06 2008 Ian Chapman 0.2.26-2 +- Release bump + +* Sun Jan 06 2008 Ian Chapman 0.2.26-1 +- Upgrade to 0.2.26 + +* Wed Aug 22 2007 Ian Chapman 0.2.25-2 +- Release bump for F8 mass rebuild +- License change due to new guidelines +- Use fontpath.d for F8+ +- Added patch to fix compilation with open() macro on F8+ + +* Sun May 27 2007 Ian Chapman 0.2.25-1 +- Upgrade to 0.2.25 + +* Tue Mar 13 2007 Ian Chapman 0.2.24-1 +- Upgrade to 0.2.24 +- Convert README and ChangeLog to UTF-8 +- Added patch for x11font to generate more font sizes useful for other + applications such as xawtv (courtesy of Dmitry Butskoy) +- Fonts sub-rpm now obsoletes and provides xawtv-tv-fonts +- Split font generation and font installation into separate sections +- Various other minor changes to the spec +- Added xfs support for the fonts + +* Fri Sep 01 2006 Ian Chapman 0.2.22-2 +- Minor spec cleanups + +* Tue Aug 29 2006 Ian Chapman 0.2.22-1 +- Initial release From eeaf0a4e26236b3e84fc78f94b65071b98e83990 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 17 May 2023 12:25:02 -0400 Subject: [PATCH 05/14] Update License tag to SPDX identifiers; use '%patch -P N' Examine the source and update the License tag to use SPDX expressions. Also change the deprecated %patchN macros to the newer '%patch -P N' style. Signed-off-by: David Cantrell --- zvbi.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index 8c14f43..e95f5ac 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,16 +3,15 @@ Name: zvbi Version: 0.2.35 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library -# See NEWS for a full breakdown of licensing. -License: LGPLv2+ and GPLv2+ and BSD +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 Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: fontconfig @@ -54,8 +53,8 @@ Fonts from zvbi converted for use with X11 %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%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 @@ -158,6 +157,10 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Wed May 17 2023 David Cantrell - 0.2.35-20 +- Update License tag to use SPDX identifiers +- Change deprecated %%patchN macros to %%patch -P N + * Sun Feb 05 2023 Kalev Lember - 0.2.35-19 - Avoid requiring systemd for systemd rpm scriptlets From 95a871dde95b9273a198a06ef025f10589ba6681 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:48:43 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index e95f5ac..dec3236 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 20%{?dist} +Release: 21%{?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 @@ -157,6 +157,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.2.35-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 17 2023 David Cantrell - 0.2.35-20 - Update License tag to use SPDX identifiers - Change deprecated %%patchN macros to %%patch -P N From b4f09b45e9695c047b34cf982da2fe561612f6d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:20:06 +0000 Subject: [PATCH 07/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index dec3236..e2d944e 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 21%{?dist} +Release: 22%{?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 @@ -157,6 +157,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.2.35-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.2.35-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 71ecef088a42963c720c04ecfa5a30096ad9bb46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:58:41 +0000 Subject: [PATCH 08/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index e2d944e..813dfb1 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 22%{?dist} +Release: 23%{?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 @@ -157,6 +157,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.2.35-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.2.35-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 580382233d00d1c94305dc5dbd2e68288c474ad9 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Sat, 14 Sep 2024 00:25:31 +0200 Subject: [PATCH 09/14] 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 From 1759f87111df20648951100a1c3bf0fa4bf3c1b7 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Tue, 10 Dec 2024 12:51:19 +0100 Subject: [PATCH 10/14] Update to 0.2.43 (RHBZ#2330170) --- .gitignore | 1 + sources | 2 +- zvbi-0.2.42-fix_sincos_declaration.patch | 51 ------------------------ zvbi.spec | 8 ++-- 4 files changed, 6 insertions(+), 56 deletions(-) delete mode 100644 zvbi-0.2.42-fix_sincos_declaration.patch diff --git a/.gitignore b/.gitignore index a05bce2..1e9a398 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ zvbi-0.2.33.tar.bz2 /zvbi-0.2.42.tar.gz +/zvbi-0.2.43.tar.gz diff --git a/sources b/sources index 5d9c577..6192031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zvbi-0.2.42.tar.gz) = 65ebbab09d0180f62c2016fe3462786a6f89d0ee414f9983d1a89582bff0c17e58fcb8f45690add0314bd3b7d2de86f82e97fd49c93842e0a4f294b2b5508687 +SHA512 (zvbi-0.2.43.tar.gz) = 7216e6a3538e4b37d11dd45e5ebaf2b7c0c3b4ba4824e5854d508711f6a048fb9c3bb7b02262c0d91ef3019568ca1119b4b46043a23d1176edfcc78d48f70f48 diff --git a/zvbi-0.2.42-fix_sincos_declaration.patch b/zvbi-0.2.42-fix_sincos_declaration.patch deleted file mode 100644 index be243e2..0000000 --- a/zvbi-0.2.42-fix_sincos_declaration.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 ccc226d..0c7d482 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,7 +2,7 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.42 +Version: 0.2.43 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 @@ -10,8 +10,6 @@ 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 @@ -61,7 +59,6 @@ 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 < - 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 From cc4275d37c0101b130d4f7fe7ae877ee89eb0ef3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:54:19 +0000 Subject: [PATCH 11/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 0c7d482..7f4f490 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.43 -Release: 1%{?dist} +Release: 2%{?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 @@ -166,6 +166,9 @@ make check %changelog +* 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) From 7d6b85c779620a4924a57bbdc0d4ca15c27c8d75 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Fri, 14 Mar 2025 09:44:41 +0100 Subject: [PATCH 12/14] Update to 0.2.44 (RHBZ#2351225) --- .gitignore | 1 + sources | 2 +- zvbi.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1e9a398..b7cf58c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ 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 6192031..0c6fcd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zvbi-0.2.43.tar.gz) = 7216e6a3538e4b37d11dd45e5ebaf2b7c0c3b4ba4824e5854d508711f6a048fb9c3bb7b02262c0d91ef3019568ca1119b4b46043a23d1176edfcc78d48f70f48 +SHA512 (zvbi-0.2.44.tar.gz) = 74b7d44faf42f919ebd3ccb69f8567f56909075d3acf4a3b4dfcbdf85489492f27d8a04173e0010f59706356e4078cd10911945f87e2596de2b897672d1e55cb diff --git a/zvbi.spec b/zvbi.spec index 7f4f490..72e0d3d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,8 +2,8 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.43 -Release: 2%{?dist} +Version: 0.2.44 +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 @@ -166,6 +166,9 @@ make check %changelog +* Fri Mar 14 2025 Xavier Bachelot - 0.2.44-1 +- Update to 0.2.44 (RHBZ#2351225) + * Sun Jan 19 2025 Fedora Release Engineering - 0.2.43-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2cca179777fe49fcf521341dc751af8e3940436c Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Fri, 14 Mar 2025 10:06:56 +0100 Subject: [PATCH 13/14] Acknowledge for bin/sbin merge in F42+ --- zvbi.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zvbi.spec b/zvbi.spec index 72e0d3d..688d06e 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -143,7 +143,9 @@ make check %license COPYING.md %doc AUTHORS BUGS ChangeLog NEWS README.md TODO %{_bindir}/%{name}* +%if ! (0%{?fedora} >= 42) %{_sbindir}/zvbid +%endif %{_unitdir}/zvbid.service %{_libdir}/libzvbi.so.0* %{_libdir}/libzvbi-chains.so.0* @@ -168,6 +170,7 @@ make check %changelog * 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 From 535d6f46e153336a3f114b1edfb4c97dec9386ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:21:47 +0000 Subject: [PATCH 14/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 688d06e..55b88a0 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.44 -Release: 1%{?dist} +Release: 2%{?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 @@ -168,6 +168,9 @@ 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+