diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2018-08-11 14:52:17 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-08-15 08:20:06 -0700 |
| commit | bd0db062df54cfe9fc550db91be2134ddbf763e6 (patch) | |
| tree | aa30f8c6e11b03ab196dd21c859477d173c56e26 /meta-multimedia/recipes-dvb | |
| parent | 85b0d91d397fd46922c9266db13e725f36968837 (diff) | |
| download | meta-openembedded-contrib-bd0db062df54cfe9fc550db91be2134ddbf763e6.tar.gz | |
oscam: Upgrade to latest rev 11431 on trunk
Add patch to fix build with glibc 2.28+
Remove backported patches which are no longer needed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-dvb')
3 files changed, 29 insertions, 41 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 new file mode 100644 index 00000000000..d3d89e333b5 --- /dev/null +++ b/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch @@ -0,0 +1,26 @@ +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/respect-cflags.patch b/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch deleted file mode 100644 index 179d04a5596..00000000000 --- a/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Backport -http://www.streamboard.tv/oscam/changeset/10068 -http://www.streamboard.tv/oscam/changeset/10070 - -Index: /CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt (revision 10067) -+++ b/CMakeLists.txt (revision 10068) -@@ -625,8 +625,8 @@ - list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR) - add_definitions ("-W -Wall ") -- set (CMAKE_C_FLAGS "-Wall -O2") -- set (CMAKE_CXX_FLAGS "-Wall -O2") -- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") -- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2") -+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") -+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb") - endif (CMAKE_COMPILER_IS_GNUCC) - # some optimisations -Index: /csctapi/CMakeLists.txt -=================================================================== ---- a/csctapi/CMakeLists.txt (revision 10069) -+++ b/csctapi/CMakeLists.txt (revision 10070) -@@ -6,8 +6,8 @@ - list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR) - add_definitions ("-W -Wall ") -- set (CMAKE_C_FLAGS "-Wall -O2") -- set (CMAKE_CXX_FLAGS "-Wall -O2") -- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") -- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2") -+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") -+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb") - endif (CMAKE_COMPILER_IS_GNUCC) - # Mac extra removes to avoid ranlib warnings in some situations diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb index cac517ff5df..2bd970fd5d1 100644 --- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +++ b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libusb1 openssl pcsc-lite" SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ - file://respect-cflags.patch \ -" -SRCREV = "9164" + file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \ + " +SRCREV = "11431" PV = "1.10+${SRCPV}" S = "${WORKDIR}/trunk" |