Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting2.git;a=commitdiff;h=6872e70b3c18fe4dd5e73968d56faa0f2257574b
commit 6872e70b3c18fe4dd5e73968d56faa0f2257574b Author: Baste <[email protected]> Date: Wed Jun 27 11:13:22 2012 +0200 zvbi-0.2.33-3-x86_64 * Rebuild with png diff --git a/source/lib-extra/zvbi/FrugalBuild b/source/lib-extra/zvbi/FrugalBuild index 2d6f0a4..03d75be 100644 --- a/source/lib-extra/zvbi/FrugalBuild +++ b/source/lib-extra/zvbi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=zvbi pkgver=0.2.33 -pkgrel=2 +pkgrel=3 pkgdesc="Raw VBI, Teletext and Closed Caption decoding library" license="GPL" depends=('libpng>=1.4.1') @@ -13,6 +13,8 @@ _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="zapping" Finclude sourceforge url="http://zapping.sourceforge.net" - -sha1sums=('0e32cb71357dc629305dd15027bc76533fcb69a3') +source=($source libpng15.patch stat.patch) +sha1sums=('0e32cb71357dc629305dd15027bc76533fcb69a3' \ + 'e58d02538acb7a65cedae30d5106bbdf7c7dd787' \ + 'c03e3bb6a8e97bfdd69afaf8a4c7c5807c49e790') # optimization OK diff --git a/source/lib-extra/zvbi/libpng15.patch b/source/lib-extra/zvbi/libpng15.patch new file mode 100644 index 0000000..481e238 --- /dev/null +++ b/source/lib-extra/zvbi/libpng15.patch @@ -0,0 +1,18 @@ +diff -up zvbi-0.2.33/src/exp-gfx.c~ zvbi-0.2.33/src/exp-gfx.c +--- zvbi-0.2.33/src/exp-gfx.c~ 2008-02-24 15:17:47.000000000 +0100 ++++ zvbi-0.2.33/src/exp-gfx.c 2011-12-06 13:40:25.218139962 +0100 +@@ -1672,11 +1672,11 @@ write_png (gfx_instance * gfx, + char title[80]; + unsigned int i; + +- if (setjmp (png_ptr->jmpbuf)) ++ if (png_jmpbuf (png_ptr)) + return FALSE; + + png_set_write_fn (png_ptr, +- (voidp) gfx, ++ gfx, + write_data, + flush_data); + + diff --git a/source/lib-extra/zvbi/stat.patch b/source/lib-extra/zvbi/stat.patch new file mode 100644 index 0000000..21647aa --- /dev/null +++ b/source/lib-extra/zvbi/stat.patch @@ -0,0 +1,34 @@ +diff -Nrbu zvbi-0.2.33/contrib/ntsc-cc.c zvbi-0.2.33-OK/contrib/ntsc-cc.c +--- zvbi-0.2.33/contrib/ntsc-cc.c 2007-11-27 20:39:34.000000000 +0300 ++++ zvbi-0.2.33-OK/contrib/ntsc-cc.c 2010-02-21 17:57:17.000000000 +0300 +@@ -32,6 +32,7 @@ + #include <fcntl.h> + #include <errno.h> + #include <locale.h> ++#include <sys/stat.h> + #include <sys/ioctl.h> + #include <sys/types.h> + #include <sys/time.h> +diff -Nrbu zvbi-0.2.33/src/io-dvb.c zvbi-0.2.33-OK/src/io-dvb.c +--- zvbi-0.2.33/src/io-dvb.c 2008-02-24 17:18:21.000000000 +0300 ++++ zvbi-0.2.33-OK/src/io-dvb.c 2010-02-21 17:57:32.000000000 +0300 +@@ -27,6 +27,7 @@ + + #include <unistd.h> /* read() */ + #include <errno.h> ++#include <sys/stat.h> + #include <sys/select.h> + #include <sys/ioctl.h> + +diff -Nrbu zvbi-0.2.33/src/io-v4l.c zvbi-0.2.33-OK/src/io-v4l.c +--- zvbi-0.2.33/src/io-v4l.c 2008-02-24 17:17:28.000000000 +0300 ++++ zvbi-0.2.33-OK/src/io-v4l.c 2010-02-21 17:57:47.000000000 +0300 +@@ -40,6 +40,7 @@ + #include <errno.h> + #include <unistd.h> /* read(), dup2(), getuid() */ + #include <assert.h> ++#include <sys/stat.h> + #include <sys/time.h> /* timeval */ + #include <sys/types.h> /* fd_set, uid_t */ + #include <sys/ioctl.h> /* for (_)videodev.h */ + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
