aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-01 23:13:00 -0800
committerKhem Raj <raj.khem@gmail.com>2019-02-03 10:46:42 -0800
commitace62392d15b0e500f9af1774ffcfc752d441a98 (patch)
tree4ac9fd338a02e90a74f676d94fdfb7631e6c0bb4
parentb284f2b45a9127b84460ab99f00fd13755b1af5b (diff)
downloadmeta-openembedded-contrib-ace62392d15b0e500f9af1774ffcfc752d441a98.tar.gz
meta-openembedded-contrib-ace62392d15b0e500f9af1774ffcfc752d441a98.tar.bz2
meta-openembedded-contrib-ace62392d15b0e500f9af1774ffcfc752d441a98.zip
oscam: Update to latest svn revision 11491
Supports openssl 1.1.x Drop upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch26
-rw-r--r--meta-multimedia/recipes-dvb/oscam/oscam_svn.bb5
2 files changed, 2 insertions, 29 deletions
diff --git a/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch b/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
deleted file mode 100644
index d3d89e333b..0000000000
--- a/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a372fe467495a674ad6244b67e83dfbfa8455f51 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 11 Aug 2018 13:54:32 -0700
-Subject: [PATCH] include sys/sysmacros.h for major/minor definitions
-
-csctapi/ifd_db2com.c:27: undefined reference to `minor'
-collect2: error: ld returned 1 exit status
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- globals.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/globals.h b/globals.h
-index bd12244..9e10225 100644
---- a/globals.h
-+++ b/globals.h
-@@ -36,6 +36,7 @@
- #include <termios.h>
- #include <inttypes.h>
- #include <sys/utsname.h>
-+#include <sys/sysmacros.h>
-
- /*
- * The following hack is taken from Linux: include/linux/kconfig.h
diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
index a8aec113cd..5acdd7ebc7 100644
--- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
+++ b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
@@ -4,12 +4,11 @@ HOMEPAGE = "http://www.streamboard.tv/oscam/"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "libusb1 openssl10 pcsc-lite"
+DEPENDS = "libusb1 openssl pcsc-lite"
SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \
- file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \
"
-SRCREV = "11431"
+SRCREV = "11491"
PV = "1.10+${SRCPV}"
S = "${WORKDIR}/trunk"