-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5 from AlexELEC/coreelec-21
Coreelec 21
- Loading branch information
Showing
12 changed files
with
153 additions
and
218 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 0 additions & 34 deletions
34
...s/addons/addon-depends/qt-everywhere/patches/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
This file was deleted.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
projects/Amlogic-ce/packages/addons/service/hyperion.ng/changelog.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| 114 | ||
| - Update to 2.0.16 | ||
| 113 | ||
| - Update to 2.0.15 | ||
| 112 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
...ges/addons/service/hyperion.ng/patches/0001-Remove-unused-libs-for-Amlogic-platform.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| From 156cfd51d056643a846c594ef6a5d5ebd7bd0a8e Mon Sep 17 00:00:00 2001 | ||
| From: Portisch <hugo.portisch@yahoo.de> | ||
| Date: Sun, 17 Nov 2019 09:20:38 +0100 | ||
| Subject: [PATCH 1/2] Remove unused libs for Amlogic platform | ||
|
|
||
| --- | ||
| src/hyperion-aml/CMakeLists.txt | 4 ---- | ||
| src/hyperion-framebuffer/CMakeLists.txt | 4 ---- | ||
| src/hyperion-remote/CMakeLists.txt | 4 ---- | ||
| src/hyperion-v4l2/CMakeLists.txt | 4 ---- | ||
| src/hyperiond/CMakeLists.txt | 4 ---- | ||
| 5 files changed, 20 deletions(-) | ||
|
|
||
| diff --git a/src/hyperion-aml/CMakeLists.txt b/src/hyperion-aml/CMakeLists.txt | ||
| index 40b04df3..fea62f34 100644 | ||
| --- a/src/hyperion-aml/CMakeLists.txt | ||
| +++ b/src/hyperion-aml/CMakeLists.txt | ||
| @@ -23,10 +23,6 @@ else() | ||
| target_link_libraries(${PROJECT_NAME} ssdp) | ||
| endif() | ||
|
|
||
| -if(ENABLE_AMLOGIC) | ||
| - target_link_libraries(${PROJECT_NAME} pcre16 dl z) | ||
| -endif() | ||
| - | ||
| install (TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin" COMPONENT "hyperion_aml") | ||
|
|
||
| if(CMAKE_HOST_UNIX) | ||
| diff --git a/src/hyperion-framebuffer/CMakeLists.txt b/src/hyperion-framebuffer/CMakeLists.txt | ||
| index a9470f5c..8ac51da4 100644 | ||
| --- a/src/hyperion-framebuffer/CMakeLists.txt | ||
| +++ b/src/hyperion-framebuffer/CMakeLists.txt | ||
| @@ -22,10 +22,6 @@ else() | ||
| target_link_libraries(${PROJECT_NAME} ssdp) | ||
| endif() | ||
|
|
||
| -if(ENABLE_AMLOGIC) | ||
| - target_link_libraries(${PROJECT_NAME} pcre16 dl z) | ||
| -endif() | ||
| - | ||
| install (TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin" COMPONENT "hyperion_framebuffer") | ||
|
|
||
| if(CMAKE_HOST_UNIX) | ||
| diff --git a/src/hyperion-remote/CMakeLists.txt b/src/hyperion-remote/CMakeLists.txt | ||
| index ef60a7dc..8046fc15 100644 | ||
| --- a/src/hyperion-remote/CMakeLists.txt | ||
| +++ b/src/hyperion-remote/CMakeLists.txt | ||
| @@ -21,10 +21,6 @@ target_link_libraries(${PROJECT_NAME} | ||
| Qt${QT_VERSION_MAJOR}::Widgets | ||
| ) | ||
|
|
||
| -if(ENABLE_AMLOGIC) | ||
| - target_link_libraries(${PROJECT_NAME} pcre16 dl z) | ||
| -endif() | ||
| - | ||
| if(ENABLE_MDNS) | ||
| target_link_libraries(${PROJECT_NAME} mdns) | ||
| else() | ||
| diff --git a/src/hyperion-v4l2/CMakeLists.txt b/src/hyperion-v4l2/CMakeLists.txt | ||
| index 37189cdc..92aadb28 100644 | ||
| --- a/src/hyperion-v4l2/CMakeLists.txt | ||
| +++ b/src/hyperion-v4l2/CMakeLists.txt | ||
| @@ -22,10 +22,6 @@ else() | ||
| target_link_libraries(${PROJECT_NAME} ssdp) | ||
| endif() | ||
|
|
||
| -if(ENABLE_AMLOGIC) | ||
| - target_link_libraries(${PROJECT_NAME} pcre16 dl z) | ||
| -endif() | ||
| - | ||
| install (TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin" COMPONENT "hyperion_v4l2") | ||
|
|
||
| if(CMAKE_HOST_UNIX) | ||
| diff --git a/src/hyperiond/CMakeLists.txt b/src/hyperiond/CMakeLists.txt | ||
| index 79a0b221..8ecbce4c 100644 | ||
| --- a/src/hyperiond/CMakeLists.txt | ||
| +++ b/src/hyperiond/CMakeLists.txt | ||
| @@ -71,10 +71,6 @@ if(ENABLE_PROTOBUF_SERVER) | ||
| target_link_libraries(${PROJECT_NAME} protoserver) | ||
| endif() | ||
|
|
||
| -if(ENABLE_AMLOGIC) | ||
| - target_link_libraries(${PROJECT_NAME} pcre16 dl z) | ||
| -endif(ENABLE_AMLOGIC) | ||
| - | ||
| if(ENABLE_DISPMANX) | ||
| target_link_libraries(${PROJECT_NAME} dispmanx-grabber) | ||
| endif (ENABLE_DISPMANX) | ||
| -- | ||
| 2.43.2 | ||
|
|
43 changes: 43 additions & 0 deletions
43
...ons/service/hyperion.ng/patches/0002-Embed-image-format-plugins-at-Amlogic-platform.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| From 2e0ddd267d196e1e65e0cdbf5e2933c57a1db278 Mon Sep 17 00:00:00 2001 | ||
| From: Portisch <hugo.portisch@yahoo.de> | ||
| Date: Sun, 17 Nov 2019 09:20:38 +0100 | ||
| Subject: [PATCH 2/2] Embed image format plugins at Amlogic platform | ||
|
|
||
| --- | ||
| libsrc/db/CMakeLists.txt | 6 ++++++ | ||
| src/hyperiond/hyperiond.cpp | 5 +++++ | ||
| 2 files changed, 11 insertions(+) | ||
|
|
||
| diff --git a/libsrc/db/CMakeLists.txt b/libsrc/db/CMakeLists.txt | ||
| index 1beb3fe5..a72ce10f 100644 | ||
| --- a/libsrc/db/CMakeLists.txt | ||
| +++ b/libsrc/db/CMakeLists.txt | ||
| @@ -12,3 +12,9 @@ target_link_libraries(database | ||
| hyperion-utils | ||
| Qt${QT_VERSION_MAJOR}::Sql | ||
| ) | ||
| + | ||
| +if (ENABLE_AMLOGIC) | ||
| + target_link_libraries(database | ||
| + ${plugin_libs} | ||
| + ) | ||
| +endif() | ||
| diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp | ||
| index 6c71475d..f40d6d2c 100644 | ||
| --- a/src/hyperiond/hyperiond.cpp | ||
| +++ b/src/hyperiond/hyperiond.cpp | ||
| @@ -26,6 +26,11 @@ | ||
| #include <webserver/WebServer.h> | ||
| #include "hyperiond.h" | ||
|
|
||
| +#ifdef ENABLE_AMLOGIC | ||
| +#include <QtPlugin> | ||
| +Q_IMPORT_PLUGIN(QGifPlugin) | ||
| +#endif | ||
| + | ||
| // Flatbuffer Server | ||
| #ifdef ENABLE_FLATBUF_SERVER | ||
| #include <flatbufserver/FlatBufferServer.h> | ||
| -- | ||
| 2.43.2 | ||
|
|
132 changes: 0 additions & 132 deletions
132
...rvice/hyperion.ng/patches/Embed-QSQLITE-driver-and-qjpeg-plugin-at-Amlogic-platform.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.