From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../recipes-dvb/oscam/oscam/respect-cflags.patch | 38 ++++++++++++++++++++++ .../meta-multimedia/recipes-dvb/oscam/oscam_svn.bb | 20 ++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch create mode 100644 meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb (limited to 'meta-openembedded/meta-multimedia/recipes-dvb/oscam') diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch new file mode 100644 index 000000000..179d04a55 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch @@ -0,0 +1,38 @@ +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-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb new file mode 100644 index 000000000..cac517ff5 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb @@ -0,0 +1,20 @@ +SUMMARY = "OSCam: Open Source Conditional Access Module" +HOMEPAGE = "http://www.streamboard.tv/oscam/" + +LICENSE = "GPLv3" +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" +PV = "1.10+${SRCPV}" + +S = "${WORKDIR}/trunk" + +inherit cmake + +EXTRA_OECMAKE = "-DDEFAULT_CS_CONFDIR=${sysconfdir} -DCMAKE_BUILD_TYPE=Debug" + -- cgit v1.2.1