From b24ead1fc74d69ccb60f86bc59f6bfb59daa2511 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 17:58:55 +0200 Subject: [PATCH 01/11] bluez: update to bluez-5.13 --- packages/network/bluez/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index d8701128c4..583991d640 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="bluez" -PKG_VERSION="5.12" +PKG_VERSION="5.13" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 9c86958e5579127576d73c22b9b06c21f4178999 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 19:08:48 +0200 Subject: [PATCH 02/11] vdr: update to vdr-2.1.3 --- packages/3rdparty/multimedia/vdr/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr/package.mk b/packages/3rdparty/multimedia/vdr/package.mk index ebc8047b11..eaaf0f0487 100644 --- a/packages/3rdparty/multimedia/vdr/package.mk +++ b/packages/3rdparty/multimedia/vdr/package.mk @@ -18,7 +18,7 @@ ################################################################################ PKG_NAME="vdr" -PKG_VERSION="2.1.2" +PKG_VERSION="2.1.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From b3bcf749981253545397c83cec796b2cb4335bda Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 19:09:09 +0200 Subject: [PATCH 03/11] vdr-sc: fix build with vdr 2.1.3 --- .../vdr-sc/patches/vdr-sc-620-vdr-2.1.3.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-vdr-2.1.3.patch diff --git a/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-vdr-2.1.3.patch b/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-vdr-2.1.3.patch new file mode 100644 index 0000000000..0bfbb733bf --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-vdr-2.1.3.patch @@ -0,0 +1,31 @@ +diff --git a/device.c b/device.c +index 04bbef1..e6d63aa 100644 +--- a/device.c ++++ b/device.c +@@ -357,7 +357,7 @@ bool cScDevices::Initialize(void) + *vdr_nci=0; *vdr_ud=vdr_save_ud; + + int i, found=0; +- for(i=0; i0) PRINTF(L_GEN_INFO,"captured %d video device%s",found,found>1 ? "s" : ""); + else PRINTF(L_GEN_INFO,"no DVB device captured"); + return found>0; +@@ -411,7 +411,7 @@ void cScDevices::Shutdown(void) + + void cScDevices::SetForceBudget(int n) + { +- if(n>=0 && n=0 && n Date: Sat, 18 Jan 2014 19:09:29 +0200 Subject: [PATCH 04/11] vdr-epgsearch: update to vdr-epgsearch-29c174a --- packages/3rdparty/multimedia/vdr-epgsearch/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/package.mk b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk index af0743cb98..7086ca7e21 100644 --- a/packages/3rdparty/multimedia/vdr-epgsearch/package.mk +++ b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="vdr-epgsearch" -PKG_VERSION="e2de927" +PKG_VERSION="29c174a" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 251e14d8b5892c378d60fc035113a9a8e76ff15f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 19:09:46 +0200 Subject: [PATCH 05/11] vdr-plugin-dvbapi: update to vdr-plugin-dvbapi-4d9de95 --- packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk index eeb9916240..0a979ed313 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="vdr-plugin-dvbapi" -PKG_VERSION="2be5e15" +PKG_VERSION="4d9de95" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From da58d802f578f4f6352033a3d40421e3f06210a5 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 19:10:06 +0200 Subject: [PATCH 06/11] vdr-plugin-vnsiserver: update to vdr-plugin-vnsiserver-9021115 --- packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk index 282e946eb1..eb0437f2d3 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk +++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="vdr-plugin-vnsiserver" -PKG_VERSION="e2e6804" +PKG_VERSION="9021115" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From e4408fe2af27a6ff5aa4a3bba64fcdcb8156ca02 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 19:10:25 +0200 Subject: [PATCH 07/11] vdr-iptv: update to vdr-iptv-2.0.1 --- packages/3rdparty/multimedia/vdr-iptv/package.mk | 2 +- .../multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/3rdparty/multimedia/vdr-iptv/package.mk b/packages/3rdparty/multimedia/vdr-iptv/package.mk index 457a96825b..a1e2e14fa5 100644 --- a/packages/3rdparty/multimedia/vdr-iptv/package.mk +++ b/packages/3rdparty/multimedia/vdr-iptv/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="vdr-iptv" -PKG_VERSION="2.0.0" +PKG_VERSION="2.0.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch index 43517c085f..4c2fe8408b 100644 --- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch +++ b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 7f147b8..db294fc 100644 +index 74f8b09..db294fc 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,6 @@ @@ -16,7 +16,7 @@ index 7f147b8..db294fc 100644 ### 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 = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr)) -LIBDIR = $(call PKGCFG,libdir) -LOCDIR = $(call PKGCFG,locdir) -PLGCFG = $(call PKGCFG,plgcfg) From 366430a7ed28bb91eeaedb6244e612e04f095fc2 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 19:10:53 +0200 Subject: [PATCH 08/11] vdr-plugin-streamdev: update to vdr-plugin-streamdev-40704cd --- .../vdr-plugin-streamdev/package.mk | 2 +- ...ugin-streamdev-03_vdr-2.1.2-buildfix.patch | 25 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk index 0f31158f77..f6bdb6b3af 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk +++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="vdr-plugin-streamdev" -PKG_VERSION="a9c2adb" +PKG_VERSION="40704cd" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch b/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch deleted file mode 100644 index 99fba05523..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_vdr-2.1.2-buildfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 18f51127373375ce189be498a64cc286114f142f Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sat, 19 Oct 2013 21:40:14 +0300 -Subject: [PATCH] vdr 2.1.2 buildfix - ---- - server/connectionVTP.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/server/connectionVTP.c b/server/connectionVTP.c -index 55c92de..57bb64b 100644 ---- a/server/connectionVTP.c -+++ b/server/connectionVTP.c -@@ -1377,7 +1377,7 @@ bool cConnectionVTP::CmdSTAT(const char *Option) - if (*Option) { - if (strcasecmp(Option, "DISK") == 0) { - int FreeMB, UsedMB; -- int Percent = VideoDiskSpace(&FreeMB, &UsedMB); -+ int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB); - Reply(250, "%dMB %dMB %d%%", FreeMB + UsedMB, FreeMB, Percent); - } - else if (strcasecmp(Option, "NAME") == 0) { --- -1.7.2.5 - From 65542375c08ada03abc26b259d5d0f938883ac54 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 19:11:07 +0200 Subject: [PATCH 09/11] vdr-addon: bump (4.1.2) --- .../addons/service/multimedia/vdr-addon/changelog.txt | 8 ++++++++ packages/addons/service/multimedia/vdr-addon/package.mk | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index 6e21f13662..7a5a72c52d 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,3 +1,11 @@ +4.1.2 +- update to vdr-2.1.3 +- update to vdr-iptv-2.0.1 +- update to vdr-plugin-dvbapi-4d9de95 +- update to vdr-plugin-streamdev-40704cd +- update to vdr-plugin-vnsiserver-9021115 +- update to vdr-epgsearch-29c174a + 4.1.1 - rebuild to fix curl/gnutls/ssl diff --git a/packages/addons/service/multimedia/vdr-addon/package.mk b/packages/addons/service/multimedia/vdr-addon/package.mk index 5e91babd9c..78475dae1d 100644 --- a/packages/addons/service/multimedia/vdr-addon/package.mk +++ b/packages/addons/service/multimedia/vdr-addon/package.mk @@ -19,7 +19,7 @@ PKG_NAME="vdr-addon" PKG_VERSION="4.1" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" From b0deb572bf7a4861fae2c9ee1d85549d576a8824 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 19:22:31 +0200 Subject: [PATCH 10/11] service.openelec.settings: update to 0.3.10 --- packages/mediacenter/service.openelec.settings/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/service.openelec.settings/package.mk b/packages/mediacenter/service.openelec.settings/package.mk index b2fbcdb634..3ab6faa071 100644 --- a/packages/mediacenter/service.openelec.settings/package.mk +++ b/packages/mediacenter/service.openelec.settings/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="service.openelec.settings" -PKG_VERSION="0.3.9" +PKG_VERSION="0.3.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="prop." From 649a95ac4d53bd693c69dbe100e4b05f3040aea7 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 18 Jan 2014 21:47:22 +0200 Subject: [PATCH 11/11] tntnet:host: build depend on zlib:host --- packages/3rdparty/web/tntnet/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/web/tntnet/package.mk b/packages/3rdparty/web/tntnet/package.mk index 73daf9aafa..f51135dd15 100644 --- a/packages/3rdparty/web/tntnet/package.mk +++ b/packages/3rdparty/web/tntnet/package.mk @@ -25,7 +25,7 @@ PKG_SITE="http://www.tntnet.org/" PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="" PKG_DEPENDS_TARGET="libtool cxxtools" -PKG_BUILD_DEPENDS_HOST="toolchain cxxtools:host" +PKG_BUILD_DEPENDS_HOST="toolchain cxxtools:host zlib:host" PKG_BUILD_DEPENDS_TARGET="toolchain tntnet:host libtool cxxtools" PKG_PRIORITY="optional" PKG_SECTION="python/web"