Skip to content

Commit

Permalink
Merge branch 'Omega' into temp
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvana-7777 committed Nov 21, 2023
2 parents e5f3a00 + 491a65a commit 6144b82
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
run: |
if [[ $DEBIAN_BUILD != true ]]; then mkdir -p xbmc/cmake/addons/addons/${app_id}/; fi
if [[ $DEBIAN_BUILD != true ]]; then echo "${app_id} https://github.com/nirvana-7777/pvr.eon Nexus" > xbmc/cmake/addons/addons/${app_id}/${app_id}.txt; fi
if [[ $DEBIAN_BUILD != true ]]; then echo "${app_id} https://github.com/nirvana-7777/pvr.eon Omega" > xbmc/cmake/addons/addons/${app_id}/${app_id}.txt; fi
if [[ $DEBIAN_BUILD != true ]]; then echo "all" > xbmc/cmake/addons/addons/${app_id}/platforms.txt; fi
if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi
if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; fi
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buildPlugin(version: "Nexus")
buildPlugin(version: "Omega")
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
[![Build and run tests](https://github.com/nirvana-7777/pvr.eon/actions/workflows/build.yml/badge.svg?branch=Nexus)](https://github.com/nirvana-7777/pvr.eon/actions/workflows/build.yml)
[![Build and run tests](https://github.com/nirvana-7777/pvr.eon/actions/workflows/build.yml/badge.svg?branch=Omega)](https://github.com/nirvana-7777/pvr.eon/actions/workflows/build.yml)

# EON.tv PVR client for Kodi
This is the EON.tv PVR client addon for Kodi. It provides Kodi integration for the streaming provider [EON.tv](https://eon.tv). A user account / paid subscription is required to use this addon. Please create the user account outside of this addon. Please enter the username/password to the configuration of this addon. Some content is geo-blocked.
Expand All @@ -23,13 +23,10 @@ This is the EON.tv PVR client addon for Kodi. It provides Kodi integration for t
### Linux

1. `git clone --branch master https://github.com/xbmc/xbmc.git`
2. `mkdir -p xbmc/cmake/addons/addons/pvr.eon/`
3. `echo "pvr.eon https://github.com/nirvana-7777/pvr.eon Nexus" > xbmc/cmake/addons/addons/pvr.eon/pvr.eon.txt`
4. `echo "all" > xbmc/cmake/addons/addons/pvr.eon/platforms.txt`
5. `git clone https://github.com/nirvana-7777/pvr.eon.git`
6. `cd pvr.eon && mkdir build && cd build`
7. `cmake -DADDONS_TO_BUILD=pvr.eon -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`
8. `make`
2. `git clone --branch Omega https://github.com/nirvana-7777/pvr.eon.git`
3. `cd pvr.eon && mkdir build && cd build`
4. `cmake -DADDONS_TO_BUILD=pvr.eon -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`
5. `make`

## Notes

Expand Down
4 changes: 2 additions & 2 deletions pvr.eon/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.eon"
version="20.7.6"
version="21.7.6"
name="EON PVR Client"
provider-name="Nirvana">
<requires>
@ADDON_DEPENDS@
<import addon="inputstream.adaptive" minversion="20.0.0"/>
<import addon="inputstream.adaptive" minversion="21.0.0"/>
<import addon="script.module.inputstreamhelper" version="0.5.8"/>
</requires>
<extension point="kodi.pvrclient" library_@PLATFORM@="@LIBRARY_FILENAME@"/>
Expand Down
18 changes: 9 additions & 9 deletions pvr.eon/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
v20.5.0
v21.5.0
- Initial release
v20.6.0
v21.6.0
- Migrate from botan towards native AES and SHA256 implementations for:
- better portability
- faster compilation
- less dependencies
v20.6.1
v21.6.1
- Switch from adaptive to manual-osd for inputstream
- Fix not subscribed channels leading to crash
v20.7.0
v21.7.0
- Add Android TV platform (e.g. BigScreen/4K)
v20.7.1
v21.7.1
- Adapt user agent header for platforms when streaming
v20.7.2
v21.7.2
- Fix EPG date
v20.7.3
v21.7.3
- Optionally use inputstream.ffmpegdirect
v20.7.4
v21.7.4
- Exploit some more EPG data (live, age, seasons, episodes)
v20.7.5
v21.7.5
- Fix startup with empty credentials and web
v20.7.6
- Try to fix armv7a

0 comments on commit 6144b82

Please sign in to comment.