<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hello,<div class=""><br class=""></div><div class="">This was already removed upstream (<a href="https://github.com/uclouvain/openjpeg/commit/c02f145cd1f8714727178d8a74cdd21a5327b107" class="">https://github.com/uclouvain/openjpeg/commit/c02f145cd1f8714727178d8a74cdd21a5327b107</a>), so why not remove it here and avoid possible problems.</div><div class=""><br class=""></div><div class="">Regards,</div><div class="">Tadej Novak</div><div class=""><br class=""></div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 14. mar. 2016, at 04:00, Rémi Denis-Courmont <<a href="mailto:remi@remlab.net" class="">remi@remlab.net</a>> wrote:</div><br class="Apple-interchange-newline"><div class="">
<div class=""><div style="font-size: 12pt; font-family: Calibri,sans-serif;" class=""><div class="">Hey,</div><div class=""><br class=""></div><div class="">Static linking should cause no particular issues with symbols. Your problem is probably something else.</div><div class=""><br class=""></div><div class="">-- </div><div class="">Rémi Denis-Courmont</div><div class="">Sent from my NVIDIA Tegra-powered device</div><br class=""><div id="htc_header" class="">----- Reply message -----<br class="">De : "Tadej Novak" <<a href="mailto:tadej@tano.si" class="">tadej@tano.si</a>><br class="">Pour : <<a href="mailto:vlc-devel@videolan.org" class="">vlc-devel@videolan.org</a>><br class="">Objet : [vlc-devel] [PATCH] Contribs: Do not build openjpeg with t1_generate_luts<br class="">Date : dim., mars 13, 2016 00:59</div></div><br class=""><pre style="word-wrap: break-word; white-space: pre-wrap;" class="">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
_______________________________________________
vlc-devel mailing list
To unsubscribe or modify your subscription options:
<a href="https://mailman.videolan.org/listinfo/vlc-devel" class="">https://mailman.videolan.org/listinfo/vlc-devel</a>
</pre></div>_______________________________________________<br class="">vlc-devel mailing list<br class="">To unsubscribe or modify your subscription options:<br class=""><a href="https://mailman.videolan.org/listinfo/vlc-devel" class="">https://mailman.videolan.org/listinfo/vlc-devel</a><br class=""></div></blockquote></div><br class=""></div></body></html>