[vlc-devel] [vlc-commits] contrib: openjpeg: added patch to fix install.

[Steve Lhomme]

On Tue, Dec 5, 2017 at 5:38 AM, Konstantin Pavlov <git at videolan.org> wrote:
> vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Tue Dec  5 07:38:18 2017 +0300| [6d854372e2048ccab20aa80c40782dccb905f9f2] | committer: Konstantin Pavlov
>
> contrib: openjpeg: added patch to fix install.
>
> While at it, use upstream-preferred cmake parameters.
>
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6d854372e2048ccab20aa80c40782dccb905f9f2
> ---
>
>  contrib/src/openjpeg/install.patch | 23 +++++++++++++++++++++++
>  contrib/src/openjpeg/rules.mak     |  3 ++-
>  2 files changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/src/openjpeg/install.patch b/contrib/src/openjpeg/install.patch
> new file mode 100644
> index 0000000000..77a04cbfdc
> --- /dev/null
> +++ b/contrib/src/openjpeg/install.patch
> @@ -0,0 +1,23 @@
> +From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
> +From: Even Rouault <even.rouault at spatialys.com>
> +Date: Mon, 9 Oct 2017 11:40:43 +0200
> +Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
> + static-only build lacks the installation target for the library (#1019, fixes
> + regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
> +
> +---
> + src/lib/openjp2/CMakeLists.txt | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
> +index 0b4520384..f8990ccf0 100644
> +--- a/src/lib/openjp2/CMakeLists.txt
> ++++ b/src/lib/openjp2/CMakeLists.txt
> +@@ -99,6 +99,7 @@ else()
> +     set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
> +   else()
> +     add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
> ++    set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
> +   endif()
> + endif()
> +
> diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
> index b505ca062c..f9b860008b 100644
> --- a/contrib/src/openjpeg/rules.mak
> +++ b/contrib/src/openjpeg/rules.mak
> @@ -15,12 +15,13 @@ ifdef HAVE_VISUALSTUDIO
>  #      $(APPLY) $(SRC)/openjpeg/msvc.patch
>  endif
>  #      $(APPLY) $(SRC)/openjpeg/restrict.patch
> +       $(APPLY) $(SRC)/openjpeg/install.patch
>         $(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in")
>         $(MOVE)
>
>  .openjpeg: openjpeg
>         cd $< && $(HOSTVARS) $(CMAKE) \
> -               -DBUILD_SHARED_LIBS=OFF -DBUILD_PKGCONFIG_FILES=ON \
> +               -DBUILD_SHARED_LIBS:bool=off -DBUILD_PKGCONFIG_FILES=ON -DCMAKE_BUILD_TYPE=Release \

The Release mode should probably only be used with "ifndef WITH_OPTIMIZATION"

>                 .
>         cd $< && $(MAKE) install
>         touch $@
>
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits