mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-17 07:45:47 +01:00
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>
This commit is contained in:
parent
85b0d91d39
commit
bd0db062df
|
|
@ -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
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
DEPENDS = "libusb1 openssl pcsc-lite"
|
DEPENDS = "libusb1 openssl pcsc-lite"
|
||||||
|
|
||||||
SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \
|
SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \
|
||||||
file://respect-cflags.patch \
|
file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "9164"
|
SRCREV = "11431"
|
||||||
PV = "1.10+${SRCPV}"
|
PV = "1.10+${SRCPV}"
|
||||||
|
|
||||||
S = "${WORKDIR}/trunk"
|
S = "${WORKDIR}/trunk"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user