[FFmpeg-devel] [PATCH] codec2: use pkg-config file if it is available

[FFmpeg-devel] [PATCH] codec2: use pkg-config file if it is available

[Christopher Degawa]

codec2.pc has been available since 2016, and I believe most distros
have it by now.

codec2-dev's commit:
https://github.com/drowe67/codec2-dev/commit/fdfda67436b5b7308cf0758d9192f1dd540d439d

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index f6f5c29fea..b935b4f44c 100755
--- a/configure
+++ b/configure
@@ -6852,7 +6852,8 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
                              { check_lib libcelt celt/celt.h celt_decoder_create_custom -lcelt0 ||
                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
 enabled libcaca           && require_pkg_config libcaca caca caca.h caca_create_canvas
-enabled libcodec2         && require libcodec2 codec2/codec2.h codec2_create -lcodec2
+enabled libcodec2         && { require_pkg_config libcodec2 codec2 codec2.h codec2_create ||
+                               require libcodec2 codec2/codec2.h codec2_create -lcodec2; }
 enabled libdav1d          && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d/dav1d.h" dav1d_version
 enabled libdavs2          && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
 enabled libdc1394         && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
-- 
2.45.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] codec2: use pkg-config file if it is available

[Christopher Degawa]

On Sun, Jul 21, 2024 at 12:03 AM Christopher Degawa <ccom@randomderp.com>
wrote:

> +enabled libcodec2         && { require_pkg_config libcodec2 codec2
> codec2.h codec2_create ||
> +                               require libcodec2 codec2/codec2.h
> codec2_create -lcodec2; }
>

I made a mistake and this should have been check_pkg_config instead.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH v2] codec2: use pkg-config file if it is available

[Christopher Degawa]

codec2.pc has been available since 2016, and I believe most distros
have it by now.

codec2-dev's commit:
https://github.com/drowe67/codec2-dev/commit/fdfda67436b5b7308cf0758d9192f1dd540d439d

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index f6f5c29fea..bacbb1a557 100755
--- a/configure
+++ b/configure
@@ -6852,7 +6852,8 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
                              { check_lib libcelt celt/celt.h celt_decoder_create_custom -lcelt0 ||
                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
 enabled libcaca           && require_pkg_config libcaca caca caca.h caca_create_canvas
-enabled libcodec2         && require libcodec2 codec2/codec2.h codec2_create -lcodec2
+enabled libcodec2         && { check_pkg_config libcodec2 codec2 codec2.h codec2_create ||
+                               require libcodec2 codec2/codec2.h codec2_create -lcodec2; }
 enabled libdav1d          && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d/dav1d.h" dav1d_version
 enabled libdavs2          && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
 enabled libdc1394         && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
-- 
2.45.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".