only install karaberus_tools and karaberus

avoids bringing several copies of ffmpeg in the shared libraries while still being relatively easy to pull off
Japan7 · Apr 23, 2024 · 6e61f80 · 6e61f80
1 parent db6c439
commit 6e61f80
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-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
@@ -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)