Commit 6b2f3623 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Hugo Beauzée-Luyssen

Contribs: update asdcplib to 2.7.9 and port to nettle

This removes the OpenSSL dependency

Close #16999 and #17815
Signed-off-by: default avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
parent 52e2cc6f
b8ea9ed77e7fd207f991c1edf91f6601e4fdd626c203890ef938cef8790b29bd1a11945a03a475f6e1c827a0ad170980b7d4c5a7d81e7758aeb262ccb408f241 asdcplib-1.12.58.tar.gz
2ae375b2cbb76bbb0ca75a6b2a37b5b51350165ad07b92957f269611b37d92475da44c1046f06f316a1dc1e00f3141b5c9763abd64c41c341131b9c7c4d04bab asdcplib-2.7.19.tar.gz
From 283142c645a906a64da4a8e9d6d619762a0c8305 Mon Sep 17 00:00:00 2001
From: Aaron Boxer <boxerab@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.5.14
+Cflags: -I${includedir}
+Libs: -L${libdir} -lasdcp -lkumu -lnettle -lgmp
--
2.11.0
This diff is collapsed.
# asdcplib
ASDCPLIB_VERSION := 1.12.58
ASDCPLIB_VERSION := 2.7.19
ASDCPLIB_URL := http://download.cinecert.com/asdcplib/asdcplib-$(ASDCPLIB_VERSION).tar.gz
......@@ -16,11 +16,16 @@ $(TARBALLS)/asdcplib-$(ASDCPLIB_VERSION).tar.gz:
asdcplib: asdcplib-$(ASDCPLIB_VERSION).tar.gz .sum-asdcplib
$(UNPACK)
$(APPLY) $(SRC)/asdcplib/port-to-nettle.patch
$(APPLY) $(SRC)/asdcplib/static-programs.patch
$(APPLY) $(SRC)/asdcplib/adding-pkg-config-file.patch
$(APPLY) $(SRC)/asdcplib/win32-cross-compilation.patch
$(MOVE)
.asdcplib: asdcplib
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-freedist
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-freedist --enable-dev-headers
cd $< && $(MAKE) install
mkdir -p -- "$(PREFIX)/lib/pkgconfig"
cp $</asdcplib.pc "$(PREFIX)/lib/pkgconfig/"
touch $@
--- asdcplib.old/src/Makefile.am 2017-01-17 22:38:59.494475028 +0100
+++ asdcplib/src/Makefile.am 2017-01-17 23:00:44.922416865 +0100
@@ -240,64 +240,64 @@
# sources and linkage for CLI utilities
asdcp_test_SOURCES = asdcp-test.cpp
-asdcp_test_LDADD = libasdcp.la libkumu.la
+asdcp_test_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
asdcp_wrap_SOURCES = asdcp-wrap.cpp
-asdcp_wrap_LDADD = libasdcp.la libkumu.la
+asdcp_wrap_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
asdcp_unwrap_SOURCES = asdcp-unwrap.cpp
-asdcp_unwrap_LDADD = libasdcp.la libkumu.la
+asdcp_unwrap_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
asdcp_util_SOURCES = asdcp-util.cpp
-asdcp_util_LDADD = libasdcp.la libkumu.la
+asdcp_util_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
asdcp_info_SOURCES = asdcp-info.cpp
-asdcp_info_LDADD = libasdcp.la libkumu.la
+asdcp_info_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
kmfilegen_SOURCES = kmfilegen.cpp
-kmfilegen_LDADD = libkumu.la
+kmfilegen_LDADD = libkumu.la -lnettle -lgmp
kmrandgen_SOURCES = kmrandgen.cpp
-kmrandgen_LDADD = libkumu.la
+kmrandgen_LDADD = libkumu.la -lnettle -lgmp
kmuuidgen_SOURCES = kmuuidgen.cpp
-kmuuidgen_LDADD = libkumu.la
+kmuuidgen_LDADD = libkumu.la -lnettle -lgmp
blackwave_SOURCES = blackwave.cpp
-blackwave_LDADD = libasdcp.la libkumu.la
+blackwave_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
pinkwave_SOURCES = pinkwave.cpp
-pinkwave_LDADD = libasdcp.la libkumu.la
+pinkwave_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
klvwalk_SOURCES = klvwalk.cpp
-klvwalk_LDADD = libasdcp.la libkumu.la
+klvwalk_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
wavesplit_SOURCES = wavesplit.cpp
-wavesplit_LDADD = libasdcp.la libkumu.la
+wavesplit_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
j2c_test_SOURCES = j2c-test.cpp
-j2c_test_LDADD = libasdcp.la libkumu.la
+j2c_test_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
klvsplit_SOURCES = klvsplit.cpp
-klvsplit_LDADD = libasdcp.la libkumu.la
+klvsplit_LDADD = libasdcp.la libkumu.la -lnettle -lgmp
if USE_AS_02
as_02_wrap_SOURCES = as-02-wrap.cpp
-as_02_wrap_LDADD = libas02.la libasdcp.la libkumu.la
+as_02_wrap_LDADD = libas02.la libasdcp.la libkumu.la -lnettle -lgmp
as_02_unwrap_SOURCES = as-02-unwrap.cpp
-as_02_unwrap_LDADD = libas02.la libasdcp.la libkumu.la
+as_02_unwrap_LDADD = libas02.la libasdcp.la libkumu.la -lnettle -lgmp
as_02_info_SOURCES = as-02-info.cpp
-as_02_info_LDADD = libas02.la libasdcp.la libkumu.la
+as_02_info_LDADD = libas02.la libasdcp.la libkumu.la -lnettle -lgmp
endif
if USE_PHDR
phdr_wrap_SOURCES = phdr-wrap.cpp
-phdr_wrap_LDADD = libphdr.la libas02.la libasdcp.la libkumu.la
+phdr_wrap_LDADD = libphdr.la libas02.la libasdcp.la libkumu.la -lnettle -lgmp
phdr_unwrap_SOURCES = phdr-unwrap.cpp
-phdr_unwrap_LDADD = libphdr.la libas02.la libasdcp.la libkumu.la
+phdr_unwrap_LDADD = libphdr.la libas02.la libasdcp.la libkumu.la -lnettle -lgmp
endif
# list of programs that need to be compiled for use in test suite
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment