From ac51712fd2b9bdfd17839736c343185c1110953c Mon Sep 17 00:00:00 2001 From: hschang Date: Wed, 2 Jul 2014 16:20:29 +0900 Subject: [PATCH] [dvbapp] build fix --- meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb | 5 ++- .../enigma2/enigma2_vuplus_conversion_error.patch | 40 ++++++++++++++++++++++ .../enigma2/enigma2_vuplus_default_arg_error.patch | 13 +++++++ .../enigma2/enigma2_vuplus_eptrlist_insert.patch | 22 ++++++++++++ .../enigma2_vuplus_remove_dreambox_enigma.patch | 4 +-- 5 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_conversion_error.patch create mode 100644 meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_default_arg_error.patch create mode 100644 meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_eptrlist_insert.patch diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index bf991b8..76302b3 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -114,6 +114,9 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t file://enigma2_vuplus_fix_standby_name.patch \ file://enigma2_vuplus_fix_standby_name_skin.patch \ file://enigma2_vuplus_epng.patch \ + file://enigma2_vuplus_eptrlist_insert.patch \ + file://enigma2_vuplus_conversion_error.patch \ + file://enigma2_vuplus_default_arg_error.patch \ file://MyriadPro-Regular.otf \ file://MyriadPro-Semibold.otf \ file://MyriadPro-SemiboldIt.otf \ @@ -157,7 +160,7 @@ FILES_${PN}-meta = "${datadir}/meta" PACKAGES += "${PN}-meta" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit autotools pkgconfig pythonnative +inherit autotools-brokensep pkgconfig pythonnative do_configure_prepend() { git checkout ${BRANCH} diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_conversion_error.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_conversion_error.patch new file mode 100644 index 0000000..1a867c0 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_conversion_error.patch @@ -0,0 +1,40 @@ +diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp +index febfd78..6a90274 100644 +--- a/lib/dvb/pmt.cpp ++++ b/lib/dvb/pmt.cpp +@@ -268,7 +268,7 @@ void eDVBServicePMTHandler::AITready(int error) + std::string boundaryExtension = ""; + + int controlCode = (*i)->getApplicationControlCode(); +- ApplicationIdentifier * applicationIdentifier = (*i)->getApplicationIdentifier(); ++ const ApplicationIdentifier * applicationIdentifier = (*i)->getApplicationIdentifier(); + profilecode = 0; + orgid = applicationIdentifier->getOrganisationId(); + appid = applicationIdentifier->getApplicationId(); +@@ -285,7 +285,7 @@ void eDVBServicePMTHandler::AITready(int error) + case APPLICATION_DESCRIPTOR: + { + ApplicationDescriptor* applicationDescriptor = (ApplicationDescriptor*)(*desc); +- ApplicationProfileList* applicationProfiles = applicationDescriptor->getApplicationProfiles(); ++ const ApplicationProfileList* applicationProfiles = applicationDescriptor->getApplicationProfiles(); + ApplicationProfileConstIterator interactionit = applicationProfiles->begin(); + for(; interactionit != applicationProfiles->end(); ++interactionit) + { +@@ -353,7 +353,7 @@ void eDVBServicePMTHandler::AITready(int error) + } + if(!hbbtvUrl.empty()) + { +- char* uu = hbbtvUrl.c_str(); ++ const char* uu = hbbtvUrl.c_str(); + if(!strncmp(uu, "http://", 7) || !strncmp(uu, "dvb://", 6) || !strncmp(uu, "https://", 8)) + { + if(controlCode == 1) m_HBBTVUrl = hbbtvUrl; +@@ -420,7 +420,7 @@ void eDVBServicePMTHandler::OCready(int error) + { + for (std::vector::const_iterator it = ptr->getSections().begin(); it != ptr->getSections().end(); ++it) + { +- unsigned char* sectionData = (*it)->getData(); ++ unsigned char* sectionData = (unsigned char*)(*it)->getData(); + } + } + /* for now, do not keep listening for table updates */ diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_default_arg_error.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_default_arg_error.patch new file mode 100644 index 0000000..529dbb3 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_default_arg_error.patch @@ -0,0 +1,13 @@ +diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp +index 0287acf..dc1b22e 100644 +--- a/lib/service/servicedvbrecord.cpp ++++ b/lib/service/servicedvbrecord.cpp +@@ -15,7 +15,7 @@ + + DEFINE_REF(eDVBServiceRecord); + +-eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref, bool isstreamclient = false): ++eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref, bool isstreamclient): + m_ref(ref),m_is_stream_client(isstreamclient) + { + CONNECT(m_service_handler.serviceEvent, eDVBServiceRecord::serviceEvent); diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_eptrlist_insert.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_eptrlist_insert.patch new file mode 100644 index 0000000..9f58493 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_eptrlist_insert.patch @@ -0,0 +1,22 @@ +diff --git a/lib/base/eptrlist.h b/lib/base/eptrlist.h +index 0da46da..361323c 100644 +--- a/lib/base/eptrlist.h ++++ b/lib/base/eptrlist.h +@@ -174,7 +174,7 @@ public: + { + // added a new item to the list... in order + // returns a iterator to the new item +- return insert( std::lower_bound( std::list::begin(), std::list::end(), e, less()), e ); ++ return this->insert( std::lower_bound( std::list::begin(), std::list::end(), e, less()), e ); + } + + }; +@@ -804,7 +804,7 @@ public: + { + // added a new item to the list... in order + // returns a iterator to the new item +- return insert( std::lower_bound( std::list >::begin(), e, std::list >::end()), e ); ++ return this->insert( std::lower_bound( std::list >::begin(), e, std::list >::end()), e ); + } + + }; diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_dreambox_enigma.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_dreambox_enigma.patch index dd18695..44f7ca7 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_dreambox_enigma.patch +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_dreambox_enigma.patch @@ -8,7 +8,7 @@ index 9e17547..840b1eb 100644 + if(string && string[0]){ + char *ptr; -+ ptr = string; ++ ptr = (char *)string; + while(1) + { + char *enigma = strcasestr(ptr, "enigma"); @@ -21,7 +21,7 @@ index 9e17547..840b1eb 100644 + break; + } + -+ ptr = string; ++ ptr = (char *)string; + while(1) + { + char *dreambox = strcasestr(ptr, "dreambox"); -- 2.7.4