powerel7
/
gui
2
0
Fork 0
Code Issues Pull Requests Releases Activity
Browse Source

zvbi package update 

Signed-off-by: guibuilder_pel7ppc64lebuilder0 <guibuilder@powerel.org>
master
guibuilder_pel7ppc64lebuilder0 4 years ago
parent
a2b18c9def
commit
3b004ad3cd
3 changed files with 426 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 128
      SOURCES/zvbi-0.2.24-tvfonts.patch
  2. 11
      SOURCES/zvbi-0.2.25-openfix.patch
  3. 287
      SPECS/zvbi.spec

128
SOURCES/zvbi-0.2.24-tvfonts.patch
Unescape View File

@ -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;
}
-
-

11
SOURCES/zvbi-0.2.25-openfix.patch
Unescape View File

@ -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;

287
SPECS/zvbi.spec
Unescape View File

@ -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 <<EOF
[Unit]
Description=Proxy Sharing V4L VBI Device Between Applications
After=syslog.target

[Service]
Type=forking
ExecStart=%{_sbindir}/zvbid

[Install]
WantedBy=multi-user.target

EOF


%build
# Note: We don't do --enable-static=no because static libs are needed to build
# x11font during compile time to convert zvbi fonts into x11 fonts. x11font
# is thrown away and not installed as it's not useful for anything else
%configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy
make %{?_smp_mflags}

# Generate fonts, fonts.alias and fonts.dir
pushd contrib
./x11font
for font in *.bdf
do
bdftopcf $font | gzip -9 -c > ${font%.bdf}.pcf.gz
done
mkfontdir -x .bdf .
cat >fonts.alias <<EOF
teletext -ets-teletext-medium-r-normal--*-200-75-75-c-120-iso10646-1
EOF
popd


%install
mkdir -p %{buildroot}%{fontdir}
make install DESTDIR=%{buildroot}

%find_lang %{name}

mkdir -p %{buildroot}%{_unitdir}
install -m644 zvbid.service %{buildroot}%{_unitdir}
rm -rf %{buildroot}%{_initrddir}

install -pm0644 contrib/*.pcf.gz %{buildroot}%{fontdir}
install -pm0644 contrib/fonts.* %{buildroot}%{fontdir}
touch %{buildroot}%{fontdir}/fonts.cache-1

mkdir -p %{buildroot}%{catalogue}
ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}


%post
%systemd_post zvbid.service


%preun
%systemd_preun zvbid.service


%postun
%systemd_postun_with_restart zvbid.service


%files -f %{name}.lang
%{_bindir}/%{name}*
%{_sbindir}/zvbid
%{_unitdir}/zvbid.service
%{_libdir}/*.so.*
%{_mandir}/man1/*
%exclude %{_libdir}/*.a
%exclude %{_libdir}/*.la
%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO


%files devel
%{_includedir}/libzvbi.h
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}-0.2.pc


%files fonts
%dir %{_datadir}/fonts/%{name}
%{fontdir}/*.gz
%{fontdir}/fonts.dir
%{fontdir}/fonts.alias
%{catalogue}/%{name}
%ghost %{fontdir}/fonts.cache-1


%changelog
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.2.35-8
- Remove obsolete scriptlets

* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

* Sun Feb 14 2016 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.35-1
- Update to 0.2.35

* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.33-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

* Mon Sep 24 2012 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.33-14
- new systemd-rpm macros (#850382)
- drop sysv triggerun migration

* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

* Tue Dec 06 2011 Hans de Goede <hdegoede@redhat.com> - 0.2.33-11
- Fix build with libpng-1.5

* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.2.33-10
- Rebuild for new libpng

* Fri Sep 23 2011 Tom Callaway <spot@fedoraproject.org> - 0.2.33-9
- add missing triggerun for systemd migration

* Tue Sep 6 2011 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.33-8
- Drop chkconfig stuff completely

* Wed Aug 17 2011 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.33-7
- Migration from SysV to Systemd init system (#730154)

* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

* Sun Feb 21 2010 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.33-5
- add patch to fix compiling under rawhide (#564991)
- make fonts subpackage arch independent

* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Wed Mar 25 2009 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.33-3
- Rebuilt for #491975

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Fri Nov 14 2008 Subhodip Biswas <subhodip@fedoraproject.org > - 0.2.33-1
- Package update .
* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.2.30-2
- Fix Patch0:/%%patch mismatch.

* Wed Mar 05 2008 Ian Chapman <packages[AT]amiga-hardware.com> 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 <rel-eng@fedoraproject.org> - 0.2.26-3
- Autorebuild for GCC 4.3

* Sun Jan 06 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.2.26-2
- Release bump

* Sun Jan 06 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.2.26-1
- Upgrade to 0.2.26

* Wed Aug 22 2007 Ian Chapman <packages[AT]amiga-hardware.com> 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 <packages[AT]amiga-hardware.com> 0.2.25-1
- Upgrade to 0.2.25

* Tue Mar 13 2007 Ian Chapman <packages[AT]amiga-hardware.com> 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 <packages[AT]amiga-hardware.com> 0.2.22-2
- Minor spec cleanups

* Tue Aug 29 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.2.22-1
- Initial release
Write Preview
Loading…
Cancel
Save