Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/
Date: Thu, 29 Dec 2016 13:14:43
Message-Id: 1483017107.56051b2a7d5aca0f7d18b43b874023cbade03405.soap@gentoo
1 commit: 56051b2a7d5aca0f7d18b43b874023cbade03405
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 23 16:11:24 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 13:11:47 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56051b2a
7
8 media-libs/openjpeg: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3224
11
12 .../openjpeg/files/openjpeg-2.0.0-build.patch | 14 --------
13 .../files/openjpeg-2.0.0-pkgconfig-static.patch | 10 ------
14 .../openjpeg/files/openjpeg-2.0.0-pkgconfig.patch | 37 ----------------------
15 3 files changed, 61 deletions(-)
16
17 diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch
18 deleted file mode 100644
19 index 31ae12f..00000000
20 --- a/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch
21 +++ /dev/null
22 @@ -1,14 +0,0 @@
23 ---- openjpeg-2.0.0/CMakeLists.txt
24 -+++ openjpeg-2.0.0/CMakeLists.txt
25 -@@ -279,11 +279,4 @@
26 - DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
27 - )
28 -
29 --#-----------------------------------------------------------------------------
30 --# install CHANGES and LICENSE
31 --if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
32 -- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
33 --endif()
34 --install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
35 --
36 - include (cmake/OpenJPEGCPack.cmake)
37
38 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
39 deleted file mode 100644
40 index 60a5a47..00000000
41 --- a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig-static.patch
42 +++ /dev/null
43 @@ -1,10 +0,0 @@
44 -Upstream issue 223, http://code.google.com/p/openjpeg/issues/detail?id=223
45 -
46 ---- openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in
47 -+++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in
48 -@@ -10,4 +10,5 @@
49 - URL: http://www.openjpeg.org/
50 - Version: @OPENJPEG_VERSION@
51 - Libs: -L${libdir} -lopenjp2
52 -+Libs.private: -L${libdir} -lopenjp2 -lm
53 - Cflags: -I${includedir}
54
55 diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
56 deleted file mode 100644
57 index 656f4c2..00000000
58 --- a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
59 +++ /dev/null
60 @@ -1,37 +0,0 @@
61 -Pkgconfig support http://code.google.com/p/openjpeg/source/detail?r=2250
62 -
63 ---- openjpeg-2.0.0/CMakeLists.txt
64 -+++ openjpeg-2.0.0/CMakeLists.txt
65 -@@ -171,6 +171,16 @@
66 - endif()
67 -
68 - #-----------------------------------------------------------------------------
69 -+# pkgconfig support
70 -+if(UNIX)
71 -+ # install in lib and not share (see multi-arch note above)
72 -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
73 -+ ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
74 -+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
75 -+ ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
76 -+endif()
77 -+
78 -+#-----------------------------------------------------------------------------
79 - # Compiler specific flags:
80 - if(CMAKE_COMPILER_IS_GNUCC)
81 - # For all builds, make sure openjpeg is std99 compliant:
82 ---- /dev/null
83 -+++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in
84 -@@ -0,0 +1,13 @@
85 -+prefix=@CMAKE_INSTALL_PREFIX@
86 -+bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
87 -+mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
88 -+docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
89 -+libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
90 -+includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
91 -+
92 -+Name: openjp2
93 -+Description: JPEG2000 library (Part 1 and 2)
94 -+URL: http://www.openjpeg.org/
95 -+Version: @OPENJPEG_VERSION@
96 -+Libs: -L${libdir} -lopenjp2
97 -+Cflags: -I${includedir}