1 files changed, 34 insertions, 61 deletions
diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt
index 02b9fd8fa31c..49af929acfa5 100644
--- a/graphics/openjpeg/files/patch-CMakeLists.txt
+++ b/graphics/openjpeg/files/patch-CMakeLists.txt
@@ -1,64 +1,37 @@
---- CMakeLists.txt.orig	2014-03-27 11:58:08.000000000 +0100
-+++ CMakeLists.txt	2014-05-24 11:24:37.000000000 +0200
-@@ -54,7 +54,7 @@
- endif(NOT OPENJPEG_SOVERSION)
- SET(OPENJPEG_LIBRARY_PROPERTIES
-   VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
--  SOVERSION "${OPENJPEG_SOVERSION}"
-+  SOVERSION 2
- )
- 
- # --------------------------------------------------------------------------
-@@ -94,7 +94,7 @@
- # Install directories
- 
- STRING(TOLOWER ${PROJECT_NAME} projectname)
--SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
-+SET(OPENJPEG_INSTALL_SUBDIR "${projectname}")
- 
- IF(NOT OPENJPEG_INSTALL_BIN_DIR)
-   SET(OPENJPEG_INSTALL_BIN_DIR "bin")
-@@ -125,11 +125,11 @@
- ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
- 
- IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
--  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
-+  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/")
- ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
- 
- IF(NOT OPENJPEG_INSTALL_MAN_DIR)
--  SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
-+  SET(OPENJPEG_INSTALL_MAN_DIR "man/")
- ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
- 
- IF(NOT OPENJPEG_INSTALL_DOC_DIR)
-@@ -148,7 +148,7 @@
-   # We could install *.cmake files in share/ however those files contains
-   # hardcoded path to libraries on a multi-arch system (fedora/debian) those
-   # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
--  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
- ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
- 
- #-----------------------------------------------------------------------------
-@@ -188,10 +188,10 @@
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
-   INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
+--- CMakeLists.txt.orig	2014-05-23 22:46:07.000000000 +0200
++++ CMakeLists.txt	2014-05-23 22:48:32.000000000 +0200
+@@ -334,14 +334,14 @@
+   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 )
++    libdata/pkgconfig )
+ #
+   if(BUILD_JPWL)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig )
+   endif()
+ #
+   if(BUILD_JPIP)
+@@ -349,7 +349,7 @@
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig )
+   endif()
+ #
+   if(BUILD_JP3D)
+@@ -357,7 +357,7 @@
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
 -    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
 +    libdata/pkgconfig )
-   INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
-   \"libopenjpeg1.pc\"
--  \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
-+  \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/libopenjpeg.pc\")")
- ENDIF(UNIX)
+   endif()
+ endif()
  
- #-----------------------------------------------------------------------------
-@@ -288,6 +288,7 @@
- #-----------------------------------------------------------------------------
- # install all targets referenced as OPENJPEGTargets
- INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
-+SET(OPENJPEG_LIBRARIES "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}/lib${OPENJPEG_LIBRARY_NAME}.so")
- CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
-   ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
-   @ONLY