[vlc-devel] [PATCH 2/3] contrib: asdcplib: generate the pkg-config file the usual autotools way

[Steve Lhomme]

On 2020-03-26 11:07, Rémi Denis-Courmont wrote:
> Le torstaina 26. maaliskuuta 2020, 10.48.22 EET Steve Lhomme a écrit :
>> Supported for both autotools and CMake builds, although it's hardcoded to
>> nettle builds for now.
> 
> And the .pc file is also hard-coded for static builds here.

Yes. I didn't change that part, so from our side it should work just 
like before. To upstream the patch it would need more work.

>> Co-Authored-By: Aaron Boxer <boxerab at gmail.com>
>> ---
>>   .../0001-generate-a-pkg-config-file.patch     | 69 +++++++++++++++++++
>>   .../src/asdcplib/adding-pkg-config-file.patch | 29 --------
>>   contrib/src/asdcplib/rules.mak                |  2 +-
>>   3 files changed, 70 insertions(+), 30 deletions(-)
>>   create mode 100644
>> contrib/src/asdcplib/0001-generate-a-pkg-config-file.patch delete mode
>> 100644 contrib/src/asdcplib/adding-pkg-config-file.patch
>>
>> diff --git a/contrib/src/asdcplib/0001-generate-a-pkg-config-file.patch
>> b/contrib/src/asdcplib/0001-generate-a-pkg-config-file.patch new file mode
>> 100644
>> index 00000000000..bb2703135ae
>> --- /dev/null
>> +++ b/contrib/src/asdcplib/0001-generate-a-pkg-config-file.patch
>> @@ -0,0 +1,69 @@
>> +From 9a36afbf244bea9ebcfaa587eb5d89cb5caf1491 Mon Sep 17 00:00:00 2001
>> +From: Steve Lhomme <robux4 at ycbcr.xyz>
>> +Date: Thu, 26 Mar 2020 08:54:36 +0100
>> +Subject: [PATCH 2/3] generate a pkg-config file
>> +
>> +(hardcoded to nettle for now)
>> +---
>> + CMakeLists.txt |  5 +++++
>> + asdcplib.pc.in | 10 ++++++++++
>> + configure.ac   | 11 +++++++++++
>> + 3 files changed, 26 insertions(+)
>> + create mode 100644 asdcplib.pc.in
>> +
>> +diff --git a/CMakeLists.txt b/CMakeLists.txt
>> +index cf5b240..daef20b 100644
>> +--- a/CMakeLists.txt
>> ++++ b/CMakeLists.txt
>> +@@ -51,3 +51,8 @@ set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
>> + set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
>> + set(CPACK_PACKAGE_INSTALL_DIRECTORY
>> ${PROJECT_NAME}{VERSION_MAJOR}.${VERSION_MINOR}) + include(CPack)
>> ++
>> ++# Produce a pkg-config file
>> ++configure_file("asdcplib.pc.in" "asdcplib.pc" @ONLY)
>> ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/asdcplib.pc"
>> ++		DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
>> +diff --git a/asdcplib.pc.in b/asdcplib.pc.in
>> +new file mode 100644
>> +index 0000000..8d86dc2
>> +--- /dev/null
>> ++++ b/asdcplib.pc.in
>> +@@ -0,0 +1,10 @@
>> ++prefix=@CMAKE_INSTALL_PREFIX@
>> ++exec_prefix=${prefix}
>> ++includedir=${prefix}/include
>> ++libdir=${exec_prefix}/@LIB_INSTALL_DIR@
>> ++
>> ++Name: asdcplib
>> ++Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
>> ++Version: @VERSION_STRING@
>> ++Cflags: -I${includedir}
>> ++Libs: -L${libdir} -lasdcp -lkumu -lnettle -lgmp
>> +diff --git a/configure.ac b/configure.ac
>> +index 29be9f8..102d96d 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -133,8 +133,19 @@ AC_CHECK_LIB([pthread], [pthread_create])
>> + #AC_FUNC_STAT
>> + #AC_CHECK_FUNCS([getcwd memset regcomp strchr strerror strrchr strstr
>> strtol]) +
>> ++dnl Mimick CMake strings
>> ++CPACK_PACKAGE_DESCRIPTION_SUMMARY="asdcplib from cinecert.com"
>> ++CMAKE_INSTALL_PREFIX=${prefix}
>> ++LIB_INSTALL_DIR=lib
>> ++VERSION_STRING=${VERSION}
>> ++AC_SUBST(CPACK_PACKAGE_DESCRIPTION_SUMMARY)
>> ++AC_SUBST(CMAKE_INSTALL_PREFIX)
>> ++AC_SUBST(LIB_INSTALL_DIR)
>> ++AC_SUBST(VERSION_STRING)
>> ++
>> + AC_CONFIG_FILES([Makefile
>> +                  src/Makefile
>> ++                 asdcplib.pc
>> + 		 win32/Makefile
>> + 		 win32/Makefile.mak:win32/Makefile.wmk])
>> + AC_OUTPUT
>> +--
>> +2.26.0.windows.1
>> +
>> diff --git a/contrib/src/asdcplib/adding-pkg-config-file.patch
>> b/contrib/src/asdcplib/adding-pkg-config-file.patch deleted file mode
>> 100644
>> index 977f66da828..00000000000
>> --- a/contrib/src/asdcplib/adding-pkg-config-file.patch
>> +++ /dev/null
>> @@ -1,29 +0,0 @@
>> -From 283142c645a906a64da4a8e9d6d619762a0c8305 Mon Sep 17 00:00:00 2001
>> -From: Aaron Boxer <boxerab at gmail.com>
>> -Date: Fri, 27 May 2016 19:25:38 -0400
>> -Subject: [PATCH 5/5] adding pkg-config file
>> -
>> ----
>> - asdcplib.pc | 10 ++++++++++
>> - 1 file changed, 10 insertions(+)
>> - create mode 100644 asdcplib.pc
>> -
>> -diff --git a/asdcplib.pc b/asdcplib.pc
>> -new file mode 100644
>> -index 0000000..36fdd12
>> ---- /dev/null
>> -+++ b/asdcplib.pc
>> -@@ -0,0 +1,10 @@
>> -+prefix=/usr/local
>> -+exec_prefix=${prefix}
>> -+includedir=${prefix}/include
>> -+libdir=${exec_prefix}/lib
>> -+
>> -+Name: asdcplib
>> -+Description: The asdcp library
>> -+Version: 2.7.19
>> -+Cflags: -I${includedir}
>> -+Libs: -L${libdir} -lasdcp -lkumu -lnettle -lgmp
>> ---
>> -2.11.0
>> -
>> diff --git a/contrib/src/asdcplib/rules.mak b/contrib/src/asdcplib/rules.mak
>> index b35ca3ad09d..2bbb693179f 100644
>> --- a/contrib/src/asdcplib/rules.mak
>> +++ b/contrib/src/asdcplib/rules.mak
>> @@ -25,7 +25,7 @@ asdcplib: rel_$(ASDCPLIB_VERSION).tar.gz .sum-asdcplib
>>   	rm -rf $(UNPACK_DIR)
>>   	mv asdcplib-rel_$(ASDCPLIB_VERSION) $(UNPACK_DIR)
>>   	$(APPLY) $(SRC)/asdcplib/port-to-nettle.patch
>> -	$(APPLY) $(SRC)/asdcplib/adding-pkg-config-file.patch
>> +	$(APPLY) $(SRC)/asdcplib/0001-generate-a-pkg-config-file.patch
>>   	$(APPLY) $(SRC)/asdcplib/win32-cross-compilation.patch
>>   	$(APPLY) $(SRC)/asdcplib/win32-dirent.patch
>>   	$(MOVE)
> 
> 
> -- 
> Реми Дёни-Курмон
> http://www.remlab.net/
> 
> 
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>