Skip to content
This repository was archived by the owner on Nov 20, 2025. It is now read-only.

Commit a7143be

Browse files
flexiondotorgflexiondotorg
committed
chore(deps): update library versions and fix build process
- Update library versions to latest releases: - aom 3.8.1 → 3.13.1 - ass 0.17.1 → 0.17.4 - brotli 1.1 → 1.2.0 - freetype 2.13.2 → 2.14.1 - fribidi 1.0.13 → 1.0.16 - harfbuzz 8.3.0 → 12.2.0 - ogg 1.3.1 → 1.3.6 - opus 1.4 → 1.5.2 - png head → 1.6.50 - theora 1.1.1 → 1.2.0 - expat 2.5.0 → 2.7.3 - fontconfig 2.15 → 2.16 - iconv 1.17 → 1.18 - linunibreak 5.1 → 6.1
1 parent 1482238 commit a7143be

File tree

2 files changed

+60
-50
lines changed

2 files changed

+60
-50
lines changed

‎README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -153,20 +153,20 @@ Input #0, mov,mp4,m4a,3gp,3g2,mj2, from './bbb.mp4':
153153
| Library | Version |
154154
|----------|---------|
155155
| FFmpeg | 6.1 |
156-
| aom | 3.8.1 |
157-
| ass | 0.17.1 |
158-
| brotli | 1.1 |
156+
| aom | 3.13.1 |
157+
| ass | 0.17.4 |
158+
| brotli | 1.2.0 |
159159
| bz2 | 1.0.8 |
160-
| freetype | 2.13.2 |
161-
| fribidi | 1.0.13 |
162-
| harfbuzz | 8.3.0 |
160+
| freetype | 2.14.1 |
161+
| fribidi | 1.0.16 |
162+
| harfbuzz | 12.2.0 |
163163
| mp3lame | 3.1000 |
164-
| ogg | 1.3.1 |
165-
| opus | 1.4 |
166-
| png | head |
164+
| ogg | 1.3.6 |
165+
| opus | 1.5.2 |
166+
| png | 1.6.50 |
167167
| speex | 1.2.1 |
168-
| theora | 1.1.1 |
169-
| unibreak | 5.1 |
170-
| vpx | 1.14.0 |
168+
| theora | 1.2.0 |
169+
| unibreak | 6.1 |
170+
| vpx | 1.15.0 |
171171
| x264 | head |
172-
| zlib | 1.3 |
172+
| zlib | 1.3.1 |

‎internal/builder/main.go‎

Lines changed: 47 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func buildVpx() {
186186
buildDir := path.Join(srcPath, "ffbuild")
187187

188188
if !exists(zipPath) {
189-
download("https://github.com/webmproject/libvpx/archive/refs/tags/v1.14.0.zip", zipPath)
189+
download("https://github.com/webmproject/libvpx/archive/refs/tags/v1.15.2.zip", zipPath)
190190
}
191191

192192
unzip(zipPath, srcPath)
@@ -230,19 +230,14 @@ func buildVpx() {
230230
}
231231

232232
func buildTheora() {
233-
zipPath := path.Join(downloadsDir, "theora.zip")
233+
zipPath := path.Join(downloadsDir, "theora.tar.xz")
234234
srcPath := path.Join(buildDir, "theora")
235235

236236
if !exists(zipPath) {
237-
download("http://downloads.xiph.org/releases/theora/libtheora-1.1.1.zip", zipPath)
237+
download("https://ftp.osuosl.org/pub/xiph/releases/theora/libtheora-1.2.0.tar.xz", zipPath)
238238
}
239239

240-
unzip(zipPath, srcPath)
241-
242-
vorbisPath := path.Join(buildDir, "vorbis")
243-
244-
copyFile(path.Join(srcPath, "config.guess"), path.Join(vorbisPath, "config.guess"))
245-
copyFile(path.Join(srcPath, "config.sub"), path.Join(vorbisPath, "config.sub"))
240+
untar(zipPath, srcPath, "libtheora-1.2.0/")
246241

247242
{
248243
log.Println("Running configure")
@@ -265,6 +260,9 @@ func buildTheora() {
265260
run("[theora configure]", cmd)
266261
}
267262

263+
// Prevent automake regeneration
264+
touchAutomakeFiles(srcPath)
265+
268266
{
269267
log.Println("Running make")
270268

@@ -280,14 +278,14 @@ func buildTheora() {
280278
}
281279

282280
func buildOgg() {
283-
zipPath := path.Join(downloadsDir, "ogg.tar.gz")
281+
zipPath := path.Join(downloadsDir, "ogg.tar.xz")
284282
srcPath := path.Join(buildDir, "ogg")
285283

286284
if !exists(zipPath) {
287-
download("http://downloads.xiph.org/releases/ogg/libogg-1.3.1.tar.gz", zipPath)
285+
download("https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.6.tar.xz", zipPath)
288286
}
289287

290-
untar(zipPath, srcPath, "libogg-1.3.1/")
288+
untar(zipPath, srcPath, "libogg-1.3.6/")
291289

292290
{
293291
log.Println("Running configure")
@@ -307,6 +305,9 @@ func buildOgg() {
307305
run("[ogg configure]", cmd)
308306
}
309307

308+
// Prevent automake regeneration
309+
touchAutomakeFiles(srcPath)
310+
310311
{
311312
log.Println("Running make")
312313

@@ -326,7 +327,7 @@ func buildVorbis() {
326327
srcPath := path.Join(buildDir, "vorbis")
327328

328329
if !exists(zipPath) {
329-
download("http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.gz", zipPath)
330+
download("https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.7.tar.gz", zipPath)
330331
}
331332

332333
untar(zipPath, srcPath, "libvorbis-1.3.7/")
@@ -420,10 +421,10 @@ func buildOpus() {
420421
srcPath := path.Join(buildDir, "opus")
421422

422423
if !exists(zipPath) {
423-
download("https://downloads.xiph.org/releases/opus/opus-1.4.tar.gz", zipPath)
424+
download("https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.5.2.tar.gz", zipPath)
424425
}
425426

426-
untar(zipPath, srcPath, "opus-1.4/")
427+
untar(zipPath, srcPath, "opus-1.5.2/")
427428

428429
{
429430
log.Println("Running configure")
@@ -509,10 +510,10 @@ func buildExpat() {
509510
srcPath := path.Join(buildDir, "expat")
510511

511512
if !exists(zipPath) {
512-
download("https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.gz", zipPath)
513+
download("https://github.com/libexpat/libexpat/releases/download/R_2_7_3/expat-2.7.3.tar.gz", zipPath)
513514
}
514515

515-
untar(zipPath, srcPath, "expat-2.5.0/")
516+
untar(zipPath, srcPath, "expat-2.7.3/")
516517

517518
{
518519
log.Println("Running configure")
@@ -521,9 +522,9 @@ func buildExpat() {
521522
path.Join(srcPath, "configure"),
522523
srcPath,
523524
fmt.Sprintf("--prefix=%v", tgtDir),
524-
"--disable-debug",
525525
"--enable-static",
526526
"--disable-shared",
527+
"--without-xmlwf",
527528
fmt.Sprintf("CFLAGS=-I%v", incDir),
528529
fmt.Sprintf("CPPFLAGS=-I%v", incDir),
529530
fmt.Sprintf("LDFLAGS=-L%v", libDir),
@@ -532,6 +533,9 @@ func buildExpat() {
532533
run("[expat configure]", cmd)
533534
}
534535

536+
// Prevent automake regeneration
537+
touchAutomakeFiles(srcPath)
538+
535539
{
536540
log.Println("Running make")
537541

@@ -547,14 +551,14 @@ func buildExpat() {
547551
}
548552

549553
func buildFontconfig() {
550-
zipPath := path.Join(downloadsDir, "fontconfig.tar.gz")
554+
zipPath := path.Join(downloadsDir, "fontconfig.tar.xz")
551555
srcPath := path.Join(buildDir, "fontconfig")
552556

553557
if !exists(zipPath) {
554-
download("https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.15.0.tar.gz", zipPath)
558+
download("https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz", zipPath)
555559
}
556560

557-
untar(zipPath, srcPath, "fontconfig-2.15.0/")
561+
untar(zipPath, srcPath, "fontconfig-2.16.0/")
558562

559563
{
560564
log.Println("Running configure")
@@ -574,6 +578,9 @@ func buildFontconfig() {
574578
run("[fontconfig configure]", cmd)
575579
}
576580

581+
// Prevent automake regeneration
582+
touchAutomakeFiles(srcPath)
583+
577584
{
578585
log.Println("Running make")
579586

@@ -593,10 +600,10 @@ func buildFribidi() {
593600
srcPath := path.Join(buildDir, "fribidi")
594601

595602
if !exists(zipPath) {
596-
download("https://github.com/fribidi/fribidi/releases/download/v1.0.13/fribidi-1.0.13.tar.xz", zipPath)
603+
download("https://github.com/fribidi/fribidi/releases/download/v1.0.16/fribidi-1.0.16.tar.xz", zipPath)
597604
}
598605

599-
untar(zipPath, srcPath, "fribidi-1.0.13/")
606+
untar(zipPath, srcPath, "fribidi-1.0.16/")
600607

601608
{
602609
log.Println("Running configure")
@@ -636,10 +643,10 @@ func buildIconv() {
636643
srcPath := path.Join(buildDir, "iconv")
637644

638645
if !exists(zipPath) {
639-
download("https://ftp.mirrorservice.org/pub/gnu/libiconv/libiconv-1.17.tar.gz", zipPath)
646+
download("https://ftp.mirrorservice.org/pub/gnu/libiconv/libiconv-1.18.tar.gz", zipPath)
640647
}
641648

642-
untar(zipPath, srcPath, "libiconv-1.17/")
649+
untar(zipPath, srcPath, "libiconv-1.18/")
643650

644651
{
645652
log.Println("Running configure")
@@ -755,7 +762,7 @@ func buildBrotli() {
755762
srcPath := path.Join(buildDir, "brotli")
756763

757764
if !exists(zipPath) {
758-
download("https://codeload.github.com/google/brotli/zip/refs/heads/v1.1", zipPath)
765+
download("https://github.com/google/brotli/archive/refs/tags/v1.2.0.zip", zipPath)
759766
}
760767

761768
unzip(zipPath, srcPath)
@@ -799,7 +806,7 @@ func buildPng() {
799806
srcPath := path.Join(buildDir, "png")
800807

801808
if !exists(zipPath) {
802-
download("https://codeload.github.com/pnggroup/libpng/zip/refs/heads/libpng16", zipPath)
809+
download("https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.50.zip", zipPath)
803810
}
804811

805812
unzip(zipPath, srcPath)
@@ -842,10 +849,10 @@ func buildUnibreak() {
842849
srcPath := path.Join(buildDir, "unibreak")
843850

844851
if !exists(zipPath) {
845-
download("https://github.com/adah1972/libunibreak/releases/download/libunibreak_5_1/libunibreak-5.1.tar.gz", zipPath)
852+
download("https://github.com/adah1972/libunibreak/releases/download/libunibreak_6_1/libunibreak-6.1.tar.gz", zipPath)
846853
}
847854

848-
untar(zipPath, srcPath, "libunibreak-5.1/")
855+
untar(zipPath, srcPath, "libunibreak-6.1/")
849856

850857
{
851858
log.Println("Running configure")
@@ -864,6 +871,9 @@ func buildUnibreak() {
864871
run("[unibreak configure]", cmd)
865872
}
866873

874+
// Prevent automake regeneration
875+
touchAutomakeFiles(srcPath)
876+
867877
{
868878
log.Println("Running make")
869879

@@ -883,10 +893,10 @@ func buildFreetype() {
883893
srcPath := path.Join(buildDir, "freetype")
884894

885895
if !exists(zipPath) {
886-
download("https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz", zipPath)
896+
download("https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.xz", zipPath)
887897
}
888898

889-
untar(zipPath, srcPath, "freetype-2.13.2/")
899+
untar(zipPath, srcPath, "freetype-2.14.1/")
890900

891901
{
892902
log.Println("Running configure")
@@ -927,10 +937,10 @@ func buildHarfbuzz() {
927937
srcPath := path.Join(buildDir, "harfbuzz")
928938

929939
if !exists(zipPath) {
930-
download("https://github.com/harfbuzz/harfbuzz/releases/download/8.3.0/harfbuzz-8.3.0.tar.xz", zipPath)
940+
download("https://github.com/harfbuzz/harfbuzz/releases/download/12.2.0/harfbuzz-12.2.0.tar.xz", zipPath)
931941
}
932942

933-
untar(zipPath, srcPath, "harfbuzz-8.3.0/")
943+
untar(zipPath, srcPath, "harfbuzz-12.2.0/")
934944

935945
{
936946
log.Println("Running setup")
@@ -993,10 +1003,10 @@ func (b *Builder) buildASS() {
9931003
srcPath := path.Join(buildDir, "ass")
9941004

9951005
if !exists(zipPath) {
996-
download("https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.gz", zipPath)
1006+
download("https://github.com/libass/libass/releases/download/0.17.4/libass-0.17.4.tar.gz", zipPath)
9971007
}
9981008

999-
untar(zipPath, srcPath, "libass-0.17.1/")
1009+
untar(zipPath, srcPath, "libass-0.17.4/")
10001010

10011011
{
10021012
log.Println("Running configure")
@@ -1041,8 +1051,8 @@ func buildAOM() {
10411051
buildPath := path.Join(buildDir, "aom-build")
10421052

10431053
if !exists(zipPath) {
1044-
//https://aomedia.googlesource.com/aom/+/refs/tags/v3.8.1
1045-
download("https://aomedia.googlesource.com/aom/+archive/bb6430482199eaefbeaaa396600935082bc43f66.tar.gz", zipPath)
1054+
//https://aomedia.googlesource.com/aom/+/refs/tags/v3.13.1
1055+
download("https://aomedia.googlesource.com/aom/+archive/d772e334cc724105040382a977ebb10dfd393293.tar.gz", zipPath)
10461056
}
10471057

10481058
untar(zipPath, srcPath, "")

0 commit comments

Comments
 (0)