frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix amlogic for newer kernels (#214)

Browse Source 
* fix amlogic for newer kernels
crosscompile stay on 32bit aml with kernel 3.10

* add new platform amlogic64. This is used e.g. for new wetek boxes hub and play2
This commit is contained in:
redPanther
2016-09-02 07:41:27 +02:00
committed by GitHub
parent e342927d77
commit 06c878e76f
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsrc/grabber/amlogic/AmlogicGrabber.cpp
View File

@@ -16,14 +16,19 @@
#include <utils/Logger.h>
#include <grabber/AmlogicGrabber.h>
// Flags copied from 'include/linux/amlogic/amports/amvideocap.h' at https://github.com/codesnake/linux-amlogic
#define AMVIDEOCAP_IOC_MAGIC 'V'
#define AMVIDEOCAP_IOW_SET_WANTFRAME_WIDTH _IOW(AMVIDEOCAP_IOC_MAGIC, 0x02, int)
#define AMVIDEOCAP_IOW_SET_WANTFRAME_HEIGHT _IOW(AMVIDEOCAP_IOC_MAGIC, 0x03, int)
// Flags copied from 'include/linux/amlogic/amports/amvstream.h' at https://github.com/codesnake/linux-amlogic
#define AMSTREAM_IOC_MAGIC 'S'
#define AMSTREAM_IOC_GET_VIDEO_DISABLE _IOR(AMSTREAM_IOC_MAGIC, 0x48, unsigned long)
#if HAVE_AML_HEADER
#include <amcodec/amports/amstream.h>
#else
// Flags copied from 'include/linux/amlogic/amports/amvstream.h' at https://github.com/codesnake/linux-amlogic
#define AMSTREAM_IOC_MAGIC 'S'
#define AMSTREAM_IOC_GET_VIDEO_DISABLE _IOR(AMSTREAM_IOC_MAGIC, 0x48, unsigned long)
#endif
AmlogicGrabber::AmlogicGrabber(const unsigned width, const unsigned height)
: _width(std::max(160u, width)) // Minimum required width or height is 160

8
libsrc/grabber/amlogic/CMakeLists.txt
View File

@@ -1,3 +1,4 @@
INCLUDE (CheckIncludeFiles)
# Define the current source locations
SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
@@ -17,6 +18,12 @@ SET(AmlogicSOURCES
QT5_WRAP_CPP(AmlogicHEADERS_MOC ${AmlogicQT_HEADERS})
CHECK_INCLUDE_FILES ("amcodec/amports/amstream.h" HAVE_AML_HEADER)
IF (${HAVE_AML_HEADER})
ADD_DEFINITIONS( -DHAVE_AML_HEADER )
ENDIF()
add_library(amlogic-grabber
${AmlogicHEADERS}
${AmlogicQT_HEADERS}
@@ -27,3 +34,4 @@ add_library(amlogic-grabber
target_link_libraries(amlogic-grabber
hyperion
${QT_LIBRARIES})

2
libsrc/leddevice/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ find_package(libusb-1.0 REQUIRED)
#find_package(Threads REQUIRED)
include_directories(
../../include/hidapi
${CMAKE_SOURCE_DIR}/include/hidapi
${LIBUSB_1_INCLUDE_DIRS}
) # for Lightpack device