jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9844 from heitbaum/addon

Browse Source 
Addon updates
This commit is contained in:
Christian Hewitt 2025-03-07 13:59:06 +04:00 committed by GitHub
commit f039c54705
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 9 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/addons/addon-depends/comskip/package.mk
View File

@ -2,11 +2,11 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="comskip"
PKG_VERSION="6e66de54358498aa276d233f5b3e7fa673526af1"
PKG_SHA256="412f0cc543cbe327b36b0354c00ace260c996e95dd95cb585ca58dd52c926607"
PKG_VERSION="0.83"
PKG_SHA256="bd90d7922916e0b04ea9f3426ea7747d347f218f3f915fb4d251961d0730876e"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kaashoek.com/comskip/"
PKG_URL="https://github.com/erikkaashoek/Comskip/archive/${PKG_VERSION}.tar.gz"
PKG_URL="https://github.com/erikkaashoek/Comskip/archive/V${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain argtable2 ffmpegx"
PKG_DEPENDS_CONFIG="argtable2 ffmpegx"
PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings."

58
packages/addons/addon-depends/comskip/patches/comskip-001-ffmpeg6.patch
View File

@ -1,58 +0,0 @@
From 3f940e6f8e83fbb0cbbca6a4f55b506ccec8d3c4 Mon Sep 17 00:00:00 2001
From: bsperduto <brian.sperduto@gmail.com>
Date: Sun, 3 Dec 2023 08:50:41 -0600
Subject: [PATCH 1/2] Fix for deprecation of DECLARE_ALIGNED #164
---
comskip.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/comskip.c b/comskip.c
index 08ffd5e..e85f61a 100644
--- a/comskip.c
+++ b/comskip.c
@@ -733,9 +733,9 @@ int sceneChangePercent;
bool lastFrameWasBlack = false;
bool lastFrameWasSceneChange = false;
-#include <libavutil/avutil.h> // only for DECLARE_ALIGNED
-static DECLARE_ALIGNED(32, long, histogram)[256];
-static DECLARE_ALIGNED(32, long, lastHistogram)[256];
+
+static long histogram[256];
+static long lastHistogram[256];
#define MAXCSLENGTH 400*300
#define MAXCUTSCENES 8
@@ -10097,7 +10097,7 @@ void LoadCutScene(const char *filename)
#define OWN_HISTOGRAM_WIDTH 4
#define OWN_HISTOGRAM_HEIGHT 256
-static DECLARE_ALIGNED(32, int, own_histogram)[OWN_HISTOGRAM_WIDTH][OWN_HISTOGRAM_HEIGHT];
+static int own_histogram[OWN_HISTOGRAM_WIDTH][OWN_HISTOGRAM_HEIGHT];
int scan_step;
#define SCAN_MULTI
From eae0b430d7c9317333fb8759bd67369fd71a085a Mon Sep 17 00:00:00 2001
From: bsperduto <brian.sperduto@gmail.com>
Date: Sun, 10 Dec 2023 13:32:57 +0100
Subject: [PATCH 2/2] [PATCH] Update mpeg2dec.c
---
mpeg2dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mpeg2dec.c b/mpeg2dec.c
index 626a991..bb2fa2b 100755
--- a/mpeg2dec.c
+++ b/mpeg2dec.c
@@ -349,7 +349,7 @@ static void signal_handler (int sig)
#define AUDIOBUFFER 1600000
static double base_apts = 0.0, apts, top_apts = 0.0;
-static DECLARE_ALIGNED(16, short, audio_buffer[AUDIOBUFFER]);
+static short audio_buffer[AUDIOBUFFER];
static short *audio_buffer_ptr = audio_buffer;
static int audio_samples = 0;
#define ISSAME(T1,T2) (fabs((T1) - (T2)) < 0.001)

293
packages/addons/addon-depends/comskip/patches/comskip-174-ffmpeg7.patch
View File

@ -1,293 +0,0 @@
From 0a8ce55e9ec5bd805e868f7f342e86ec981a3441 Mon Sep 17 00:00:00 2001
From: phunkyfish <phunkyfish@gmail.com>
Date: Thu, 23 Jan 2025 09:01:35 +0000
Subject: [PATCH 1/5] Add configure~ to .gitignore
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 2941b0c..f463d0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ autom4te.cache
compile
config.*
configure
+configure~
depcomp
install-sh
missing
From d073c92190e14cbe79d6d2c6aae39a349b9c9a9f Mon Sep 17 00:00:00 2001
From: phunkyfish <phunkyfish@gmail.com>
Date: Wed, 22 Jan 2025 22:35:09 +0000
Subject: [PATCH 2/5] Enable building with ffmpeg 6 and 7
---
mpeg2dec.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/mpeg2dec.c b/mpeg2dec.c
index 3caa63c..4b13416 100755
--- a/mpeg2dec.c
+++ b/mpeg2dec.c
@@ -575,8 +575,14 @@ void sound_to_frames(VideoState *is, short **b, int s, int c, int format)
for (l=0;l < c;l++ ) volume += *((fb[l])++) * 64000;
else
for (l=0;l < c;l++ ) volume += *((fb[0])++) * 64000;
+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(59, 37, 100) && \
+ LIBAVUTIL_BUILD >= AV_VERSION_INT(57, 28, 100)
+ *audio_buffer_ptr++ = volume / is->audio_st->codecpar->ch_layout.nb_channels;
+ avg_volume += abs(volume / is->audio_st->codecpar->ch_layout.nb_channels);
+#else
*audio_buffer_ptr++ = volume / is->audio_st->codecpar->channels;
avg_volume += abs(volume / is->audio_st->codecpar->channels);
+#endif
}
}
else
@@ -592,8 +598,14 @@ void sound_to_frames(VideoState *is, short **b, int s, int c, int format)
for (l=0;l < c;l++ ) volume += *((sb[l])++);
else
for (l=0;l < c;l++ ) volume += *((sb[0])++);
+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(59, 37, 100) && \
+ LIBAVUTIL_BUILD >= AV_VERSION_INT(57, 28, 100)
+ *audio_buffer_ptr++ = volume / is->audio_st->codecpar->ch_layout.nb_channels;
+ avg_volume += abs(volume / is->audio_st->codecpar->ch_layout.nb_channels);
+#else
*audio_buffer_ptr++ = volume / is->audio_st->codecpar->channels;
avg_volume += abs(volume / is->audio_st->codecpar->channels);
+#endif
}
}
}
@@ -769,7 +781,19 @@ void audio_packet_process(VideoState *is, AVPacket *pkt)
}
-
+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(59, 37, 100) && \
+ LIBAVUTIL_BUILD >= AV_VERSION_INT(57, 28, 100)
+ data_size = av_samples_get_buffer_size(NULL, is->frame->ch_layout.nb_channels,
+ is->frame->nb_samples,
+ is->frame->format, 1);
+ if (data_size > 0)
+ {
+ sound_to_frames(is, (short **)is->frame->data, is->frame->nb_samples ,is->frame->ch_layout.nb_channels, is->frame->format);
+ }
+ is->audio_clock += (double)data_size /
+ (is->frame->ch_layout.nb_channels * is->frame->sample_rate * av_get_bytes_per_sample(is->frame->format));
+ av_frame_unref(is->frame);
+#else
data_size = av_samples_get_buffer_size(NULL, is->frame->channels,
is->frame->nb_samples,
is->frame->format, 1);
@@ -780,6 +804,7 @@ void audio_packet_process(VideoState *is, AVPacket *pkt)
is->audio_clock += (double)data_size /
(is->frame->channels * is->frame->sample_rate * av_get_bytes_per_sample(is->frame->format));
av_frame_unref(is->frame);
+#endif
}
if (ALIGN_AC3_PACKETS && is->audio_st->codecpar->codec_id == AV_CODEC_ID_AC3) {
@@ -1033,6 +1058,10 @@ void DoSeekRequest(VideoState *is)
if(ret < 0)
{
char *error_text;
+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(59, 37, 100) && \
+ LIBAVUTIL_BUILD >= AV_VERSION_INT(57, 28, 100)
+ error_text = "Generic";
+#else
if (is->pFormatCtx->iformat->read_seek)
{
error_text = "Format specific";
@@ -1045,6 +1074,7 @@ void DoSeekRequest(VideoState *is)
{
error_text = "Generic";
}
+#endif
fprintf(stderr, "%s error while seeking. target=%6.3f, \"%s\"\n", error_text,is->seek_pts, is->pFormatCtx->url);
From 22a3aeb6eb8d1d4fdadc4d19f61519282a32e643 Mon Sep 17 00:00:00 2001
From: phunkyfish <phunkyfish@gmail.com>
Date: Thu, 23 Jan 2025 16:28:44 +0000
Subject: [PATCH 3/5] Adding missing pthread header, needed for windows builds
---
comskip.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/comskip.c b/comskip.c
index 2babdb8..373bd53 100644
--- a/comskip.c
+++ b/comskip.c
@@ -16,6 +16,7 @@
#include "platform.h"
#include "vo.h"
#include <argtable2.h>
+#include <pthread.h>
#include <libavformat/avformat.h>
From 102b2a4e192f7d42681fc15c523b7863af7688a1 Mon Sep 17 00:00:00 2001
From: phunkyfish <phunkyfish@gmail.com>
Date: Thu, 23 Jan 2025 16:30:10 +0000
Subject: [PATCH 4/5] Fixes needed for windows build with Msys2
---
platform.h | 2 +-
video_out_dx.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/platform.h b/platform.h
index c37a872..179e89f 100644
--- a/platform.h
+++ b/platform.h
@@ -74,7 +74,7 @@ typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef unsigned __int64 uint64_t;
-#ifndef HARDWARE_DECODE
+#if !defined(HARDWARE_DECODE) && !defined(__MINGW64__)
#include <compat/w32pthreads.h> // Is already defined in ffmpeg
#endif
diff --git a/video_out_dx.c b/video_out_dx.c
index 887df9b..ea17ab0 100644
--- a/video_out_dx.c
+++ b/video_out_dx.c
@@ -541,7 +541,7 @@ static int create_window (dx_instance_t * instance)
/* store a directx_instance pointer into the window local storage
* (for later use in event_handler).
* We need to use SetWindowLongPtr when it is available in mingw */
- SetWindowLongPtr (instance->window, GWLP_USERDATA, instance);
+ SetWindowLongPtr (instance->window, GWLP_USERDATA, (LONG_PTR) instance);
SetWindowPos(instance->window, HWND_TOP, 100, 0, 0, 0, SWP_SHOWWINDOW|SWP_NOSIZE);
ShowWindow (instance->window, SW_SHOW);
@@ -928,13 +928,13 @@ void vo_init(int width, int height, char *title)
memset(buf2,128,width*height);
#ifdef RGB
- instance = vo_dxrgb_open();
- hWind = instance;
+ instance = (dx_instance_t *) vo_dxrgb_open();
+ hWind = (HWND) instance;
strcpy(instance->title, title);
dxrgb_setup( instance, width, height, width, height, &result);
// dx_setup_fbuf ( instance, buffer, &result);
#else
- instance = vo_dx_open();
+ instance = (HWND) vo_dx_open();
strcpy(instance->title, title);
dx_setup( instance, width, height, width, height, &result);
#endif
From cd5fce346cebc554d7e262a58c8961a6968243e8 Mon Sep 17 00:00:00 2001
From: phunkyfish <phunkyfish@gmail.com>
Date: Thu, 23 Jan 2025 08:44:06 +0000
Subject: [PATCH 5/5] Github workflows for Linux, Mac and Windows
---
.github/workflows/build.yaml | 87 ++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
create mode 100644 .github/workflows/build.yaml
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 0000000..522b19c
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,87 @@
+name: Build
+on: [push, pull_request]
+
+jobs:
+ build:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - os: ubuntu-latest
+ platform: linux
+ - os: macos-latest
+ platform: macos
+ ffmpeg_version: ffmpeg5
+ - os: macos-latest
+ platform: macos
+ ffmpeg_version: ffmpeg6
+ - os: macos-latest
+ platform: macos
+ ffmpeg_version: ffmpeg7
+ - os: windows-latest
+ platform: windows-mingw
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Setup
+ shell: bash
+ run: |
+ setupScript='ci/${{ matrix.platform }}/setup.sh'
+ [ ! -f "$setupScript" ] || "$setupScript"
+
+ - name: Configure Apt packages
+ if: ${{ matrix.platform == 'linux' }}
+ run: |
+ sudo apt-get install -y autoconf libtool git build-essential libargtable2-dev libavformat-dev libswscale-dev libsdl1.2-dev
+
+ - name: Configure Brew packages ffmpeg7
+ if: ${{ matrix.ffmpeg_version == 'ffmpeg7' }}
+ run: |
+ brew install autoconf automake libtool pkgconfig argtable ffmpeg sdl
+
+ - name: Configure Brew packages ffmpeg6
+ if: ${{ matrix.ffmpeg_version == 'ffmpeg6' }}
+ run: |
+ brew install autoconf automake libtool pkgconfig argtable ffmpeg@6 sdl
+ brew link ffmpeg@6
+
+ - name: Configure Brew packages ffmpeg5
+ if: ${{ matrix.ffmpeg_version == 'ffmpeg5' }}
+ run: |
+ brew install autoconf automake libtool pkgconfig argtable ffmpeg@5 sdl
+ brew link ffmpeg@5
+
+ - name: Setup msys2
+ uses: msys2/setup-msys2@v2
+ if: ${{ matrix.platform == 'windows-mingw' }}
+ with:
+ update: true
+ install: >-
+ mingw-w64-x86_64-gcc
+ mingw-w64-x86_64-make
+ mingw-w64-x86_64-autotools
+ mingw-w64-x86_64-libtool
+ mingw-w64-x86_64-pkg-config
+ mingw-w64-x86_64-yasm
+ mingw-w64-x86_64-argtable
+ mingw-w64-x86_64-ffmpeg
+ - name: Put MSYS2_MinGW64 on PATH
+ if: ${{ matrix.platform == 'windows-mingw' }}
+ run: |
+ echo "${{ runner.temp }}/msys64/mingw64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+ - name: Configure and build Posix
+ if: ${{ matrix.platform != 'windows-mingw' }}
+ run: |
+ ./autogen.sh
+ ./configure
+ make
+
+ - name: Configure and build Windows
+ if: ${{ matrix.platform == 'windows-mingw' }}
+ run: |
+ msys2 -c './autogen.sh'
+ msys2 -c './configure'
+ msys2 -c 'make'

6
packages/addons/service/minisatip/package.mk
View File

@ -2,9 +2,9 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="minisatip"
PKG_VERSION="1.3.39"
PKG_SHA256="b6b0062fb0604bd7e7a1b1d9dcf001dd13aa38f56ef886b6b76883780d8d31cc"
PKG_REV="6"
PKG_VERSION="1.3.40"
PKG_SHA256="d02deb76ee7a5fcf70febedee3fe52b73deedb653cb9a3c1ed6e7db0d0d190fa"
PKG_REV="7"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/catalinii/minisatip"

2
packages/addons/service/nextpvr/package.mk
View File

@ -4,7 +4,7 @@
PKG_NAME="nextpvr"
PKG_VERSION="7.0.1~Piers"
PKG_ADDON_VERSION="7.0.1~1"
PKG_REV="2"
PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="NextPVR"
PKG_SITE="https://nextpvr.com"

2
packages/addons/service/tvheadend42/package.mk
View File

@ -5,7 +5,7 @@ PKG_NAME="tvheadend42"
PKG_VERSION="5bdcfd8ac97b3337e1c7911ae24127df76fa693a"
PKG_SHA256="b562a26248cdc02dc94cc62038deea172668fa4c079b2ea4e1b4220f3b1d34f5"
PKG_VERSION_NUMBER="4.2.8-36"
PKG_REV="5"
PKG_REV="6"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.tvheadend.org"

2
packages/addons/service/tvheadend43/package.mk
View File

@ -5,7 +5,7 @@ PKG_NAME="tvheadend43"
PKG_VERSION="653bd0400b4413db96b80c807f0f7524f9248adb"
PKG_SHA256="9c2e13a70f97cf4c9b37cd93bfd03a7a1e0b7f3b18080c40ef99b8917642dbd7"
PKG_VERSION_NUMBER="4.3-2375"
PKG_REV="5"
PKG_REV="6"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.tvheadend.org"