Packman Build Service PMBS

File djv-1.0.5_path.patch of Package djv (Revision f7e33503d202b4d664484a2cfe102cb0)

Currently displaying revision f7e33503d202b4d664484a2cfe102cb0 , Show latest

diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/bin/djv_convert/CMakeLists.txt djv-1.0.5git.20141225/bin/djv_convert/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/bin/djv_convert/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/bin/djv_convert/CMakeLists.txt	2015-09-17 04:31:44.467047115 +0300
@@ -32,16 +32,5 @@
     TARGETS djv_convert
     RUNTIME DESTINATION bin)
 
-if (UNIX)
-
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_convert_linux.sh.in
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_convert.sh
-        @ONLY)
 
-    install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_convert.sh
-        DESTINATION bin)
-
-endif (UNIX)
 
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/bin/djv_info/CMakeLists.txt djv-1.0.5git.20141225/bin/djv_info/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/bin/djv_info/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/bin/djv_info/CMakeLists.txt	2015-09-17 04:32:03.271165419 +0300
@@ -32,16 +32,5 @@
     TARGETS djv_info
     RUNTIME DESTINATION bin)
 
-if (UNIX)
-
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_info_linux.sh.in
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_info.sh
-        @ONLY)
 
-    install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_info.sh
-        DESTINATION bin)
-
-endif (UNIX)
 
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/bin/djv_ls/CMakeLists.txt djv-1.0.5git.20141225/bin/djv_ls/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/bin/djv_ls/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/bin/djv_ls/CMakeLists.txt	2015-09-17 04:32:24.587299440 +0300
@@ -32,16 +32,4 @@
     TARGETS djv_ls
     RUNTIME DESTINATION bin)
 
-if (UNIX)
-
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_ls_linux.sh.in
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_ls.sh
-        @ONLY)
-
-    install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_ls.sh
-        DESTINATION bin)
-
-endif (UNIX)
 
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/bin/djv_view/CMakeLists.txt djv-1.0.5git.20141225/bin/djv_view/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/bin/djv_view/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/bin/djv_view/CMakeLists.txt	2015-09-17 04:33:09.447581196 +0300
@@ -61,15 +61,6 @@
 
 elseif (UNIX)
 
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_view_linux.sh.in
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_view.sh
-        @ONLY)
-
-    install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_view.sh
-        DESTINATION bin)
-
     install(
         FILES ${PROJECT_BINARY_DIR}/etc/Linux/djv_view.desktop
         DESTINATION /usr/share/applications)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/doc/CMakeLists.txt djv-1.0.5git.20141225/doc/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/doc/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/doc/CMakeLists.txt	2015-09-17 04:34:13.055980036 +0300
@@ -137,12 +137,12 @@
 install(
     FILES
     ${html}
-    DESTINATION doc)
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc)
 
 install(
     FILES
     ${images}
-    DESTINATION doc/images)
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc/images)
 
 #install(
 #    DIRECTORY
@@ -152,4 +152,4 @@
 install(
     FILES
     ${legal}
-    DESTINATION doc)
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/lib/djvCore/CMakeLists.txt djv-1.0.5git.20141225/lib/djvCore/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/lib/djvCore/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/lib/djvCore/CMakeLists.txt	2015-09-17 07:22:39.184031848 +0300
@@ -163,7 +163,7 @@
 
 target_link_libraries(djvCore ${djvCoreDeps})
 
-set_target_properties(djvCore PROPERTIES FOLDER lib)
+set_target_properties(djvCore PROPERTIES VERSION 0.0.0 SOVERSION 0)
 
 if (djvInstallRpath)
 
@@ -180,6 +180,6 @@
 install(
     TARGETS djvCore
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/lib/djvGui/CMakeLists.txt djv-1.0.5git.20141225/lib/djvGui/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/lib/djvGui/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/lib/djvGui/CMakeLists.txt	2015-09-17 05:06:38.299465704 +0300
@@ -136,7 +136,7 @@
 
 target_link_libraries(djvGui ${djvGuiDeps})
 
-set_target_properties(djvGui PROPERTIES FOLDER lib)
+set_target_properties(djvGui PROPERTIES VERSION 0.0.0 SOVERSION 0)
 
 if (djvInstallRpath)
 
@@ -153,5 +153,5 @@
 install(
     TARGETS djvGui
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/lib/djvViewLib/CMakeLists.txt djv-1.0.5git.20141225/lib/djvViewLib/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/lib/djvViewLib/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/lib/djvViewLib/CMakeLists.txt	2015-09-17 05:07:03.275515081 +0300
@@ -141,7 +141,7 @@
 
 target_link_libraries(djvViewLib ${djvGuiLibs})
 
-set_target_properties(djvViewLib PROPERTIES FOLDER lib)
+set_target_properties(djvViewLib PROPERTIES VERSION 0.0.0 SOVERSION 0)
 
 if (djvInstallRpath)
 
@@ -158,6 +158,6 @@
 install(
     TARGETS djvViewLib
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvCineonPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvCineonPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvCineonPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvCineonPlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -37,5 +37,5 @@
 install(
     TARGETS djvCineonPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvDpxPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvDpxPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvDpxPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvDpxPlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -38,5 +38,5 @@
 install(
     TARGETS djvDpxPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvIffPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvIffPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvIffPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvIffPlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -33,5 +33,5 @@
 install(
     TARGETS djvIffPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvIflPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvIflPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvIflPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvIflPlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -29,5 +29,5 @@
 install(
     TARGETS djvIflPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvJpegPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvJpegPlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -35,6 +35,6 @@
 install(
     TARGETS djvJpegPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvLibquicktimePlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvLibquicktimePlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvLibquicktimePlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvLibquicktimePlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -35,5 +35,5 @@
 install(
     TARGETS djvLibquicktimePlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvLutPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvLutPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvLutPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvLutPlugin/CMakeLists.txt	2015-09-17 04:29:40.966268345 +0300
@@ -33,5 +33,5 @@
 install(
     TARGETS djvLutPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvOpenExrPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvOpenExrPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvOpenExrPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvOpenExrPlugin/CMakeLists.txt	2015-09-17 04:29:40.966268345 +0300
@@ -37,5 +37,5 @@
 install(
     TARGETS djvOpenExrPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvPicPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvPicPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvPicPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvPicPlugin/CMakeLists.txt	2015-09-17 04:29:40.966268345 +0300
@@ -29,5 +29,5 @@
 install(
     TARGETS djvPicPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvPngPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvPngPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvPngPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvPngPlugin/CMakeLists.txt	2015-09-17 04:29:40.966268345 +0300
@@ -35,5 +35,5 @@
 install(
     TARGETS djvPngPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvPpmPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvPpmPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvPpmPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvPpmPlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -33,5 +33,5 @@
 install(
     TARGETS djvPpmPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvQuickTimePlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvQuickTimePlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvQuickTimePlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvQuickTimePlugin/CMakeLists.txt	2015-09-17 04:29:40.966268345 +0300
@@ -35,5 +35,5 @@
 install(
     TARGETS djvQuickTimePlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvRlaPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvRlaPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvRlaPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvRlaPlugin/CMakeLists.txt	2015-09-17 04:29:40.966268345 +0300
@@ -29,5 +29,5 @@
 install(
     TARGETS djvRlaPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvSgiPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvSgiPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvSgiPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvSgiPlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -33,5 +33,5 @@
 install(
     TARGETS djvSgiPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvTargaPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvTargaPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvTargaPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvTargaPlugin/CMakeLists.txt	2015-09-17 04:29:40.966268345 +0300
@@ -33,5 +33,5 @@
 install(
     TARGETS djvTargaPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvTiffPlugin/CMakeLists.txt djv-1.0.5git.20141225/plugins/djvTiffPlugin/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/plugins/djvTiffPlugin/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/plugins/djvTiffPlugin/CMakeLists.txt	2015-09-17 04:29:40.970268379 +0300
@@ -39,5 +39,5 @@
 install(
     TARGETS djvTiffPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/tests/djvTestLib/CMakeLists.txt djv-1.0.5git.20141225/tests/djvTestLib/CMakeLists.txt
--- djv-1.0.5git.20141225.orig/tests/djvTestLib/CMakeLists.txt	2015-09-14 08:16:34.000000000 +0300
+++ djv-1.0.5git.20141225/tests/djvTestLib/CMakeLists.txt	2015-09-17 05:03:13.639072387 +0300
@@ -22,13 +22,3 @@
 
 endif (djvInstallRpath)
 
-install(
-    FILES ${header}
-    DESTINATION include)
-
-install(
-    TARGETS djvTestLib
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
-