From 6303ef1e00eb7469a62052db5cd62b65ddb6e4c1 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 16 May 2022 23:30:03 +0000 Subject: [PATCH 01/22] ffmpeg: Add extra-version flag to match SPK_VER --- cross/ffmpeg/Makefile | 5 ++++- spk/ffmpeg/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cross/ffmpeg/Makefile b/cross/ffmpeg/Makefile index b5ba223d9ce..97794ad5f06 100644 --- a/cross/ffmpeg/Makefile +++ b/cross/ffmpeg/Makefile @@ -9,7 +9,7 @@ HOMEPAGE = https://www.ffmpeg.org/ COMMENT = FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library LICENSE = GPLv2 -CONFIGURE_ARGS = --target-os=linux --cross-prefix=$(TC_PATH)$(TC_PREFIX) --prefix=$(INSTALL_PREFIX) +CONFIGURE_ARGS = --target-os=linux --cross-prefix=$(TC_PATH)$(TC_PREFIX) --prefix=$(INSTALL_PREFIX) CONFIGURE_ARGS += --extra-cflags="-I$(WORK_DIR)/install$(INSTALL_PREFIX)/include" CONFIGURE_ARGS += --extra-ldflags="-L$(WORK_DIR)/install$(INSTALL_PREFIX)/lib" CONFIGURE_ARGS += --extra-libs="-lxml2 -ldl" --pkg-config=/usr/bin/pkg-config --ranlib=$(RANLIB) @@ -21,6 +21,9 @@ CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --disable-doc +# Must match $(SPK_REV) from spk/ffmpeg/Makefil +CONFIGURE_ARGS += --extra-version=$(shell sed -n 's/^SPK_REV = \(.*\)/\1/p' $(WORK_DIR)/../../../spk/ffmpeg/Makefile) + # Enable Synology specific -hls_seek_time option and other optimizations CONFIGURE_ARGS += --extra-cflags=-DSYNO_VIDEOSTATION diff --git a/spk/ffmpeg/Makefile b/spk/ffmpeg/Makefile index 1cc04fabb81..d6a96667201 100644 --- a/spk/ffmpeg/Makefile +++ b/spk/ffmpeg/Makefile @@ -1,8 +1,8 @@ SPK_NAME = ffmpeg SPK_VERS = 4.4.2 -SPK_REV = 43 +SPK_REV = 44 SPK_ICON = src/ffmpeg.png -CHANGELOG = "1. Update to version 4.4.2
2. Update intel-media-driver to 22Q1
3. Import Jellyfin project patches
4. Multiple dependency updates: fribidi, libaom, libass, libbluray, SVT-AV1, x264
5. Enable dav1d decoder
6. Enable libopenjpeg en/decoder
7. Enable RIST protocol
8. Fix an issue causing tvheadend to segfault on DSM7 x86_64" +CHANGELOG = "1. Add extra-version flag" CONF_DIR = src/conf From 574af43a701dede0c1dfc110513dfaeed7303b80 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 16 May 2022 23:35:44 +0000 Subject: [PATCH 02/22] ffmpeg: Enable WebP encoder/decoder --- cross/ffmpeg/Makefile | 3 +++ spk/ffmpeg/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cross/ffmpeg/Makefile b/cross/ffmpeg/Makefile index 97794ad5f06..b1e79dd4041 100644 --- a/cross/ffmpeg/Makefile +++ b/cross/ffmpeg/Makefile @@ -93,6 +93,9 @@ CONFIGURE_ARGS += --enable-libsoxr DEPENDS += cross/opencore-amr CONFIGURE_ARGS += --enable-libopencore-amrnb --enable-libopencore-amrwb +DEPENDS += cross/libwebp +CONFIGURE_ARGS += --enable-libwebp + DEPENDS += cross/libzmq CONFIGURE_ARGS += --enable-libzmq diff --git a/spk/ffmpeg/Makefile b/spk/ffmpeg/Makefile index d6a96667201..4394d28d04b 100644 --- a/spk/ffmpeg/Makefile +++ b/spk/ffmpeg/Makefile @@ -2,7 +2,7 @@ SPK_NAME = ffmpeg SPK_VERS = 4.4.2 SPK_REV = 44 SPK_ICON = src/ffmpeg.png -CHANGELOG = "1. Add extra-version flag" +CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder" CONF_DIR = src/conf From 4f987db8c189b4e02e53891b51c2dded58745817 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 12:42:32 +0000 Subject: [PATCH 03/22] docker-tvheadend: Update digests against master --- cross/docker-tvheadend/Makefile | 1 - cross/docker-tvheadend/digests | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cross/docker-tvheadend/Makefile b/cross/docker-tvheadend/Makefile index 787594c3231..43dcb36ea61 100644 --- a/cross/docker-tvheadend/Makefile +++ b/cross/docker-tvheadend/Makefile @@ -2,7 +2,6 @@ PKG_NAME = docker-tvheadend PKG_VERS = master PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/tvheadend/tvheadend/archive PKG_DIST_SITE = https://github.com/linuxserver/docker-tvheadend/archive/refs/heads PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) diff --git a/cross/docker-tvheadend/digests b/cross/docker-tvheadend/digests index 8790897daa6..0040514e3b4 100644 --- a/cross/docker-tvheadend/digests +++ b/cross/docker-tvheadend/digests @@ -1,3 +1,3 @@ -docker-tvheadend-master.tar.gz SHA1 bf96d0f57047213bddbcd928743fe32cbcebd2f2 -docker-tvheadend-master.tar.gz SHA256 ba2cc65378ad25fa2880a3b2a06012a1199a80259566d4d8a319071d392a6d72 -docker-tvheadend-master.tar.gz MD5 09e5c8fca4f83bd0c89e35f649d51794 +docker-tvheadend-master.tar.gz SHA1 9ba92e179527055f9cfc1b3667630226498393ba +docker-tvheadend-master.tar.gz SHA256 83d55c94d6d91831a93bc82c55bbb7ac9c288a116d1b55116356bdaabaa216d4 +docker-tvheadend-master.tar.gz MD5 602fdc59634a09bb182f54533392b1c0 From db243b73112c3a57662d886f64179d538e405ffb Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 12:56:20 +0000 Subject: [PATCH 04/22] tvheadend: Fix version so digests is constant --- cross/docker-tvheadend/Makefile | 7 ++++--- cross/docker-tvheadend/digests | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cross/docker-tvheadend/Makefile b/cross/docker-tvheadend/Makefile index 43dcb36ea61..a294110c63c 100644 --- a/cross/docker-tvheadend/Makefile +++ b/cross/docker-tvheadend/Makefile @@ -1,9 +1,10 @@ PKG_NAME = docker-tvheadend -PKG_VERS = master +# git hash from April 22nd 2022 +PKG_VERS = 8d64a8b94105530c1e149b3973a66da9299c20dd PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/linuxserver/docker-tvheadend/archive/refs/heads -PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/linuxserver/docker-tvheadend/archive +PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = diff --git a/cross/docker-tvheadend/digests b/cross/docker-tvheadend/digests index 0040514e3b4..781f812949b 100644 --- a/cross/docker-tvheadend/digests +++ b/cross/docker-tvheadend/digests @@ -1,3 +1,3 @@ -docker-tvheadend-master.tar.gz SHA1 9ba92e179527055f9cfc1b3667630226498393ba -docker-tvheadend-master.tar.gz SHA256 83d55c94d6d91831a93bc82c55bbb7ac9c288a116d1b55116356bdaabaa216d4 -docker-tvheadend-master.tar.gz MD5 602fdc59634a09bb182f54533392b1c0 +docker-tvheadend-git8d64a8b94105530c1e149b3973a66da9299c20dd.tar.gz SHA1 6978e485f3218db05c75e323a8565acd57b1cceb +docker-tvheadend-git8d64a8b94105530c1e149b3973a66da9299c20dd.tar.gz SHA256 1aff725cc5a84799555f13949a0d537ca5de96e4c94f72dd3b11f98e8e22bf2b +docker-tvheadend-git8d64a8b94105530c1e149b3973a66da9299c20dd.tar.gz MD5 356ebd94fc693974f5388d959e6cffb1 From ae811b1d6e09a2e177342c9570e4599ccab885e1 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 12:57:16 +0000 Subject: [PATCH 05/22] ffmpeg: Add candidates for enablement --- spk/ffmpeg/TODO | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 spk/ffmpeg/TODO diff --git a/spk/ffmpeg/TODO b/spk/ffmpeg/TODO new file mode 100644 index 00000000000..d8fe786c115 --- /dev/null +++ b/spk/ffmpeg/TODO @@ -0,0 +1,39 @@ +To modify: + --enable-libfontconfig VS --enable-fontconfig + +Candidates for enablement: + --enable-ladspa + --enable-libbs2b + --enable-libcaca + --enable-libcdio + --enable-libcodec2 + --enable-libflite + --enable-libgme + --enable-libgsm + --enable-libmysofa + --enable-libopenmpt + --enable-librabbitmq + --enable-librubberband + --enable-libsnappy + --enable-libsrt + --enable-libssh + --enable-libtwolame + --enable-libvidstab + --enable-libxvid + --enable-libzimg + --enable-lv2 + --enable-omx + --enable-pocketsphinx + --enable-librsvg + --enable-libdc1394 + --enable-libiec61883 + --enable-chromaprint + --enable-frei0r + +Not to be enabled: + --enable-libjack + --enable-libpulse + --enable-openal + --enable-opencl + --enable-opengl + --enable-sdl2 From 500fde7e861767a6a079440706476301275efc0c Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 13:01:30 +0000 Subject: [PATCH 06/22] ffmpeg: Convert from enable-fontconfig to enable-libfontconfig --- cross/ffmpeg/Makefile | 5 ++++- spk/ffmpeg/TODO | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cross/ffmpeg/Makefile b/cross/ffmpeg/Makefile index b1e79dd4041..c97dc922fef 100644 --- a/cross/ffmpeg/Makefile +++ b/cross/ffmpeg/Makefile @@ -16,7 +16,7 @@ CONFIGURE_ARGS += --extra-libs="-lxml2 -ldl" --pkg-config=/usr/bin/pkg-config -- CONFIGURE_ARGS += --enable-cross-compile --enable-rpath --enable-pic CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-gpl --enable-version3 -CONFIGURE_ARGS += --enable-fontconfig --enable-avresample +CONFIGURE_ARGS += --enable-avresample CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --disable-doc @@ -56,6 +56,9 @@ DEPENDS += cross/libxml2 CONFIGURE_ARGS += --enable-libxml2 CONFIGURE_ARGS += --enable-demuxer=dash +DEPENDS += cross/fontconfig +CONFIGURE_ARGS += --enable-libfontconfig + DEPENDS += cross/freetype CONFIGURE_ARGS += --enable-libfreetype diff --git a/spk/ffmpeg/TODO b/spk/ffmpeg/TODO index d8fe786c115..64083df8a1a 100644 --- a/spk/ffmpeg/TODO +++ b/spk/ffmpeg/TODO @@ -1,6 +1,3 @@ -To modify: - --enable-libfontconfig VS --enable-fontconfig - Candidates for enablement: --enable-ladspa --enable-libbs2b From 542879f27b2c91ddb6c18a2ea4dfdda573ab397a Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 13:03:34 +0000 Subject: [PATCH 07/22] chromaprint: Update from version 1.5.0 to 1.5.1 --- cross/chromaprint/Makefile | 2 +- cross/chromaprint/PLIST | 2 +- cross/chromaprint/digests | 6 +++--- spk/chromaprint/Makefile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cross/chromaprint/Makefile b/cross/chromaprint/Makefile index 61a1c7495cc..786af3f4acb 100644 --- a/cross/chromaprint/Makefile +++ b/cross/chromaprint/Makefile @@ -1,5 +1,5 @@ PKG_NAME = chromaprint -PKG_VERS = 1.5.0 +PKG_VERS = 1.5.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/acoustid/chromaprint/releases/download/v$(PKG_VERS) diff --git a/cross/chromaprint/PLIST b/cross/chromaprint/PLIST index 1dcbed39598..e4f3e387dff 100644 --- a/cross/chromaprint/PLIST +++ b/cross/chromaprint/PLIST @@ -1,4 +1,4 @@ bin:bin/fpcalc lnk:lib/libchromaprint.so lnk:lib/libchromaprint.so.1 -lib:lib/libchromaprint.so.1.5.0 +lib:lib/libchromaprint.so.1.5.1 diff --git a/cross/chromaprint/digests b/cross/chromaprint/digests index 7166d145b38..c3dbb009e49 100644 --- a/cross/chromaprint/digests +++ b/cross/chromaprint/digests @@ -1,3 +1,3 @@ -chromaprint-1.5.0.tar.gz SHA1 f7619befa313d23016ad6ed31d5b4fb307774da7 -chromaprint-1.5.0.tar.gz SHA256 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a -chromaprint-1.5.0.tar.gz MD5 e078aa024cf78788d55434a487b5978f +chromaprint-1.5.1.tar.gz SHA1 f54d8b58ff514ab65851d524237b38d8965cba57 +chromaprint-1.5.1.tar.gz SHA256 a1aad8fa3b8b18b78d3755b3767faff9abb67242e01b478ec9a64e190f335e1c +chromaprint-1.5.1.tar.gz MD5 54e71f86bcf1d34989db639044ba9628 diff --git a/spk/chromaprint/Makefile b/spk/chromaprint/Makefile index 9c997dd4a3a..f9fad58bef5 100644 --- a/spk/chromaprint/Makefile +++ b/spk/chromaprint/Makefile @@ -1,6 +1,6 @@ SPK_NAME = chromaprint -SPK_VERS = 1.5.0 -SPK_REV = 17 +SPK_VERS = 1.5.1 +SPK_REV = 18 SPK_ICON = src/chromaprint.png DEPENDS = cross/$(SPK_NAME) From 87526d2711603c19dd5a1bbf58178e12d6f3f5e4 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 13:11:56 +0000 Subject: [PATCH 08/22] chromaprint: Update changelog --- spk/chromaprint/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/chromaprint/Makefile b/spk/chromaprint/Makefile index f9fad58bef5..9a3ba38e6f4 100644 --- a/spk/chromaprint/Makefile +++ b/spk/chromaprint/Makefile @@ -10,7 +10,7 @@ STARTABLE = no MAINTAINER = ymartin59 DESCRIPTION = Chromaprint is the core component of the AcoustID project. It\'s a client-side library that implements a custom algorithm for extracting fingerprints from any audio source. DISPLAY_NAME = Chromaprint -CHANGELOG = "1. Update to ffmpeg 4.4.1" +CHANGELOG = "1. Update to version 1.5.1
2. Update to ffmpeg 4.4.2" HOMEPAGE = https://acoustid.org/chromaprint LICENSE = LGPL2.1+ From a7bc888a36876964ea74ed9de989ffe2c10f5fad Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 13:13:55 +0000 Subject: [PATCH 09/22] ffmpeg: Enable caca (color ASCII art) and rabbitmq support --- cross/ffmpeg/Makefile | 16 +++++++++++----- spk/ffmpeg/Makefile | 2 +- spk/ffmpeg/TODO | 1 - 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cross/ffmpeg/Makefile b/cross/ffmpeg/Makefile index c97dc922fef..5f8633d2a4c 100644 --- a/cross/ffmpeg/Makefile +++ b/cross/ffmpeg/Makefile @@ -81,9 +81,18 @@ DEPENDS += cross/flac DEPENDS += cross/libtheora CONFIGURE_ARGS += --enable-libtheora +DEPENDS += cross/libcaca +CONFIGURE_ARGS += --enable-libcaca + DEPENDS += cross/libvorbis CONFIGURE_ARGS += --enable-libvorbis +DEPENDS += cross/libwebp +CONFIGURE_ARGS += --enable-libwebp + +DEPENDS += cross/libzmq +CONFIGURE_ARGS += --enable-libzmq + DEPENDS += cross/gnutls CONFIGURE_ARGS += --enable-gnutls @@ -96,11 +105,8 @@ CONFIGURE_ARGS += --enable-libsoxr DEPENDS += cross/opencore-amr CONFIGURE_ARGS += --enable-libopencore-amrnb --enable-libopencore-amrwb -DEPENDS += cross/libwebp -CONFIGURE_ARGS += --enable-libwebp - -DEPENDS += cross/libzmq -CONFIGURE_ARGS += --enable-libzmq +DEPENDS += cross/rabbitmq +CONFIGURE_ARGS += --enable-librabbitmq DEPENDS += cross/zvbi CONFIGURE_ARGS += --enable-libzvbi diff --git a/spk/ffmpeg/Makefile b/spk/ffmpeg/Makefile index 4394d28d04b..27923c10293 100644 --- a/spk/ffmpeg/Makefile +++ b/spk/ffmpeg/Makefile @@ -2,7 +2,7 @@ SPK_NAME = ffmpeg SPK_VERS = 4.4.2 SPK_REV = 44 SPK_ICON = src/ffmpeg.png -CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder" +CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder
3. Enable caca (color ASCII art) output device
4. Enable rabbitmq support" CONF_DIR = src/conf diff --git a/spk/ffmpeg/TODO b/spk/ffmpeg/TODO index 64083df8a1a..711071f4c5c 100644 --- a/spk/ffmpeg/TODO +++ b/spk/ffmpeg/TODO @@ -9,7 +9,6 @@ Candidates for enablement: --enable-libgsm --enable-libmysofa --enable-libopenmpt - --enable-librabbitmq --enable-librubberband --enable-libsnappy --enable-libsrt From 466ef72cd2d26242e1fd62038a8c2ff1911cca4f Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 13:26:48 +0000 Subject: [PATCH 10/22] ffmpeg: Enable frei0r pligin API support --- cross/ffmpeg/Makefile | 3 +++ cross/frei0r/Makefile | 17 +++++++++++++++++ cross/frei0r/PLIST | 4 ++++ cross/frei0r/digests | 3 +++ spk/ffmpeg/Makefile | 2 +- spk/ffmpeg/TODO | 2 -- 6 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 cross/frei0r/Makefile create mode 100644 cross/frei0r/PLIST create mode 100644 cross/frei0r/digests diff --git a/cross/ffmpeg/Makefile b/cross/ffmpeg/Makefile index 5f8633d2a4c..0a6a8c5d8ca 100644 --- a/cross/ffmpeg/Makefile +++ b/cross/ffmpeg/Makefile @@ -62,6 +62,9 @@ CONFIGURE_ARGS += --enable-libfontconfig DEPENDS += cross/freetype CONFIGURE_ARGS += --enable-libfreetype +DEPENDS += cross/frei0r +CONFIGURE_ARGS += --enable-libfrei0r + DEPENDS += cross/fribidi CONFIGURE_ARGS += --enable-libfribidi diff --git a/cross/frei0r/Makefile b/cross/frei0r/Makefile new file mode 100644 index 00000000000..f8dd2a7b855 --- /dev/null +++ b/cross/frei0r/Makefile @@ -0,0 +1,17 @@ +PKG_NAME = frei0r +PKG_VERS = 1.8.0 +PKG_EXT = tar.gz +PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/dyne/frei0r/archive/refs/tags +PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +HOMEPAGE = https://frei0r.dyne.org/ +COMMENT = Frei0r is a minimalistic plugin API for video effects. +LICENSE = GPL-2.0 + +CMAKE_ARGS = -DCMAKE_BUILD_TYPE=Release +CMAKE_ARGS += -DURIPARSER_BUILD_DOCS=OFF +CMAKE_ARGS += -DURIPARSER_BUILD_TESTS=OFF + +include ../../mk/spksrc.cross-cmake.mk diff --git a/cross/frei0r/PLIST b/cross/frei0r/PLIST new file mode 100644 index 00000000000..17fb213a67b --- /dev/null +++ b/cross/frei0r/PLIST @@ -0,0 +1,4 @@ +bin:bin/uriparse +lnk:lib/liburiparser.so +lnk:lib/liburiparser.so.1 +lib:lib/liburiparser.so.1.0.29 diff --git a/cross/frei0r/digests b/cross/frei0r/digests new file mode 100644 index 00000000000..7b8a437a36e --- /dev/null +++ b/cross/frei0r/digests @@ -0,0 +1,3 @@ +frei0r-1.8.0.tar.gz SHA1 eb1e552c16ae50668f6b67ef91bd920eec41fd94 +frei0r-1.8.0.tar.gz SHA256 14def1b926c67c1000a67f79696cb280041d1070be745416fb05bfbd21ba6586 +frei0r-1.8.0.tar.gz MD5 ff576ebbb5b086f6781696b1a6c7bcca diff --git a/spk/ffmpeg/Makefile b/spk/ffmpeg/Makefile index 27923c10293..e4295841f7b 100644 --- a/spk/ffmpeg/Makefile +++ b/spk/ffmpeg/Makefile @@ -2,7 +2,7 @@ SPK_NAME = ffmpeg SPK_VERS = 4.4.2 SPK_REV = 44 SPK_ICON = src/ffmpeg.png -CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder
3. Enable caca (color ASCII art) output device
4. Enable rabbitmq support" +CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder
3. Enable caca (color ASCII art) output device
4. Enable rabbitmq support
5. Enable frei0r plugin API support" CONF_DIR = src/conf diff --git a/spk/ffmpeg/TODO b/spk/ffmpeg/TODO index 711071f4c5c..97a981b0124 100644 --- a/spk/ffmpeg/TODO +++ b/spk/ffmpeg/TODO @@ -1,7 +1,6 @@ Candidates for enablement: --enable-ladspa --enable-libbs2b - --enable-libcaca --enable-libcdio --enable-libcodec2 --enable-libflite @@ -24,7 +23,6 @@ Candidates for enablement: --enable-libdc1394 --enable-libiec61883 --enable-chromaprint - --enable-frei0r Not to be enabled: --enable-libjack From 0fda7e06609036101e0ca2ea1f5a568adf823d79 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 18:17:00 +0000 Subject: [PATCH 11/22] ffmpeg: Misc fixes related to rabbitmq & frei0r for proper build --- cross/ffmpeg/Makefile | 8 ++++---- cross/frei0r/Makefile | 4 ++++ cross/librabbitmq/Makefile | 19 +++++++++++++++++++ cross/librabbitmq/PLIST | 3 +++ cross/librabbitmq/digests | 3 +++ 5 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 cross/librabbitmq/Makefile create mode 100644 cross/librabbitmq/PLIST create mode 100644 cross/librabbitmq/digests diff --git a/cross/ffmpeg/Makefile b/cross/ffmpeg/Makefile index 0a6a8c5d8ca..c598f4d77cf 100644 --- a/cross/ffmpeg/Makefile +++ b/cross/ffmpeg/Makefile @@ -62,9 +62,6 @@ CONFIGURE_ARGS += --enable-libfontconfig DEPENDS += cross/freetype CONFIGURE_ARGS += --enable-libfreetype -DEPENDS += cross/frei0r -CONFIGURE_ARGS += --enable-libfrei0r - DEPENDS += cross/fribidi CONFIGURE_ARGS += --enable-libfribidi @@ -108,7 +105,7 @@ CONFIGURE_ARGS += --enable-libsoxr DEPENDS += cross/opencore-amr CONFIGURE_ARGS += --enable-libopencore-amrnb --enable-libopencore-amrwb -DEPENDS += cross/rabbitmq +DEPENDS += cross/librabbitmq CONFIGURE_ARGS += --enable-librabbitmq DEPENDS += cross/zvbi @@ -134,6 +131,9 @@ ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH)) DEPENDS += cross/dav1d CONFIGURE_ARGS += --enable-libdav1d +DEPENDS += cross/frei0r +CONFIGURE_ARGS += --enable-frei0r + DEPENDS += cross/librist CONFIGURE_ARGS += --enable-librist diff --git a/cross/frei0r/Makefile b/cross/frei0r/Makefile index f8dd2a7b855..7cb93143329 100644 --- a/cross/frei0r/Makefile +++ b/cross/frei0r/Makefile @@ -6,10 +6,14 @@ PKG_DIST_SITE = https://github.com/dyne/frei0r/archive/refs/tags PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) +DEPENDS = cross/freetype cross/cairo + HOMEPAGE = https://frei0r.dyne.org/ COMMENT = Frei0r is a minimalistic plugin API for video effects. LICENSE = GPL-2.0 +UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) + CMAKE_ARGS = -DCMAKE_BUILD_TYPE=Release CMAKE_ARGS += -DURIPARSER_BUILD_DOCS=OFF CMAKE_ARGS += -DURIPARSER_BUILD_TESTS=OFF diff --git a/cross/librabbitmq/Makefile b/cross/librabbitmq/Makefile new file mode 100644 index 00000000000..99ae126a53f --- /dev/null +++ b/cross/librabbitmq/Makefile @@ -0,0 +1,19 @@ +PKG_NAME = rabbitmq-c +PKG_VERS = 0.11.0 +PKG_EXT = tar.gz +PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/alanxz/rabbitmq-c/archive/refs/tags/ +PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = cross/openssl + +HOMEPAGE = https://github.com/alanxz/rabbitmq-c +COMMENT = This is a C-language AMQP client library for use with v2.0+ of the RabbitMQ broker. +LICENSE = MIT + +CMAKE_ARGS = -DCMAKE_BUILD_TYPE=Release +CMAKE_ARGS += -DURIPARSER_BUILD_DOCS=OFF +CMAKE_ARGS += -DURIPARSER_BUILD_TESTS=OFF + +include ../../mk/spksrc.cross-cmake.mk diff --git a/cross/librabbitmq/PLIST b/cross/librabbitmq/PLIST new file mode 100644 index 00000000000..ebfd7f58a2c --- /dev/null +++ b/cross/librabbitmq/PLIST @@ -0,0 +1,3 @@ +lnk:lib/librabbitmq.so +lnk:lib/librabbitmq.so.4 +lib:lib/librabbitmq.so.4.5.0 diff --git a/cross/librabbitmq/digests b/cross/librabbitmq/digests new file mode 100644 index 00000000000..87860ff2847 --- /dev/null +++ b/cross/librabbitmq/digests @@ -0,0 +1,3 @@ +rabbitmq-c-0.11.0.tar.gz SHA1 f1786acb5242ec2f29a0f39f84bcd3c3760eadac +rabbitmq-c-0.11.0.tar.gz SHA256 437d45e0e35c18cf3e59bcfe5dfe37566547eb121e69fca64b98f5d2c1c2d424 +rabbitmq-c-0.11.0.tar.gz MD5 e7d9896577aea6351811d7c1d7f0a68a From caea4a3948ac91cee2fa7416e5217edb914d0c56 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 18:40:09 +0000 Subject: [PATCH 12/22] frei0r: Fix PLIST and remove depends --- cross/frei0r/Makefile | 2 +- cross/frei0r/PLIST | 135 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 132 insertions(+), 5 deletions(-) diff --git a/cross/frei0r/Makefile b/cross/frei0r/Makefile index 7cb93143329..6d4ad5a50a9 100644 --- a/cross/frei0r/Makefile +++ b/cross/frei0r/Makefile @@ -6,7 +6,7 @@ PKG_DIST_SITE = https://github.com/dyne/frei0r/archive/refs/tags PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/freetype cross/cairo +DEPENDS = HOMEPAGE = https://frei0r.dyne.org/ COMMENT = Frei0r is a minimalistic plugin API for video effects. diff --git a/cross/frei0r/PLIST b/cross/frei0r/PLIST index 17fb213a67b..1990d1b9480 100644 --- a/cross/frei0r/PLIST +++ b/cross/frei0r/PLIST @@ -1,4 +1,131 @@ -bin:bin/uriparse -lnk:lib/liburiparser.so -lnk:lib/liburiparser.so.1 -lib:lib/liburiparser.so.1.0.29 +lib:lib/frei0r-1/3dflippo.so +lib:lib/frei0r-1/addition_alpha.so +lib:lib/frei0r-1/addition.so +lib:lib/frei0r-1/aech0r.so +lib:lib/frei0r-1/alpha0ps.so +lib:lib/frei0r-1/alphaatop.so +lib:lib/frei0r-1/alphagrad.so +lib:lib/frei0r-1/alphainjection.so +lib:lib/frei0r-1/alphain.so +lib:lib/frei0r-1/alphaout.so +lib:lib/frei0r-1/alphaover.so +lib:lib/frei0r-1/alphaspot.so +lib:lib/frei0r-1/alphaxor.so +lib:lib/frei0r-1/balanc0r.so +lib:lib/frei0r-1/baltan.so +lib:lib/frei0r-1/bgsubtract0r.so +lib:lib/frei0r-1/blend.so +lib:lib/frei0r-1/bluescreen0r.so +lib:lib/frei0r-1/brightness.so +lib:lib/frei0r-1/B.so +lib:lib/frei0r-1/burn.so +lib:lib/frei0r-1/bw0r.so +lib:lib/frei0r-1/c0rners.so +lib:lib/frei0r-1/cairoaffineblend.so +lib:lib/frei0r-1/cairoblend.so +lib:lib/frei0r-1/cairogradient.so +lib:lib/frei0r-1/cairoimagegrid.so +lib:lib/frei0r-1/cartoon.so +lib:lib/frei0r-1/cluster.so +lib:lib/frei0r-1/colgate.so +lib:lib/frei0r-1/coloradj_RGB.so +lib:lib/frei0r-1/colordistance.so +lib:lib/frei0r-1/colorhalftone.so +lib:lib/frei0r-1/colorize.so +lib:lib/frei0r-1/color_only.so +lib:lib/frei0r-1/colortap.so +lib:lib/frei0r-1/composition.so +lib:lib/frei0r-1/contrast0r.so +lib:lib/frei0r-1/curves.so +lib:lib/frei0r-1/d90stairsteppingfix.so +lib:lib/frei0r-1/darken.so +lib:lib/frei0r-1/defish0r.so +lib:lib/frei0r-1/delay0r.so +lib:lib/frei0r-1/delaygrab.so +lib:lib/frei0r-1/difference.so +lib:lib/frei0r-1/distort0r.so +lib:lib/frei0r-1/dither.so +lib:lib/frei0r-1/divide.so +lib:lib/frei0r-1/dodge.so +lib:lib/frei0r-1/edgeglow.so +lib:lib/frei0r-1/elastic_scale.so +lib:lib/frei0r-1/emboss.so +lib:lib/frei0r-1/equaliz0r.so +lib:lib/frei0r-1/flippo.so +lib:lib/frei0r-1/gamma.so +lib:lib/frei0r-1/glitch0r.so +lib:lib/frei0r-1/glow.so +lib:lib/frei0r-1/grain_extract.so +lib:lib/frei0r-1/grain_merge.so +lib:lib/frei0r-1/G.so +lib:lib/frei0r-1/hardlight.so +lib:lib/frei0r-1/hqdn3d.so +lib:lib/frei0r-1/hueshift0r.so +lib:lib/frei0r-1/hue.so +lib:lib/frei0r-1/IIRblur.so +lib:lib/frei0r-1/invert0r.so +lib:lib/frei0r-1/ising0r.so +lib:lib/frei0r-1/keyspillm0pup.so +lib:lib/frei0r-1/lenscorrection.so +lib:lib/frei0r-1/letterb0xed.so +lib:lib/frei0r-1/levels.so +lib:lib/frei0r-1/lighten.so +lib:lib/frei0r-1/lightgraffiti.so +lib:lib/frei0r-1/lissajous0r.so +lib:lib/frei0r-1/luminance.so +lib:lib/frei0r-1/mask0mate.so +lib:lib/frei0r-1/medians.so +lib:lib/frei0r-1/multiply.so +lib:lib/frei0r-1/ndvi.so +lib:lib/frei0r-1/nervous.so +lib:lib/frei0r-1/nois0r.so +lib:lib/frei0r-1/normaliz0r.so +lib:lib/frei0r-1/nosync0r.so +lib:lib/frei0r-1/onecol0r.so +lib:lib/frei0r-1/overlay.so +lib:lib/frei0r-1/partik0l.so +lib:lib/frei0r-1/perspective.so +lib:lib/frei0r-1/pixeliz0r.so +lib:lib/frei0r-1/plasma.so +lib:lib/frei0r-1/posterize.so +lib:lib/frei0r-1/pr0be.so +lib:lib/frei0r-1/pr0file.so +lib:lib/frei0r-1/premultiply.so +lib:lib/frei0r-1/primaries.so +lib:lib/frei0r-1/rgbnoise.so +lib:lib/frei0r-1/RGB.so +lib:lib/frei0r-1/rgbsplit0r.so +lib:lib/frei0r-1/R.so +lib:lib/frei0r-1/saturat0r.so +lib:lib/frei0r-1/saturation.so +lib:lib/frei0r-1/scanline0r.so +lib:lib/frei0r-1/screen.so +lib:lib/frei0r-1/select0r.so +lib:lib/frei0r-1/sharpness.so +lib:lib/frei0r-1/sigmoidaltransfer.so +lib:lib/frei0r-1/sobel.so +lib:lib/frei0r-1/softglow.so +lib:lib/frei0r-1/softlight.so +lib:lib/frei0r-1/sopsat.so +lib:lib/frei0r-1/spillsupress.so +lib:lib/frei0r-1/squareblur.so +lib:lib/frei0r-1/subtract.so +lib:lib/frei0r-1/tehRoxx0r.so +lib:lib/frei0r-1/test_pat_B.so +lib:lib/frei0r-1/test_pat_C.so +lib:lib/frei0r-1/test_pat_G.so +lib:lib/frei0r-1/test_pat_I.so +lib:lib/frei0r-1/test_pat_L.so +lib:lib/frei0r-1/test_pat_R.so +lib:lib/frei0r-1/threelay0r.so +lib:lib/frei0r-1/three_point_balance.so +lib:lib/frei0r-1/threshold0r.so +lib:lib/frei0r-1/timeout.so +lib:lib/frei0r-1/tint0r.so +lib:lib/frei0r-1/transparency.so +lib:lib/frei0r-1/twolay0r.so +lib:lib/frei0r-1/uvmap.so +lib:lib/frei0r-1/value.so +lib:lib/frei0r-1/vertigo.so +lib:lib/frei0r-1/vignette.so +lib:lib/frei0r-1/xfade0r.so From 3abf30256928234592ab18ad658a8a26b6a53d7b Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 17 May 2022 20:52:39 +0000 Subject: [PATCH 13/22] ffmpeg: Adjust frei0r PLIST with cairo removal --- cross/frei0r/PLIST | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cross/frei0r/PLIST b/cross/frei0r/PLIST index 1990d1b9480..6b22cfafcee 100644 --- a/cross/frei0r/PLIST +++ b/cross/frei0r/PLIST @@ -21,10 +21,6 @@ lib:lib/frei0r-1/B.so lib:lib/frei0r-1/burn.so lib:lib/frei0r-1/bw0r.so lib:lib/frei0r-1/c0rners.so -lib:lib/frei0r-1/cairoaffineblend.so -lib:lib/frei0r-1/cairoblend.so -lib:lib/frei0r-1/cairogradient.so -lib:lib/frei0r-1/cairoimagegrid.so lib:lib/frei0r-1/cartoon.so lib:lib/frei0r-1/cluster.so lib:lib/frei0r-1/colgate.so From 1f1141196160bf4095e72a8002ff30c6e44cff37 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 18 May 2022 00:14:11 +0000 Subject: [PATCH 14/22] frei0r: Re-include freetype + TODO comments related to cairo --- cross/frei0r/Makefile | 2 +- spk/ffmpeg/TODO | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cross/frei0r/Makefile b/cross/frei0r/Makefile index 6d4ad5a50a9..ad3dcb5d14d 100644 --- a/cross/frei0r/Makefile +++ b/cross/frei0r/Makefile @@ -6,7 +6,7 @@ PKG_DIST_SITE = https://github.com/dyne/frei0r/archive/refs/tags PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = +DEPENDS = cross/freetype HOMEPAGE = https://frei0r.dyne.org/ COMMENT = Frei0r is a minimalistic plugin API for video effects. diff --git a/spk/ffmpeg/TODO b/spk/ffmpeg/TODO index 97a981b0124..b0033b3a5e5 100644 --- a/spk/ffmpeg/TODO +++ b/spk/ffmpeg/TODO @@ -1,3 +1,11 @@ +To enhance if other requirements: + --enable-frei0r ==> Could benefit from adding cross/cairo + Generates the following extras libs: + lib:lib/frei0r-1/cairoaffineblend.so + lib:lib/frei0r-1/cairoblend.so + lib:lib/frei0r-1/cairogradient.so + lib:lib/frei0r-1/cairoimagegrid.so + Candidates for enablement: --enable-ladspa --enable-libbs2b @@ -19,12 +27,12 @@ Candidates for enablement: --enable-lv2 --enable-omx --enable-pocketsphinx - --enable-librsvg --enable-libdc1394 --enable-libiec61883 --enable-chromaprint Not to be enabled: + --enable-librsvg ==> Requires gobject-introspection + python + many other dependencies increasing spk size --enable-libjack --enable-libpulse --enable-openal From 364ac147e05b6058e6970aad196828bd8b3ba90c Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 18 May 2022 00:18:10 +0000 Subject: [PATCH 15/22] chromaprint: Build fixes --- cross/chromaprint/Makefile | 3 ++- .../patches/001-disable-HAVE_AV_FRAME.patch | 17 ----------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 cross/chromaprint/patches/001-disable-HAVE_AV_FRAME.patch diff --git a/cross/chromaprint/Makefile b/cross/chromaprint/Makefile index 786af3f4acb..8e20a709dd7 100644 --- a/cross/chromaprint/Makefile +++ b/cross/chromaprint/Makefile @@ -3,7 +3,7 @@ PKG_VERS = 1.5.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/acoustid/chromaprint/releases/download/v$(PKG_VERS) -PKG_DIR = $(PKG_NAME)-v$(PKG_VERS) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) HOMEPAGE = https://acoustid.org/chromaprint COMMENT = Chromaprint is the core component of the AcoustID project. It\'s a client-side library that implements a custom algorithm for extracting fingerprints from any audio source. @@ -26,5 +26,6 @@ CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR) include ../../mk/spksrc.cross-cmake.mk CMAKE_ARGS += -DBUILD_TOOLS=ON +CMAKE_ARGS += -DBUILD_TESTS=OFF CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(CMAKE_RPATH) CMAKE_ARGS += -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" diff --git a/cross/chromaprint/patches/001-disable-HAVE_AV_FRAME.patch b/cross/chromaprint/patches/001-disable-HAVE_AV_FRAME.patch deleted file mode 100644 index 736cbb3b13d..00000000000 --- a/cross/chromaprint/patches/001-disable-HAVE_AV_FRAME.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/audio/ffmpeg_audio_reader.h.orig 2020-04-15 04:08:10.000000000 +0000 -+++ src/audio/ffmpeg_audio_reader.h 2021-04-12 23:31:30.658596475 +0000 -@@ -27,14 +27,6 @@ extern "C" { - #define av_packet_unref av_free_packet - #endif - --#ifndef HAVE_AV_FRAME_ALLOC --#define av_frame_alloc avcodec_alloc_frame --#endif -- --#ifndef HAVE_AV_FRAME_FREE --#define av_frame_free avcodec_free_frame --#endif -- - #ifndef AV_ERROR_MAX_STRING_SIZE - #define AV_ERROR_MAX_STRING_SIZE 128 - #endif From fe88daaacabccffe3fb3bc6358dd80760dabd4cc Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 18 May 2022 12:52:39 +0000 Subject: [PATCH 16/22] ffmpeg: Enable zimg image processing support --- cross/ffmpeg/Makefile | 3 +++ cross/libzimg/Makefile | 30 ++++++++++++++++++++++++++++++ cross/libzimg/PLIST | 3 +++ cross/libzimg/digests | 3 +++ spk/ffmpeg/Makefile | 2 +- spk/ffmpeg/TODO | 1 - 6 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 cross/libzimg/Makefile create mode 100644 cross/libzimg/PLIST create mode 100644 cross/libzimg/digests diff --git a/cross/ffmpeg/Makefile b/cross/ffmpeg/Makefile index c598f4d77cf..dea5a56553e 100644 --- a/cross/ffmpeg/Makefile +++ b/cross/ffmpeg/Makefile @@ -137,6 +137,9 @@ CONFIGURE_ARGS += --enable-frei0r DEPENDS += cross/librist CONFIGURE_ARGS += --enable-librist +DEPENDS += cross/libzimg +CONFIGURE_ARGS += --enable-libzimg + # end ifneq $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) endif diff --git a/cross/libzimg/Makefile b/cross/libzimg/Makefile new file mode 100644 index 00000000000..9e9c85f1f68 --- /dev/null +++ b/cross/libzimg/Makefile @@ -0,0 +1,30 @@ +PKG_NAME = zimg +PKG_VERS = 3.0.4 +PKG_EXT = tar.gz +PKG_DIST_NAME = release-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/sekrit-twc/zimg/archive/refs/tags +PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME)-release-$(PKG_VERS) + +DEPENDS = + +HOMEPAGE = https://github.com/sekrit-twc/zimg +COMMENT = The "z" library implements the commonly required image processing basics of scaling, colorspace conversion, and depth conversion. +LICENSE = WTFPL license + +UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS) + +GNU_CONFIGURE = 1 +PRE_CONFIGURE_TARGET = zimg_pre_configure + +include ../../mk/spksrc.cross-cc.mk + +ifeq ($(call version_lt, $(TCVERSION), 7.0),1) +ifeq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH)) +CONFIGURE_ARGS += --disable-simd +endif +endif + +.PHONY: zimg_pre_configure +zimg_pre_configure: + @$(RUN) ./autogen.sh diff --git a/cross/libzimg/PLIST b/cross/libzimg/PLIST new file mode 100644 index 00000000000..9c7961fd835 --- /dev/null +++ b/cross/libzimg/PLIST @@ -0,0 +1,3 @@ +lnk:lib/libzimg.so +lnk:lib/libzimg.so.2 +lib:lib/libzimg.so.2.0.0 diff --git a/cross/libzimg/digests b/cross/libzimg/digests new file mode 100644 index 00000000000..46eacb8dcb9 --- /dev/null +++ b/cross/libzimg/digests @@ -0,0 +1,3 @@ +zimg-3.0.4.tar.gz SHA1 310752978bcdeaa0e1bb2489cdac5009d7d6b8b1 +zimg-3.0.4.tar.gz SHA256 219d1bc6b7fde1355d72c9b406ebd730a4aed9c21da779660f0a4c851243e32f +zimg-3.0.4.tar.gz MD5 9ef18426caecf049d3078732411a9802 diff --git a/spk/ffmpeg/Makefile b/spk/ffmpeg/Makefile index e4295841f7b..96e25e0cd40 100644 --- a/spk/ffmpeg/Makefile +++ b/spk/ffmpeg/Makefile @@ -2,7 +2,7 @@ SPK_NAME = ffmpeg SPK_VERS = 4.4.2 SPK_REV = 44 SPK_ICON = src/ffmpeg.png -CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder
3. Enable caca (color ASCII art) output device
4. Enable rabbitmq support
5. Enable frei0r plugin API support" +CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder
3. Enable caca (color ASCII art) output device
4. Enable rabbitmq support
5. Enable frei0r plugin API support
6. Enable zimg image processing support" CONF_DIR = src/conf diff --git a/spk/ffmpeg/TODO b/spk/ffmpeg/TODO index b0033b3a5e5..1e7a9d088eb 100644 --- a/spk/ffmpeg/TODO +++ b/spk/ffmpeg/TODO @@ -23,7 +23,6 @@ Candidates for enablement: --enable-libtwolame --enable-libvidstab --enable-libxvid - --enable-libzimg --enable-lv2 --enable-omx --enable-pocketsphinx From bcba86a51c3c0bfa97a3d8f143fc6396cfcf0ccb Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 18 May 2022 13:06:56 +0000 Subject: [PATCH 17/22] ffmpeg: Enable libdc1394 camera support --- cross/ffmpeg/Makefile | 5 +++++ cross/libdc1394/Makefile | 17 +++++++++++++++++ cross/libdc1394/PLIST | 4 ++++ cross/libdc1394/digests | 3 +++ spk/ffmpeg/Makefile | 2 +- spk/ffmpeg/TODO | 1 - 6 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 cross/libdc1394/Makefile create mode 100644 cross/libdc1394/PLIST create mode 100644 cross/libdc1394/digests diff --git a/cross/ffmpeg/Makefile b/cross/ffmpeg/Makefile index dea5a56553e..e50fce2db1a 100644 --- a/cross/ffmpeg/Makefile +++ b/cross/ffmpeg/Makefile @@ -38,9 +38,11 @@ include ../../mk/spksrc.common.mk OPTIONAL_DEPENDS = native/nasm OPTIONAL_DEPENDS += cross/dav1d +OPTIONAL_DEPENDS += cross/frei0r OPTIONAL_DEPENDS += cross/libass OPTIONAL_DEPENDS += cross/libaom OPTIONAL_DEPENDS += cross/libvpx +OPTIONAL_DEPENDS += cross/libzimg OPTIONAL_DEPENDS += cross/svt-av1 OPTIONAL_DEPENDS += cross/svt-hevc OPTIONAL_DEPENDS += cross/libva @@ -84,6 +86,9 @@ CONFIGURE_ARGS += --enable-libtheora DEPENDS += cross/libcaca CONFIGURE_ARGS += --enable-libcaca +DEPENDS += cross/libdc1394 +CONFIGURE_ARGS += --enable-libdc1394 + DEPENDS += cross/libvorbis CONFIGURE_ARGS += --enable-libvorbis diff --git a/cross/libdc1394/Makefile b/cross/libdc1394/Makefile new file mode 100644 index 00000000000..0d724de7d6c --- /dev/null +++ b/cross/libdc1394/Makefile @@ -0,0 +1,17 @@ +PKG_NAME = libdc1394 +PKG_VERS = 2.2.6 +PKG_EXT = tar.gz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$(PKG_VERS) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = + +HOMEPAGE = https://damien.douxchamps.net/ieee1394/libdc1394/ +COMMENT = Libdc1394 is a library that provides a complete high level application programming interface (API) for developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specifications (also known as the IIDC or DCAM Specifications). +LICENSE = GPL + +GNU_CONFIGURE = 1 +ADDITIONAL_CFLAGS = -O2 + +include ../../mk/spksrc.cross-cc.mk diff --git a/cross/libdc1394/PLIST b/cross/libdc1394/PLIST new file mode 100644 index 00000000000..7849e80a5fd --- /dev/null +++ b/cross/libdc1394/PLIST @@ -0,0 +1,4 @@ +bin:bin/dc1394_reset_bus +lnk:lib/libdc1394.so +lnk:lib/libdc1394.so.25 +lib:lib/libdc1394.so.25.0.0 diff --git a/cross/libdc1394/digests b/cross/libdc1394/digests new file mode 100644 index 00000000000..7027c56d075 --- /dev/null +++ b/cross/libdc1394/digests @@ -0,0 +1,3 @@ +libdc1394-2.2.6.tar.gz SHA1 af5fce93580585c485bb491f34a32c49bcb78b58 +libdc1394-2.2.6.tar.gz SHA256 2b905fc9aa4eec6bdcf6a2ae5f5ba021232739f5be047dec8fe8dd6049c10fed +libdc1394-2.2.6.tar.gz MD5 9fad67bbff08fe2818d5ec81802ec89f diff --git a/spk/ffmpeg/Makefile b/spk/ffmpeg/Makefile index 96e25e0cd40..9814cc63c2f 100644 --- a/spk/ffmpeg/Makefile +++ b/spk/ffmpeg/Makefile @@ -2,7 +2,7 @@ SPK_NAME = ffmpeg SPK_VERS = 4.4.2 SPK_REV = 44 SPK_ICON = src/ffmpeg.png -CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder
3. Enable caca (color ASCII art) output device
4. Enable rabbitmq support
5. Enable frei0r plugin API support
6. Enable zimg image processing support" +CHANGELOG = "1. Add extra-version flag
2. Enable WebP encoder/decoder
3. Enable libcaca (color ASCII art) output device
4. Enable rabbitmq support
5. Enable frei0r plugin API support
6. Enable zimg image processing support
7. Enable dc1394 API support" CONF_DIR = src/conf diff --git a/spk/ffmpeg/TODO b/spk/ffmpeg/TODO index 1e7a9d088eb..d74a0ee21fb 100644 --- a/spk/ffmpeg/TODO +++ b/spk/ffmpeg/TODO @@ -26,7 +26,6 @@ Candidates for enablement: --enable-lv2 --enable-omx --enable-pocketsphinx - --enable-libdc1394 --enable-libiec61883 --enable-chromaprint From 348ab5079880ab7dc566d8ea8f1eb1fe9ab5fe66 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 23 May 2022 10:54:22 +0000 Subject: [PATCH 18/22] docker-tvheadend: Use latest release instead of git hash --- cross/docker-tvheadend/Makefile | 3 +-- cross/docker-tvheadend/digests | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cross/docker-tvheadend/Makefile b/cross/docker-tvheadend/Makefile index a294110c63c..882c9228c9f 100644 --- a/cross/docker-tvheadend/Makefile +++ b/cross/docker-tvheadend/Makefile @@ -1,6 +1,5 @@ PKG_NAME = docker-tvheadend -# git hash from April 22nd 2022 -PKG_VERS = 8d64a8b94105530c1e149b3973a66da9299c20dd +PKG_VERS = 42078692-ls128 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/linuxserver/docker-tvheadend/archive diff --git a/cross/docker-tvheadend/digests b/cross/docker-tvheadend/digests index 781f812949b..819fb36210d 100644 --- a/cross/docker-tvheadend/digests +++ b/cross/docker-tvheadend/digests @@ -1,3 +1,3 @@ -docker-tvheadend-git8d64a8b94105530c1e149b3973a66da9299c20dd.tar.gz SHA1 6978e485f3218db05c75e323a8565acd57b1cceb -docker-tvheadend-git8d64a8b94105530c1e149b3973a66da9299c20dd.tar.gz SHA256 1aff725cc5a84799555f13949a0d537ca5de96e4c94f72dd3b11f98e8e22bf2b -docker-tvheadend-git8d64a8b94105530c1e149b3973a66da9299c20dd.tar.gz MD5 356ebd94fc693974f5388d959e6cffb1 +docker-tvheadend-git42078692-ls128.tar.gz SHA1 8b3e719557e39103c927c9fa7b05bdca74f9c111 +docker-tvheadend-git42078692-ls128.tar.gz SHA256 0890be36a7404a5780f5972e7f3ffe3ea37f564ab5bb5727ea15512f6a4006f3 +docker-tvheadend-git42078692-ls128.tar.gz MD5 dfda57c087b825985176d9709c5d7189 From 82c1c4400ac8db563d6444aaeafe6058de56ce79 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Fri, 27 May 2022 12:37:15 +0000 Subject: [PATCH 19/22] strip.mk: Auto-detect and include libatomic.so as needed --- mk/spksrc.strip.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/mk/spksrc.strip.mk b/mk/spksrc.strip.mk index dba511df55d..da8dd3669c2 100644 --- a/mk/spksrc.strip.mk +++ b/mk/spksrc.strip.mk @@ -43,9 +43,24 @@ endif strip_msg: @$(MSG) "Stripping binaries and libraries of $(NAME)" +include_libatomic: + @cat $(INSTALL_PLIST) | sed 's/:/ /' | while read type file ; \ + do \ + case $${type} in \ + lib|bin) \ + if [ "$$(objdump -p $(STAGING_DIR)/$${file} | grep NEEDED | grep libatomic)" ]; then \ + echo -n "Including libatomic.so..." ; \ + install -m 644 $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/$$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) $(STAGING_DIR)/lib ; \ + cd $(STAGING_DIR)/lib/ && ln -sf $$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) libatomic.so.1 ; \ + cd $(STAGING_DIR)/lib/ && ln -sf $$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) libatomic.so ; \ + fi \ + ;; \ + esac ; \ + done + pre_strip_target: strip_msg -strip_target: $(PRE_STRIP_TARGET) $(INSTALL_PLIST) +strip_target: $(PRE_STRIP_TARGET) $(INSTALL_PLIST) include_libatomic @cat $(INSTALL_PLIST) | sed 's/:/ /' | while read type file ; \ do \ case $${type} in \ From 0d072407874aba245aefa583b4f309a47310125d Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Fri, 27 May 2022 13:12:06 +0000 Subject: [PATCH 20/22] strip.mk: Minor adjustments based on @hgy59 feedbacks --- mk/spksrc.strip.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/spksrc.strip.mk b/mk/spksrc.strip.mk index da8dd3669c2..2870d0adf90 100644 --- a/mk/spksrc.strip.mk +++ b/mk/spksrc.strip.mk @@ -48,11 +48,12 @@ include_libatomic: do \ case $${type} in \ lib|bin) \ - if [ "$$(objdump -p $(STAGING_DIR)/$${file} | grep NEEDED | grep libatomic)" ]; then \ - echo -n "Including libatomic.so..." ; \ + if [ "$$(objdump -p $(STAGING_DIR)/$${file} 2>/dev/null | grep NEEDED | grep libatomic)" ]; then \ + echo "Including libatomic.so..." ; \ install -m 644 $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/$$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) $(STAGING_DIR)/lib ; \ cd $(STAGING_DIR)/lib/ && ln -sf $$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) libatomic.so.1 ; \ cd $(STAGING_DIR)/lib/ && ln -sf $$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) libatomic.so ; \ + break ; \ fi \ ;; \ esac ; \ From 9dfaddf1385bc6bb9af6d873dabf78cd89878e21 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Fri, 27 May 2022 14:16:35 +0000 Subject: [PATCH 21/22] strip.mk: Include @hgy59 proposed changes to manage libatomic.so Co-Author: hgy59 --- mk/spksrc.strip.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mk/spksrc.strip.mk b/mk/spksrc.strip.mk index 2870d0adf90..25cbf8c3c2d 100644 --- a/mk/spksrc.strip.mk +++ b/mk/spksrc.strip.mk @@ -37,6 +37,8 @@ else $(POST_STRIP_TARGET): $(STRIP_TARGET) endif +TC_LIBRARY_PATH = $(realpath $(TC_PATH)..)/$(TC_LIBRARY) + .PHONY: strip strip_msg .PHONY: $(PRE_STRIP_TARGET) $(STRIP_TARGET) $(POST_STRIP_TARGET) @@ -49,10 +51,11 @@ include_libatomic: case $${type} in \ lib|bin) \ if [ "$$(objdump -p $(STAGING_DIR)/$${file} 2>/dev/null | grep NEEDED | grep libatomic)" ]; then \ - echo "Including libatomic.so..." ; \ - install -m 644 $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/$$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) $(STAGING_DIR)/lib ; \ - cd $(STAGING_DIR)/lib/ && ln -sf $$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) libatomic.so.1 ; \ - cd $(STAGING_DIR)/lib/ && ln -sf $$(readlink $(realpath $(TC_PATH)..)/$(TC_LIBRARY)/libatomic.so) libatomic.so ; \ + _libatomic_="$$(readlink $(TC_LIBRARY_PATH)/libatomic.so)" ; \ + echo "===> Include libatomic from toolchain ($${_libatomic_})" ; \ + install -m 644 $(TC_LIBRARY_PATH)/$${_libatomic_} $(STAGING_DIR)/lib ; \ + cd $(STAGING_DIR)/lib/ && ln -sf $${_libatomic_} libatomic.so.1 ; \ + cd $(STAGING_DIR)/lib/ && ln -sf $${_libatomic_} libatomic.so ; \ break ; \ fi \ ;; \ From 15504b9e9a218322a12e4e7ab3e7a54be18a52da Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 27 May 2022 17:32:50 +0200 Subject: [PATCH 22/22] fix include_libatomic - create lib folder on demand - ensure full name of libatomic --- mk/spksrc.strip.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mk/spksrc.strip.mk b/mk/spksrc.strip.mk index 25cbf8c3c2d..8574b13bed7 100644 --- a/mk/spksrc.strip.mk +++ b/mk/spksrc.strip.mk @@ -50,10 +50,11 @@ include_libatomic: do \ case $${type} in \ lib|bin) \ - if [ "$$(objdump -p $(STAGING_DIR)/$${file} 2>/dev/null | grep NEEDED | grep libatomic)" ]; then \ + if [ "$$(objdump -p $(STAGING_DIR)/$${file} 2>/dev/null | grep NEEDED | grep libatomic\.so)" ]; then \ _libatomic_="$$(readlink $(TC_LIBRARY_PATH)/libatomic.so)" ; \ - echo "===> Include libatomic from toolchain ($${_libatomic_})" ; \ - install -m 644 $(TC_LIBRARY_PATH)/$${_libatomic_} $(STAGING_DIR)/lib ; \ + echo "===> Add libatomic from toolchain ($${_libatomic_})" ; \ + install -d -m 755 $(STAGING_DIR)/lib ; \ + install -m 644 $(TC_LIBRARY_PATH)/$${_libatomic_} $(STAGING_DIR)/lib/ ; \ cd $(STAGING_DIR)/lib/ && ln -sf $${_libatomic_} libatomic.so.1 ; \ cd $(STAGING_DIR)/lib/ && ln -sf $${_libatomic_} libatomic.so ; \ break ; \