diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-02-01 23:13:00 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-02-03 10:46:42 -0800 |
| commit | ace62392d15b0e500f9af1774ffcfc752d441a98 (patch) | |
| tree | 4ac9fd338a02e90a74f676d94fdfb7631e6c0bb4 | |
| parent | b284f2b45a9127b84460ab99f00fd13755b1af5b (diff) | |
| download | meta-openembedded-ace62392d15b0e500f9af1774ffcfc752d441a98.tar.gz | |
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.patch | 26 | ||||
| -rw-r--r-- | meta-multimedia/recipes-dvb/oscam/oscam_svn.bb | 5 |
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 @@ | |||
| 1 | From a372fe467495a674ad6244b67e83dfbfa8455f51 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 11 Aug 2018 13:54:32 -0700 | ||
| 4 | Subject: [PATCH] include sys/sysmacros.h for major/minor definitions | ||
| 5 | |||
| 6 | csctapi/ifd_db2com.c:27: undefined reference to `minor' | ||
| 7 | collect2: error: ld returned 1 exit status | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | globals.h | 1 + | ||
| 13 | 1 file changed, 1 insertion(+) | ||
| 14 | |||
| 15 | diff --git a/globals.h b/globals.h | ||
| 16 | index bd12244..9e10225 100644 | ||
| 17 | --- a/globals.h | ||
| 18 | +++ b/globals.h | ||
| 19 | @@ -36,6 +36,7 @@ | ||
| 20 | #include <termios.h> | ||
| 21 | #include <inttypes.h> | ||
| 22 | #include <sys/utsname.h> | ||
| 23 | +#include <sys/sysmacros.h> | ||
| 24 | |||
| 25 | /* | ||
| 26 | * 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/" | |||
| 4 | LICENSE = "GPLv3" | 4 | LICENSE = "GPLv3" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 6 | 6 | ||
| 7 | DEPENDS = "libusb1 openssl10 pcsc-lite" | 7 | DEPENDS = "libusb1 openssl pcsc-lite" |
| 8 | 8 | ||
| 9 | SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ | 9 | SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ |
| 10 | file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \ | ||
| 11 | " | 10 | " |
| 12 | SRCREV = "11431" | 11 | SRCREV = "11491" |
| 13 | PV = "1.10+${SRCPV}" | 12 | PV = "1.10+${SRCPV}" |
| 14 | 13 | ||
| 15 | S = "${WORKDIR}/trunk" | 14 | S = "${WORKDIR}/trunk" |
