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

[Tadej Novak]

Hello,

This was already removed upstream (https://github.com/uclouvain/openjpeg/commit/c02f145cd1f8714727178d8a74cdd21a5327b107), so why not remove it here and avoid possible problems.

Regards,
Tadej Novak


> On 14. mar. 2016, at 04:00, Rémi Denis-Courmont <remi at remlab.net> wrote:
> 
> Hey,
> 
> Static linking should cause no particular issues with symbols. Your problem is probably something else.
> 
> --
> Rémi Denis-Courmont
> Sent from my NVIDIA Tegra-powered device
> 
> ----- Reply message -----
> De : "Tadej Novak" <tadej at tano.si>
> Pour : <vlc-devel at videolan.org>
> Objet : [vlc-devel] [PATCH] Contribs: Do not build openjpeg with	t1_generate_luts
> Date : dim., mars 13, 2016 00:59
> 
> 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:
> https://mailman.videolan.org/listinfo/vlc-devel <https://mailman.videolan.org/listinfo/vlc-devel>
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20160314/2eb5ec19/attachment.html>