gistfile1.txt

commit 51c3524d20c35d6c99c50243326ae0123f7ed1e8
Author: Romain Beauxis <[email protected]>
Date:   Sun Apr 2 10:11:54 2023 -0500

    Test.

diff --git a/Makefile.defs.in b/Makefile.defs.in
index b90215e5..5614bad0 100644
--- a/Makefile.defs.in
+++ b/Makefile.defs.in
@@ -73,7 +73,7 @@ W_AO=@W_AO@
 W_BJACK=@W_BJACK@
 W_CAMLIMAGES=@W_CAMLIMAGES@
 W_CAMLIMAGES_FREETYPE=@W_CAMLIMAGES_FREETYPE@
-W_CAMOMILE=@W_CAMOMILE@
+W_CAMOMILE_COMPAT=@W_CAMOMILE_COMPAT@
 W_CRY=@W_CRY@
 W_DSSI=@W_DSSI@
 W_DYNLINK=@W_DYNLINK@
diff --git a/configure.ac b/configure.ac
index df6108f7..0ca2b6d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -698,11 +698,11 @@ fi
 AC_ARG_ENABLE([camomile],
   AS_HELP_STRING([--disable-camomile],[don't use camomile (no charset detection and conversion)]))

-AC_CHECK_OCAML_BINDING([camomile])
+AC_CHECK_OCAML_BINDING([camomile-compat])

 if test "x$enable_camomile" = "xno" ; then
-   W_CAMOMILE=""
-   w_CAMOMILE="no"
+   W_CAMOMILE_COMPAT=""
+   w_CAMOMILE_COMPAT="no"
 fi

 AC_ARG_WITH([camomile-data-dir],
@@ -710,7 +710,7 @@ AC_ARG_WITH([camomile-data-dir],
       [--with-camomile-data-dir=path],
       [path to camomile data files (autodetected by default)]))

-if test -z "$W_CAMOMILE" ; then
+if test -z "$W_CAMOMILE_COMPAT" ; then
   if test "x$enable_camomile" = "xno" ; then
     cat >> src/configure.ml <<EOCONF
 let camomile_dir = ""
@@ -818,7 +818,7 @@ let recode_tag ?in_enc ?out_enc s =
 let env_has key = try ignore (Sys.getenv key) ; true with Not_found -> false

 let recode_tag =
-  if env_has "LIQ_DISABLE_CAMOMILE" then
+  if env_has "LIQ_DISABLE_CAMOMILE_COMPAT" then
     fun ?in_enc:_ ?out_enc:_ s -> s
   else
     recode_tag
@@ -1028,7 +1028,7 @@ cat <<EOMSG
    - Vorbis            : $w_VORBIS

  * Tags
-   - charset detection : $w_CAMOMILE
+   - charset detection : $w_CAMOMILE_COMPAT
    - Taglib (ID3 tags) : $w_TAGLIB
    - Vorbis            : $w_VORBIS

@@ -1137,7 +1137,7 @@ variables {
   ao-enabled: $b_AO
   bjack-enabled: $b_BJACK
   camlimages-enabled: $b_CAMLIMAGES
-  camomile-enabled: $b_CAMOMILE
+  camomile-enabled: $b_CAMOMILE_COMPAT
   cry-enabled: $b_CRY
   dssi-enabled: $b_DSSI
   faad-enabled: $b_FAAD
diff --git a/liquidsoap.opam b/liquidsoap.opam
index cc4e356b..fd7a9170 100644
--- a/liquidsoap.opam
+++ b/liquidsoap.opam
@@ -17,7 +17,7 @@ depends: [
   "conf-autoconf" {dev}
   "conf-automake" {dev}
   "ocaml" {>= "4.12.0" & < "5.0.0"}
-  "camomile" {>= "1.0.0"}
+  "camomile" {>= "2.0.1"}
   "dtools" {>= "0.4.4"}
   "duppy" {>= "0.9.1"}
   "menhir" {>= "20180703"}
diff --git a/src/Makefile b/src/Makefile
index 13fc53a6..0a0cba6c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-INCDIRS = builtins conversions converters decoder encoder encoder_formats harbor io lang lang_encoders ogg_formats operators outputs protocols sources stream tools $(if $(W_CAMOMILE),,tools/metadata/no-camomile) tools/metadata
+INCDIRS = builtins conversions converters decoder encoder encoder_formats harbor io lang lang_encoders ogg_formats operators outputs protocols sources stream tools $(if $(W_CAMOMILE_COMPAT),,tools/metadata/no-camomile) tools/metadata

 liquidsoap_c_files = \
        tools/unix_c.c \
@@ -179,7 +179,7 @@ io = \
        $(if $(W_FFMPEG),io/ffmpeg_io.ml)

 tools_metadata = \
-       $(if $(W_CAMOMILE),tools/metadata/metadataCharEncoding.ml,tools/metadata/no-camomile/metadataCharEncoding.ml) \
+       $(if $(W_CAMOMILE_COMPAT),tools/metadata/metadataCharEncoding.ml,tools/metadata/no-camomile/metadataCharEncoding.ml) \
        tools/metadata/metadataBase.ml \
        tools/metadata/metadataID3v1.ml tools/metadata/metadataID3v2.ml \
        tools/metadata/metadataJPEG.ml tools/metadata/metadataPNG.ml \