[vlc-devel] [PATCH 1/2] contrib/soxr: use pkgconfig to find FFmpeg/Libav

[Thomas Guillem]

Both patches merged, thanks!

On Tue, Mar 20, 2018, at 21:12, Sean McGovern wrote:
> ---
>  contrib/src/soxr/find_ff_pkgconfig.patch | 27 +++++++++++++++++++++++++++
>  contrib/src/soxr/rules.mak               |  1 +
>  2 files changed, 28 insertions(+)
>  create mode 100644 contrib/src/soxr/find_ff_pkgconfig.patch
> 
> diff --git a/contrib/src/soxr/find_ff_pkgconfig.patch b/contrib/src/
> soxr/find_ff_pkgconfig.patch
> new file mode 100644
> index 0000000..3231f639
> --- /dev/null
> +++ b/contrib/src/soxr/find_ff_pkgconfig.patch
> @@ -0,0 +1,27 @@
> +--- soxr/CMakeLists.txt.orig	2018-03-20 15:53:33.455252098 -0400
> ++++ soxr/CMakeLists.txt	2018-03-20 15:54:37.683356636 -0400
> +@@ -127,18 +127,20 @@
> + endif ()
> + 
> + if (WITH_AVFFT)
> +-  find_package (LibAVCodec REQUIRED)
> ++  find_package(PkgConfig)
> ++  pkg_check_modules(AVCODEC REQUIRED libavcodec)
> +   if (AVCODEC_FOUND)
> +     include_directories (${AVCODEC_INCLUDE_DIRS})
> +-    set (LIBS ${LIBS} ${AVCODEC_LIBRARIES})
> ++    set (LIBS ${LIBS} ${AVCODEC_LDFLAGS})
> +   endif ()
> + endif ()
> + 
> + if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND 
> SIMD32_FOUND AND WITH_CR32))
> +-  find_package (LibAVUtil)
> ++  find_package(PkgConfig)
> ++  pkg_check_modules(AVUTIL REQUIRED libavutil)
> +   if (AVUTIL_FOUND)
> +     include_directories (${AVUTIL_INCLUDE_DIRS})
> +-    set (LIBS ${LIBS} ${AVUTIL_LIBRARIES})
> ++    set (LIBS ${LIBS} ${AVUTIL_LDFLAGS})
> +   endif ()
> + endif ()
> + 
> diff --git a/contrib/src/soxr/rules.mak b/contrib/src/soxr/rules.mak
> index 9cd2072..bf49a2d 100644
> --- a/contrib/src/soxr/rules.mak
> +++ b/contrib/src/soxr/rules.mak
> @@ -18,6 +18,7 @@ soxr: soxr-$(SOXR_VERSION)-Source.tar.xz .sum-soxr
>  	$(UNPACK)
>  	$(APPLY) $(SRC)/soxr/0001-always-generate-.pc.patch
>  	$(APPLY) $(SRC)/soxr/0002-expose-Libs.private-in-.pc.patch
> +	$(APPLY) $(SRC)/soxr/find_ff_pkgconfig.patch
>  	$(MOVE)
>  
>  .soxr: soxr toolchain.cmake
> -- 
> 2.7.4
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel