From bc2bfc68d0c819c57ba418458daf684ecba9a158 Mon Sep 17 00:00:00 2001 From: CvH Date: Thu, 24 Jan 2019 22:27:25 +0100 Subject: [PATCH] oscam: update to 695307b --- packages/addons/service/oscam/changelog.txt | 13 ++++++++----- packages/addons/service/oscam/package.mk | 8 ++++---- .../service/oscam/patches/oscam-01-revision.patch | 6 +++--- .../oscam/patches/oscam-02-link-with-ludev.patch | 12 +++++------- .../oscam/patches/oscam-03-pcsc-pthread.patch | 8 ++++---- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/packages/addons/service/oscam/changelog.txt b/packages/addons/service/oscam/changelog.txt index 4463afd2dd..19a90e321c 100644 --- a/packages/addons/service/oscam/changelog.txt +++ b/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 diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk index e9c986178b..5df8de451a 100644 --- a/packages/addons/service/oscam/package.mk +++ b/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" diff --git a/packages/addons/service/oscam/patches/oscam-01-revision.patch b/packages/addons/service/oscam/patches/oscam-01-revision.patch index 73f8aca6f4..43aeb9ca11 100644 --- a/packages/addons/service/oscam/patches/oscam-01-revision.patch +++ b/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'` diff --git a/packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch b/packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch index ff16f494da..7fade2ed5e 100644 --- a/packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch +++ b/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 diff --git a/packages/addons/service/oscam/patches/oscam-03-pcsc-pthread.patch b/packages/addons/service/oscam/patches/oscam-03-pcsc-pthread.patch index 4eeee55111..e42fa170b9 100644 --- a/packages/addons/service/oscam/patches/oscam-03-pcsc-pthread.patch +++ b/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)