From 6e61f80c6f96dc70a521e942ee63a13c30724ac1 Mon Sep 17 00:00:00 2001 From: odrling Date: Tue, 23 Apr 2024 04:12:58 +0200 Subject: [PATCH] only install karaberus_tools and karaberus avoids bringing several copies of ffmpeg in the shared libraries while still being relatively easy to pull off --- ci/build.sh | 4 ++-- karaberus_tools/karaberus_tools.c | 2 +- karaberus_tools/karaberus_tools.h | 2 +- server/s3.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index c264fb0..fab1c8c 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -6,6 +6,6 @@ apk add chimera-repo-contrib apk add go -meson setup /build --buildtype release --strip -Db_lto=true -Db_lto_mode=thin -Db_pie=true -Dffmpeg:programs=disabled -Dffmpeg:tests=disabled -Dffmpeg:encoders=disabled -Dffmpeg:muxers=disabled -Dffmpeg:avfilter=disabled -Dffmpeg:avdevice=disabled -Dffmpeg:postproc=disabled -Dffmpeg:swresample=disabled -Dffmpeg:swscale=disabled -Dffmpeg:decoders=disabled -Dffmpeg:aac_decoder=enabled -Dffmpeg:aac_fixed_decoder=enabled -Dffmpeg:aac_latm_decoder=enabled -Dffmpeg:version3=enabled $crossarg +meson setup /build --buildtype release --strip -Db_lto=true -Db_lto_mode=thin -Dffmpegaacsucks:default_library=static -Ddakara_check:default_library=static -Db_pie=true -Dffmpeg:programs=disabled -Dffmpeg:tests=disabled -Dffmpeg:encoders=disabled -Dffmpeg:muxers=disabled -Dffmpeg:avfilter=disabled -Dffmpeg:avdevice=disabled -Dffmpeg:postproc=disabled -Dffmpeg:swresample=disabled -Dffmpeg:swscale=disabled -Dffmpeg:decoders=disabled -Dffmpeg:aac_decoder=enabled -Dffmpeg:aac_fixed_decoder=enabled -Dffmpeg:aac_latm_decoder=enabled -Dffmpeg:version3=enabled $crossarg meson compile -C /build -meson install -C /build --destdir /image +meson install -C /build --destdir /image --skip-subprojects diff --git a/karaberus_tools/karaberus_tools.c b/karaberus_tools/karaberus_tools.c index 041d356..51852a5 100644 --- a/karaberus_tools/karaberus_tools.c +++ b/karaberus_tools/karaberus_tools.c @@ -27,5 +27,5 @@ int read_piped(void *opaque, uint8_t *buf, int n) { } struct dakara_check_results *karaberus_dakara_check(int fdr) { - return dakara_check_avio(BUFSIZE, &fdr, read_piped, NULL); + return dakara_check_avio(KARABERUS_BUFSIZE, &fdr, read_piped, NULL); } diff --git a/karaberus_tools/karaberus_tools.h b/karaberus_tools/karaberus_tools.h index 2489bf3..44f1f77 100644 --- a/karaberus_tools/karaberus_tools.h +++ b/karaberus_tools/karaberus_tools.h @@ -7,7 +7,7 @@ #include #include -const size_t BUFSIZE = 1024*4; +const size_t KARABERUS_BUFSIZE = 1024*4; struct fdpipe { int fdr; diff --git a/server/s3.go b/server/s3.go index 57200d3..7e23aeb 100644 --- a/server/s3.go +++ b/server/s3.go @@ -93,7 +93,7 @@ func CheckS3File(ctx context.Context, video_filename string) (*CheckS3FileOutput go func(fdw C.int, objreader io.Reader) { for { - buf := make([]byte, C.BUFSIZE) + buf := make([]byte, C.KARABERUS_BUFSIZE) n, err := objreader.Read(buf) if err != nil { panic(err)