[vlc-devel] [PATCH] Contribs: Do not build openjpeg with t1_generate_luts

[Tadej Novak]

t1_generate_luts is a test and contains main() function. This
causes issues with static linking where two main functions are
found and this one is used. Reproducable on iOS when linking
with a C++ application. Removing this test fixes the issue.
---
 contrib/src/openjpeg/remove-tests.patch | 21 +++++++++++++++++++++
 contrib/src/openjpeg/rules.mak          |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 contrib/src/openjpeg/remove-tests.patch

diff --git a/contrib/src/openjpeg/remove-tests.patch b/contrib/src/openjpeg/remove-tests.patch
new file mode 100644
index 0000000..ffd4cad
--- /dev/null
+++ b/contrib/src/openjpeg/remove-tests.patch
@@ -0,0 +1,21 @@
+--- openjpeg/libopenjpeg/jpwl/Makefile.am.orig	2012-02-07 11:49:55.000000000 +0100
++++ openjpeg/libopenjpeg/jpwl/Makefile.am	2016-03-06 09:59:38.000000000 +0100
+@@ -18,7 +18,6 @@
+ ../pi.c \
+ ../raw.c \
+ ../t1.c \
+-../t1_generate_luts.c \
+ ../t2.c \
+ ../tcd.c \
+ ../tgt.c \
+
+ --- openjpeg/libopenjpeg/Makefile.am.orig	2012-02-07 11:49:55.000000000 +0100
+ +++ openjpeg/libopenjpeg/Makefile.am	2016-03-06 09:59:41.000000000 +0100
+ @@ -35,7 +35,6 @@
+  pi.c \
+  raw.c \
+  t1.c \
+ -t1_generate_luts.c \
+  t2.c \
+  tcd.c \
+  tgt.c \
diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index d756ab2..0e67023 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -15,6 +15,7 @@ ifdef HAVE_VISUALSTUDIO
 	$(APPLY) $(SRC)/openjpeg/msvc.patch
 endif
 	$(APPLY) $(SRC)/openjpeg/restrict.patch
+	$(APPLY) $(SRC)/openjpeg/remove-tests.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
-- 
2.7.2