[depends] - add libzvbi

Memphiz · Dec 1, 2014 · eb4b65b · eb4b65b · Memphiz · Dec 2, 2014
1 parent ffad6b8
commit eb4b65b
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 0 deletions.
diff --git a/tools/depends/target/zvbi/01-zvbi-ssize_max.patch b/tools/depends/target/zvbi/01-zvbi-ssize_max.patch
@@ -0,0 +1,28 @@
+Linear memory extents over SSIZE_MAX are undefined, so there is no
+point in protecting against them.
+diff -ru zvbi.orig/src/export.c zvbi/src/export.c
+--- zvbi.orig/src/export.c	2011-11-06 11:22:47.000000000 +0200
++++ zvbi/src/export.c	2011-11-06 11:27:39.000000000 +0200
+@@ -1076,8 +1076,6 @@
+ 		size_t count;
+
+ 		count = src_size;
+-		if (unlikely (src_size > SSIZE_MAX))
+-			count = SSIZE_MAX & -4096;
+
+ 		for (retry = 10;; --retry) {
+ 			actual = write (e->_handle.fd, src, count);
+@@ -1632,12 +1630,7 @@
+ 			free (e->buffer.data);
+ 		}
+
+-		if (unlikely (e->buffer.offset > (size_t) SSIZE_MAX)) {
+-			errno = EOVERFLOW;
+-			actual = -1; /* failed */
+-		} else {
+-			actual = e->buffer.offset;
+-		}
++		actual = e->buffer.offset;
+ 	} else {
+ 		if (VBI_EXPORT_TARGET_ALLOC == e->target)
+ 			free (e->buffer.data);
diff --git a/tools/depends/target/zvbi/02-zvbi-ioctl.patch b/tools/depends/target/zvbi/02-zvbi-ioctl.patch
@@ -0,0 +1,19 @@
+diff -ru zvbi.orig/contrib/ntsc-cc.c zvbi/contrib/ntsc-cc.c
+--- zvbi.orig/contrib/ntsc-cc.c	2011-11-06 11:22:47.000000000 +0200
++++ zvbi/contrib/ntsc-cc.c	2011-11-06 11:29:04.000000000 +0200
+@@ -32,7 +32,6 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <locale.h>
+-#include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #ifdef HAVE_GETOPT_LONG
+@@ -44,6 +43,7 @@
+ #include "src/libzvbi.h"
+
+ #ifdef ENABLE_V4L2
++#  include <sys/ioctl.h>
+ #  include <asm/types.h>
+ #  include "src/videodev2k.h"
+ #endif
diff --git a/tools/depends/target/zvbi/03-zvbi-fix-clang-support.patch b/tools/depends/target/zvbi/03-zvbi-fix-clang-support.patch
@@ -0,0 +1,30 @@
+diff -ru zvbi/src/misc.h zvbi-fixed/src/misc.h
+--- zvbi/src/misc.h	2013-07-02 04:32:31.000000000 +0200
++++ zvbi-fixed/src/misc.h	2013-08-08 21:37:22.000000000 +0200
+@@ -52,17 +52,6 @@
+ #  define unlikely(expr) __builtin_expect(expr, 0)
+ #endif
+
+-#undef __i386__
+-#undef __i686__
+-/* FIXME #cpu is deprecated
+-#if #cpu (i386)
+-#  define __i386__ 1
+-#endif
+-#if #cpu (i686)
+-#  define __i686__ 1
+-#endif
+-*/
+-
+ /* &x == PARENT (&x.tm_min, struct tm, tm_min),
+    safer than &x == (struct tm *) &x.tm_min. A NULL _ptr is safe and
+    will return NULL, not -offsetof(_member). */
+@@ -156,8 +145,6 @@
+
+ #define likely(expr) (expr)
+ #define unlikely(expr) (expr)
+-#undef __i386__
+-#undef __i686__
+
+ static char *
+ PARENT_HELPER (char *p, unsigned int offset)
diff --git a/tools/depends/target/zvbi/Makefile b/tools/depends/target/zvbi/Makefile
@@ -0,0 +1,53 @@
+include ../../Makefile.include
+DEPS= ../../Makefile.include Makefile
+
+# lib name, version
+PACKAGENAME=zvbi
+LIBNAME=lib$(PACKAGENAME)
+VERSION=0.2.35
+SOURCE=$(PACKAGENAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.bz2
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX) --without-x --disable-dvb --disable-bktr \
+	--disable-nls --disable-proxy \
+	--without-doxygen
+
+LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).a
+
+CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
+
+all: $(LIBDYLIB) .installed-$(PLATFORM)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
+	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	cd $(PLATFORM); patch -p1 < ../01-zvbi-ssize_max.patch
+	cd $(PLATFORM); patch -p1 < ../02-zvbi-ioctl.patch
+ifeq ($(OS),osx)
+	cd $(PLATFORM); patch -p1 < ../03-zvbi-fix-clang-support.patch
+endif
+	cd $(PLATFORM); autoreconf -vif
+	cd $(PLATFORM); $(CONFIGURE)
+
+$(LIBDYLIB): $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)
+
+.installed-$(PLATFORM): $(LIBDYLIB)
+ifeq ($(OS),android)
+	rm -f $(PLATFORM)/src/.libs/libzvbi.la $(PLATFORM)/src/.libs/libzvbi.so $(PLATFORM)/src/.libs/libzvbi.so.0
+	mv -f $(PLATFORM)/src/.libs/libzvbi.so.0.0.0 $(PLATFORM)/src/.libs/libzvbi.so
+	$(RPL) -e "libzvbi.so.0" "libzvbi.so\x00\x00" $(PLATFORM)/src/.libs/libzvbi.so
+	-$(READELF) --dynamic $(PLATFORM)/src/.libs/libzvbi.so | grep ibrary
+endif
+	$(MAKE) -C $(PLATFORM) install
+	touch $@
+clean:
+	$(MAKE) -C $(PLATFORM) clean
+	rm -r .installed-$(PLATFORM)
+
+distclean::
+	rm -rf $(PLATFORM) .installed-$(PLATFORM)