[SCM] xbmc-pvr-addons/master: Refresh patches
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Fri May 23 19:13:28 UTC 2014
The following commit has been merged in the master branch:
commit bc8373970791f270429f34adb8ea8b2567886a97
Author: Balint Reczey <balint at balintreczey.hu>
Date: Thu May 22 12:39:34 2014 +0200
Refresh patches
diff --git a/debian/README.src b/debian/README.src
index 9c7b5ef..423c969 100644
--- a/debian/README.src
+++ b/debian/README.src
@@ -1,2 +1,8 @@
-Please remove xmlParser.* from upstream tarballs before packaging since their
-license is considered to be non-free.
+The following paths are removed from DFSG-free source:
+lib/jsoncpp
+lib/tinyxml/readme.txt
+lib/tinyxml/tiny*
+lib/tinyxml2
+xbmc/*.h
+xbmc/NOTE
+xbmc/xbmc_stream_utils.hpp
diff --git a/debian/patches/01_use-system-libs.patch b/debian/patches/01_use-system-libs.patch
index 75b648a..bf56eab 100644
--- a/debian/patches/01_use-system-libs.patch
+++ b/debian/patches/01_use-system-libs.patch
@@ -8,13 +8,13 @@ Forwarded: not-needed
LIBNAME = libargustv-addon
lib_LTLIBRARIES = libargustv-addon.la
--LIBS = @abs_top_builddir@/lib/jsoncpp/libjsoncpp.la
-+# LIBS = @abs_top_builddir@/lib/jsoncpp/libjsoncpp.la
+-LIBS = @abs_top_srcdir@/lib/jsoncpp/libjsoncpp.la
++# LIBS = @abs_top_srcdir@/lib/jsoncpp/libjsoncpp.la
include ../Makefile.include.am
--INCLUDES+=-I$(srcdir)/src -I$(srcdir)/src/lib/filesystem -I at abs_top_srcdir@/lib/jsoncpp/include
-+INCLUDES+=-I$(srcdir)/src -I$(srcdir)/src/lib/filesystem -I/usr/include/jsoncpp
+-INCLUDES+=-Isrc -Isrc/lib/filesystem -I at abs_top_srcdir@/lib/jsoncpp/include
++INCLUDES+=-Isrc -Isrc/lib/filesystem -I/usr/include/jsoncpp
libargustv_addon_la_SOURCES = src/activerecording.cpp \
src/channel.cpp \
@@ -31,8 +31,8 @@ Forwarded: not-needed
LIBNAME = libpvrdemo-addon
lib_LTLIBRARIES = libpvrdemo-addon.la
--LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
-+LIBS = @abs_top_builddir@/lib/tinyxml/libxbmcxmlutils.la
+-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS = @abs_top_srcdir@/lib/tinyxml/libxbmcxmlutils.la
include ../Makefile.include.am
@@ -42,8 +42,8 @@ Forwarded: not-needed
LIBNAME = libmediaportal-addon
lib_LTLIBRARIES = libmediaportal-addon.la
--LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
-+LIBS = @abs_top_builddir@/lib/tinyxml/libxbmcxmlutils.la
+-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS = @abs_top_srcdir@/lib/tinyxml/libxbmcxmlutils.la
include ../Makefile.include.am
@@ -53,8 +53,8 @@ Forwarded: not-needed
LIBNAME = libnextpvr-addon
lib_LTLIBRARIES = libnextpvr-addon.la
--LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
-+LIBS = @abs_top_builddir@/lib/tinyxml/libxbmcxmlutils.la
+-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS = @abs_top_srcdir@/lib/tinyxml/libxbmcxmlutils.la
include ../Makefile.include.am
@@ -64,8 +64,8 @@ Forwarded: not-needed
LIBNAME = libpvrnjoy-addon
lib_LTLIBRARIES = libpvrnjoy-addon.la
--LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
-+LIBS = @abs_top_builddir@/lib/tinyxml/libxbmcxmlutils.la
+-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS = @abs_top_srcdir@/lib/tinyxml/libxbmcxmlutils.la
include ../Makefile.include.am
@@ -75,14 +75,14 @@ Forwarded: not-needed
LIBNAME = libvuplus-addon
lib_LTLIBRARIES = libvuplus-addon.la
--LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
-+LIBS = @abs_top_builddir@/lib/tinyxml/libxbmcxmlutils.la
+-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS = @abs_top_srcdir@/lib/tinyxml/libxbmcxmlutils.la
include ../Makefile.include.am
--- a/configure.ac
+++ b/configure.ac
-@@ -264,7 +264,6 @@
+@@ -265,13 +265,11 @@
AC_CONFIG_FILES([Makefile \
lib/Makefile \
@@ -90,14 +90,20 @@ Forwarded: not-needed
lib/libhts/Makefile \
lib/tinyxml/Makefile \
lib/cmyth/Makefile \
+ lib/cmyth/libcmyth/Makefile \
+ lib/cmyth/librefmem/Makefile \
+- lib/tinyxml2/Makefile \
+ lib/libdvblinkremote/Makefile \
+ addons/Makefile \
+ addons/pvr.demo/Makefile \
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,7 +2,7 @@
ADDITIONAL_SUBDIRS = cmyth
endif
--SUBDIRS = libhts tinyxml jsoncpp $(ADDITIONAL_SUBDIRS)
-+SUBDIRS = libhts tinyxml $(ADDITIONAL_SUBDIRS)
+-SUBDIRS = libhts tinyxml tinyxml2 jsoncpp libdvblinkremote $(ADDITIONAL_SUBDIRS)
++SUBDIRS = libhts tinyxml libdvblinkremote $(ADDITIONAL_SUBDIRS)
zip:
@@ -146,7 +152,7 @@ Forwarded: not-needed
using namespace std;
--- a/addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp
+++ b/addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
#include "md5.h"
@@ -177,3 +183,83 @@ Forwarded: not-needed
#define CHANNELDATAVERSION 2
+--- a/lib/libdvblinkremote/util.h
++++ b/lib/libdvblinkremote/util.h
+@@ -27,7 +27,7 @@
+ #include <sstream>
+ #include <iostream>
+ #include <cstdio>
+-#include "tinyxml2/tinyxml2.h"
++#include "tinyxml2.h"
+
+ namespace dvblinkremote {
+ class Util {
+@@ -53,4 +53,4 @@
+ template <class T> static bool from_string(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&));
+ template <class T> static bool to_string(const T& t, std::string& s);
+ };
+-}
+\ No newline at end of file
++}
+--- a/lib/libdvblinkremote/xml_object_serializer.h
++++ b/lib/libdvblinkremote/xml_object_serializer.h
+@@ -30,7 +30,7 @@
+ #include "request.h"
+ #include "response.h"
+ #include "util.h"
+-#include "tinyxml2/tinyxml2.h"
++#include "tinyxml2.h"
+
+ using namespace dvblinkremote;
+
+--- a/lib/libdvblinkremote/Makefile.am
++++ b/lib/libdvblinkremote/Makefile.am
+@@ -26,10 +26,12 @@
+ util.cpp \
+ xml_object_serializer_factory.cpp
+
+-LIBS= @abs_top_srcdir@/lib/tinyxml2/libtinyxml2.la
++# LIBS= @abs_top_srcdir@/lib/tinyxml2/libtinyxml2.la
+
++libdvblinkremote_la_LDFLAGS = -ltinyxml2
++
+ INCLUDES=-I..
+
+ $(LIB): libdvblinkremote.la
+ cp -f .libs/libdvblinkremote.a .
+- cp -f .libs/libdvblinkremote.la $(LIB)
+\ No newline at end of file
++ cp -f .libs/libdvblinkremote.la $(LIB)
+--- a/addons/pvr.dvbviewer/src/DvbData.cpp
++++ b/addons/pvr.dvbviewer/src/DvbData.cpp
+@@ -1,7 +1,7 @@
+ #include "DvbData.h"
+ #include "client.h"
+ #include "platform/util/util.h"
+-#include "tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ #include "tinyxml/XMLUtils.h"
+ #include <inttypes.h>
+ #include <set>
+--- a/addons/pvr.dvbviewer/Makefile.am
++++ b/addons/pvr.dvbviewer/Makefile.am
+@@ -10,7 +10,7 @@
+ LIBNAME = libdvbviewer-addon
+ lib_LTLIBRARIES = libdvbviewer-addon.la
+
+-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS = @abs_top_srcdir@/lib/tinyxml/libxbmcxmlutils.la
+
+ include ../Makefile.include.am
+
+--- a/addons/pvr.wmc/Makefile.am
++++ b/addons/pvr.wmc/Makefile.am
+@@ -10,7 +10,7 @@
+ LIBNAME = libpvrwmc-addon
+ lib_LTLIBRARIES = libpvrwmc-addon.la
+
+-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS = @abs_top_srcdir@/lib/tinyxml/libxbmcxmlutils.la
+
+ include ../Makefile.include.am
+
diff --git a/debian/patches/02_use_global_cflags.patch b/debian/patches/02_use_global_cflags.patch
deleted file mode 100644
index 7db726c..0000000
--- a/debian/patches/02_use_global_cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-+++ b/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-@@ -16,7 +16,7 @@
- ### The directory environment:
-
- # Use package data if installed...otherwise assume we're under the VDR source directory:
--PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-+PKGCFG = $(shell pkg-config --variable=$(1) vdr)
- LIBDIR ?= $(call PKGCFG,libdir)
- LOCDIR = $(call PKGCFG,locdir)
- PLGCFG = $(call PKGCFG,plgcfg)
-@@ -25,8 +25,8 @@
-
- ### The compiler options:
-
--export CFLAGS = $(call PKGCFG,cflags)
--export CXXFLAGS = $(call PKGCFG,cxxflags)
-+export CFLAGS += $(call PKGCFG,cflags)
-+export CXXFLAGS += $(call PKGCFG,cxxflags)
-
- ### The version number of VDR's plugin API:
-
-@@ -48,7 +48,7 @@
- endif
-
- ifndef NOCONFIG
--CXXFLAGS = $(call PKGCFG,cflags)
-+CXXFLAGS += $(call PKGCFG,cflags)
- CXXFLAGS += -fPIC
- else
- -include $(VDRSRC)/Make.global
diff --git a/debian/patches/03_disable_dvbviewer.patch b/debian/patches/03_disable_dvbviewer.patch
deleted file mode 100644
index 690d8e4..0000000
--- a/debian/patches/03_disable_dvbviewer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/addons/Makefile.am
-+++ b/addons/Makefile.am
-@@ -6,7 +6,6 @@
- endif
-
- SUBDIRS = pvr.demo \
-- pvr.dvbviewer \
- pvr.hts \
- pvr.mediaportal.tvserver \
- pvr.nextpvr \
diff --git a/debian/patches/series b/debian/patches/series
index a21e6b0..147600e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
01_use-system-libs.patch
-02_use_global_cflags.patch
-03_disable_dvbviewer.patch
diff --git a/debian/rules b/debian/rules
index 82cab85..c89813c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,6 @@ override_dh_clean:
\) -exec rm -f "{}" \;
override_dh_auto_configure:
- rm lib/tinyxml/tiny*
- rm -rf xbmc
./bootstrap
./configure --prefix=/usr --enable-addons-with-dependencies --enable-release
--
xbmc-pvr-addons packaging
More information about the pkg-multimedia-commits
mailing list