[SCM] kodi/master: Use external kazlib

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 48ec1e43a9a9ec907f883266f44abcd28c695e2e
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Mar 20 01:04:12 2015 +0100

    Use external kazlib

diff --git a/debian/control b/debian/control
index 369130c..5489f1c 100644
--- a/debian/control
+++ b/debian/control
@@ -105,6 +105,7 @@ Build-Depends: debhelper (>= 9~),
  libdvdnav-dev,
  libdvdread-dev,
  libhdhomerun-dev,
+ libkaz-dev,
  fontforge,
  fonts-dejavu-core,
  fonts-droid,
diff --git a/debian/copyright b/debian/copyright
index 5c67f2e..be971d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,6 +25,7 @@ Files-Excluded: lib/afpfs-ng
  lib/libdvd/libdvdread/msvc
  lib/libhdhomerun
  lib/libhts/Win32
+ lib/cpluff/kazlib
  lib/liblame
  lib/libmad
  lib/libmicrohttpd
@@ -233,10 +234,6 @@ License: public-domain
  These examples are free software; Johannes Lehtinen gives unlimited
  permission to copy, distribute and modify them.
 
-Files: lib/cpluff/kazlib/*
-Copyright: 1997, Kaz Kylheku <kaz at ashi.footprints.net>
-License: UNKNOWN
-
 Files: lib/cximage-6.0/CxImage/*
 Copyright: 1995-2008, Davide Pizzolato
 License: Zlib
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 5258770..5acd859 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -154,3 +154,106 @@ Forwarded: not-needed
   #include "dvdnav/dvdnav_internal.h"
   #include "dvdnav/vm.h"
   #include "dvdnav/dvd_types.h"
+--- a/lib/cpluff/libcpluff/Makefile.am
++++ b/lib/cpluff/libcpluff/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ SUBDIRS = docsrc
+ 
+-LIBS = @LIBS_LIBCPLUFF@ @LTLIBINTL@ @LIBS@
++LIBS = @LIBS_LIBCPLUFF@ @LTLIBINTL@ @LIBS@ -lkaz
+ 
+ CPPFLAGS = @CPPFLAGS@
+ CPPFLAGS += -I. -DCP_C_API=CP_EXPORT -DCP_HOST="\"$(host)\"" -DCP_DATADIR="\"$(datadir)\""
+@@ -16,7 +16,7 @@
+ DOXYGEN_STYLE = $(top_srcdir)/docsrc/doxygen.footer $(top_srcdir)/docsrc/doxygen.css
+ 
+ lib_LTLIBRARIES = libcpluff.la
+-libcpluff_la_SOURCES = psymbol.c pscan.c ploader.c pinfo.c pcontrol.c serial.c logging.c context.c cpluff.c util.c ../kazlib/list.c ../kazlib/list.h ../kazlib/hash.c ../kazlib/hash.h internal.h thread.h util.h defines.h
++libcpluff_la_SOURCES = psymbol.c pscan.c ploader.c pinfo.c pcontrol.c serial.c logging.c context.c cpluff.c util.c  internal.h thread.h util.h defines.h
+ if POSIX_THREADS
+ libcpluff_la_SOURCES += thread_posix.c
+ endif
+--- a/lib/cpluff/libcpluff/context.c
++++ b/lib/cpluff/libcpluff/context.c
+@@ -30,7 +30,7 @@
+ #include <assert.h>
+ #include <stdarg.h>
+ #include <string.h>
+-#include "../kazlib/list.h"
++#include <kazlib/list.h>
+ #include "cpluff.h"
+ #include "util.h"
+ #ifdef CP_THREADS
+--- a/lib/cpluff/libcpluff/internal.h
++++ b/lib/cpluff/libcpluff/internal.h
+@@ -40,8 +40,8 @@
+ #elif defined(DLOPEN_LIBTOOL)
+ #include <ltdl.h>
+ #endif
+-#include "../kazlib/list.h"
+-#include "../kazlib/hash.h"
++#include <kazlib/list.h>
++#include <kazlib/hash.h>
+ #include "cpluff.h"
+ #ifdef CP_THREADS
+ #include "thread.h"
+--- a/lib/cpluff/libcpluff/pcontrol.c
++++ b/lib/cpluff/libcpluff/pcontrol.c
+@@ -34,8 +34,8 @@
+ #include <assert.h>
+ #include <string.h>
+ #include <stddef.h>
+-#include "../kazlib/list.h"
+-#include "../kazlib/hash.h"
++#include <kazlib/list.h>
++#include <kazlib/hash.h>
+ #include "cpluff.h"
+ #include "defines.h"
+ #include "util.h"
+--- a/lib/cpluff/libcpluff/pinfo.c
++++ b/lib/cpluff/libcpluff/pinfo.c
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <assert.h>
+-#include "../kazlib/hash.h"
++#include <kazlib/hash.h>
+ #include "cpluff.h"
+ #include "defines.h"
+ #include "util.h"
+--- a/lib/cpluff/libcpluff/psymbol.c
++++ b/lib/cpluff/libcpluff/psymbol.c
+@@ -28,7 +28,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
+-#include "../kazlib/hash.h"
++#include <kazlib/hash.h>
+ #include "cpluff.h"
+ #include "defines.h"
+ #include "internal.h"
+--- a/lib/cpluff/libcpluff/util.c
++++ b/lib/cpluff/libcpluff/util.c
+@@ -30,7 +30,7 @@
+ #include <string.h>
+ #include <limits.h>
+ #include <assert.h>
+-#include "../kazlib/list.h"
++#include <kazlib/list.h>
+ #include "cpluff.h"
+ #include "defines.h"
+ #include "util.h"
+--- a/lib/cpluff/libcpluff/util.h
++++ b/lib/cpluff/libcpluff/util.h
+@@ -28,8 +28,8 @@
+ #ifndef UTIL_H_
+ #define UTIL_H_
+ 
+-#include "../kazlib/list.h"
+-#include "../kazlib/hash.h"
++#include <kazlib/list.h>
++#include <kazlib/hash.h>
+ #include "cpluff.h"
+ #include "defines.h"
+ 

-- 
kodi packaging