| 1 |
xmw 13/06/06 13:15:53 |
| 2 |
|
| 3 |
Added: openjpeg-2.0.0-pkgconfig.patch |
| 4 |
openjpeg-2.0.0-build.patch |
| 5 |
Log: |
| 6 |
Version bump, set SLOT to 2, backport pkg-config patch as pointed out by Rafał Mużyło (bug 440086), non-maint commit. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: openjpeg-2.0.0-pkgconfig.patch |
| 17 |
=================================================================== |
| 18 |
Pkgconfig support http://code.google.com/p/openjpeg/source/detail?r=2250 |
| 19 |
|
| 20 |
--- openjpeg-2.0.0/CMakeLists.txt |
| 21 |
+++ openjpeg-2.0.0/CMakeLists.txt |
| 22 |
@@ -171,6 +171,16 @@ |
| 23 |
endif() |
| 24 |
|
| 25 |
#----------------------------------------------------------------------------- |
| 26 |
+# pkgconfig support |
| 27 |
+if(UNIX) |
| 28 |
+ # install in lib and not share (see multi-arch note above) |
| 29 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in |
| 30 |
+ ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) |
| 31 |
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION |
| 32 |
+ ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
| 33 |
+endif() |
| 34 |
+ |
| 35 |
+#----------------------------------------------------------------------------- |
| 36 |
# Compiler specific flags: |
| 37 |
if(CMAKE_COMPILER_IS_GNUCC) |
| 38 |
# For all builds, make sure openjpeg is std99 compliant: |
| 39 |
--- /dev/null |
| 40 |
+++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in |
| 41 |
@@ -0,0 +0,13 @@ |
| 42 |
+prefix=@CMAKE_INSTALL_PREFIX@ |
| 43 |
+bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
| 44 |
+mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
| 45 |
+docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
| 46 |
+libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
| 47 |
+includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
| 48 |
+ |
| 49 |
+Name: openjp2 |
| 50 |
+Description: JPEG2000 library (Part 1 and 2) |
| 51 |
+URL: http://www.openjpeg.org/ |
| 52 |
+Version: @OPENJPEG_VERSION@ |
| 53 |
+Libs: -L${libdir} -lopenjp2 |
| 54 |
+Cflags: -I${includedir} |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 media-libs/openjpeg/files/openjpeg-2.0.0-build.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: openjpeg-2.0.0-build.patch |
| 64 |
=================================================================== |
| 65 |
--- openjpeg-2.0.0/CMakeLists.txt |
| 66 |
+++ openjpeg-2.0.0/CMakeLists.txt |
| 67 |
@@ -279,11 +279,4 @@ |
| 68 |
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR} |
| 69 |
) |
| 70 |
|
| 71 |
-#----------------------------------------------------------------------------- |
| 72 |
-# install CHANGES and LICENSE |
| 73 |
-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) |
| 74 |
- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
| 75 |
-endif() |
| 76 |
-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
| 77 |
- |
| 78 |
include (cmake/OpenJPEGCPack.cmake) |
Archives