[vlc-devel] [PATCH] contrib: aribb25: don't build a test program in the library

[Steve Lhomme]

---
 contrib/src/aribb25/aribb25-td-program.patch | 21 ++++++++++++++++++++
 contrib/src/aribb25/rules.mak                |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 contrib/src/aribb25/aribb25-td-program.patch

diff --git a/contrib/src/aribb25/aribb25-td-program.patch b/contrib/src/aribb25/aribb25-td-program.patch
new file mode 100644
index 000000000000..7ecdb39ffddc
--- /dev/null
+++ b/contrib/src/aribb25/aribb25-td-program.patch
@@ -0,0 +1,21 @@
+--- aribb25/Makefile.am.td	2020-05-27 11:31:45.022327400 +0200
++++ aribb25/Makefile.am	2020-05-27 11:32:08.392029100 +0200
+@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+ lib_LTLIBRARIES = libaribb25.la
+ libaribb25_la_SOURCES = src/arib_std_b25.c src/b_cas_card.c src/multi2.c \
+         src/portable.h src/ts_section_parser.c src/arib_std_b25_error_code.h \
+-        src/b_cas_card_error_code.h src/multi2_error_code.h src/td.c \
++        src/b_cas_card_error_code.h src/multi2_error_code.h \
+         src/ts_section_parser_error_code.h src/arib_std_b25.h src/b_cas_card.h \
+         src/multi2.h src/ts_common_types.h src/ts_section_parser.h src/aribb25api.h
+ libaribb25_la_LIBADD = $(AM_LIBS) $(pcsclite_CFLAGS) $(PCSC_LIBS)
+@@ -17,4 +17,9 @@ pkginclude_HEADERS = src/arib_std_b25_er
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = src/aribb25.pc
+ 
++td_SOURCES = src/td.c
++td_LDADD = libaribb25.la
++
++bin_PROGRAMS = td
++
+ dist_doc_DATA = README.jp.txt README.md LICENCE
diff --git a/contrib/src/aribb25/rules.mak b/contrib/src/aribb25/rules.mak
index 7bcd9b3e03fd..61bbc020c9f8 100644
--- a/contrib/src/aribb25/rules.mak
+++ b/contrib/src/aribb25/rules.mak
@@ -22,9 +22,11 @@ $(TARBALLS)/aribb25-$(ARIBB25_VERSION).tar.gz:
 
 aribb25: aribb25-$(ARIBB25_VERSION).tar.gz .sum-aribb25
 	$(UNPACK)
+	$(APPLY) $(SRC)/aribb25/aribb25-td-program.patch
 	$(MOVE)
 
 .aribb25: aribb25
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) && $(MAKE) install
 	touch $@
-- 
2.26.2