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.

Sign up for GitHub

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 and TVH 2022Q3 update #5495

Merged
merged 30 commits into from
Nov 20, 2022
Merged

FFMPEG and TVH 2022Q3 update #5495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
46494bc
libhdhomerun: Update from version 20220303 to 20221031
th0ma7 Nov 17, 2022
3ce4622
tvheadend: Update to git hash 52c3ed3 from November 10th 2022
th0ma7 Nov 17, 2022
4e5ac0e
curl: Enable a few extras options for tvheadend needs
th0ma7 Nov 17, 2022
7194c66
libhdhomerun: Forgot to update the digests
th0ma7 Nov 17, 2022
9a1828a
tvheadend: Fix dvb-scan filename containing space characters
th0ma7 Nov 18, 2022
65a31e2
tvheadend: Multiple build adjustments
th0ma7 Nov 18, 2022
966b64a
tvheadend: Update description
th0ma7 Nov 18, 2022
f1cdcaf
x264: Update to b093bbe7 commit and change download method
th0ma7 Nov 18, 2022
e0887b8
comskip: Update to latest git hash and fix download issue
th0ma7 Nov 18, 2022
230c937
libaom: Update to v3.5 and use direct download insteaf of git
th0ma7 Nov 18, 2022
43f9690
ffmpeg: Update from v4.4.2 to v4.4.3
th0ma7 Nov 19, 2022
edc7eba
libaom: Change download source location
th0ma7 Nov 19, 2022
ec070b5
ffmpeg: Remove patch arm/034 as now included in v4.4.3
th0ma7 Nov 19, 2022
f735d78
Update description to match FFMPEG 4.4.3
th0ma7 Nov 19, 2022
a00c34e
ffmpeg: Update to Intel Media Driver 2022Q3 Release - 22.5.4
th0ma7 Nov 19, 2022
065b8bd
libdvbcsa: Use newer source allowing CPU optimizations
th0ma7 Nov 19, 2022
0f92c2c
libass: Update from version 0.15.2 to 0.16.0
th0ma7 Nov 19, 2022
df41f61
fontconfig: Update from version 2.14.0 to 2.14.1
th0ma7 Nov 19, 2022
803f0f7
harfbuzz: Update from version 2.9.1 to 5.3.1
th0ma7 Nov 19, 2022
6d45abe
libpng: Update from version 1.6.37 to 1.6.38
th0ma7 Nov 19, 2022
590087d
libvpx: Update from version 1.11.0 to 1.12.0
th0ma7 Nov 19, 2022
2dd94ef
SVT-AV1: Update from version 1.0.0-rc2 to 1.3.0
th0ma7 Nov 19, 2022
5590100
codec2: Update from version 1.0.3 to 1.0.5
th0ma7 Nov 19, 2022
1b44837
libbluray: Update from version 1.3.1 to 1.3.3
th0ma7 Nov 19, 2022
cfb3d8b
speex: Update from version 1.2.0 to 1.2.1
th0ma7 Nov 19, 2022
c8ef286
flac: Update from version 1.3.4 to 1.4.2
th0ma7 Nov 19, 2022
9f87e70
ffmpeg: Update description
th0ma7 Nov 19, 2022
25c8ffa
tvheadend: Update description related to libdvbcsa
th0ma7 Nov 19, 2022
ca40946
harfbuzz: Now requires gcc >= 4.9 making armv7l unsupported
th0ma7 Nov 20, 2022
df03eff
tvheadend: Forgot to bump package version
th0ma7 Nov 20, 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
2 changes: 1 addition & 1 deletion cross/codec2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = codec2
PKG_VERS = 1.0.3
PKG_VERS = 1.0.5
PKG_EXT = tar.gz
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
Expand Down
6 changes: 3 additions & 3 deletions cross/codec2/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
codec2-1.0.3.tar.gz SHA1 77ef870d5b8a9c54c68dddf70766be8f3bae013a
codec2-1.0.3.tar.gz SHA256 48162d562ea3bf4ca273f3c45df04505a006bd9a2b376006c75706c4de957da7
codec2-1.0.3.tar.gz MD5 a20cb37573eb98f8c956212698a49a81
codec2-1.0.5.tar.gz SHA1 56e540e2f107d6a7832f1d4e1d65859f8a26c98b
codec2-1.0.5.tar.gz SHA256 cd9a065dd1c3477f6172a0156294f767688847e4d170103d1f08b3a075f82826
codec2-1.0.5.tar.gz MD5 16a09b210409bad137c91bb18eb7cb92
10 changes: 5 additions & 5 deletions cross/comskip/Makefile
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PKG_NAME = comskip
PKG_NAME = Comskip
PKG_VERS = 0.82.010
PKG_EXT = tar.gz
PKG_DOWNLOAD_METHOD = git
PKG_GIT_HASH = 84fcd7388394c95fc8a7e558642bbadb43134507
PKG_DIST_SITE = https://github.com/erikkaashoek/Comskip.git
PKG_GIT_HASH = a041945ffa5dc0c53119e732f25e4d23b11ffa9e
PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/erikkaashoek/Comskip/archive
PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH)
PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)

DEPENDS = cross/argtable
OPTIONAL_DEPENDS = cross/ffmpeg
Expand Down
Empty file modified cross/comskip/PLIST
100755 → 100644
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions cross/comskip/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
comskip-git84fcd7388394c95fc8a7e558642bbadb43134507.tar.gz SHA1 78d558759e30a8d220d1fbe2554a8d35de9357bb
comskip-git84fcd7388394c95fc8a7e558642bbadb43134507.tar.gz SHA256 c621712e6451ce1c5a988f7fed597a24c355b4cd246efa0ebb0aa03b6f727910
comskip-git84fcd7388394c95fc8a7e558642bbadb43134507.tar.gz MD5 dd247f264a6a5bbad31313f299be1fec
Comskip-gita041945ffa5dc0c53119e732f25e4d23b11ffa9e.tar.gz SHA1 42151ea9077a639d66b894537b0ad3b8fa6d814f
Comskip-gita041945ffa5dc0c53119e732f25e4d23b11ffa9e.tar.gz SHA256 69c201820931b714fcf596a6156ffdfb2b698f51480c22551b00505eb9ba0a23
Comskip-gita041945ffa5dc0c53119e732f25e4d23b11ffa9e.tar.gz MD5 1ab49da01a8453617682af59ec7bb279
5 changes: 4 additions & 1 deletion cross/curl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://curl.se/download
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/zlib cross/openssl
DEPENDS = cross/zlib cross/openssl cross/gnutls cross/libssh2 cross/zstd cross/libwebsockets
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@th0ma7 is this really required?
IMHO it makes no sense to have two TLS libraries as default in curl (openssl and gnutls).
This blows up the curl package (I already tried to minimize it, by adding the curl libraries by default and make the curl executable optional).

Asking, as I am building an update for git, while it fails now for arch-ppc853x-5.2, since gnutls >= 3.7.4 is in the dependencies.

if tvh really requires to build libcurl with gnutls, libssh2 zstd and libwebsockets and curl build does not autodetect such dependencies, we need to enhance cross/curl for advances configuration (as we do for cross/busibox, cross/pcre2, et al.)

What's your opinion?

Copy link
Contributor Author

@th0ma7 th0ma7 Dec 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could probably play with the build order to ensure gnutls gets built before curl and therefore allowing it to autodetecting it and link to it without having to specifying it. As such a normal curl build would not make use of it. Would that make sense?


HOMEPAGE = https://curl.haxx.se
COMMENT = Command line tool and library for transferring data with URLs
LICENSE = https://curl.haxx.se/docs/copyright.html

GNU_CONFIGURE = 1
CONFIGURE_ARGS = --enable-ipv6
CONFIGURE_ARGS += --with-libssh2
CONFIGURE_ARGS += --with-gnutls
CONFIGURE_ARGS += --with-openssl
CONFIGURE_ARGS += --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
CONFIGURE_ARGS += --with-ca-path=/usr/share/ca-certificates/mozilla

ifneq ($(strip $(CURL_INCLUDE_EXECUTABLE)),1)
PLIST_TRANSFORM = sed -e '/bin:bin/d'
Expand Down
6 changes: 3 additions & 3 deletions cross/ffmpeg/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = ffmpeg
PKG_VERS = 4.4.2
PKG_VERS = 4.4.3
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.ffmpeg.org/releases
Expand Down Expand Up @@ -167,8 +167,8 @@ DEPENDS += cross/fdk-aac
CONFIGURE_ARGS += --enable-libfdk-aac --enable-nonfree

ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
# Newer libass requires harfbuzz which in turns requires c++ from gcc >= 4.8 (88f6281-6.1 = gcc-4.6.4)
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
# Newer libass requires harfbuzz which in turns requires c++ from gcc >= 4.9 (88f6281-6.1 = gcc-4.6.4)
DEPENDS += cross/libass
CONFIGURE_ARGS += --enable-libass
endif
Expand Down
6 changes: 3 additions & 3 deletions cross/ffmpeg/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ffmpeg-4.4.2.tar.bz2 SHA1 81bc301075a689140785ff9ecf27faf381060de3
ffmpeg-4.4.2.tar.bz2 SHA256 f98a482520c47507521a907914daa9efbc1384e0591b5afc3da18aa897de2948
ffmpeg-4.4.2.tar.bz2 MD5 2c6b506c0889eb698eb45b130235dc52
ffmpeg-4.4.3.tar.bz2 SHA1 a900f77ed16a18421983b499114c1595b8b765f2
ffmpeg-4.4.3.tar.bz2 SHA256 33b8c2dbcd530fe1db5710415345609b4ca227bd0da1e3a9332dbb0f11fd273a
ffmpeg-4.4.3.tar.bz2 MD5 885b75fdaf2fa29ad291d5b5ae716697
287 changes: 0 additions & 287 deletions cross/ffmpeg/patches/arm/034-avcodec-arm-sbcenc-avoid-callee-preserved-vfp-regist.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cross/flac/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = flac
PKG_VERS = 1.3.4
PKG_VERS = 1.4.2
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://ftp.osuosl.org/pub/xiph/releases/$(PKG_NAME)/
Expand Down
8 changes: 4 additions & 4 deletions cross/flac/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
bin:bin/flac
bin:bin/metaflac
lnk:lib/libFLAC++.so
lnk:lib/libFLAC++.so.6
lib:lib/libFLAC++.so.6.3.0
lnk:lib/libFLAC++.so.10
lib:lib/libFLAC++.so.10.0.0
lnk:lib/libFLAC.so
lnk:lib/libFLAC.so.8
lib:lib/libFLAC.so.8.3.0
lnk:lib/libFLAC.so.12
lib:lib/libFLAC.so.12.0.0
6 changes: 3 additions & 3 deletions cross/flac/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
flac-1.3.4.tar.xz SHA1 99c28482a8b2d81deaf740639e4cb55658427420
flac-1.3.4.tar.xz SHA256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737
flac-1.3.4.tar.xz MD5 bfdb2dd854d334b55a3309e3cd659f2c
flac-1.4.2.tar.xz SHA1 4297c4f7c8665705f46886403755061dd0a30289
flac-1.4.2.tar.xz SHA256 e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4
flac-1.4.2.tar.xz MD5 ca9140f37b286d2571e37d66aae50f92
Loading