From 0409ff821f5dd8b45cab91177995c3d8f52b5b63 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 22 May 2021 12:15:44 +0200 Subject: [PATCH] oscam: update to 11693 --- packages/addons/service/oscam/changelog.txt | 3 +++ packages/addons/service/oscam/package.mk | 8 ++++---- .../addons/service/oscam/patches/oscam-01-revision.patch | 2 +- .../service/oscam/patches/oscam-02-link-with-ludev.patch | 6 +----- .../service/oscam/patches/oscam-03-pcsc-pthread.patch | 2 -- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/addons/service/oscam/changelog.txt b/packages/addons/service/oscam/changelog.txt index 3acad8349d..3a6a7a1f70 100644 --- a/packages/addons/service/oscam/changelog.txt +++ b/packages/addons/service/oscam/changelog.txt @@ -1,3 +1,6 @@ +111 +- Update to version 11693 + 110 - Update to version 11681 diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk index 50d66e6aa0..50c794a33d 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="9aeb49912948dd6df076f83549e5885cc615a44b" # 2021-01-07 -PKG_SHA256="e2761fdd6587d21bc8007b0f107032f7740a0431d05cdc520cdcea742197bf22" -PKG_VERSION_NUMBER="11681" -PKG_REV="110" +PKG_VERSION="4b1c46857d95b4242d77986ff80d9c8092c15cfa" +PKG_SHA256="9fe8be8c1bf2f89630d8adc279088d31d9852bfe226052f6d9dc11ef2fe149f3" +PKG_VERSION_NUMBER="11693" +PKG_REV="111" 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 43aeb9ca11..387459d559 100644 --- a/packages/addons/service/oscam/patches/oscam-01-revision.patch +++ b/packages/addons/service/oscam/patches/oscam-01-revision.patch @@ -1,6 +1,6 @@ --- a/config.sh +++ b/config.sh -@@ -698,7 +698,7 @@ do +@@ -701,7 +701,7 @@ do break ;; '-r'|'--oscam-revision') 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 7fade2ed5e..2334452850 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,8 +1,6 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d28847f..1b7ecc5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -498,7 +498,7 @@ add_library (${csoscam} STATIC ${csoscam_srcs} ${csoscam_hdrs}) +@@ -498,7 +498,7 @@ add_library (${csoscam} STATIC ${csoscam set (exe_name "oscam") add_executable (${exe_name} ${exe_srcs} ${exe_hdrs}) @@ -11,8 +9,6 @@ index 6d28847f..1b7ecc5e 100644 if(HAVE_LIBRT AND HAVE_LIBUSB) if (LIBUSBDIR) set (libusb_link "imp_libusb") -diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt -index 6790913e..a603d3ee 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -12,7 +12,7 @@ file (GLOB all_srcs ${exe_srcs}) 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 e42fa170b9..77d899dea7 100644 --- a/packages/addons/service/oscam/patches/oscam-03-pcsc-pthread.patch +++ b/packages/addons/service/oscam/patches/oscam-03-pcsc-pthread.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1b7ecc5e..ddef8576 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -561,6 +561,7 @@ if (HAVE_PCSC)