From 500c0c5f5565d63398080f6c28dc6df15976b2f2 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Thu, 30 Jan 2025 07:53:18 +0100 Subject: [PATCH 1/2] 6 packages from savonet/ocaml-xiph at 1.0.0 --- packages/flac/flac.1.0.0/opam | 43 +++++++++++++++++++++++++++++++ packages/ogg/ogg.1.0.0/opam | 40 ++++++++++++++++++++++++++++ packages/opus/opus.1.0.0/opam | 42 ++++++++++++++++++++++++++++++ packages/speex/speex.1.0.0/opam | 42 ++++++++++++++++++++++++++++++ packages/theora/theora.1.0.0/opam | 40 ++++++++++++++++++++++++++++ packages/vorbis/vorbis.1.0.0/opam | 41 +++++++++++++++++++++++++++++ 6 files changed, 248 insertions(+) create mode 100644 packages/flac/flac.1.0.0/opam create mode 100644 packages/ogg/ogg.1.0.0/opam create mode 100644 packages/opus/opus.1.0.0/opam create mode 100644 packages/speex/speex.1.0.0/opam create mode 100644 packages/theora/theora.1.0.0/opam create mode 100644 packages/vorbis/vorbis.1.0.0/opam diff --git a/packages/flac/flac.1.0.0/opam b/packages/flac/flac.1.0.0/opam new file mode 100644 index 00000000000..75828820757 --- /dev/null +++ b/packages/flac/flac.1.0.0/opam @@ -0,0 +1,43 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Bindings to libflac" +maintainer: ["The Savonet Team "] +authors: ["The Savonet Team "] +license: "LGPL-2.1-only" +homepage: "https://github.com/savonet/ocaml-xiph" +bug-reports: "https://github.com/savonet/ocaml-xiph/issues" +depends: [ + "conf-libflac" + "conf-pkg-config" + "ocaml" {>= "4.03.0"} + "dune" {>= "2.8"} + "dune-configurator" + "odoc" {with-doc} +] +depopts: [ + "ogg" {= version} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/savonet/ocaml-xiph.git" +x-maintenance-intent: ["(latest)"] +url { + src: + "https://github.com/savonet/ocaml-xiph/archive/refs/tags/v1.0.0.tar.gz" + checksum: [ + "md5=4a1490eba0b6bcd06e7849acfdf2c98a" + "sha512=625b1faed23a06c5f9a37bef3da817f9bac1b7493ceaab7d693d11aedd3125f75df50ae59ffd3088ffb0cb1e673ab82d14f4d684e757460a126232273865e846" + ] +} diff --git a/packages/ogg/ogg.1.0.0/opam b/packages/ogg/ogg.1.0.0/opam new file mode 100644 index 00000000000..8111855689b --- /dev/null +++ b/packages/ogg/ogg.1.0.0/opam @@ -0,0 +1,40 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Bindings to libogg" +maintainer: ["The Savonet Team "] +authors: ["The Savonet Team "] +license: "LGPL-2.1-only" +homepage: "https://github.com/savonet/ocaml-xiph" +bug-reports: "https://github.com/savonet/ocaml-xiph/issues" +depends: [ + "conf-libogg" + "conf-pkg-config" + "ocaml" {>= "4.08.0"} + "dune" {>= "2.8"} + "dune-configurator" + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/savonet/ocaml-xiph.git" +x-maintenance-intent: ["(latest)"] +url { + src: + "https://github.com/savonet/ocaml-xiph/archive/refs/tags/v1.0.0.tar.gz" + checksum: [ + "md5=4a1490eba0b6bcd06e7849acfdf2c98a" + "sha512=625b1faed23a06c5f9a37bef3da817f9bac1b7493ceaab7d693d11aedd3125f75df50ae59ffd3088ffb0cb1e673ab82d14f4d684e757460a126232273865e846" + ] +} diff --git a/packages/opus/opus.1.0.0/opam b/packages/opus/opus.1.0.0/opam new file mode 100644 index 00000000000..932cd0c5a4c --- /dev/null +++ b/packages/opus/opus.1.0.0/opam @@ -0,0 +1,42 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Bindings to libopus" +maintainer: ["The Savonet Team "] +authors: ["The Savonet Team "] +license: "LGPL-2.1-only" +homepage: "https://github.com/savonet/ocaml-xiph" +bug-reports: "https://github.com/savonet/ocaml-xiph/issues" +depends: [ + "conf-libogg" + "conf-libopus" + "conf-pkg-config" + "ocaml" {>= "4.08.0"} + "dune" {>= "2.8"} + "dune-configurator" + "ogg" {= version} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/savonet/ocaml-xiph.git" +x-maintenance-intent: ["(latest)"] +url { + src: + "https://github.com/savonet/ocaml-xiph/archive/refs/tags/v1.0.0.tar.gz" + checksum: [ + "md5=4a1490eba0b6bcd06e7849acfdf2c98a" + "sha512=625b1faed23a06c5f9a37bef3da817f9bac1b7493ceaab7d693d11aedd3125f75df50ae59ffd3088ffb0cb1e673ab82d14f4d684e757460a126232273865e846" + ] +} diff --git a/packages/speex/speex.1.0.0/opam b/packages/speex/speex.1.0.0/opam new file mode 100644 index 00000000000..2d471abe3a4 --- /dev/null +++ b/packages/speex/speex.1.0.0/opam @@ -0,0 +1,42 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Bindings to libspeex" +maintainer: ["The Savonet Team "] +authors: ["The Savonet Team "] +license: "LGPL-2.1-only" +homepage: "https://github.com/savonet/ocaml-xiph" +bug-reports: "https://github.com/savonet/ocaml-xiph/issues" +depends: [ + "conf-libogg" + "conf-libspeex" + "conf-pkg-config" + "dune" {>= "2.8"} + "dune-configurator" + "ocaml" {>= "4.07"} + "ogg" {= version} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/savonet/ocaml-xiph.git" +x-maintenance-intent: ["(latest)"] +url { + src: + "https://github.com/savonet/ocaml-xiph/archive/refs/tags/v1.0.0.tar.gz" + checksum: [ + "md5=4a1490eba0b6bcd06e7849acfdf2c98a" + "sha512=625b1faed23a06c5f9a37bef3da817f9bac1b7493ceaab7d693d11aedd3125f75df50ae59ffd3088ffb0cb1e673ab82d14f4d684e757460a126232273865e846" + ] +} diff --git a/packages/theora/theora.1.0.0/opam b/packages/theora/theora.1.0.0/opam new file mode 100644 index 00000000000..51ef00208eb --- /dev/null +++ b/packages/theora/theora.1.0.0/opam @@ -0,0 +1,40 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Bindings to libtheora" +maintainer: ["The Savonet Team "] +authors: ["The Savonet Team "] +license: "LGPL-2.1-only" +homepage: "https://github.com/savonet/ocaml-xiph" +bug-reports: "https://github.com/savonet/ocaml-xiph/issues" +depends: [ + "conf-libtheora" + "conf-pkg-config" + "dune" {>= "2.8"} + "dune-configurator" + "ogg" {= version} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/savonet/ocaml-xiph.git" +x-maintenance-intent: ["(latest)"] +url { + src: + "https://github.com/savonet/ocaml-xiph/archive/refs/tags/v1.0.0.tar.gz" + checksum: [ + "md5=4a1490eba0b6bcd06e7849acfdf2c98a" + "sha512=625b1faed23a06c5f9a37bef3da817f9bac1b7493ceaab7d693d11aedd3125f75df50ae59ffd3088ffb0cb1e673ab82d14f4d684e757460a126232273865e846" + ] +} diff --git a/packages/vorbis/vorbis.1.0.0/opam b/packages/vorbis/vorbis.1.0.0/opam new file mode 100644 index 00000000000..3d92302a211 --- /dev/null +++ b/packages/vorbis/vorbis.1.0.0/opam @@ -0,0 +1,41 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Bindings to libvorbis" +maintainer: ["The Savonet Team "] +authors: ["The Savonet Team "] +license: "LGPL-2.1-only" +homepage: "https://github.com/savonet/ocaml-xiph" +bug-reports: "https://github.com/savonet/ocaml-xiph/issues" +depends: [ + "conf-libvorbis" + "conf-pkg-config" + "ocaml" {>= "4.03.0"} + "dune" {>= "2.8"} + "dune-configurator" + "ogg" {= version} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/savonet/ocaml-xiph.git" +x-maintenance-intent: ["(latest)"] +url { + src: + "https://github.com/savonet/ocaml-xiph/archive/refs/tags/v1.0.0.tar.gz" + checksum: [ + "md5=4a1490eba0b6bcd06e7849acfdf2c98a" + "sha512=625b1faed23a06c5f9a37bef3da817f9bac1b7493ceaab7d693d11aedd3125f75df50ae59ffd3088ffb0cb1e673ab82d14f4d684e757460a126232273865e846" + ] +} From 0c5a47712304e81f584b25fdc7e9ee4532cb874b Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Thu, 30 Jan 2025 11:34:05 +0100 Subject: [PATCH 2/2] Add new upper-bounds. --- packages/flac/flac.0.3.0/opam | 2 +- packages/flac/flac.0.3.1/opam | 2 +- packages/flac/flac.0.4.0/opam | 2 +- packages/flac/flac.0.5.0/opam | 2 +- packages/flac/flac.0.5.1/opam | 2 +- packages/liquidsoap-core/liquidsoap-core.2.2.0/opam | 1 + packages/liquidsoap-core/liquidsoap-core.2.2.1/opam | 1 + packages/liquidsoap-core/liquidsoap-core.2.2.2/opam | 1 + packages/liquidsoap-core/liquidsoap-core.2.2.3/opam | 1 + packages/liquidsoap-core/liquidsoap-core.2.2.4-1/opam | 1 + packages/liquidsoap-core/liquidsoap-core.2.2.5/opam | 1 + packages/liquidsoap-core/liquidsoap-core.2.3.0/opam | 1 + packages/opus/opus.0.2.0/opam | 2 +- packages/opus/opus.0.2.1/opam | 2 +- packages/opus/opus.0.2.2/opam | 2 +- packages/speex/speex.0.4.0/opam | 2 +- packages/speex/speex.0.4.1/opam | 2 +- packages/theora/theora.0.4.0/opam | 2 +- packages/theora/theora.0.4.1/opam | 2 +- packages/vorbis/vorbis.0.8.0/opam | 2 +- 20 files changed, 20 insertions(+), 13 deletions(-) diff --git a/packages/flac/flac.0.3.0/opam b/packages/flac/flac.0.3.0/opam index 67fdd4b0ada..17111486c35 100644 --- a/packages/flac/flac.0.3.0/opam +++ b/packages/flac/flac.0.3.0/opam @@ -13,7 +13,7 @@ depends: [ "dune-configurator" ] depopts: [ - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/flac/flac.0.3.1/opam b/packages/flac/flac.0.3.1/opam index f6d790fad87..7c8c70b3193 100644 --- a/packages/flac/flac.0.3.1/opam +++ b/packages/flac/flac.0.3.1/opam @@ -15,7 +15,7 @@ depends: [ "odoc" {with-doc} ] depopts: [ - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/flac/flac.0.4.0/opam b/packages/flac/flac.0.4.0/opam index 40645dea008..3cee976de6f 100644 --- a/packages/flac/flac.0.4.0/opam +++ b/packages/flac/flac.0.4.0/opam @@ -15,7 +15,7 @@ depends: [ "odoc" {with-doc} ] depopts: [ - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/flac/flac.0.5.0/opam b/packages/flac/flac.0.5.0/opam index a63a2af6638..0613fe86def 100644 --- a/packages/flac/flac.0.5.0/opam +++ b/packages/flac/flac.0.5.0/opam @@ -15,7 +15,7 @@ depends: [ "odoc" {with-doc} ] depopts: [ - "ogg" {>= "0.7.4"} + "ogg" {>= "0.7.4" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/flac/flac.0.5.1/opam b/packages/flac/flac.0.5.1/opam index 20b1eae646a..3b11eab7818 100644 --- a/packages/flac/flac.0.5.1/opam +++ b/packages/flac/flac.0.5.1/opam @@ -15,7 +15,7 @@ depends: [ "odoc" {with-doc} ] depopts: [ - "ogg" {>= "0.7.4"} + "ogg" {>= "0.7.4" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/liquidsoap-core/liquidsoap-core.2.2.0/opam b/packages/liquidsoap-core/liquidsoap-core.2.2.0/opam index 6e4b1341e27..1f3cb601aa6 100644 --- a/packages/liquidsoap-core/liquidsoap-core.2.2.0/opam +++ b/packages/liquidsoap-core/liquidsoap-core.2.2.0/opam @@ -87,6 +87,7 @@ conflicts: [ "ffmpeg" {>= "1.2.0"} "ffmpeg-avutil" {>= "1.2.0"} "flac" {< "0.5.0"} + "flac" {> "1.0.0"} "frei0r" {< "0.1.0"} "gstreamer" {< "0.3.1"} "inotify" {< "1.0"} diff --git a/packages/liquidsoap-core/liquidsoap-core.2.2.1/opam b/packages/liquidsoap-core/liquidsoap-core.2.2.1/opam index 45f7245c916..ab005d39dd3 100644 --- a/packages/liquidsoap-core/liquidsoap-core.2.2.1/opam +++ b/packages/liquidsoap-core/liquidsoap-core.2.2.1/opam @@ -87,6 +87,7 @@ conflicts: [ "ffmpeg" {>= "1.2.0"} "ffmpeg-avutil" {>= "1.2.0"} "flac" {< "0.5.0"} + "flac" {> "1.0.0"} "frei0r" {< "0.1.0"} "gstreamer" {< "0.3.1"} "inotify" {< "1.0"} diff --git a/packages/liquidsoap-core/liquidsoap-core.2.2.2/opam b/packages/liquidsoap-core/liquidsoap-core.2.2.2/opam index cac32aa2aa2..235b3af49d1 100644 --- a/packages/liquidsoap-core/liquidsoap-core.2.2.2/opam +++ b/packages/liquidsoap-core/liquidsoap-core.2.2.2/opam @@ -87,6 +87,7 @@ conflicts: [ "ffmpeg" {>= "1.2.0"} "ffmpeg-avutil" {>= "1.2.0"} "flac" {< "0.3.0"} + "flac" {> "1.0.0"} "frei0r" {< "0.1.0"} "gstreamer" {< "0.3.1"} "inotify" {< "1.0"} diff --git a/packages/liquidsoap-core/liquidsoap-core.2.2.3/opam b/packages/liquidsoap-core/liquidsoap-core.2.2.3/opam index b1cbed1838e..e4f6e758996 100644 --- a/packages/liquidsoap-core/liquidsoap-core.2.2.3/opam +++ b/packages/liquidsoap-core/liquidsoap-core.2.2.3/opam @@ -86,6 +86,7 @@ conflicts: [ "ffmpeg" {>= "1.2.0"} "ffmpeg-avutil" {>= "1.2.0"} "flac" {< "0.3.0"} + "flac" {> "1.0.0"} "frei0r" {< "0.1.0"} "gstreamer" {< "0.3.1"} "inotify" {< "1.0"} diff --git a/packages/liquidsoap-core/liquidsoap-core.2.2.4-1/opam b/packages/liquidsoap-core/liquidsoap-core.2.2.4-1/opam index 7fe9c0015d3..45f762ec005 100644 --- a/packages/liquidsoap-core/liquidsoap-core.2.2.4-1/opam +++ b/packages/liquidsoap-core/liquidsoap-core.2.2.4-1/opam @@ -86,6 +86,7 @@ conflicts: [ "ffmpeg" {>= "1.2.0"} "ffmpeg-avutil" {>= "1.2.0"} "flac" {< "0.3.0"} + "flac" {> "1.0.0"} "frei0r" {< "0.1.0"} "gstreamer" {< "0.3.1"} "inotify" {< "1.0"} diff --git a/packages/liquidsoap-core/liquidsoap-core.2.2.5/opam b/packages/liquidsoap-core/liquidsoap-core.2.2.5/opam index 21c9efe58c3..5a99b30197c 100644 --- a/packages/liquidsoap-core/liquidsoap-core.2.2.5/opam +++ b/packages/liquidsoap-core/liquidsoap-core.2.2.5/opam @@ -87,6 +87,7 @@ conflicts: [ "ffmpeg" {>= "1.2.0"} "ffmpeg-avutil" {>= "1.2.0"} "flac" {< "0.3.0"} + "flac" {> "1.0.0"} "frei0r" {< "0.1.0"} "gstreamer" {< "0.3.1"} "inotify" {< "1.0"} diff --git a/packages/liquidsoap-core/liquidsoap-core.2.3.0/opam b/packages/liquidsoap-core/liquidsoap-core.2.3.0/opam index c8f7c8d1bc8..e6316f9e32b 100644 --- a/packages/liquidsoap-core/liquidsoap-core.2.3.0/opam +++ b/packages/liquidsoap-core/liquidsoap-core.2.3.0/opam @@ -83,6 +83,7 @@ conflicts: [ "ffmpeg" {< "1.2.0"} "ffmpeg-avutil" {< "1.2.0"} "flac" {< "0.3.0"} + "flac" {> "1.0.0"} "frei0r" {< "0.1.0"} "inotify" {< "1.0"} "ladspa" {< "0.2.0"} diff --git a/packages/opus/opus.0.2.0/opam b/packages/opus/opus.0.2.0/opam index 486290d96fd..3dfee5dfb3b 100644 --- a/packages/opus/opus.0.2.0/opam +++ b/packages/opus/opus.0.2.0/opam @@ -11,7 +11,7 @@ depends: [ "conf-pkg-config" "dune" {>= "2.0"} "dune-configurator" - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/opus/opus.0.2.1/opam b/packages/opus/opus.0.2.1/opam index 3d748a365f0..d0c0ec3b6da 100644 --- a/packages/opus/opus.0.2.1/opam +++ b/packages/opus/opus.0.2.1/opam @@ -12,7 +12,7 @@ depends: [ "conf-pkg-config" "dune" {>= "2.8"} "dune-configurator" - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} "odoc" {with-doc} ] build: [ diff --git a/packages/opus/opus.0.2.2/opam b/packages/opus/opus.0.2.2/opam index fd1580d39f4..6ea28b6f66f 100644 --- a/packages/opus/opus.0.2.2/opam +++ b/packages/opus/opus.0.2.2/opam @@ -13,7 +13,7 @@ depends: [ "ocaml" {>= "4.08.0"} "dune" {>= "2.8"} "dune-configurator" - "ogg" {>= "0.7.1"} + "ogg" {>= "0.7.1" & < "1.0.0"} "odoc" {with-doc} ] build: [ diff --git a/packages/speex/speex.0.4.0/opam b/packages/speex/speex.0.4.0/opam index 5f4a5005d62..5287bf99079 100644 --- a/packages/speex/speex.0.4.0/opam +++ b/packages/speex/speex.0.4.0/opam @@ -11,7 +11,7 @@ depends: [ "conf-pkg-config" "dune" {>= "2.0"} "dune-configurator" - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/speex/speex.0.4.1/opam b/packages/speex/speex.0.4.1/opam index 16be3770452..d7ffb054022 100644 --- a/packages/speex/speex.0.4.1/opam +++ b/packages/speex/speex.0.4.1/opam @@ -13,7 +13,7 @@ depends: [ "dune" {>= "2.8"} "dune-configurator" "ocaml" {>= "4.07"} - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} "odoc" {with-doc} ] build: [ diff --git a/packages/theora/theora.0.4.0/opam b/packages/theora/theora.0.4.0/opam index 137dd26ca81..08e38e7e7a8 100644 --- a/packages/theora/theora.0.4.0/opam +++ b/packages/theora/theora.0.4.0/opam @@ -10,7 +10,7 @@ depends: [ "conf-pkg-config" "dune" {>= "2.0"} "dune-configurator" - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/theora/theora.0.4.1/opam b/packages/theora/theora.0.4.1/opam index 91e3d35b3ee..616a4b4cadf 100644 --- a/packages/theora/theora.0.4.1/opam +++ b/packages/theora/theora.0.4.1/opam @@ -11,7 +11,7 @@ depends: [ "conf-pkg-config" "dune" {>= "2.0"} "dune-configurator" - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/vorbis/vorbis.0.8.0/opam b/packages/vorbis/vorbis.0.8.0/opam index 2b6e977373c..e01bf8d6508 100644 --- a/packages/vorbis/vorbis.0.8.0/opam +++ b/packages/vorbis/vorbis.0.8.0/opam @@ -10,7 +10,7 @@ depends: [ "conf-pkg-config" "dune" {>= "2.0"} "dune-configurator" - "ogg" {>= "0.7.0"} + "ogg" {>= "0.7.0" & < "1.0.0"} "ocaml" {>= "4.03.0"} ] build: [