Packman Build Service PMBS

djv.changes Changed

djv.spec Changed

@@ -16,28 +16,24 @@
 #
 
 %define soname  0
-%define git_date git.20141225
 Name:           djv
-Version:        1.0.5%git_date
+Version:        1.0.5.20150809.a7104da
 Release:        0
 Summary:        DJV Imaging
 License:        BSD-3-Clause
 Group:          Productivity/Graphics/Viewers
 Url:            http://djv.sourceforge.net/
-Source0:        http://git.code.sf.net/p/djv/git#/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM libjpeg .patch darbyjohnston@yahoo.com -- Attempt at fixing libjpeg namespace conflicts
-# (fixed in upstream)
-Patch0:         djv-1.0.5_libjpeg.patch
+Source0:        http://git.code.sf.net/p/djv/git#/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE include.patch avvissu@yandex.ru -- Don't include depending when packaging
 Patch1:         djv-1.0.5_include.patch
 # PATCH-FIX-OPENSUSE path.patch avvissu@yandex.ru -- Change the default installation path
 Patch2:         djv-1.0.5_path.patch
-# PATCH-FIX-OPENSUSE doc.patch avvissu@yandex.ru -- Change the search path to doc
-Patch3:         djv-1.0.5_doc.patch
 # PATCH-FIX-UPSTREAM link_library.patch avvissu@yandex.ru -- Build with --no-undefined
 Patch4:         djv-1.0.5_link_library.patch
 # PATCH-FIX-UPSTREAM qt5-5.5.patch avvissu@yandex.ru -- Fix build with Qt5 >= 5.5
 Patch5:         djv-1.0.5_qt5-5.5.patch
+Patch6:         djv-ffmpeg.patch
+Patch7:         djv-runtime_paths.patch
 BuildRequires:  cmake >= 3.0
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -50,24 +46,23 @@
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(IlmBase) >= 2.2.0
 BuildRequires:  pkgconfig(OpenEXR) >= 2.2.0
-BuildRequires:  pkgconfig(Qt5Core) >= 5.3.0
-BuildRequires:  pkgconfig(Qt5OpenGL)
-BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  cmake(Qt5Concurrent)
+BuildRequires:  cmake(Qt5Core) >= 5.3.0
+BuildRequires:  cmake(Qt5LinguistTools)
+BuildRequires:  cmake(Qt5OpenGL)
+BuildRequires:  cmake(Qt5Svg)
+BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  pkgconfig(glew) >= 1.10.0
 BuildRequires:  pkgconfig(glu)
-BuildRequires:  pkgconfig(libavcodec) >= 2.6.2
-BuildRequires:  pkgconfig(libavdevice)
-BuildRequires:  pkgconfig(libavfilter)
+BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libpng) >= 1.6.8
-# quicktime removed from git
-BuildRequires:  pkgconfig(libquicktime) >= 1.2.4
-BuildRequires:  pkgconfig(libswresample)
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libtiff-4) >= 4.0.3
 BuildRequires:  pkgconfig(zlib) >= 1.2.8
 Recommends:     %{name}-doc
+Requires:       lib%{name}Core%{soname} = %{version}-%{release}
 ExcludeArch:    %{arm}
 
 %description
@@ -81,9 +76,9 @@
 %package -n     lib%{name}Core%{soname}
 Summary:        C++ library for realtime MIDI input/ouput
 Group:          System/Libraries
-Provides:       lib%{name}%{soname} = %{version}
-Provides:       lib%{name}Gui%{soname} = %{version}
-Provides:       lib%{name}ViewLib%{soname} = %{version}
+Provides:       lib%{name}%{soname} = %{version}-%{release}
+Provides:       lib%{name}Gui%{soname} = %{version}-%{release}
+Provides:       lib%{name}ViewLib%{soname} = %{version}-%{release}
 
 %description -n lib%{name}Core%{soname}
 Professional movie playback software for film production, VFX, and 
@@ -94,7 +89,7 @@
 %package        plugins
 Summary:        DJV plugins
 Group:          Productivity/Graphics/Viewers
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description    plugins
 Professional movie playback software for film production, VFX, and 
@@ -107,10 +102,10 @@
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries/C and C++
-Requires:       lib%{name}%{soname} = %{version}
-Provides:       %{name}Core = %{version}
-Provides:       %{name}Gui = %{version}
-Provides:       %{name}ViewLib = %{version}
+Requires:       lib%{name}%{soname} = %{version}-%{release}
+Provides:       %{name}Core = %{version}-%{release}
+Provides:       %{name}Gui = %{version}-%{release}
+Provides:       %{name}ViewLib = %{version}-%{release}
 
 %description    devel
 Professional movie playback software for film production, VFX, and 
@@ -133,15 +128,16 @@
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 # Change exec-path
 sed -i '/Exec/s|[/].*|%{name}_view|' $(grep -rl 'djv_view.sh')
+sed -i~ /tests/d CMakeLists.txt
 
 %build
 %cmake \
@@ -151,6 +147,9 @@
 
 %install
 %cmake_install
+find %{buildroot} -ls
+
+mv -v %{buildroot}%{_prefix}/translations %{buildroot}%{_libdir}/%{name}
 
 # Search and load all plugins
 d="%{buildroot}"

djv-1.0.5_doc.patch Deleted

djv-1.0.5_include.patch Changed

djv-1.0.5_libjpeg.patch Deleted

@@ -1,65 +0,0 @@
-diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegLoad.cpp djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegLoad.cpp
---- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegLoad.cpp	2015-09-14 08:16:34.000000000 +0300
-+++ djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegLoad.cpp	2015-09-14 13:37:07.093362271 +0300
-@@ -215,16 +215,7 @@
- 
-     libjpeg::jpeg_save_markers(jpeg, JPEG_COM, 0xFFFF);
- 
--    //! \todo How do we fix the windows/libjpeg TRUE name clash?
--
--    libjpeg::boolean b =
--#if defined(DJV_WINDOWS)
--        1;
--#else
--        libjpeg::TRUE;
--#endif // DJV_WINDOWS
--
--    if (! libjpeg::jpeg_read_header(jpeg, b))
-+    if (! libjpeg::jpeg_read_header(jpeg, static_cast<libjpeg::boolean>(1)))
-     {
-         return false;
-     }
-diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegPlugin.h djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegPlugin.h
---- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegPlugin.h	2015-09-14 08:16:34.000000000 +0300
-+++ djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegPlugin.h	2015-09-14 13:42:10.457921343 +0300
-@@ -38,16 +38,6 @@
- 
- #include <stdio.h>
- 
--//! \todo Is there a better way to fix theses libjpeg / X11 / OS define
--//! conflicts?
--
--#if defined(TRUE)
--#undef TRUE
--#endif // TRUE
--#if defined(FALSE)
--#undef FALSE
--#endif // FALSE
--
- //! \todo This namespace is meant to resolve conflicts on Windows, is it still
- //! necessary?
- 
-diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegSave.cpp djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegSave.cpp
---- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegSave.cpp	2015-09-14 08:16:34.000000000 +0300
-+++ djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegSave.cpp	2015-09-14 13:39:00.597577219 +0300
-@@ -242,17 +242,9 @@
- 
-     libjpeg::jpeg_set_defaults(jpeg);
- 
--    //! \todo How do we fix the windows/libjpeg TRUE name clash?
--
--    libjpeg::boolean b =
--#if defined(DJV_WINDOWS)
--        1;
--#else
--        libjpeg::TRUE;
--#endif // DJV_WINDOWS
--
--    libjpeg::jpeg_set_quality(jpeg, quality, b);
--    libjpeg::jpeg_start_compress(jpeg, b);
-+   libjpeg::jpeg_set_quality(jpeg, quality, static_cast<libjpeg::boolean>(1));
-+   libjpeg::jpeg_start_compress(jpeg, static_cast<libjpeg::boolean>(1));
-+ 
- 
-     QString tag = info.tags[djvImageTags::tagLabels()[djvImageTags::DESCRIPTION]];
-

djv-1.0.5_link_library.patch Changed

djv-1.0.5_path.patch Changed

@@ -1,47 +1,44 @@
-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 @@
+--- a/bin/djv_convert/CMakeLists.txt
++++ b/bin/djv_convert/CMakeLists.txt
+@@ -54,16 +54,5 @@ install(
      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 @@
+--- a/bin/djv_info/CMakeLists.txt
++++ b/bin/djv_info/CMakeLists.txt
+@@ -54,16 +54,5 @@ install(
      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 @@
+--- a/bin/djv_ls/CMakeLists.txt
++++ b/bin/djv_ls/CMakeLists.txt
+@@ -54,16 +54,4 @@ install(
      TARGETS djv_ls
      RUNTIME DESTINATION bin)
  
@@ -58,10 +55,9 @@
 -
 -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 @@
+--- a/bin/djv_view/CMakeLists.txt
++++ b/bin/djv_view/CMakeLists.txt
+@@ -72,15 +72,6 @@ if (APPLE)
  
  elseif (UNIX)
  
@@ -77,10 +73,9 @@
      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 @@
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -102,12 +102,12 @@ set(legal
  install(
      FILES
      ${html}
@@ -95,16 +90,15 @@
  
  #install(
  #    DIRECTORY
-@@ -152,4 +152,4 @@
+@@ -117,4 +117,4 @@ install(
  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 @@
+--- a/lib/djvCore/CMakeLists.txt
++++ b/lib/djvCore/CMakeLists.txt
+@@ -169,7 +169,7 @@ add_library(djvCore ${header} ${source}
  
  target_link_libraries(djvCore ${djvCoreDeps})
  
@@ -113,7 +107,7 @@
  
  if (djvInstallRpath)
  
-@@ -180,6 +180,6 @@
+@@ -190,6 +190,6 @@ install(
  install(
      TARGETS djvCore
      RUNTIME DESTINATION bin
@@ -122,10 +116,9 @@
 +    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 @@
+--- a/lib/djvGui/CMakeLists.txt
++++ b/lib/djvGui/CMakeLists.txt
+@@ -229,7 +229,7 @@ add_library(djvGui ${header} ${source} $
  
  target_link_libraries(djvGui ${djvGuiDeps})
  
@@ -134,7 +127,7 @@
  
  if (djvInstallRpath)
  
-@@ -153,5 +153,5 @@
+@@ -250,6 +250,6 @@ install(
  install(
      TARGETS djvGui
      RUNTIME DESTINATION bin
@@ -142,10 +135,10 @@
 -    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 @@
+ 
+--- a/lib/djvViewLib/CMakeLists.txt
++++ b/lib/djvViewLib/CMakeLists.txt
+@@ -212,7 +212,7 @@ add_library(djvViewLib ${header} ${sourc
  
  target_link_libraries(djvViewLib ${djvGuiLibs})
  
@@ -154,7 +147,7 @@
  
  if (djvInstallRpath)
  
-@@ -158,6 +158,6 @@
+@@ -233,6 +233,6 @@ install(
  install(
      TARGETS djvViewLib
      RUNTIME DESTINATION bin
@@ -163,10 +156,9 @@
 +    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 @@
+--- a/plugins/djvCineonPlugin/CMakeLists.txt
++++ b/plugins/djvCineonPlugin/CMakeLists.txt
+@@ -63,10 +63,10 @@ install(
  install(
      TARGETS djvCineonPlugin
      RUNTIME DESTINATION bin
@@ -174,10 +166,16 @@
 -    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 djvCineonWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+--- a/plugins/djvDpxPlugin/CMakeLists.txt
++++ b/plugins/djvDpxPlugin/CMakeLists.txt
+@@ -67,10 +67,10 @@ install(
  install(
      TARGETS djvDpxPlugin
      RUNTIME DESTINATION bin
@@ -185,10 +183,16 @@
 -    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 djvDpxWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+--- a/plugins/djvIffPlugin/CMakeLists.txt
++++ b/plugins/djvIffPlugin/CMakeLists.txt
+@@ -61,10 +61,10 @@ install(
  install(
      TARGETS djvIffPlugin
      RUNTIME DESTINATION bin
@@ -196,10 +200,16 @@
 -    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 djvIffWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+--- a/plugins/djvIflPlugin/CMakeLists.txt
++++ b/plugins/djvIflPlugin/CMakeLists.txt
+@@ -29,5 +29,5 @@ endif (djvInstallRpath)
  install(
      TARGETS djvIflPlugin
      RUNTIME DESTINATION bin
@@ -207,10 +217,9 @@
 -    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 @@
+--- a/plugins/djvJpegPlugin/CMakeLists.txt
++++ b/plugins/djvJpegPlugin/CMakeLists.txt
+@@ -62,11 +62,11 @@ install(
  install(
      TARGETS djvJpegPlugin
      RUNTIME DESTINATION bin
@@ -218,22 +227,17 @@
 -    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
+     TARGETS djvJpegWidgetPlugin
      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 @@
+ 
+--- a/plugins/djvLutPlugin/CMakeLists.txt
++++ b/plugins/djvLutPlugin/CMakeLists.txt
+@@ -61,10 +61,10 @@ install(
  install(
      TARGETS djvLutPlugin
      RUNTIME DESTINATION bin
@@ -241,10 +245,16 @@
 -    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 djvLutWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+--- a/plugins/djvOpenExrPlugin/CMakeLists.txt
++++ b/plugins/djvOpenExrPlugin/CMakeLists.txt
+@@ -63,10 +63,10 @@ install(
  install(
      TARGETS djvOpenExrPlugin
      RUNTIME DESTINATION bin
@@ -252,10 +262,16 @@
 -    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 djvOpenExrWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+--- a/plugins/djvPicPlugin/CMakeLists.txt
++++ b/plugins/djvPicPlugin/CMakeLists.txt
+@@ -40,5 +40,5 @@ install(
  install(
      TARGETS djvPicPlugin
      RUNTIME DESTINATION bin
@@ -263,10 +279,9 @@
 -    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 @@
+--- a/plugins/djvPngPlugin/CMakeLists.txt
++++ b/plugins/djvPngPlugin/CMakeLists.txt
+@@ -37,5 +37,5 @@ endif (djvInstallRpath)
  install(
      TARGETS djvPngPlugin
      RUNTIME DESTINATION bin
@@ -274,10 +289,9 @@
 -    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 @@
+--- a/plugins/djvPpmPlugin/CMakeLists.txt
++++ b/plugins/djvPpmPlugin/CMakeLists.txt
+@@ -61,10 +61,10 @@ install(
  install(
      TARGETS djvPpmPlugin
      RUNTIME DESTINATION bin
@@ -285,21 +299,16 @@
 -    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
+     TARGETS djvPpmWidgetPlugin
      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 @@
+--- a/plugins/djvRlaPlugin/CMakeLists.txt
++++ b/plugins/djvRlaPlugin/CMakeLists.txt
+@@ -29,5 +29,5 @@ endif (djvInstallRpath)
  install(
      TARGETS djvRlaPlugin
      RUNTIME DESTINATION bin
@@ -307,10 +316,9 @@
 -    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 @@
+--- a/plugins/djvSgiPlugin/CMakeLists.txt
++++ b/plugins/djvSgiPlugin/CMakeLists.txt
+@@ -61,10 +61,10 @@ install(
  install(
      TARGETS djvSgiPlugin
      RUNTIME DESTINATION bin
@@ -318,10 +326,16 @@
 -    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 djvSgiWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+--- a/plugins/djvTargaPlugin/CMakeLists.txt
++++ b/plugins/djvTargaPlugin/CMakeLists.txt
+@@ -61,10 +61,10 @@ install(
  install(
      TARGETS djvTargaPlugin
      RUNTIME DESTINATION bin
@@ -329,10 +343,16 @@
 -    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 djvTargaWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+--- a/plugins/djvTiffPlugin/CMakeLists.txt
++++ b/plugins/djvTiffPlugin/CMakeLists.txt
+@@ -74,10 +74,10 @@ install(
  install(
      TARGETS djvTiffPlugin
      RUNTIME DESTINATION bin
@@ -340,10 +360,16 @@
 -    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 @@
+ install(
+     TARGETS djvTiffWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+--- a/tests/djvTestLib/CMakeLists.txt
++++ b/tests/djvTestLib/CMakeLists.txt
+@@ -32,13 +32,3 @@ if (djvInstallRpath)
  
  endif (djvInstallRpath)
  
@@ -357,3 +383,20 @@
 -    LIBRARY DESTINATION lib
 -    ARCHIVE DESTINATION lib)
 -
+--- a/plugins/djvFFmpegPlugin/CMakeLists.txt
++++ b/plugins/djvFFmpegPlugin/CMakeLists.txt
+@@ -62,10 +62,10 @@ install(
+ install(
+     TARGETS djvFFmpegPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION li${LIB_SUFFIX}/djvb
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
+ install(
+     TARGETS djvFFmpegWidgetPlugin
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION li${LIB_SUFFIX}/djvb
++    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)

djv-1.0.5_qt5-5.5.patch Changed

djv-ffmpeg.patch Added

@@ -0,0 +1,116 @@
+--- a/cmake/Modules/FindFFmpeg.cmake
++++ b/cmake/Modules/FindFFmpeg.cmake
+@@ -1,108 +1,5 @@
+-# Find the FFmpeg library.
+-#
+-# This module defines the following variables:
+-#
+-# * FFMPEG_INCLUDE_DIRS - Include directories for FFmpeg.
+-# * FFMPEG_LIBRARIES    - Libraries to link against FFmpeg.
+-# * FFMPEG_FOUND        - True if FFmpeg has been found and can be used.
+-
+-find_path(AVCODEC_INCLUDE_DIR libavcodec/avcodec.h)
+-find_path(AVDEVICE_INCLUDE_DIR libavdevice/avdevice.h)
+-find_path(AVFILTER_INCLUDE_DIR libavfilter/avfilter.h)
+-find_path(AVFORMAT_INCLUDE_DIR libavformat/avformat.h)
+-find_path(AVUTIL_INCLUDE_DIR libavutil/avutil.h)
+-find_path(SWRESAMPLE_INCLUDE_DIR libswresample/swresample.h)
+-find_path(SWSCALE_INCLUDE_DIR libswscale/swscale.h)
+-
+-set(FFMPEG_INCLUDE_DIRS
+-    ${AVUTIL_INCLUDE_DIR}
+-    ${AVDEVICE_INCLUDE_DIR}
+-    ${AVFILTER_INCLUDE_DIR}
+-    ${AVFORMAT_INCLUDE_DIR}
+-    ${AVUTIL_INCLUDE_DIR}
+-    ${SWRESAMPLE_INCLUDE_DIR}
+-    ${SWSCALE_INCLUDE_DIR})
+-
+-set(findLibraryOptions)
+-
+-find_library(
+-    AVCODEC_LIBRARY
+-    NAMES avcodec
+-    PATH_SUFFIXES lib
+-    ${findLibraryOptions})
+-find_library(
+-    AVDEVICE_LIBRARY
+-    NAMES avdevice
+-    PATH_SUFFIXES lib
+-    ${findLibraryOptions})
+-find_library(
+-    AVFILTER_LIBRARY
+-    NAMES avfilter
+-    PATH_SUFFIXES lib
+-    ${findLibraryOptions})
+-find_library(
+-    AVFORMAT_LIBRARY
+-    NAMES avformat
+-    PATH_SUFFIXES lib
+-    ${findLibraryOptions})
+-find_library(
+-    AVUTIL_LIBRARY
+-    NAMES avutil
+-    PATH_SUFFIXES lib
+-    ${findLibraryOptions})
+-find_library(
+-    SWRESAMPLE_LIBRARY
+-    NAMES swresample
+-    PATH_SUFFIXES lib
+-    ${findLibraryOptions})
+-find_library(
+-    SWSCALE_LIBRARY
+-    NAMES swscale
+-    PATH_SUFFIXES lib
+-    ${findLibraryOptions})
+-
+-set(FFMPEG_LIBRARIES
+-    ${AVCODEC_LIBRARY}
+-    ${AVDEVICE_LIBRARY}
+-    ${AVFILTER_LIBRARY}
+-    ${AVFORMAT_LIBRARY}
+-    ${AVUTIL_LIBRARY}
+-    ${SWRESAMPLE_LIBRARY}
+-    ${SWSCALE_LIBRARY})
+-
+-include(FindPackageHandleStandardArgs)
+-
+-find_package_handle_standard_args(
+-    FFMPEG
+-    REQUIRED_VARS
+-        AVCODEC_INCLUDE_DIR
+-        AVDEVICE_INCLUDE_DIR
+-        AVFILTER_INCLUDE_DIR
+-        AVFORMAT_INCLUDE_DIR
+-        AVUTIL_INCLUDE_DIR
+-        SWRESAMPLE_INCLUDE_DIR
+-        SWSCALE_INCLUDE_DIR
+-        AVCODEC_LIBRARY
+-        AVDEVICE_LIBRARY
+-        AVFILTER_LIBRARY
+-        AVFORMAT_LIBRARY
+-        AVUTIL_LIBRARY
+-        SWRESAMPLE_LIBRARY
+-        SWSCALE_LIBRARY)
+-
+-mark_as_advanced(
+-    AVCODEC_INCLUDE_DIR
+-    AVDEVICE_INCLUDE_DIR
+-    AVFILTER_INCLUDE_DIR
+-    AVFORMAT_INCLUDE_DIR
+-    AVUTIL_INCLUDE_DIR
+-    SWRESAMPLE_INCLUDE_DIR
+-    SWSCALE_INCLUDE_DIR
+-    AVCODEC_LIBRARY
+-    AVDEVICE_LIBRARY
+-    AVFILTER_LIBRARY
+-    AVFORMAT_LIBRARY
+-    AVUTIL_LIBRARY
+-    SWRESAMPLE_LIBRARY
+-    SWSCALE_LIBRARY)
+-
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(AVCODEC libavcodec REQUIRED)
++pkg_check_modules(AVFORMAT libavformat REQUIRED)
++pkg_check_modules(AVUTIL libavutil REQUIRED)
++pkg_check_modules(SWSCALE libswscale REQUIRED)

djv-runtime_paths.patch Added

_service Added

_service.tmp Deleted

djv-1.0.5.20150809.a7104da.tar.xz Added

djv-1.0.5git.20141225.tar.bz2 Deleted

Changes of Revision 6