From 7664dcda6ed63b2012968d48228362d75fe9ba55 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <daten@mia.(none)>
Date: Sun, 31 Jan 2010 14:35:43 +0100
Subject: [PATCH 1/3] purge out patches which are not needed anymore as they
 went upstream

---
 cxxtools/patches/0001-fix-compile-error.patch | 24 -------------------
 zimlib/patches/001-fix-cxxtools-option.patch  | 15 ------------
 zimlib/patches/002-disable-tests.patch        | 13 ----------
 zimlib/patches/003-reduce-memory-usage.patch  | 13 ----------
 4 files changed, 65 deletions(-)
 delete mode 100644 cxxtools/patches/0001-fix-compile-error.patch
 delete mode 100644 zimlib/patches/001-fix-cxxtools-option.patch
 delete mode 100644 zimlib/patches/002-disable-tests.patch
 delete mode 100644 zimlib/patches/003-reduce-memory-usage.patch

diff --git a/cxxtools/patches/0001-fix-compile-error.patch b/cxxtools/patches/0001-fix-compile-error.patch
deleted file mode 100644
index 1b8601c..0000000
--- a/cxxtools/patches/0001-fix-compile-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/fileimpl.cpp b/src/fileimpl.cpp
-index 08edcb9..db8cb7f 100644
---- a/src/fileimpl.cpp
-+++ b/src/fileimpl.cpp
-@@ -35,6 +35,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include <string.h>
-+#include <cstdio>
- 
- namespace cxxtools {
- 
-diff --git a/src/http/messageheader.cpp b/src/http/messageheader.cpp
-index 9381be7..21ee7c3 100644
---- a/src/http/messageheader.cpp
-+++ b/src/http/messageheader.cpp
-@@ -30,6 +30,7 @@
- #include <cxxtools/clock.h>
- #include <cctype>
- #include <sstream>
-+#include <cstdio>
- 
- namespace cxxtools {
- 
diff --git a/zimlib/patches/001-fix-cxxtools-option.patch b/zimlib/patches/001-fix-cxxtools-option.patch
deleted file mode 100644
index 8760f2c..0000000
--- a/zimlib/patches/001-fix-cxxtools-option.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: configure.in
-===================================================================
---- a/configure.in	(revision 239)
-+++ b/configure.in	(working copy)
-@@ -26,9 +26,9 @@
- if test "$with_cxxtools" = "yes"
- then
-   AC_DEFINE(WITH_CXXTOOLS, [1], [defined if cxxtools is used])
-+  AC_CHECK_HEADER([cxxtools/condition.h], , AC_MSG_ERROR([cxxtools headers not found]))
- fi
- 
--AC_CHECK_HEADER([cxxtools/condition.h], , AC_MSG_ERROR([cxxtools headers not found]))
- AM_CONDITIONAL(WITH_CXXTOOLS, test "$with_cxxtools" = yes)
- 
- # output
diff --git a/zimlib/patches/002-disable-tests.patch b/zimlib/patches/002-disable-tests.patch
deleted file mode 100644
index f89f99c..0000000
--- a/zimlib/patches/002-disable-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Makefile.am
-===================================================================
---- a/Makefile.am	(revision 239)
-+++ b/Makefile.am	(working copy)
-@@ -1,8 +1,4 @@
- SUBDIRS = \
- 	src \
- 	include \
--	test \
- 	zimDump
--
--test: all
--	test/zimlib-test
diff --git a/zimlib/patches/003-reduce-memory-usage.patch b/zimlib/patches/003-reduce-memory-usage.patch
deleted file mode 100644
index e261efd..0000000
--- a/zimlib/patches/003-reduce-memory-usage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- zimlib.orig/src/fileimpl.cpp	2009-08-25 01:47:04.000000000 +0200
-+++ zimlib/src/fileimpl.cpp	2009-10-08 13:02:45.000000000 +0200
-@@ -43,8 +43,8 @@
-   //
-   FileImpl::FileImpl(const char* fname)
-     : zimFile(fname, std::ios::in | std::ios::binary),
--      direntCache(512),
--      clusterCache(16)
-+      direntCache(32),
-+      clusterCache(1)
-   {
-     if (!zimFile)
-       throw ZenoFileFormatError(std::string("can't open zim-file \"") + fname + '"');

From 0ae8a8bbf3e37f13c060385d67c043ff4bd8461a Mon Sep 17 00:00:00 2001
From: Mirko Vogt <daten@mia.(none)>
Date: Sun, 31 Jan 2010 14:36:30 +0100
Subject: [PATCH 2/3] add host-build dependency cxxtools/host

---
 tntnet/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tntnet/Makefile b/tntnet/Makefile
index c6ed4e5..d34652d 100644
--- a/tntnet/Makefile
+++ b/tntnet/Makefile
@@ -19,6 +19,8 @@ PKG_INSTALL:=1
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
+PKG_BUILD_DEPENDS:=cxxtools/host
+
 TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
 TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
 

From b1540c419855cde2661cbe4285f664432fdd2f2b Mon Sep 17 00:00:00 2001
From: Mirko Vogt <daten@mia.(none)>
Date: Sun, 31 Jan 2010 14:38:56 +0100
Subject: [PATCH 3/3] as now the underlying zimlib got upgraded, bump version
 of vido

---
 vido/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vido/Makefile b/vido/Makefile
index b038b0d..7917199 100644
--- a/vido/Makefile
+++ b/vido/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vido
-PKG_VERSION:=20091107
-PKG_REV:=046bb78668ceefb0cc7f1dc9df9fe22242d3e873
+PKG_VERSION:=20100124
+PKG_REV:=5d30ead071fc7f5f38e439824e97aa5d9ccea67a
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz