From 7deee8103edf77bf68095253668f4818d09609e1 Mon Sep 17 00:00:00 2001 From: Christopher Degawa Date: Tue, 2 Aug 2022 15:46:19 -0500 Subject: [PATCH 1/2] libsharpyuv: add pkg-config file Signed-off-by: Christopher Degawa Change-Id: I872cd62ccdf096044c7921afda8289849d141531 --- CMakeLists.txt | 1 + configure.ac | 2 +- sharpyuv/Makefile.am | 1 + sharpyuv/libsharpyuv.pc.in | 11 +++++++++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 sharpyuv/libsharpyuv.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 251b6f9a..93bcaec1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -308,6 +308,7 @@ set_target_properties( sharpyuv PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv/sharpyuv.h;\ ${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv/sharpyuv_csp.h") +configure_pkg_config("sharpyuv/libsharpyuv.pc") install(TARGETS sharpyuv EXPORT ${PROJECT_NAME}Targets PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webp/sharpyuv diff --git a/configure.ac b/configure.ac index 5baaca52..c0c1b92e 100644 --- a/configure.ac +++ b/configure.ac @@ -753,7 +753,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([src/webp/config.h]) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile \ examples/Makefile extras/Makefile imageio/Makefile \ - sharpyuv/Makefile \ + sharpyuv/Makefile sharpyuv/libsharpyuv.pc \ src/dec/Makefile src/enc/Makefile src/dsp/Makefile \ src/demux/Makefile src/mux/Makefile \ src/utils/Makefile \ diff --git a/sharpyuv/Makefile.am b/sharpyuv/Makefile.am index ed9869ba..eda07187 100644 --- a/sharpyuv/Makefile.am +++ b/sharpyuv/Makefile.am @@ -35,3 +35,4 @@ libsharpyuv_la_LIBADD = libsharpyuv_la_LIBADD += libsharpyuv_sse2.la libsharpyuv_la_LIBADD += libsharpyuv_neon.la libsharpyuvincludedir = $(includedir)/webp/sharpyuv +pkgconfig_DATA = libsharpyuv.pc diff --git a/sharpyuv/libsharpyuv.pc.in b/sharpyuv/libsharpyuv.pc.in new file mode 100644 index 00000000..d3931f6a --- /dev/null +++ b/sharpyuv/libsharpyuv.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libsharpyuv +Description: Library for sharp RGB to YUV conversion +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lsharpyuv +Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ From 04764b56a00417d9c3aa5105f3b62a4445ac1fe6 Mon Sep 17 00:00:00 2001 From: Christopher Degawa Date: Tue, 2 Aug 2022 15:58:49 -0500 Subject: [PATCH 2/2] libwebp.pc: add libsharpyuv to requires Signed-off-by: Christopher Degawa Change-Id: I7111d1f7738dad566dc74fc11be99ff92e11c50b --- src/libwebp.pc.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libwebp.pc.in b/src/libwebp.pc.in index 733bb6db..8f98432c 100644 --- a/src/libwebp.pc.in +++ b/src/libwebp.pc.in @@ -6,6 +6,7 @@ includedir=@includedir@ Name: libwebp Description: Library for the WebP graphics format Version: @PACKAGE_VERSION@ +Requires: libsharpyuv Cflags: -I${includedir} Libs: -L${libdir} -lwebp Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@