Merge pull request #3236 from CvH/9.0/addon-ups

several addons updated

packages/addons/addon-depends/mpd-mpc/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpd-mpc"
-PKG_VERSION="0.30"
-PKG_SHA256="65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce"
+PKG_VERSION="0.31"
+PKG_SHA256="62373e83a8a165b2ed43967975efecd3feee530f4557d6b861dd08aa89d52b2d"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz"

packages/addons/service/dispmanx_vnc/changelog.txt

@@ -1,3 +1,6 @@
+106
+- Fix versioning
+
 105
 - Update to 5bde54b
 

packages/addons/service/dispmanx_vnc/package.mk

@@ -4,7 +4,8 @@
 PKG_NAME="dispmanx_vnc"
 PKG_VERSION="5bde54b5a43a2e6f65994f3b9c665db90c45923f"
 PKG_SHA256="1f096cd70d86620596db947757486064fe37dc2766ad33530318c35b279472aa"
-PKG_REV="105"
+PKG_VERSION_DATE="2018-08-18"
+PKG_REV="106"
 PKG_ARCH="arm"
 PKG_ADDON_PROJECTS="RPi"
 PKG_LICENSE="OSS"
@@ -13,7 +14,7 @@ PKG_URL="https://github.com/patrikolausson/dispmanx_vnc/archive/$PKG_VERSION.tar
 PKG_DEPENDS_TARGET="toolchain libvncserver bcm2835-bootloader bcm2835-driver libconfig openssl"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Raspberry Pi VNC: a Virtual Network Computing server for Raspberry Pi"
-PKG_LONGDESC="Raspberry Pi VNC ($PKG_VERSION) is a Virtual Network Computing (VNC) server for Raspberry Pi using dispmanx"
+PKG_LONGDESC="Raspberry Pi VNC ($PKG_VERSION_DATE) is a Virtual Network Computing (VNC) server for Raspberry Pi using dispmanx"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Raspberry Pi VNC"
@@ -25,7 +26,7 @@ pre_make_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  :
 }
 
 addon() {

packages/addons/service/hyperion/changelog.txt

@@ -1,3 +1,6 @@
+109
+- Update to version 2018-12-20
+
 108
 - Update to version 1d125d8
   * Kodi 18 fix merged

packages/addons/service/hyperion/package.mk

@@ -3,9 +3,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="hyperion"
-PKG_VERSION="1d125d8df863ad176002f591d72dbba79ce9be63"
-PKG_SHA256="1f3bcd1422dffb7c4398b1c22c63f78151c52c9a44505d1a4ba31278290fd47c"
-PKG_REV="108"
+PKG_VERSION="22f7be8df010fe8f0a51e3677fe0c8e709042622"
+PKG_SHA256="51cb6c5694d4bad67255ac4ae61a3c0aa481395c4868fb044a3ee19ca35bf19d"
+PKG_VERSION_DATE="2018-12-20"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hyperion-project/hyperion"
@@ -13,7 +14,7 @@ PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.g
 PKG_DEPENDS_TARGET="toolchain Python2 libusb qtbase protobuf rpi_ws281x"
 PKG_SECTION="service"
 PKG_SHORTDESC="Hyperion: an AmbiLight controller"
-PKG_LONGDESC="Hyperion($PKG_VERSION) is an modern opensource AmbiLight implementation."
+PKG_LONGDESC="Hyperion($PKG_VERSION_DATE) is an modern opensource AmbiLight implementation."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Hyperion"

packages/addons/service/lcdd/changelog.txt

@@ -1,22 +1,25 @@
-106:
+107
+- Update to 0.5dev+2018-11-04
+
+106
 - Build with -O3 to avoid undefined symbols
 
-105:
+105
 - Rebuild after glibc bump
 
-104:
+104
 - Update to 466edd3
 
-103:
+103
 - Update to 0.5.8
 
-102:
+102
 - Update to c05a7de
 - Reintroduce dm140 driver
 - Build with libugpio
 
-101:
+101
 - Update to upstream 1554506
 
-100:
+100
 - Initial addon

packages/addons/service/lcdd/package.mk

@@ -2,9 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="lcdd"
-PKG_VERSION="466edd3"
-PKG_SHA256="786aab192a788fd09119645d60576ba258eec3de1a455aaa6d9ddea5e30e1749"
-PKG_REV="106"
+PKG_VERSION="e08546c13a4157ed98cd4a8e9086e7acd66f93c0"
+PKG_SHA256="23d0fd14e16767d4907d724404b96216c0c7338c6206760e53cf6a7662dd3af2"
+PKG_VERSION_DATE="0.5dev+2018-11-04"
+PKG_REV="107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://lcdproc.org/"

packages/addons/service/mpd/changelog.txt

@@ -1,22 +1,25 @@
+107
+- Update to version 0.21.4
+
 106
-- updated mpd to 0.20.21
+- Update to version 0.20.21
 
 105
-- updated mpd to 0.20.19
-- added mpd cli client mpc
+- Update to version 0.20.19
+- Added mpd cli client mpc
 
 104
-- update mpd to 0.20.13
-- build with more features
+- Update to version 0.20.13
+- Build with more features
 
 103
-- update mpd to 0.20.9
+- Update to version 0.20.9
 
 102
-- update mpd to 0.20.3
+- Update to version 0.20.3
 
 101
-- rebuild for libogg
+- Rebuild for libogg
 
 100
-- initial LibreELEC version
+- Initial LibreELEC version

packages/addons/service/mpd/package.mk

@@ -3,9 +3,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpd"
-PKG_VERSION="0.20.21"
-PKG_SHA256="8322764dc265c20f05c8c8fdfdd578b0722e74626bef56fcd8eebfb01acc58dc"
-PKG_REV="106"
+PKG_VERSION="0.21.4"
+PKG_SHA256="247112eabf1b818a4052db7f0f5917ab00831ebc60a1ec3bf1154da4dc16a5c7"
+PKG_REV="107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"
@@ -96,7 +96,7 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/.$TARGET_NAME/src/mpd $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/.$TARGET_NAME/mpd $ADDON_BUILD/$PKG_ADDON_ID/bin
   # copy mpd cli binary
   cp -P $(get_build_dir mpd-mpc)/.$TARGET_NAME/mpc $ADDON_BUILD/$PKG_ADDON_ID/bin
 

packages/addons/service/oscam/changelog.txt

@@ -1,21 +1,24 @@
+107
+- Update to version 11487
+
 106
-- update OScam to 11431
+- Update to version 11431
 
 105
-- update OScam to 11420
+- Update to version 11420
 - add SSL support
 
 104
-- update OSCam to 11391
+- Update to version 11391
 
 103
-- update OSCam to 11350
+- Update to version 11350
 
 102
 - fix the delayed start workaround
 
 101
-- update OSCam to 11233
+- Update to version 11233
 - fix the WeTek_Play problems
 
 100

packages/addons/service/oscam/package.mk

@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="oscam"
-PKG_VERSION="57496438f69e92ad0b7b7797a05e34f0e512ac07"
-PKG_SHA256="544df425690c8c7157fb9f0e69f497fec67bc3641247d9a45f0eb20c1c1d705b"
-PKG_VERSION_NUMBER="11431"
-PKG_REV="106"
+PKG_VERSION="695307bc8931a52ccf48927cdc197c0207ff6d66"
+PKG_SHA256="b3171a7558f235842dcc8820710f311d6a344f642e0b90b0d53d5a82451b87d4"
+PKG_VERSION_NUMBER="11487"
+PKG_REV="107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"

packages/addons/service/oscam/patches/oscam-01-revision.patch

@@ -1,11 +1,11 @@
 --- a/config.sh
 +++ b/config.sh
-@@ -689,7 +689,7 @@ do
+@@ -698,7 +698,7 @@ do
  		break
  	;;
  	'-r'|'--oscam-revision')
 -		revision=`(svnversion -n . 2>/dev/null || printf 0) | sed 's/.*://; s/[^0-9]*$//; s/^$/0/'`
 +		echo "$OSCAM_ADDON_VERSION"
- 		if [ "$revision" = "0" ] 
+ 		if [ "$revision" = "0" ]
  		then
- 			which git > /dev/null 2>&1 && revision=`git log -1 --pretty=%B | grep git-svn-id | sed -n -e 's/^.*trunk@\([0-9]*\) .*$/\1/p'`
+ 			which git > /dev/null 2>&1 && revision=`git log -10 --pretty=%B | grep git-svn-id | head -n 1 | sed -n -e 's/^.*trunk@\([0-9]*\) .*$/\1/p'`

packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch

@@ -1,18 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3ebd781..2966e65 100644
+index 6d28847f..1b7ecc5e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -474,7 +474,7 @@ add_library (${csoscam} STATIC ${csoscam_srcs} ${csoscam_hdrs})
+@@ -498,7 +498,7 @@ add_library (${csoscam} STATIC ${csoscam_srcs} ${csoscam_hdrs})
  
  set (exe_name "oscam")
  add_executable (${exe_name} ${exe_srcs} ${exe_hdrs})
 -target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt minilzo)
 +target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt minilzo udev)
  if(HAVE_LIBRT AND HAVE_LIBUSB)
-    if (LIBUSBDIR)
- 	set (libusb_link "imp_libusb")
+ 	if (LIBUSBDIR)
+ 		set (libusb_link "imp_libusb")
 diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
-index 6790913..a603d3e 100644
+index 6790913e..a603d3ee 100644
 --- a/utils/CMakeLists.txt
 +++ b/utils/CMakeLists.txt
 @@ -12,7 +12,7 @@ file (GLOB all_srcs ${exe_srcs})
@@ -24,5 +24,3 @@ index 6790913..a603d3e 100644
  #----------------------- printout resume -----------------------------
  
  message (STATUS "Utils: operating system: ${OSCamOperatingSystem}")
--- 
-1.7.2.5

packages/addons/service/oscam/patches/oscam-03-pcsc-pthread.patch

@@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd52430..b01b9fc 100644
+index 1b7ecc5e..ddef8576 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -530,6 +530,7 @@ if (HAVE_PCSC)
+@@ -561,6 +561,7 @@ if (HAVE_PCSC)
  if (NOT OSCamOperatingSystem MATCHES "Mac OS X")
  if (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin")
-     target_link_libraries (${exe_name} pcsclite)
-+    target_link_libraries (${exe_name} pthread)
+ 	target_link_libraries (${exe_name} pcsclite)
++	target_link_libraries (${exe_name} pthread)
  endif (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin")
  endif (NOT OSCamOperatingSystem MATCHES "Mac OS X")
  endif (HAVE_PCSC)