commit: 56051b2a7d5aca0f7d18b43b874023cbade03405 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Dec 23 16:11:24 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Dec 29 13:11:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56051b2a
media-libs/openjpeg: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3224 .../openjpeg/files/openjpeg-2.0.0-build.patch | 14 -------- .../files/openjpeg-2.0.0-pkgconfig-static.patch | 10 ------ .../openjpeg/files/openjpeg-2.0.0-pkgconfig.patch | 37 ---------------------- 3 files changed, 61 deletions(-) diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch deleted file mode 100644 index 31ae12f..00000000 --- a/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- openjpeg-2.0.0/CMakeLists.txt -+++ openjpeg-2.0.0/CMakeLists.txt -@@ -279,11 +279,4 @@ - DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR} - ) - --#----------------------------------------------------------------------------- --# install CHANGES and LICENSE --if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) -- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) --endif() --install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) -- - include (cmake/OpenJPEGCPack.cmake) diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig-static.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig-static.patch deleted file mode 100644 index 60a5a47..00000000 --- a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig-static.patch +++ /dev/null @@ -1,10 +0,0 @@ -Upstream issue 223, http://code.google.com/p/openjpeg/issues/detail?id=223 - ---- openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in -+++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in -@@ -10,4 +10,5 @@ - URL: http://www.openjpeg.org/ - Version: @OPENJPEG_VERSION@ - Libs: -L${libdir} -lopenjp2 -+Libs.private: -L${libdir} -lopenjp2 -lm - Cflags: -I${includedir} diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch deleted file mode 100644 index 656f4c2..00000000 --- a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ -Pkgconfig support http://code.google.com/p/openjpeg/source/detail?r=2250 - ---- openjpeg-2.0.0/CMakeLists.txt -+++ openjpeg-2.0.0/CMakeLists.txt -@@ -171,6 +171,16 @@ - endif() - - #----------------------------------------------------------------------------- -+# pkgconfig support -+if(UNIX) -+ # install in lib and not share (see multi-arch note above) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) -+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION -+ ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+endif() -+ -+#----------------------------------------------------------------------------- - # Compiler specific flags: - if(CMAKE_COMPILER_IS_GNUCC) - # For all builds, make sure openjpeg is std99 compliant: ---- /dev/null -+++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in -@@ -0,0 +1,13 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ -+mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ -+docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ -+libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ -+includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+ -+Name: openjp2 -+Description: JPEG2000 library (Part 1 and 2) -+URL: http://www.openjpeg.org/ -+Version: @OPENJPEG_VERSION@ -+Libs: -L${libdir} -lopenjp2 -+Cflags: -I${includedir}
