Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ffmpeg extras #5277

Merged
merged 22 commits into from
May 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6303ef1
ffmpeg: Add extra-version flag to match SPK_VER
th0ma7 May 16, 2022
574af43
ffmpeg: Enable WebP encoder/decoder
th0ma7 May 16, 2022
4f987db
docker-tvheadend: Update digests against master
th0ma7 May 17, 2022
db243b7
tvheadend: Fix version so digests is constant
th0ma7 May 17, 2022
ae811b1
ffmpeg: Add candidates for enablement
th0ma7 May 17, 2022
500fde7
ffmpeg: Convert from enable-fontconfig to enable-libfontconfig
th0ma7 May 17, 2022
542879f
chromaprint: Update from version 1.5.0 to 1.5.1
th0ma7 May 17, 2022
87526d2
chromaprint: Update changelog
th0ma7 May 17, 2022
a7bc888
ffmpeg: Enable caca (color ASCII art) and rabbitmq support
th0ma7 May 17, 2022
466ef72
ffmpeg: Enable frei0r pligin API support
th0ma7 May 17, 2022
0fda7e0
ffmpeg: Misc fixes related to rabbitmq & frei0r for proper build
th0ma7 May 17, 2022
caea4a3
frei0r: Fix PLIST and remove depends
th0ma7 May 17, 2022
3abf302
ffmpeg: Adjust frei0r PLIST with cairo removal
th0ma7 May 17, 2022
1f11411
frei0r: Re-include freetype + TODO comments related to cairo
th0ma7 May 18, 2022
364ac14
chromaprint: Build fixes
th0ma7 May 18, 2022
fe88daa
ffmpeg: Enable zimg image processing support
th0ma7 May 18, 2022
bcba86a
ffmpeg: Enable libdc1394 camera support
th0ma7 May 18, 2022
348ab50
docker-tvheadend: Use latest release instead of git hash
th0ma7 May 23, 2022
82c1c44
strip.mk: Auto-detect and include libatomic.so as needed
th0ma7 May 27, 2022
0d07240
strip.mk: Minor adjustments based on @hgy59 feedbacks
th0ma7 May 27, 2022
9dfaddf
strip.mk: Include @hgy59 proposed changes to manage libatomic.so
th0ma7 May 27, 2022
15504b9
fix include_libatomic
hgy59 May 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cross/chromaprint/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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)
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.
Expand All @@ -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"
2 changes: 1 addition & 1 deletion cross/chromaprint/PLIST
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions cross/chromaprint/digests
Original file line number Diff line number Diff line change
@@ -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
17 changes: 0 additions & 17 deletions cross/chromaprint/patches/001-disable-HAVE_AV_FRAME.patch

This file was deleted.

7 changes: 3 additions & 4 deletions cross/docker-tvheadend/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
PKG_NAME = docker-tvheadend
PKG_VERS = master
PKG_VERS = 42078692-ls128
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_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 =
Expand Down
6 changes: 3 additions & 3 deletions cross/docker-tvheadend/digests
Original file line number Diff line number Diff line change
@@ -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-git42078692-ls128.tar.gz SHA1 8b3e719557e39103c927c9fa7b05bdca74f9c111
docker-tvheadend-git42078692-ls128.tar.gz SHA256 0890be36a7404a5780f5972e7f3ffe3ea37f564ab5bb5727ea15512f6a4006f3
docker-tvheadend-git42078692-ls128.tar.gz MD5 dfda57c087b825985176d9709c5d7189
34 changes: 30 additions & 4 deletions cross/ffmpeg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ 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)
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

# 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

Expand All @@ -35,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
Expand All @@ -53,6 +58,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

Expand All @@ -75,9 +83,21 @@ DEPENDS += cross/flac
DEPENDS += cross/libtheora
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

DEPENDS += cross/libwebp
CONFIGURE_ARGS += --enable-libwebp

DEPENDS += cross/libzmq
CONFIGURE_ARGS += --enable-libzmq

DEPENDS += cross/gnutls
CONFIGURE_ARGS += --enable-gnutls

Expand All @@ -90,8 +110,8 @@ CONFIGURE_ARGS += --enable-libsoxr
DEPENDS += cross/opencore-amr
CONFIGURE_ARGS += --enable-libopencore-amrnb --enable-libopencore-amrwb

DEPENDS += cross/libzmq
CONFIGURE_ARGS += --enable-libzmq
DEPENDS += cross/librabbitmq
CONFIGURE_ARGS += --enable-librabbitmq

DEPENDS += cross/zvbi
CONFIGURE_ARGS += --enable-libzvbi
Expand All @@ -116,9 +136,15 @@ 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

DEPENDS += cross/libzimg
CONFIGURE_ARGS += --enable-libzimg

# end ifneq $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
endif

Expand Down
21 changes: 21 additions & 0 deletions cross/frei0r/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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)

DEPENDS = cross/freetype

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

include ../../mk/spksrc.cross-cmake.mk
127 changes: 127 additions & 0 deletions cross/frei0r/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
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/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
3 changes: 3 additions & 0 deletions cross/frei0r/digests
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions cross/libdc1394/Makefile
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions cross/libdc1394/PLIST
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions cross/libdc1394/digests
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions cross/librabbitmq/Makefile
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions cross/librabbitmq/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
lnk:lib/librabbitmq.so
lnk:lib/librabbitmq.so.4
lib:lib/librabbitmq.so.4.5.0
3 changes: 3 additions & 0 deletions cross/librabbitmq/digests
Original file line number Diff line number Diff line change
@@ -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
Loading