diff --git a/graphic/djv/djv-0.8.2-disable-build-test.patch b/graphic/djv/djv-0.8.2-disable-build-test.patch new file mode 100644 index 000000000..2f33c8cbc --- /dev/null +++ b/graphic/djv/djv-0.8.2-disable-build-test.patch @@ -0,0 +1,31 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../djv/djv-0.8.2-disable-build-test.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Disable to build test applications +Origin: OpenSDE (http://opensde.org) + +diff -ruN djv-0.8.2-orig/CMakeLists.txt djv-0.8.2/CMakeLists.txt +--- djv-0.8.2-orig/CMakeLists.txt 2009-08-01 00:32:48.000000000 +0200 ++++ djv-0.8.2/CMakeLists.txt 2011-04-15 14:38:19.176077819 +0200 +@@ -176,7 +176,7 @@ + if (NOT djv_build_minimal) + + set( +- djv_build_test ++ #djv_build_test + djv_base + djv_image + djv_ui diff --git a/graphic/djv/djv-0.8.2-disable-third-party.patch b/graphic/djv/djv-0.8.2-disable-third-party.patch new file mode 100644 index 000000000..1f5a99913 --- /dev/null +++ b/graphic/djv/djv-0.8.2-disable-third-party.patch @@ -0,0 +1,66 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../djv/djv-0.8.2-disable-third-party.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Disable to build the included third-party applications +Origin: OpenSDE (http://opensde.org) + +djv ships with all needed third-party libraries and applications but we # disabled to build/use them because we are using those provided by the +system. + +diff -ruN djv-0.8.2-orig/CMakeLists.txt djv-0.8.2/CMakeLists.txt +--- djv-0.8.2-orig/CMakeLists.txt 2009-08-01 00:32:48.000000000 +0200 ++++ djv-0.8.2/CMakeLists.txt 2011-04-15 14:38:19.176077819 +0200 +@@ -207,7 +207,7 @@ + + # Uncomment the following line to use system versions of third-party software: + +-#set(djv_third_party_use_system true) ++set(djv_third_party_use_system true) + + if (WIN32) + +@@ -262,20 +262,20 @@ + set( + djv_third_party + # mesa +- glew +- zlib +- libjpeg +- libpng +- libtiff +- ffmpeg +- libquicktime +- fltk +- ilmbase ++# glew ++# zlib ++# libjpeg ++# libpng ++# libtiff ++# ffmpeg ++# libquicktime ++# fltk ++# ilmbase + # ctl +- openexr ++# openexr + # openexr_ctl + # openexr_viewers +- portaudio ++# portaudio + ) + + else (NOT djv_build_minimal) diff --git a/graphic/djv/djv-0.8.2-fix-docdir.patch b/graphic/djv/djv-0.8.2-fix-docdir.patch new file mode 100644 index 000000000..d581a3dea --- /dev/null +++ b/graphic/djv/djv-0.8.2-fix-docdir.patch @@ -0,0 +1,31 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../djv/djv-0.8.2-fix-docdir.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Fix install destination for documentation + +Without this patch djv is installing documentation into $datadir/doc. + +--- djv-0.8.2/doc/CMakeLists.txt.orig 2011-04-15 16:13:54.960077822 +0200 ++++ djv-0.8.2/doc/CMakeLists.txt 2011-04-15 16:14:27.208077806 +0200 +@@ -33,7 +33,7 @@ + + install( + FILES ${src} +- DESTINATION doc ++ DESTINATION doc/djv + ) + + if (APPLE) diff --git a/graphic/djv/djv-0.8.2-gcc44.patch b/graphic/djv/djv-0.8.2-gcc44.patch new file mode 100644 index 000000000..ac69cbd49 --- /dev/null +++ b/graphic/djv/djv-0.8.2-gcc44.patch @@ -0,0 +1,101 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../djv/djv-0.8.2-gcc44.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Fix compiling with gcc >= 4.4 + +diff -ruN djv-0.8.2-orig/bin/softimage-flip/flip.cxx djv-0.8.2/bin/softimage-flip/flip.cxx +--- djv-0.8.2-orig/bin/softimage-flip/flip.cxx 2009-05-25 22:46:34.000000000 +0200 ++++ djv-0.8.2/bin/softimage-flip/flip.cxx 2011-04-15 14:34:14.008078153 +0200 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + using namespace std; + +diff -ruN djv-0.8.2-orig/lib/djv_base/error.cxx djv-0.8.2/lib/djv_base/error.cxx +--- djv-0.8.2-orig/lib/djv_base/error.cxx 2009-07-05 20:51:48.000000000 +0200 ++++ djv-0.8.2/lib/djv_base/error.cxx 2011-04-15 14:11:38.280077537 +0200 +@@ -6,6 +6,8 @@ + Use is subject to license terms. + ------------------------------------------------------------------------------*/ + ++#include ++ + #include "error.h" + + #include +diff -ruN djv-0.8.2-orig/lib/djv_base/file_seq.cxx djv-0.8.2/lib/djv_base/file_seq.cxx +--- djv-0.8.2-orig/lib/djv_base/file_seq.cxx 2009-06-14 22:32:04.000000000 +0200 ++++ djv-0.8.2/lib/djv_base/file_seq.cxx 2011-04-15 14:12:43.772077819 +0200 +@@ -9,6 +9,8 @@ + #undef DJV_DEBUG + //#define DJV_DEBUG + ++#include ++ + #include "file.h" + + #include +diff -ruN djv-0.8.2-orig/lib/djv_base/string_fnc.cxx djv-0.8.2/lib/djv_base/string_fnc.cxx +--- djv-0.8.2-orig/lib/djv_base/string_fnc.cxx 2009-06-13 04:53:38.000000000 +0200 ++++ djv-0.8.2/lib/djv_base/string_fnc.cxx 2011-04-15 14:13:53.452078287 +0200 +@@ -9,6 +9,8 @@ + #undef DJV_DEBUG + //#define DJV_DEBUG + ++#include ++ + #include "string.h" + + #include +diff -ruN djv-0.8.2-orig/lib/djv_image/glx_offscreen_pbuffer.cxx djv-0.8.2/lib/djv_image/glx_offscreen_pbuffer.cxx +--- djv-0.8.2-orig/lib/djv_image/glx_offscreen_pbuffer.cxx 2009-05-25 22:46:34.000000000 +0200 ++++ djv-0.8.2/lib/djv_image/glx_offscreen_pbuffer.cxx 2011-04-15 14:17:08.460077819 +0200 +@@ -8,6 +8,8 @@ + + //#define DJV_DEBUG + ++#include ++ + #include "glx_offscreen_private.h" + + #include "glx_private.h" +diff -ruN djv-0.8.2-orig/lib/djv_image/io_lut_etc.cxx djv-0.8.2/lib/djv_image/io_lut_etc.cxx +--- djv-0.8.2-orig/lib/djv_image/io_lut_etc.cxx 2009-06-13 04:35:06.000000000 +0200 ++++ djv-0.8.2/lib/djv_image/io_lut_etc.cxx 2011-04-15 14:16:13.556077838 +0200 +@@ -6,6 +6,8 @@ + Use is subject to license terms. + ------------------------------------------------------------------------------*/ + ++#include ++ + #include "io_lut.h" + + #include +diff -ruN djv-0.8.2-orig/lib/djv_image/io_ppm_save.cxx djv-0.8.2/lib/djv_image/io_ppm_save.cxx +--- djv-0.8.2-orig/lib/djv_image/io_ppm_save.cxx 2009-06-13 03:06:30.000000000 +0200 ++++ djv-0.8.2/lib/djv_image/io_ppm_save.cxx 2011-04-15 14:15:02.692075750 +0200 +@@ -8,6 +8,8 @@ + + //#define DJV_DEBUG + ++#include ++ + #include "io_ppm.h" + + #include diff --git a/graphic/djv/djv-0.8.2-rename_test_audio.patch b/graphic/djv/djv-0.8.2-rename_test_audio.patch new file mode 100644 index 000000000..ec212c882 --- /dev/null +++ b/graphic/djv/djv-0.8.2-rename_test_audio.patch @@ -0,0 +1,57 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../djv/djv-0.8.2-rename_test_audio.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Rename rename audio test tool 'test_audio' to 'djv_test_audio' + +--- djv-0.8.2/tests/audio/CMakeLists.txt.orig 2009-07-18 21:36:30.000000000 +0200 ++++ djv-0.8.2/tests/audio/CMakeLists.txt 2011-04-15 17:31:18.780078685 +0200 +@@ -7,29 +7,29 @@ + ${QUICKTIME_INCLUDE_DIR} + ) + +-add_executable(test_audio ${header} ${src}) ++add_executable(djv_test_audio ${header} ${src}) + +-add_dependencies(test_audio ${djv_ui_dep}) ++add_dependencies(djv_test_audio ${djv_ui_dep}) + + target_link_libraries( +- test_audio ++ djv_test_audio + ${djv_ui_lib} + ${QUICKTIME_LIBRARIES} + ${PORTAUDIO_LIBRARIES} + ) + +-target_link_libraries(test_audio ${djv_ui_lib}) ++target_link_libraries(djv_test_audio ${djv_ui_lib}) + + if (djv_install_rpath) + set_target_properties( +- test_audio PROPERTIES ++ djv_test_audio PROPERTIES + INSTALL_RPATH "${djv_install_rpath}" + ) + endif (djv_install_rpath) + +-install(TARGETS test_audio RUNTIME DESTINATION bin) ++install(TARGETS djv_test_audio RUNTIME DESTINATION bin) + + if (APPLE) +- DJV_OSX_INSTALL_BIN(test_audio) ++ DJV_OSX_INSTALL_BIN(djv_test_audio) + endif (APPLE) + diff --git a/graphic/djv/djv.conf b/graphic/djv/djv.conf index 5172e47d3..f141dca27 100644 --- a/graphic/djv/djv.conf +++ b/graphic/djv/djv.conf @@ -12,24 +12,33 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -# fixing the wrong openexr, xorg locations, hardcoded paths, and collision -# with djvulibre's djview - -djv_build() { +# Important Note: +# +# djv ships with all needed third-party libraries and applications but we +# disabled to build/use them because we are using those provided by the +# system. +# +# see: djv-0.8.2-disable-third-party.patch - [[ $libdir != *lib ]] && \ - sed -i -e 's,$(INSTALL_PATH)/lib,$(INSTALL_PATH)/lib64,g' \ - -e 's,$(INSTALL_PATH)/plugin,$(INSTALL_PATH)/lib64,g' config.mk +# packages we always need to have for building djv +for x in zlib libjpeg libpng libtiff ilmbase openexr \ + libxxf86vm glew fltk1 portaudio libquicktime; do + pkgprefix -t $x +done - sed -i -e 's,/usr/local/djv,'$root/$prefix',g' \ - -e 's,INSTALL_PATH_SHORTCUT = /usr/bin, ,g' \ - -e 's,-I$(EXR_PATH)/include/OpenEXR,`pkg-config OpenEXR --cflags`,g' \ - -e 's,-L$(EXR_PATH)/lib,`pkg-config OpenEXR --libs-only-L`,g' \ - -e 's,-I/usr/X11R6/include,`pkg-config x11 --cflags-only-I`,g' \ - -e 's,-L/usr/X11R6/lib -lX11,`pkg-config x11 --libs`,g' config.mk -} +# help to find libs and headers -#hook_add premake 3 "djv_build" +# libxxf86vm +var_append CXX_WRAPPER_INSERT ' ' "-I$(pkgprefix -r includedir libxxf86vm)" +var_append CXX_WRAPPER_INSERT ' ' "-L$(pkgprefix -r libdir libxxf86vm)" +# glew +var_append CXX_WRAPPER_INSERT ' ' "$(pkg-config --libs glew)" +# fltk +var_append CXX_WRAPPER_INSERT ' ' "-lfltk -lfltk_gl" +# portaudio C++ bindings +var_append CXX_WRAPPER_INSERT ' ' "$(pkg-config --libs portaudiocpp)" +# libquicktime +var_append CXX_WRAPPER_INSERT ' ' "$(pkg-config --libs libquicktime)" var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,/usr/bin/djview,/usr/bin/djv,'"