aqsis-commits Mailing List for Aqsis Renderer
Brought to you by:
ltatkinson,
pgregory
You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(63) |
Nov
(118) |
Dec
(46) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(35) |
Feb
(208) |
Mar
(82) |
Apr
(161) |
May
(144) |
Jun
(48) |
Jul
(74) |
Aug
(153) |
Sep
(161) |
Oct
(92) |
Nov
(59) |
Dec
(49) |
2003 |
Jan
(130) |
Feb
(213) |
Mar
(178) |
Apr
(276) |
May
(212) |
Jun
(216) |
Jul
(115) |
Aug
(112) |
Sep
(148) |
Oct
(36) |
Nov
(71) |
Dec
(206) |
2004 |
Jan
(221) |
Feb
(364) |
Mar
(365) |
Apr
(196) |
May
(1144) |
Jun
(368) |
Jul
(180) |
Aug
(135) |
Sep
(15) |
Oct
(24) |
Nov
(70) |
Dec
(32) |
2005 |
Jan
(39) |
Feb
(12) |
Mar
(47) |
Apr
(300) |
May
(8) |
Jun
(98) |
Jul
(62) |
Aug
(75) |
Sep
(88) |
Oct
(143) |
Nov
(213) |
Dec
(114) |
2006 |
Jan
(168) |
Feb
(147) |
Mar
(34) |
Apr
(39) |
May
(13) |
Jun
(32) |
Jul
(49) |
Aug
(25) |
Sep
(18) |
Oct
(65) |
Nov
(107) |
Dec
(61) |
2007 |
Jan
(125) |
Feb
(83) |
Mar
(27) |
Apr
(80) |
May
(53) |
Jun
(99) |
Jul
(198) |
Aug
(164) |
Sep
(66) |
Oct
(94) |
Nov
(110) |
Dec
(28) |
2008 |
Jan
(34) |
Feb
(81) |
Mar
(66) |
Apr
(61) |
May
(92) |
Jun
(68) |
Jul
(100) |
Aug
(74) |
Sep
(63) |
Oct
(81) |
Nov
(58) |
Dec
(31) |
2009 |
Jan
(69) |
Feb
(59) |
Mar
(42) |
Apr
(14) |
May
(67) |
Jun
(64) |
Jul
(5) |
Aug
(53) |
Sep
(55) |
Oct
(35) |
Nov
(2) |
Dec
|
2010 |
Jan
(9) |
Feb
(30) |
Mar
(11) |
Apr
(10) |
May
(10) |
Jun
(10) |
Jul
(19) |
Aug
(57) |
Sep
(44) |
Oct
(57) |
Nov
(24) |
Dec
(2) |
2011 |
Jan
|
Feb
|
Mar
|
Apr
(39) |
May
(40) |
Jun
(16) |
Jul
(32) |
Aug
(30) |
Sep
(14) |
Oct
(5) |
Nov
|
Dec
(1) |
2012 |
Jan
(1) |
Feb
(12) |
Mar
(11) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Paul G. <pgr...@us...> - 2014-07-06 15:07:49
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The tag, release1.8.0 has been created at 92a1eec0a688390b4f3446c8085860d9d1eb3999 (commit) - Log ----------------------------------------------------------------- commit 92a1eec0a688390b4f3446c8085860d9d1eb3999 Author: Paul Gregory <pgr...@aq...> Date: Fri Mar 2 08:02:23 2012 +0000 Minor update to the MacOSX packaging. * Disable the custom fixup, use the built-in. * Rename icons. ----------------------------------------------------------------------- hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2014-07-06 15:07:47
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, master has been updated via eb88f068fc6a41f31b40ee1257227a0e0ffd5714 (commit) via d58aab7717d3e92918939ca4448de17a86004b39 (commit) from ee1521af462070cae8d2ea85058141e8bd5df54f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit eb88f068fc6a41f31b40ee1257227a0e0ffd5714 Author: Paul Gregory <aq...@gm...> Date: Sat Jul 5 16:11:34 2014 +0100 Fix boost lexical_cast problem on Mac OS X Mavericks with the latest Xcode. diff --git a/tools/eqsl/eqsl.cpp b/tools/eqsl/eqsl.cpp index 0b6e211..c8f78f9 100644 --- a/tools/eqsl/eqsl.cpp +++ b/tools/eqsl/eqsl.cpp @@ -28,6 +28,7 @@ // // (This is the New BSD license) +#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 #include "eqsl.h" #include <aqsis/aqsis.h> commit d58aab7717d3e92918939ca4448de17a86004b39 Author: Paul Gregory <aq...@gm...> Date: Sat Jul 5 16:10:52 2014 +0100 Fix compilation with OpenEXR 2.x, fix suggested by nemysis on github: https://github.com/aqsis/aqsis/issues/3 diff --git a/libs/tex/io/exrinputfile.h b/libs/tex/io/exrinputfile.h index 0f980b2..cf8a52b 100644 --- a/libs/tex/io/exrinputfile.h +++ b/libs/tex/io/exrinputfile.h @@ -47,11 +47,9 @@ #include <boost/shared_ptr.hpp> #include <aqsis/tex/io/itexinputfile.h> +#include <OpenExr/ImfInputFile.h> //------------------------------------------------------------------------------ -namespace Imf { - class InputFile; -} namespace Aqsis { ----------------------------------------------------------------------- Summary of changes: libs/tex/io/exrinputfile.h | 4 +--- tools/eqsl/eqsl.cpp | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-08-24 19:38:08
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 61e17904d67685225bfb83c3b7d08349bd3fb39e (commit) from 81e7ed8c035eff138820606b11c5de7e127ade70 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 61e17904d67685225bfb83c3b7d08349bd3fb39e Author: Paul Gregory <pgr...@aq...> Date: Fri Aug 24 20:32:28 2012 +0100 Fix icons name for MacOSX bundling. * For some reason the config was using the full name for the icons from AQSIS_PROJECT_NAME which is "Aqsis Renderer", instead of AQSIS_PROJECT_NAME_SHORT, which is "Aqsis". diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index f37d183..7ff3fce 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -41,7 +41,7 @@ elseif(APPLE) "${AQSIS_PROJECT_NAME_SHORT}-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}-${CMAKE_SYSTEM_NAME}") #set(CPACK_PACKAGE_ICON "") set(CPACK_BUNDLE_NAME "${AQSIS_PROJECT_NAME_SHORT}") - set(CPACK_BUNDLE_ICON "${BUNDLEDIR}/${AQSIS_PROJECT_NAME}.icns") + set(CPACK_BUNDLE_ICON "${BUNDLEDIR}/${AQSIS_PROJECT_NAME_SHORT}.icns") set(CPACK_BUNDLE_PLIST "${BUNDLEDIR}/Info.plist") set(CPACK_BUNDLE_STARTUP_COMMAND "") set(CPACK_GENERATOR "Bundle") ----------------------------------------------------------------------- Summary of changes: distribution/CMakeLists.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-08-24 11:37:49
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 81e7ed8c035eff138820606b11c5de7e127ade70 (commit) from 757ed98259d02cfe4ffe4cec14cdc137d0b3e65f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 81e7ed8c035eff138820606b11c5de7e127ade70 Author: Paul Gregory <pgr...@aq...> Date: Fri Aug 24 12:37:30 2012 +0100 Update for release 1.8.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index b89d605..a83577f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,7 @@ endif() # these version variables are potentially used there. set(VERSION_MAJOR 1) set(VERSION_MINOR 8) -set(VERSION_BUILD 1) +set(VERSION_BUILD 2) set(SCM_REVISION 0) # "?" diff --git a/release-notes/1.8/summary-1.8.0.txt b/release-notes/1.8/summary-1.8.0.txt index 1b4870b..e64b31c 100644 --- a/release-notes/1.8/summary-1.8.0.txt +++ b/release-notes/1.8/summary-1.8.0.txt @@ -1,3 +1,22 @@ +Summary of changes in aqsis-1.8.2 + + +Bug Fixes +--------- + +* Define empty RiDeformationV for third-party applications + that link to our ri2rib library. +* Minor tweaks to building on Win32. + + +=================================================================== + +Summary of changes in aqsis-1.8.1 + +Minor packaging fix + +=================================================================== + Summary of changes in aqsis-1.8.0 ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 2 +- release-notes/1.8/summary-1.8.0.txt | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-08-24 09:28:26
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 757ed98259d02cfe4ffe4cec14cdc137d0b3e65f (commit) from 45f4d96697717416c1488981a62a0c63a6dfaba8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 757ed98259d02cfe4ffe4cec14cdc137d0b3e65f Author: Paul Gregory <pgr...@aq...> Date: Fri Mar 30 23:41:59 2012 +0100 Attempt to fix Win32 build with OpenEXR. * OpenEXR insists on loading headers from OpenEXR/..., had to try to fix the Win32 CMake module accordingly. diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake index 4040a48..464035f 100644 --- a/cmake/modules/FindOpenEXR.cmake +++ b/cmake/modules/FindOpenEXR.cmake @@ -29,7 +29,7 @@ ELSE(WIN32) ENDIF(WIN32) FIND_PATH(AQSIS_OPENEXR_INCLUDE_DIR - Iex.h + OpenEXR/Iex.h PATHS ${AQSIS_OPENEXR_INCLUDE_SEARCHPATH} PATH_SUFFIXES "" OpenEXR openexr DOC "Location of the OpenEXR headers" ----------------------------------------------------------------------- Summary of changes: cmake/modules/FindOpenEXR.cmake | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-08-24 09:17:40
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 45f4d96697717416c1488981a62a0c63a6dfaba8 (commit) from 2c72711f99e69d20648e9737e3f1d72e30d916af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 45f4d96697717416c1488981a62a0c63a6dfaba8 Author: Paul Gregory <pgr...@aq...> Date: Sat Mar 31 11:37:00 2012 +0100 Fix the declaration of isatty on Windows. * It is available in io.h on Windows, and this declaration was causing a clash. diff --git a/libs/slcomp/parse/scanner.ll b/libs/slcomp/parse/scanner.ll index c51d15e..1fa4261 100644 --- a/libs/slcomp/parse/scanner.ll +++ b/libs/slcomp/parse/scanner.ll @@ -16,7 +16,7 @@ using namespace Aqsis; #include "parser.hpp" #ifdef WIN32 -extern "C" TqInt isatty(TqInt); +//extern "C" TqInt isatty(TqInt); #ifdef _MSC_VER #pragma warning(disable : 4786) #endif ----------------------------------------------------------------------- Summary of changes: libs/slcomp/parse/scanner.ll | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-31 10:38:51
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, master has been updated via ee1521af462070cae8d2ea85058141e8bd5df54f (commit) from 47641b83c23d368d45fa784251ecb125eae8d1e6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ee1521af462070cae8d2ea85058141e8bd5df54f Author: Paul Gregory <pgr...@aq...> Date: Sat Mar 31 11:37:00 2012 +0100 Fix the declaration of isatty on Windows. * It is available in io.h on Windows, and this declaration was causing a clash. diff --git a/libs/slcomp/parse/scanner.ll b/libs/slcomp/parse/scanner.ll index c51d15e..1fa4261 100644 --- a/libs/slcomp/parse/scanner.ll +++ b/libs/slcomp/parse/scanner.ll @@ -16,7 +16,7 @@ using namespace Aqsis; #include "parser.hpp" #ifdef WIN32 -extern "C" TqInt isatty(TqInt); +//extern "C" TqInt isatty(TqInt); #ifdef _MSC_VER #pragma warning(disable : 4786) #endif ----------------------------------------------------------------------- Summary of changes: libs/slcomp/parse/scanner.ll | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-30 22:43:30
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, master has been updated via 47641b83c23d368d45fa784251ecb125eae8d1e6 (commit) from a5d3de4b1a36e2725ea27dccd7c166ab4ab1725d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 47641b83c23d368d45fa784251ecb125eae8d1e6 Author: Paul Gregory <pgr...@aq...> Date: Fri Mar 30 23:41:59 2012 +0100 Attempt to fix Win32 build with OpenEXR. * OpenEXR insists on loading headers from OpenEXR/..., had to try to fix the Win32 CMake module accordingly. diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake index 4040a48..464035f 100644 --- a/cmake/modules/FindOpenEXR.cmake +++ b/cmake/modules/FindOpenEXR.cmake @@ -29,7 +29,7 @@ ELSE(WIN32) ENDIF(WIN32) FIND_PATH(AQSIS_OPENEXR_INCLUDE_DIR - Iex.h + OpenEXR/Iex.h PATHS ${AQSIS_OPENEXR_INCLUDE_SEARCHPATH} PATH_SUFFIXES "" OpenEXR openexr DOC "Location of the OpenEXR headers" ----------------------------------------------------------------------- Summary of changes: cmake/modules/FindOpenEXR.cmake | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-30 20:36:51
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, master has been updated via a5d3de4b1a36e2725ea27dccd7c166ab4ab1725d (commit) via ffe3816d297ce0b31df08a4a6aba237c88dbc07d (commit) via 743b8e65a9b78fb08c7772dbd37e691c8afbc6c8 (commit) via 1cc83320c157305afb0cda431da1cc98bfecef64 (commit) via aa28c5976bd53a79c538325c2d22175831901297 (commit) from 1b1080b5cc5284111b4abc6907a12a84ecd35178 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a5d3de4b1a36e2725ea27dccd7c166ab4ab1725d Author: Chris Foster <chr...@gm...> Date: Thu Mar 29 21:12:57 2012 +1000 Update searchpath documentation for new magic chars diff --git a/doc/manual/user/user_guide/ri_standard/options_attributes.rst b/doc/manual/user/user_guide/ri_standard/options_attributes.rst index 4101ea5..437749a 100644 --- a/doc/manual/user/user_guide/ri_standard/options_attributes.rst +++ b/doc/manual/user/user_guide/ri_standard/options_attributes.rst @@ -50,11 +50,20 @@ Searchpath Options Aqsis locates the various external assets required during rendering via a standard Option called "searchpath". The "searchpath" Option has a number of string values that tell Aqsis where to look for various asset types. The string -value for each of these specifies a list of search paths separated by a colon. +value for each of these specifies a list of search paths separated by colons or +semicolons. -The special search path character "&" represents the previous value of the -option. This is only available in "searchpath" options. Using this character -you can append or prepend paths to the default path list, i.e:: +There are several characters which have special meanings in searchpath options: + +* The character & expands to the previous value of the path +* The character @ expands to the corresponding default path (for example, @ + in the "shader" searchpath will expand to the value of the "defaultshader" + searchpath.) +* The character % is used to delimit environment variables: ``%MY_PATH%`` + will expand to the value of the environment variable ``MY_PATH``. + +As an example, by using the & character you can append a custom path to the +current search path for shaders using the RIB fragment:: Option "searchpath" "shader" ["/my/shaders:&"] commit ffe3816d297ce0b31df08a4a6aba237c88dbc07d Author: Chris Foster <chr...@gm...> Date: Thu Mar 15 22:48:24 2012 +1000 Bugfix #3505124: RiDeformationV declared but not defined Small fix from Pietro Cerutti: RiDeformationV is declared in include/aqsis/ri/ri.h but never defined, this causes linking issues with software that invokes it (in particular ayam). diff --git a/libs/core/api/ri.cpp b/libs/core/api/ri.cpp index eef0a4a..7465474 100644 --- a/libs/core/api/ri.cpp +++ b/libs/core/api/ri.cpp @@ -4220,6 +4220,11 @@ RtVoid RiDeformation(RtToken name, PARAMETERLIST) Aqsis::log() << warning << "RiDeformation not supported" << std::endl; } +RtVoid RiDeformationV(RtToken name, RtInt n, RtToken tokens[], RtPointer parms[]) +{ + Aqsis::log() << warning << "RiDeformationV not supported" << std::endl; +} + RtVoid RiMakeBump(RtString imagefile, RtString bumpfile, RtToken swrap, RtToken twrap, RtFilterFunc filterfunc, RtFloat swidth, RtFloat twidth, PARAMETERLIST) { Aqsis::log() << warning << "RiMakeBump not supported" << std::endl; commit 743b8e65a9b78fb08c7772dbd37e691c8afbc6c8 Author: Paul Gregory <pgr...@aq...> Date: Sat Mar 10 10:56:26 2012 +0000 Fix use of C99 types in png loader. * Not supported on VC9, which is why we have the Tq types. diff --git a/libs/tex/io/pnginputfile.cpp b/libs/tex/io/pnginputfile.cpp index 3dfb2a0..e8c4231 100644 --- a/libs/tex/io/pnginputfile.cpp +++ b/libs/tex/io/pnginputfile.cpp @@ -72,22 +72,22 @@ public: ::png_destroy_read_struct(&m_PNGHandle, (png_infopp)&m_infoPtr,(png_infopp)NULL); } - int32_t getWidth() const + TqInt32 getWidth() const { return isValid() ? ::png_get_image_width(m_PNGHandle, m_infoPtr) : -1; } - int32_t getHeight() const + TqInt32 getHeight() const { return isValid() ? ::png_get_image_height(m_PNGHandle, m_infoPtr) : -1; } - int8_t getNrOfChannels() const + TqInt8 getNrOfChannels() const { return isValid() ? ::png_get_channels(m_PNGHandle, m_infoPtr) : 0; } - int32_t getRowBytes() const + TqInt32 getRowBytes() const { return isValid() ? ::png_get_rowbytes(m_PNGHandle, m_infoPtr) : 0; } @@ -217,7 +217,7 @@ CqPngInputFile::CqPngInputFile(const boostfs::path& fileName) // set the channels channelList.clear(); - const uint8_t nrOfChannels ( m_PNGReader->getNrOfChannels() ); + const TqUint8 nrOfChannels ( m_PNGReader->getNrOfChannels() ); static const char* channelStructure[] = {"r","g","b","a"}; @@ -276,7 +276,7 @@ void CqPngInputFile::readPixelsImpl(TqUint8* buffer, TqInt startLine, { assert(buffer); - const size_t destBytesPerPixel(getNrOfChannels() * sizeof(uint8_t)); + const size_t destBytesPerPixel(getNrOfChannels() * sizeof(TqUint8)); const size_t destBytesPerLine(destBytesPerPixel * getWidth()); TqUint8* destBuff(buffer); @@ -304,22 +304,22 @@ const TqUint8* const CqPngInputFile::getRowPtr(size_t inRowIndex) const return m_PNGReader->getRowPtr(inRowIndex); } -uint8_t CqPngInputFile::getNrOfChannels() const +TqUint8 CqPngInputFile::getNrOfChannels() const { return m_PNGReader->getNrOfChannels(); } -uint32_t CqPngInputFile::getRowBytes() const +TqUint32 CqPngInputFile::getRowBytes() const { return m_PNGReader->getRowBytes(); } -uint32_t CqPngInputFile::getWidth() const +TqUint32 CqPngInputFile::getWidth() const { return m_PNGReader->getWidth(); } -uint32_t CqPngInputFile::getHeight() const +TqUint32 CqPngInputFile::getHeight() const { return m_PNGReader->getHeight(); } diff --git a/libs/tex/io/pnginputfile.h b/libs/tex/io/pnginputfile.h index f37da19..b56063e 100644 --- a/libs/tex/io/pnginputfile.h +++ b/libs/tex/io/pnginputfile.h @@ -123,11 +123,11 @@ public: TqInt numScanlines) const; private: - uint8_t getNrOfChannels() const; - uint32_t getRowBytes() const; + TqUint8 getNrOfChannels() const; + TqUint32 getRowBytes() const; - uint32_t getWidth() const; - uint32_t getHeight() const; + TqUint32 getWidth() const; + TqUint32 getHeight() const; const TqUint8* const getRowPtr(size_t inRowIndex) const; }; commit 1cc83320c157305afb0cda431da1cc98bfecef64 Author: Paul Gregory <pgregory@indigo-Studio-XPS-1640.(none)> Date: Sun Mar 11 12:32:28 2012 +0000 Disable fixup_bundle on linux, not sure it's relevant, and I can't get to the bottom of the problems. diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index 09d0c3e..36256ee 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -116,16 +116,19 @@ get_directory_property(d_exr_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION e get_directory_property(d_bmp_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION bmp_display_name) get_directory_property(d_xpm_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION xpm_display_name) get_directory_property(piqsl_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION piqsl_display_name) -set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") -set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") -set(PLUGINS "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${display_DISPLAYLIB}" - "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_exr_DISPLAYLIB}" - "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_bmp_DISPLAYLIB}" - "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_xpm_DISPLAYLIB}" - "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${piqsl_DISPLAYLIB}" - ) -INSTALL(CODE " - include(BundleUtilities) - fixup_bundle(\"${APPS}\" \"${PLUGINS}\" \"${DIRS}\") - " COMPONENT main) +if(APPLE OR WIN32) + set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") + set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") + set(PLUGINS "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${display_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_exr_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_bmp_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_xpm_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${piqsl_DISPLAYLIB}" + ) + + INSTALL(CODE " + include(BundleUtilities) + fixup_bundle(\"${APPS}\" \"${PLUGINS}\" \"${DIRS}\") + " COMPONENT main) +endif() commit aa28c5976bd53a79c538325c2d22175831901297 Author: Paul Gregory <pgr...@aq...> Date: Wed Mar 7 21:57:25 2012 +0000 Update fixup_bundle to check the display plugins. * By default, fixup_bundle will check deps on all specified executables, and recursively through those deps. However, as the dso's are loaded dynamically they never get seen so have to be specified separately. diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index 1ffe905..09d0c3e 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -111,11 +111,21 @@ include(CPack) # By moving it here, we guarantee it happens after the files are installed, as this # is add_subdirectory'd last, and I arbitrarily choose piqsl, as if QT is enabled, # all QT apps are build anyway at the moment. -if(AQSIS_USE_QT) - set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") - set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") - INSTALL(CODE " - include(BundleUtilities) - fixup_bundle(\"${APPS}\" \"\" \"${DIRS}\") - " COMPONENT main) -endif() +get_directory_property(display_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION file_display_name) +get_directory_property(d_exr_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION exr_display_name) +get_directory_property(d_bmp_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION bmp_display_name) +get_directory_property(d_xpm_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION xpm_display_name) +get_directory_property(piqsl_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION piqsl_display_name) +set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") +set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") +set(PLUGINS "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${display_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_exr_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_bmp_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_xpm_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${piqsl_DISPLAYLIB}" + ) + +INSTALL(CODE " + include(BundleUtilities) + fixup_bundle(\"${APPS}\" \"${PLUGINS}\" \"${DIRS}\") + " COMPONENT main) ----------------------------------------------------------------------- Summary of changes: distribution/CMakeLists.txt | 27 ++++++++++++++----- .../user_guide/ri_standard/options_attributes.rst | 17 +++++++++--- libs/core/api/ri.cpp | 5 +++ libs/tex/io/pnginputfile.cpp | 20 +++++++------- libs/tex/io/pnginputfile.h | 8 +++--- 5 files changed, 52 insertions(+), 25 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Chris F. <c4...@us...> - 2012-03-29 11:14:32
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 2c72711f99e69d20648e9737e3f1d72e30d916af (commit) from 68c5b8112a00645f7b3b591ee7f236f2605ff0f9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2c72711f99e69d20648e9737e3f1d72e30d916af Author: Chris Foster <chr...@gm...> Date: Thu Mar 29 21:12:57 2012 +1000 Update searchpath documentation for new magic chars diff --git a/doc/manual/user/user_guide/ri_standard/options_attributes.rst b/doc/manual/user/user_guide/ri_standard/options_attributes.rst index 4101ea5..437749a 100644 --- a/doc/manual/user/user_guide/ri_standard/options_attributes.rst +++ b/doc/manual/user/user_guide/ri_standard/options_attributes.rst @@ -50,11 +50,20 @@ Searchpath Options Aqsis locates the various external assets required during rendering via a standard Option called "searchpath". The "searchpath" Option has a number of string values that tell Aqsis where to look for various asset types. The string -value for each of these specifies a list of search paths separated by a colon. +value for each of these specifies a list of search paths separated by colons or +semicolons. -The special search path character "&" represents the previous value of the -option. This is only available in "searchpath" options. Using this character -you can append or prepend paths to the default path list, i.e:: +There are several characters which have special meanings in searchpath options: + +* The character & expands to the previous value of the path +* The character @ expands to the corresponding default path (for example, @ + in the "shader" searchpath will expand to the value of the "defaultshader" + searchpath.) +* The character % is used to delimit environment variables: ``%MY_PATH%`` + will expand to the value of the environment variable ``MY_PATH``. + +As an example, by using the & character you can append a custom path to the +current search path for shaders using the RIB fragment:: Option "searchpath" "shader" ["/my/shaders:&"] ----------------------------------------------------------------------- Summary of changes: .../user_guide/ri_standard/options_attributes.rst | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-26 18:28:35
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, master has been updated via 1b1080b5cc5284111b4abc6907a12a84ecd35178 (commit) from 2438ceb37ad73d40892f2d6ed616ffa5bca87add (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1b1080b5cc5284111b4abc6907a12a84ecd35178 Author: Paul Gregory <pgr...@aq...> Date: Mon Mar 26 19:27:59 2012 +0100 Roll development version to 1.9.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index f50a4be..aa12aea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ endif() # some packaging variables are set in the platform-specific config files, and # these version variables are potentially used there. set(VERSION_MAJOR 1) -set(VERSION_MINOR 7) +set(VERSION_MINOR 9) set(VERSION_BUILD 0) set(SCM_REVISION 0) # "?" ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Chris F. <c4...@us...> - 2012-03-15 12:52:03
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 68c5b8112a00645f7b3b591ee7f236f2605ff0f9 (commit) from 2bee73aff43b995284ce1dcd8b2bdec5a8e92e91 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 68c5b8112a00645f7b3b591ee7f236f2605ff0f9 Author: Chris Foster <chr...@gm...> Date: Thu Mar 15 22:48:24 2012 +1000 Bugfix #3505124: RiDeformationV declared but not defined Small fix from Pietro Cerutti: RiDeformationV is declared in include/aqsis/ri/ri.h but never defined, this causes linking issues with software that invokes it (in particular ayam). diff --git a/libs/core/api/ri.cpp b/libs/core/api/ri.cpp index eef0a4a..7465474 100644 --- a/libs/core/api/ri.cpp +++ b/libs/core/api/ri.cpp @@ -4220,6 +4220,11 @@ RtVoid RiDeformation(RtToken name, PARAMETERLIST) Aqsis::log() << warning << "RiDeformation not supported" << std::endl; } +RtVoid RiDeformationV(RtToken name, RtInt n, RtToken tokens[], RtPointer parms[]) +{ + Aqsis::log() << warning << "RiDeformationV not supported" << std::endl; +} + RtVoid RiMakeBump(RtString imagefile, RtString bumpfile, RtToken swrap, RtToken twrap, RtFilterFunc filterfunc, RtFloat swidth, RtFloat twidth, PARAMETERLIST) { Aqsis::log() << warning << "RiMakeBump not supported" << std::endl; ----------------------------------------------------------------------- Summary of changes: libs/core/api/ri.cpp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-11 12:32:57
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 2bee73aff43b995284ce1dcd8b2bdec5a8e92e91 (commit) from 33a5eaa80aaeedbc681b9a132e34c3d9f3aadf04 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2bee73aff43b995284ce1dcd8b2bdec5a8e92e91 Author: Paul Gregory <pgregory@indigo-Studio-XPS-1640.(none)> Date: Sun Mar 11 12:32:28 2012 +0000 Disable fixup_bundle on linux, not sure it's relevant, and I can't get to the bottom of the problems. diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index a35c92d..f37d183 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -116,16 +116,19 @@ get_directory_property(d_exr_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION e get_directory_property(d_bmp_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION bmp_display_name) get_directory_property(d_xpm_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION xpm_display_name) get_directory_property(piqsl_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION piqsl_display_name) -set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") -set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") -set(PLUGINS "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${display_DISPLAYLIB}" - "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_exr_DISPLAYLIB}" - "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_bmp_DISPLAYLIB}" - "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_xpm_DISPLAYLIB}" - "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${piqsl_DISPLAYLIB}" - ) -INSTALL(CODE " - include(BundleUtilities) - fixup_bundle(\"${APPS}\" \"${PLUGINS}\" \"${DIRS}\") - " COMPONENT main) +if(APPLE OR WIN32) + set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") + set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") + set(PLUGINS "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${display_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_exr_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_bmp_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_xpm_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${piqsl_DISPLAYLIB}" + ) + + INSTALL(CODE " + include(BundleUtilities) + fixup_bundle(\"${APPS}\" \"${PLUGINS}\" \"${DIRS}\") + " COMPONENT main) +endif() ----------------------------------------------------------------------- Summary of changes: distribution/CMakeLists.txt | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-10 11:46:00
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 33a5eaa80aaeedbc681b9a132e34c3d9f3aadf04 (commit) from 236f567dd279d96985269e377ffb446e9937dbce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 33a5eaa80aaeedbc681b9a132e34c3d9f3aadf04 Author: Paul Gregory <pgr...@aq...> Date: Sat Mar 10 11:33:52 2012 +0000 Update to version 1.8.1 for release diff --git a/CMakeLists.txt b/CMakeLists.txt index af86c92..b89d605 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,7 @@ endif() # these version variables are potentially used there. set(VERSION_MAJOR 1) set(VERSION_MINOR 8) -set(VERSION_BUILD 0) +set(VERSION_BUILD 1) set(SCM_REVISION 0) # "?" ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-10 10:57:43
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 236f567dd279d96985269e377ffb446e9937dbce (commit) from 2118b51581cc3b37adc179874b68e47961420109 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 236f567dd279d96985269e377ffb446e9937dbce Author: Paul Gregory <pgr...@aq...> Date: Sat Mar 10 10:56:26 2012 +0000 Fix use of C99 types in png loader. * Not supported on VC9, which is why we have the Tq types. diff --git a/libs/tex/io/pnginputfile.cpp b/libs/tex/io/pnginputfile.cpp index 3dfb2a0..e8c4231 100644 --- a/libs/tex/io/pnginputfile.cpp +++ b/libs/tex/io/pnginputfile.cpp @@ -72,22 +72,22 @@ public: ::png_destroy_read_struct(&m_PNGHandle, (png_infopp)&m_infoPtr,(png_infopp)NULL); } - int32_t getWidth() const + TqInt32 getWidth() const { return isValid() ? ::png_get_image_width(m_PNGHandle, m_infoPtr) : -1; } - int32_t getHeight() const + TqInt32 getHeight() const { return isValid() ? ::png_get_image_height(m_PNGHandle, m_infoPtr) : -1; } - int8_t getNrOfChannels() const + TqInt8 getNrOfChannels() const { return isValid() ? ::png_get_channels(m_PNGHandle, m_infoPtr) : 0; } - int32_t getRowBytes() const + TqInt32 getRowBytes() const { return isValid() ? ::png_get_rowbytes(m_PNGHandle, m_infoPtr) : 0; } @@ -217,7 +217,7 @@ CqPngInputFile::CqPngInputFile(const boostfs::path& fileName) // set the channels channelList.clear(); - const uint8_t nrOfChannels ( m_PNGReader->getNrOfChannels() ); + const TqUint8 nrOfChannels ( m_PNGReader->getNrOfChannels() ); static const char* channelStructure[] = {"r","g","b","a"}; @@ -276,7 +276,7 @@ void CqPngInputFile::readPixelsImpl(TqUint8* buffer, TqInt startLine, { assert(buffer); - const size_t destBytesPerPixel(getNrOfChannels() * sizeof(uint8_t)); + const size_t destBytesPerPixel(getNrOfChannels() * sizeof(TqUint8)); const size_t destBytesPerLine(destBytesPerPixel * getWidth()); TqUint8* destBuff(buffer); @@ -304,22 +304,22 @@ const TqUint8* const CqPngInputFile::getRowPtr(size_t inRowIndex) const return m_PNGReader->getRowPtr(inRowIndex); } -uint8_t CqPngInputFile::getNrOfChannels() const +TqUint8 CqPngInputFile::getNrOfChannels() const { return m_PNGReader->getNrOfChannels(); } -uint32_t CqPngInputFile::getRowBytes() const +TqUint32 CqPngInputFile::getRowBytes() const { return m_PNGReader->getRowBytes(); } -uint32_t CqPngInputFile::getWidth() const +TqUint32 CqPngInputFile::getWidth() const { return m_PNGReader->getWidth(); } -uint32_t CqPngInputFile::getHeight() const +TqUint32 CqPngInputFile::getHeight() const { return m_PNGReader->getHeight(); } diff --git a/libs/tex/io/pnginputfile.h b/libs/tex/io/pnginputfile.h index f37da19..b56063e 100644 --- a/libs/tex/io/pnginputfile.h +++ b/libs/tex/io/pnginputfile.h @@ -123,11 +123,11 @@ public: TqInt numScanlines) const; private: - uint8_t getNrOfChannels() const; - uint32_t getRowBytes() const; + TqUint8 getNrOfChannels() const; + TqUint32 getRowBytes() const; - uint32_t getWidth() const; - uint32_t getHeight() const; + TqUint32 getWidth() const; + TqUint32 getHeight() const; const TqUint8* const getRowPtr(size_t inRowIndex) const; }; ----------------------------------------------------------------------- Summary of changes: libs/tex/io/pnginputfile.cpp | 20 ++++++++++---------- libs/tex/io/pnginputfile.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-07 21:59:01
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 2118b51581cc3b37adc179874b68e47961420109 (commit) from 92a1eec0a688390b4f3446c8085860d9d1eb3999 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2118b51581cc3b37adc179874b68e47961420109 Author: Paul Gregory <pgr...@aq...> Date: Wed Mar 7 21:57:25 2012 +0000 Update fixup_bundle to check the display plugins. * By default, fixup_bundle will check deps on all specified executables, and recursively through those deps. However, as the dso's are loaded dynamically they never get seen so have to be specified separately. diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index 2ecd8f4..a35c92d 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -111,11 +111,21 @@ include(CPack) # By moving it here, we guarantee it happens after the files are installed, as this # is add_subdirectory'd last, and I arbitrarily choose piqsl, as if QT is enabled, # all QT apps are build anyway at the moment. -if(AQSIS_USE_QT) - set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") - set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") - INSTALL(CODE " - include(BundleUtilities) - fixup_bundle(\"${APPS}\" \"\" \"${DIRS}\") - " COMPONENT main) -endif() +get_directory_property(display_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION file_display_name) +get_directory_property(d_exr_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION exr_display_name) +get_directory_property(d_bmp_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION bmp_display_name) +get_directory_property(d_xpm_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION xpm_display_name) +get_directory_property(piqsl_DISPLAYLIB DIRECTORY ../tools/displays DEFINITION piqsl_display_name) +set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") +set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") +set(PLUGINS "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${display_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_exr_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_bmp_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${d_xpm_DISPLAYLIB}" + "\${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}/${piqsl_DISPLAYLIB}" + ) + +INSTALL(CODE " + include(BundleUtilities) + fixup_bundle(\"${APPS}\" \"${PLUGINS}\" \"${DIRS}\") + " COMPONENT main) ----------------------------------------------------------------------- Summary of changes: distribution/CMakeLists.txt | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-03-02 08:03:27
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 92a1eec0a688390b4f3446c8085860d9d1eb3999 (commit) from 412e0bf763d1bffbd156cb594bc1378166d91c45 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 92a1eec0a688390b4f3446c8085860d9d1eb3999 Author: Paul Gregory <pgr...@aq...> Date: Fri Mar 2 08:02:23 2012 +0000 Minor update to the MacOSX packaging. * Disable the custom fixup, use the built-in. * Rename icons. diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index 1ffe905..2ecd8f4 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -41,13 +41,13 @@ elseif(APPLE) "${AQSIS_PROJECT_NAME_SHORT}-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}-${CMAKE_SYSTEM_NAME}") #set(CPACK_PACKAGE_ICON "") set(CPACK_BUNDLE_NAME "${AQSIS_PROJECT_NAME_SHORT}") - set(CPACK_BUNDLE_ICON "${BUNDLEDIR}/Aqsis.icns") + set(CPACK_BUNDLE_ICON "${BUNDLEDIR}/${AQSIS_PROJECT_NAME}.icns") set(CPACK_BUNDLE_PLIST "${BUNDLEDIR}/Info.plist") set(CPACK_BUNDLE_STARTUP_COMMAND "") set(CPACK_GENERATOR "Bundle") set(CPACK_SOURCE_GENERATOR "TGZ") # Custom OS X Bundle - #add_subdirectory(macosx/bundle) + add_subdirectory(macosx/bundle) elseif(UNIX) set(CPACK_SOURCE_PACKAGE_FILE_NAME diff --git a/distribution/macosx/bundle/CMakeLists.txt b/distribution/macosx/bundle/CMakeLists.txt index 261b951..2a9045a 100644 --- a/distribution/macosx/bundle/CMakeLists.txt +++ b/distribution/macosx/bundle/CMakeLists.txt @@ -31,15 +31,8 @@ set(RESOURCEPATH "${DEFAULT_RESOURCEPATH}" CACHE STRING "Aqsis resource searchpa configure_file(${CMAKE_SOURCE_DIR}/aqsisrc.in.cmake ${BUNDLEDIR}/aqsisrc) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in.cmake ${BUNDLEDIR}/Info.plist) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../application.icns ${BUNDLEDIR}/Aqsis.icns COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../application.icns ${BUNDLEDIR}/${AQSIS_PROJECT_NAME_SHORT}.icns COPYONLY) file(WRITE "${BUNDLEDIR}/PkgInfo" "APPL????") -set(OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${BUNDLEDIR}/CompleteBundle.cmake") -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CompleteBundle.cmake.in" - "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}") -set(OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${BUNDLEDIR}/create_bundle.sh") -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/create_bundle.sh.in" - "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}") -install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}") install(FILES "${BUNDLEDIR}/bundle_config.app/Contents/MacOS/applet" DESTINATION "../MacOS" PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) @@ -58,10 +51,3 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bundle_config.app ADD_CUSTOM_TARGET(bundleconfig ALL echo DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle_config.app ) - -ADD_CUSTOM_TARGET(osxbundle - WORKING_DIRECTORY ${BUNDLEDIR} - COMMAND sh ./create_bundle.sh - ) - -ADD_DEPENDENCIES(osxbundle aqsis aqsl aqsltell eqsl miqser piqsl teqser display d_bmp d_exr d_xpm piqsldisplay shaders ribparse bundleconfig) diff --git a/distribution/macosx/bundle/Info.plist.in.cmake b/distribution/macosx/bundle/Info.plist.in.cmake index e5a748e..5de5225 100644 --- a/distribution/macosx/bundle/Info.plist.in.cmake +++ b/distribution/macosx/bundle/Info.plist.in.cmake @@ -9,7 +9,7 @@ <key>CFBundleIdentifier</key> <string>org.aqsis.Aqsis</string> <key>CFBundleIconFile</key> - <string>${CMAKE_PROJECT_NAME}</string> + <string>${AQSIS_PROJECT_NAME_SHORT}</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> ----------------------------------------------------------------------- Summary of changes: distribution/CMakeLists.txt | 4 ++-- distribution/macosx/bundle/CMakeLists.txt | 16 +--------------- distribution/macosx/bundle/Info.plist.in.cmake | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-02-28 00:57:35
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 412e0bf763d1bffbd156cb594bc1378166d91c45 (commit) via 2438ceb37ad73d40892f2d6ed616ffa5bca87add (commit) from 495426ce2973c1c072b2b3b8a2a8089a1ed50728 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 412e0bf763d1bffbd156cb594bc1378166d91c45 Merge: 495426c 2438ceb Author: Paul Gregory <pgr...@aq...> Date: Tue Feb 28 00:55:10 2012 +0000 Merge branch 'master' into version1.8 ----------------------------------------------------------------------- Summary of changes: release-notes/1.8/summary-1.8.0.txt | 79 +++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 release-notes/1.8/summary-1.8.0.txt hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-02-28 00:57:33
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, master has been updated via 2438ceb37ad73d40892f2d6ed616ffa5bca87add (commit) from b7e082a1efee6f7375c6ce6f81f65fbfd8274c35 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: release-notes/1.8/summary-1.8.0.txt | 79 +++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 release-notes/1.8/summary-1.8.0.txt hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-02-28 00:32:36
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 495426ce2973c1c072b2b3b8a2a8089a1ed50728 (commit) from b7e082a1efee6f7375c6ce6f81f65fbfd8274c35 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 495426ce2973c1c072b2b3b8a2a8089a1ed50728 Author: Paul Gregory <pgr...@aq...> Date: Tue Feb 28 00:32:08 2012 +0000 Update version to 1.8 for release. diff --git a/CMakeLists.txt b/CMakeLists.txt index f50a4be..af86c92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ endif() # some packaging variables are set in the platform-specific config files, and # these version variables are potentially used there. set(VERSION_MAJOR 1) -set(VERSION_MINOR 7) +set(VERSION_MINOR 8) set(VERSION_BUILD 0) set(SCM_REVISION 0) # "?" ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-02-28 00:32:34
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, master has been updated via b7e082a1efee6f7375c6ce6f81f65fbfd8274c35 (commit) via 68ee42b29c4522056d5ab7f786b0066841eafbbd (commit) from 2d8cbb102e7b8482fb2c32b3832f087758c46598 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: distribution/CMakeLists.txt | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-02-28 00:14:51
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via b7e082a1efee6f7375c6ce6f81f65fbfd8274c35 (commit) from 68ee42b29c4522056d5ab7f786b0066841eafbbd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b7e082a1efee6f7375c6ce6f81f65fbfd8274c35 Author: Paul Gregory <pgr...@aq...> Date: Tue Feb 28 00:13:32 2012 +0000 MacOSX package fix. * Was still using the old deprecated packaging scripts, now uses pure CPack bundle support. diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index 00368cd..1ffe905 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -47,7 +47,7 @@ elseif(APPLE) set(CPACK_GENERATOR "Bundle") set(CPACK_SOURCE_GENERATOR "TGZ") # Custom OS X Bundle - add_subdirectory(macosx/bundle) + #add_subdirectory(macosx/bundle) elseif(UNIX) set(CPACK_SOURCE_PACKAGE_FILE_NAME @@ -112,7 +112,7 @@ include(CPack) # is add_subdirectory'd last, and I arbitrarily choose piqsl, as if QT is enabled, # all QT apps are build anyway at the moment. if(AQSIS_USE_QT) - set(DIRS "${QT_BINARY_DIR}") + set(DIRS "${QT_BINARY_DIR}" "${Boost_LIBRARY_DIRS}") set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") INSTALL(CODE " include(BundleUtilities) ----------------------------------------------------------------------- Summary of changes: distribution/CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-02-27 22:21:39
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been updated via 68ee42b29c4522056d5ab7f786b0066841eafbbd (commit) from 2d8cbb102e7b8482fb2c32b3832f087758c46598 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 68ee42b29c4522056d5ab7f786b0066841eafbbd Author: Paul Gregory <pgr...@aq...> Date: Mon Feb 27 22:19:55 2012 +0000 Add bundle utilities to the installation. * This definitely ensures that the required Qt dlls are included in the install and package. * Should work on MacOSX too, need to confirm that. diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index fa27121..00368cd 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -102,3 +102,20 @@ set(CPACK_SOURCE_IGNORE_FILES ) include(CPack) + +# This is a bit of a hack. +# The fixup_bundle macro will 'fixup' all exes and dlls in the specified folder, +# but you must specify an executable as a start point. I tried doing it for each +# executable, but it then 'fixes' up every executable each time, which is time +# consuming and results in the same thing. +# By moving it here, we guarantee it happens after the files are installed, as this +# is add_subdirectory'd last, and I arbitrarily choose piqsl, as if QT is enabled, +# all QT apps are build anyway at the moment. +if(AQSIS_USE_QT) + set(DIRS "${QT_BINARY_DIR}") + set(APPS "\${CMAKE_INSTALL_PREFIX}/${BINDIR}/piqsl${CMAKE_EXECUTABLE_SUFFIX}") + INSTALL(CODE " + include(BundleUtilities) + fixup_bundle(\"${APPS}\" \"\" \"${DIRS}\") + " COMPONENT main) +endif() ----------------------------------------------------------------------- Summary of changes: distribution/CMakeLists.txt | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-02-26 19:17:23
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, version1.8 has been created at 2d8cbb102e7b8482fb2c32b3832f087758c46598 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- Aqsis Renderer |
From: Paul G. <pgr...@us...> - 2012-02-26 14:38:04
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Aqsis Renderer". The branch, master has been updated via 2d8cbb102e7b8482fb2c32b3832f087758c46598 (commit) from 88f3090162632d1a11db8e25f774491545f494e5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2d8cbb102e7b8482fb2c32b3832f087758c46598 Author: Paul Gregory <pgr...@aq...> Date: Sun Feb 26 14:34:01 2012 +0000 Minor fixes to latest build changes. * Add zlib include directory when building with libpng. * Try again with the annoying header include conditions. diff --git a/libs/tex/CMakeLists.txt b/libs/tex/CMakeLists.txt index 40362d8..15f9f60 100644 --- a/libs/tex/CMakeLists.txt +++ b/libs/tex/CMakeLists.txt @@ -25,7 +25,7 @@ if(AQSIS_USE_OPENEXR) list(APPEND linklibs ${AQSIS_OPENEXR_LIBRARIES}) endif() if(AQSIS_USE_PNG) - include_directories(${AQSIS_PNG_INCLUDE_DIR}) + include_directories(${AQSIS_PNG_INCLUDE_DIR} ${AQSIS_ZLIB_INCLUDE_DIR}) add_definitions(-DAQSIS_USE_PNG) endif() list(APPEND linklibs ${AQSIS_ZLIB_LIBRARIES}) diff --git a/tools/eqsl/eqsl.cpp b/tools/eqsl/eqsl.cpp index 414870f..0b6e211 100644 --- a/tools/eqsl/eqsl.cpp +++ b/tools/eqsl/eqsl.cpp @@ -34,7 +34,7 @@ #include <cstdlib> #include <functional> -#if defined AQSIS_SYSTEM_WIN32 && !defined AQSIS_COMPILER_GCC +#if !defined AQSIS_SYSTEM_WIN32 # include <signal.h> # include <sys/wait.h> # include <sys/types.h> ----------------------------------------------------------------------- Summary of changes: libs/tex/CMakeLists.txt | 2 +- tools/eqsl/eqsl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Aqsis Renderer |