From f0fb0fbdf8d1000dab0e458988ad98beece6b128 Mon Sep 17 00:00:00 2001 From: o-oconnell Date: Tue, 3 Jan 2023 19:10:43 -0700 Subject: [PATCH] prebuilt binary for linux with the latest fixes --- Makefile | 11 ++++++++++- bin/mp4grep | Bin 2973246 -> 2973300 bytes 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a601ed2..82de857 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ BIN := bin +LIB := lib .PHONY: defs bindings all @@ -6,11 +7,19 @@ current_dir_no_prefix:= $(notdir $(shell pwd)) current_dir:= $(shell pwd) MP4GREP_LIBS:=${MP4GREP_INSTALL_PREFIX}/mp4grep-libs +# -ccopt is how you pass options to gcc from ocamlc +prebuilt-binary-gcc-options := -ccopt -I$(current_dir)/include -ccopt -L$(current_dir)/lib -cclib -lvosk -ccopt -Wl,-rpath=$(LIB) +installation-gcc-options := -ccopt -I$(current_dir)/include -ccopt -L$(current_dir)/lib -cclib -lvosk -ccopt -Wl,-rpath=$(MP4GREP_LIBS) + $(info mp4grep is being installed to MP4GREP_INSTALL_PREFIX=${MP4GREP_INSTALL_PREFIX}) $(info mp4grep libraries are being installed to ${MP4GREP_LIBS}) + +prebuilt-binary: defs bindings mp4grep.ml + ocamlc -custom -o $(BIN)/mp4grep unix.cma -I $(OPAM_SWITCH_PREFIX)/lib/parmap/ $(OPAM_SWITCH_PREFIX)/lib/parmap/parmap.cma str.cma defs.cmo mp4grep.ml vosk_bindings.o $(prebuilt-binary-gcc-options) + install: check-env copy-dynlibs copy-convertscript defs bindings mp4grep.ml - ocamlc -custom -o $(MP4GREP_INSTALL_PREFIX)/mp4grep unix.cma -I $(OPAM_SWITCH_PREFIX)/lib/parmap/ $(OPAM_SWITCH_PREFIX)/lib/parmap/parmap.cma str.cma defs.cmo mp4grep.ml vosk_bindings.o -ccopt -I$(current_dir)/include -ccopt -L$(current_dir)/lib -cclib -lvosk -ccopt -Wl,-rpath=$(MP4GREP_LIBS) + ocamlc -custom -o $(MP4GREP_INSTALL_PREFIX)/mp4grep unix.cma -I $(OPAM_SWITCH_PREFIX)/lib/parmap/ $(OPAM_SWITCH_PREFIX)/lib/parmap/parmap.cma str.cma defs.cmo mp4grep.ml vosk_bindings.o $(installation-gcc-options) copy-dynlibs: if [ -a $(MP4GREP_LIBS) ]; then rm -r $(MP4GREP_LIBS); fi; diff --git a/bin/mp4grep b/bin/mp4grep index 00a403b59aa86a64a0b57eb08edb90435798c32b..705b593c9afd253552d1d1bbef4a69c0ec141bd0 100755 GIT binary patch delta 1420 zcmZvaZA_b06oB8;LgDQP^o5R=^#cm)3gtAgEHdL}W@X7lfgte5AM67)X`-miP4ov$ zH`hA9(oNhUZrRqsq9dA!LEpHUr9Yf57Lf^TFeti(A0}d)2}U+&>bY%6nDI@X_nz-_ z@45HlSD(WY6B(By7eEqUWO(LVjiopK^;80aM6Wm^DlhV`XeiF|(Gj zGY-bdxR?^AlyNgKVh$G&zPA8Xd!2=%T>a>|7kfK6y_j;YA7zV3lx(_>>+H+8UrL#> zg{hmAakQFVW{;j#(e0I#SAAq0mo*fez+Kclfwt@(4zW}839p@EK_1Ah_bak!aRL{h zm#$2r9rn|2lUM?;l4%Ne!fR^h6xIP8py8{y6%NuLS8+4Ep4JWtt%~}up%FrK_8OK$ zm^MtKUGs*PcEr&~=4mX2!zmlQNsZI^7`#O=!)@Lc+D5WXqYd6ko8Beo3|3Ry46e%- zC+Ji6&0rxE@4lN%imB%^$cX6++9-M*t)4x9CX-_D;=BEKGAZ-AqEE0c24bWuE}rDA z>u4~cLE`7#jT;=+mj?Cgl*8O@BrQ68Hj2z)gT>71>hm4o zvy(A_4)HU?F>)rbT=UNoJ)FQMAUcvjJ6%rjBa0<4mllLH#}a%%flF8@Z{aJ2jL?t?mBvN?&tJeWN7#?Arou0ZH0sCf5#s>AxcEseAwc delta 1420 zcmZvae@t6d6vy9fY3XaB_R+EeEzl0xqx5uS{um}xv4SyV0fCXIe;{2GGv{EdFlRL~ zhJ%**3;vj#v4FH=iMnV46MZ^=q%&JEfI(`k}pYq2Nr;L%*^JvLNvX^|`J@lH}z%q5{GqNP9!OGeP0}&R8C;|~>Ad>WLMD_V~ zg~^MTI@F&s5z7PW`n1qsJYn)?T8`7?;FW;7lKGJjs&knq=m@HbWI{vmgqF||DMTuv zCmtdUgg~SbM#4m-6FUeqkwIhJOpg#RF;U^> zpyYVYkITR1n=>^z4|40cP*51lmxQrhSfUWUSUqCT!C$qaf#2HCgUed6nD<-b>-}ig ziN)Hj?dT%BI&m+*bwQzESSJz%go7v~oKjc^truCpWFLahEC~BV19rDKQ&bwN(u~7@ zI*lqTndP`=)#1cYPhk>z#=(>-kSM3EBl<8r;4rdT>>Y;#>O#) z2PI=iarh6|$Bvqp=pkY3AUjsARCg3dpMk2at(~Xl8@FZ)F+qOwa;*Tf%Z{E|` z34H2nFsHsnE-fXJlleE@(z}zereJSl{}hOLd2G3&tS4CJW-lvIz^g44``*fvYC zWwT&Yb>5TD$nt*0`%0`7oLTGxdHN_?qmZHaFrj^f)ln!?eJr01TcRLJUq&e*^Wsl8 zz^poWI~LR6)f-^UZY9%6=aWD6Ml8nDxHZ3t{2YjB-{0LXv%C209PF%EUf-_2Nb@vW zu1jnoKVoS@OTAAkct9LA#2grtHtxh?7+DuhSQT_?aHyVsf6qaRaG4zUmv$2QdAj2j zbj*V#{q?n2Oivl)){%=>5ViR7Jc!JSZSpXNU(CZHA^X4W+jOCQfiB@J-P1F)W{r4_ zkXx^tkRSdNtX_aTh4wa{Sb$2_gYN5KRLK#KZR?*64<2ToQ~ zSo;bXk}pujT^xs1e_7I{p%u^<3hVTMLmX#+gyXWF)^PeRX(Gj?cS}nZu9$)iN=sF) zi;RV_y~cHbU65vLTw$%@1#d%mHLdw_