Skip to content

Commit 8e24098

Browse files
Updating build-ffmpeg zlib version and patch file
1 parent 838d28b commit 8e24098

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

build-ffmpeg

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,16 +380,16 @@ if build "nasm" "2.15.05"; then
380380
build_done "nasm" "2.15.05"
381381
fi
382382

383-
if build "zlib" "1.2.11"; then
384-
download "https://www.zlib.net/zlib-1.2.11.tar.gz"
383+
if build "zlib" "1.3"; then
384+
download "https://www.zlib.net/zlib-1.3.tar.gz"
385385
if $SHARED_LIBRARIES; then
386386
execute ./configure --shared --prefix="${WORKSPACE}"
387387
else
388388
execute ./configure --static --prefix="${WORKSPACE}"
389389
fi
390390
execute make -j $MJOBS
391391
execute make install
392-
build_done "zlib" "1.2.11"
392+
build_done "zlib" "1.3"
393393
fi
394394

395395
if build "m4" "1.4.19"; then
@@ -865,7 +865,8 @@ fi
865865
if build "libvorbis" "1.3.7"; then
866866
download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.7.tar.gz"
867867
echo $PWD
868-
patch configure.ac ../../vorbis.config.patch
868+
869+
patch configure.ac ${CWD%/descript}vorbis.config.patch
869870
./autogen.sh
870871
if $SHARED_LIBRARIES; then
871872
execute ./configure --prefix="${WORKSPACE}" --with-ogg-libraries="${WORKSPACE}"/lib --with-ogg-includes="${WORKSPACE}"/include/ --disable-static --enable-shared --disable-oggtest

vorbis.config.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- libvorbis-1.3.7/configure.ac 2020-07-03 18:52:28
2+
+++ configure.ac 2023-12-18 10:48:08
3+
@@ -202,9 +202,9 @@
4+
CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
5+
PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
6+
*-*-darwin*)
7+
- DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
8+
- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
9+
- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
10+
+ DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char"
11+
+ CFLAGS="-DDARWIN -fno-common -Wall -g -O3 -ffast-math -fsigned-char"
12+
+ PROFILE="-DDARWIN -fno-common -Wall -g -pg -O3 -ffast-math -fsigned-char";;
13+
*-*-os2*)
14+
# Use -W instead of -Wextra because gcc on OS/2 is an old version.
15+
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"

0 commit comments

Comments
 (0)