[vlc-devel] [PATCH 3/3] contrib: openjpeg: don't ship CMake extras

[Konstantin Pavlov]

Given the amount of patches we already have on openjpeg2, maybe minor
things like that should not be merged?  I'm afraid we'll spend more time
fixing that release after release than the actual space we save...

(I don't really mind though, just sharing my thoughts).

On Tue, Dec 05, 2017 at 10:56:45PM -0500, Sean McGovern wrote:
> We don't need them.
> ---
>  contrib/src/openjpeg/no_cmake_extra.patch | 21 +++++++++++++++++++++
>  contrib/src/openjpeg/rules.mak            |  1 +
>  2 files changed, 22 insertions(+)
>  create mode 100644 contrib/src/openjpeg/no_cmake_extra.patch
> 
> diff --git a/contrib/src/openjpeg/no_cmake_extra.patch b/contrib/src/openjpeg/no_cmake_extra.patch
> new file mode 100644
> index 0000000..4bf92a0
> --- /dev/null
> +++ b/contrib/src/openjpeg/no_cmake_extra.patch
> @@ -0,0 +1,21 @@
> +--- openjpeg/CMakeLists.txt.ORIG	2017-10-04 18:23:14.000000000 -0400
> ++++ openjpeg/CMakeLists.txt	2017-12-04 22:17:51.185418577 -0500
> +@@ -328,14 +328,14 @@
> + 
> + #-----------------------------------------------------------------------------
> + # install all targets referenced as OPENJPEGTargets
> +-install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
> ++#install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
> + configure_file( ${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
> +   ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/OpenJPEGConfig.cmake
> +   @ONLY
> + )
> +-install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
> +-  DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
> +-)
> ++#install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
> ++#  DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
> ++#)
> + 
> + #-----------------------------------------------------------------------------
> + # install CHANGES and LICENSE
> diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
> index 3cb52b0..f43fe46 100644
> --- a/contrib/src/openjpeg/rules.mak
> +++ b/contrib/src/openjpeg/rules.mak
> @@ -17,6 +17,7 @@ endif
>  #	$(APPLY) $(SRC)/openjpeg/restrict.patch
>  	$(APPLY) $(SRC)/openjpeg/install.patch
>  	$(APPLY) $(SRC)/openjpeg/openjp2_pthread.patch
> +	$(APPLY) $(SRC)/openjpeg/no_cmake_extra.patch
>  	$(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in")
>  	$(MOVE)
>  
> -- 
> 2.7.4
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel

-- 
VideoLAN, Vice President
www.videolan.org
+7 926 165 45 31
@cryothresh