cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Unbreak build by removing patches added in the previous commit. The port

Browse Source 
has been updated already and builds fine with boost-1.48.0 [1]

- While here, add _build suffix for some Qt4 components to avoid
  run dependency on them. I've bumped PORTREVISION in the previous commit
  so no changes this time.

Reported by:	pav/pointyhat [1]
This commit is contained in:
Max Brazhnikov 2012-05-19 17:49:17 +00:00
parent 813ceb9846
commit 0bf61043f3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=296968
16 changed files with 1 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/aqsis/Makefile
View File

@ -33,7 +33,7 @@ USE_CMAKE= yes
CMAKE_OUTSOURCE= yes
CMAKE_VERBOSE= yes
USE_QT_VER= 4
QT_COMPONENTS= opengl qmake moc rcc uic
QT_COMPONENTS= opengl qmake_build moc_build rcc_build uic_build
PLIST_SUB+= LIBVERS=${PORTVERSION:R}
INSTALLS_ICONS= yes

44
graphics/aqsis/files/patch-libs-core-api-ri.cpp
View File

@ -1,44 +0,0 @@
--- libs/core/api/ri.cpp.orig 2012-02-20 18:29:00.000000000 +0300
+++ libs/core/api/ri.cpp 2012-02-20 18:29:35.000000000 +0300
@@ -488,12 +488,12 @@
// Read in the system configuration file.
boost::filesystem::path systemRcPath = rootPath / AQSIS_XSTR(AQSIS_MAIN_CONFIG_NAME);
- std::ifstream rcFile(systemRcPath.file_string().c_str(), std::ios::binary);
+ std::ifstream rcFile(systemRcPath.string().c_str(), std::ios::binary);
if(rcFile)
{
Aqsis::log() << info
<< "Reading system config \"" << systemRcPath << "\"\n";
- QGetRenderContext()->parseRibStream(rcFile, systemRcPath.file_string());
+ QGetRenderContext()->parseRibStream(rcFile, systemRcPath.string());
rcFile.close();
}
else
@@ -508,22 +508,22 @@
boost::filesystem::path homeRcPath = homePath;
homeRcPath /= ".aqsisrc";
- std::ifstream rcFile(homeRcPath.file_string().c_str(), std::ios::binary);
+ std::ifstream rcFile(homeRcPath.string().c_str(), std::ios::binary);
if(rcFile)
{
Aqsis::log() << info << "Reading user config \"" << homeRcPath << "\"\n";
- QGetRenderContext()->parseRibStream(rcFile, homeRcPath.file_string());
+ QGetRenderContext()->parseRibStream(rcFile, homeRcPath.string());
}
else
{
boost::filesystem::path homeRcPath2 = homePath;
homeRcPath2 /= "_aqsisrc";
- std::ifstream rcFile(homeRcPath2.file_string().c_str(), std::ios::binary);
+ std::ifstream rcFile(homeRcPath2.string().c_str(), std::ios::binary);
if(rcFile)
{
Aqsis::log() << info << "Reading user config \"" << homeRcPath2 << "\"\n";
- QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.file_string());
+ QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.string());
}
else
{

11
graphics/aqsis/files/patch-libs-core-ddmanager-ddmanager.cpp
View File

@ -1,11 +0,0 @@
--- libs/core/ddmanager/ddmanager.cpp.orig 2012-02-20 18:31:11.000000000 +0300
+++ libs/core/ddmanager/ddmanager.cpp 2012-02-20 18:31:27.000000000 +0300
@@ -349,7 +349,7 @@
}
// Load the dynamic object and locate the relevant symbols.
- CqString strDriverPathAndFile = displayPath.file_string();
+ CqString strDriverPathAndFile = displayPath.string();
m_DriverHandle = dspyPlugin.SimpleDLOpen( &strDriverPathAndFile );
if ( m_DriverHandle != NULL )
{

11
graphics/aqsis/files/patch-libs-core-geometry-blobby.cpp
View File

@ -1,11 +0,0 @@
--- libs/core/geometry/blobby.cpp.orig 2012-02-20 18:32:53.000000000 +0300
+++ libs/core/geometry/blobby.cpp 2012-02-20 18:33:07.000000000 +0300
@@ -392,7 +392,7 @@
try
{
CqString fullName = QGetRenderContext()->poptCurrent()
- ->findRiFile(dboName, "procedural").file_string();
+ ->findRiFile(dboName, "procedural").string();
DBO_handle = DBO.SimpleDLOpen(&fullName);
}
catch(XqInvalidFile& /*e*/)

20
graphics/aqsis/files/patch-libs-core-geometry-procedural.cpp
View File

@ -1,20 +0,0 @@
--- libs/core/geometry/procedural.cpp.orig 2012-02-20 18:54:32.000000000 +0300
+++ libs/core/geometry/procedural.cpp 2012-02-20 18:54:50.000000000 +0300
@@ -155,7 +155,7 @@
+ CqString ("\" in current searchpath");
return;
}
- CqString strRealName = dsoPath.file_string();
+ CqString strRealName = dsoPath.string();
void *handle = DLOpen( &strRealName );
if ( ( m_ppvfcts = ( void * ( * ) ( char * ) ) DLSym(handle, &strConver) ) == NULL )
@@ -315,7 +315,7 @@
AQSIS_THROW_XQERROR(XqValidation, EqE_BadToken, "program name not present");
// Attempt to find the program in the procedural path
std::string progName = QGetRenderContext()->poptCurrent()
- ->findRiFileNothrow(argv[0], "procedural").file_string();
+ ->findRiFileNothrow(argv[0], "procedural").string();
if(progName.empty())
{
progName = argv[0];

11
graphics/aqsis/files/patch-libs-core-renderer.cpp
View File

@ -1,11 +0,0 @@
--- libs/core/renderer.cpp.orig 2012-02-20 18:46:39.000000000 +0300
+++ libs/core/renderer.cpp 2012-02-20 18:46:49.000000000 +0300
@@ -1195,7 +1195,7 @@
if(shaderFile)
{
Aqsis::log() << info << "Loading shader \"" << strName
- << "\" from file \"" << shaderPath.file_string()
+ << "\" from file \"" << shaderPath.string()
<< "\"" << std::endl;
std::string dsoPath;

20
graphics/aqsis/files/patch-libs-core-texturing_old-texturemap_old.cpp
View File

@ -1,20 +0,0 @@
--- libs/core/texturing_old/texturemap_old.cpp.orig 2012-02-20 18:39:35.000000000 +0300
+++ libs/core/texturing_old/texturemap_old.cpp 2012-02-20 18:39:50.000000000 +0300
@@ -578,7 +578,7 @@
}
// Now open it as a tiff file.
- m_pImage = TIFFOpen( imagePath.file_string().c_str(), "r" );
+ m_pImage = TIFFOpen( imagePath.string().c_str(), "r" );
}
if ( m_pImage )
@@ -1090,7 +1090,7 @@
Aqsis::log() << error << "Cannot open texture file \"" << m_strName.c_str() << "\"" << std::endl;
return ;
}
- m_pImage = TIFFOpen(imagePath.file_string().c_str(), "r" );
+ m_pImage = TIFFOpen(imagePath.string().c_str(), "r" );
if ( m_pImage )
{

18
graphics/aqsis/files/patch-libs-shadervm-dsoshadeops.cpp
View File

@ -1,18 +0,0 @@
--- libs/shadervm/dsoshadeops.cpp.orig 2012-02-20 18:12:04.000000000 +0300
+++ libs/shadervm/dsoshadeops.cpp 2012-02-20 18:12:22.000000000 +0300
@@ -101,13 +101,13 @@
// If the path points to a directory, we add each library in the
// named directory to the list of DSO candidates.
std::vector<std::string> files = Glob(
- ((*path)/"*" SHARED_LIBRARY_SUFFIX).file_string() );
+ ((*path)/"*" SHARED_LIBRARY_SUFFIX).string() );
m_DSOPathList.insert(m_DSOPathList.end(), files.begin(), files.end());
}
else
{
// else add the file itself.
- m_DSOPathList.push_back(path->file_string());
+ m_DSOPathList.push_back(path->string());
}
}
catch(boost::filesystem::filesystem_error& /*e*/)

11
graphics/aqsis/files/patch-libs-tex-io-exrinputfile.cpp
View File

@ -1,11 +0,0 @@
--- libs/tex/io/exrinputfile.cpp.orig 2012-02-20 18:09:25.000000000 +0300
+++ libs/tex/io/exrinputfile.cpp 2012-02-20 18:09:41.000000000 +0300
@@ -163,7 +163,7 @@
{
try
{
- m_exrFile.reset(new Imf::InputFile(fileName.file_string().c_str()));
+ m_exrFile.reset(new Imf::InputFile(fileName.string().c_str()));
}
catch(Iex::BaseExc &e)
{

11
graphics/aqsis/files/patch-libs-tex-io-magicnumber.cpp
View File

@ -1,11 +0,0 @@
--- libs/tex/io/magicnumber.cpp.orig 2012-02-20 18:01:58.000000000 +0300
+++ libs/tex/io/magicnumber.cpp 2012-02-20 18:02:12.000000000 +0300
@@ -59,7 +59,7 @@
EqImageFileType guessFileType(const boostfs::path& fileName)
{
- std::ifstream inFile(fileName.file_string().c_str());
+ std::ifstream inFile(fileName.string().c_str());
if(!inFile)
{
AQSIS_THROW_XQERROR(XqInvalidFile, EqE_NoFile, "Cannot open file \""

11
graphics/aqsis/files/patch-libs-tex-io-tiffdirhandle.cpp
View File

@ -1,11 +0,0 @@
--- libs/tex/io/tiffdirhandle.cpp.orig 2012-02-20 18:04:48.000000000 +0300
+++ libs/tex/io/tiffdirhandle.cpp 2012-02-20 18:05:02.000000000 +0300
@@ -727,7 +727,7 @@
CqTiffFileHandle::CqTiffFileHandle(const boostfs::path& fileName, const char* openMode)
: m_fileName(fileName),
- m_tiffPtr(TIFFOpen(fileName.file_string().c_str(), openMode), safeTiffClose),
+ m_tiffPtr(TIFFOpen(fileName.string().c_str(), openMode), safeTiffClose),
m_isInputFile(openMode[0] == 'r'),
m_currDir(0)
{

11
graphics/aqsis/files/patch-libs-tex-io-zinputfile.cpp
View File

@ -1,11 +0,0 @@
--- libs/tex/io/zinputfile.cpp.orig 2012-02-20 18:08:03.000000000 +0300
+++ libs/tex/io/zinputfile.cpp 2012-02-20 18:08:19.000000000 +0300
@@ -41,7 +41,7 @@
CqZInputFile::CqZInputFile(const boostfs::path& fileName)
: m_header(),
m_fileName(fileName),
- m_fileStream(fileName.file_string().c_str(), std::ios::in | std::ios::binary),
+ m_fileStream(fileName.string().c_str(), std::ios::in | std::ios::binary),
m_dataBegin(0)
{
if(!m_fileStream.is_open())

13
graphics/aqsis/files/patch-libs-tex-maketexture-maketexture.cpp
View File

@ -1,13 +0,0 @@
--- libs/tex/maketexture/maketexture.cpp.orig 2012-02-20 18:10:38.000000000 +0300
+++ libs/tex/maketexture/maketexture.cpp 2012-02-20 18:10:56.000000000 +0300
@@ -335,8 +335,8 @@
{
inFileRealName = inFileName.string() + ".tif";
TqInt bakeRes = static_cast<TqInt>(paramList.find<TqFloat>("bake", 256));
- bakeToTiff(inFileName.file_string().c_str(),
- inFileRealName.file_string().c_str(), bakeRes);
+ bakeToTiff(inFileName.string().c_str(),
+ inFileRealName.string().c_str(), bakeRes);
}
// Open the input file

11
graphics/aqsis/files/patch-libs-utils_plugins.cpp
View File

@ -1,11 +0,0 @@
--- libs/util/plugins.cpp.orig 2009-12-31 13:32:11.000000000 +0100
+++ libs/util/plugins.cpp 2009-12-31 13:32:32.000000000 +0100
@@ -170,7 +170,7 @@
LocalFree( lpMsgBuf );
#else //not defined AQSIS_SYSTEM_MACOSX
- char* error = dlerror();
+ const char* error = dlerror();
if( error )
errorlog = error;
#endif

13
graphics/aqsis/files/patch-tools-piqsl-displayserverimage.cpp
View File

@ -1,13 +0,0 @@
--- tools/piqsl/displayserverimage.cpp.orig 2012-02-20 18:42:02.000000000 +0300
+++ tools/piqsl/displayserverimage.cpp 2012-02-20 18:42:18.000000000 +0300
@@ -98,8 +98,8 @@
++index;
}
- setFilename(uniquePath.file_string());
- saveToFile(uniquePath.file_string());
+ setFilename(uniquePath.string());
+ saveToFile(uniquePath.string());
}

11
graphics/aqsis/files/patch-tools-piqsl-piqslmainwindow.cpp
View File

@ -1,11 +0,0 @@
--- tools/piqsl/piqslmainwindow.cpp.orig 2012-02-20 18:43:33.000000000 +0300
+++ tools/piqsl/piqslmainwindow.cpp 2012-02-20 18:44:04.000000000 +0300
@@ -186,7 +186,7 @@
char* filename = fl_file_chooser("Load Image", "All Supported Files (*.{tif,tiff,exr,env,tx,tex,shad,zfile,sm})\tTIFF Files (*.{tif,tiff})\tOpenEXR Files (*.exr)\tTeqser Files (*.{env,tx,tex})\tShadow Files (*.{shad,zfile,sm})", "");
if(filename)
{
- std::string name = boost::filesystem::path(filename).leaf();
+ std::string name = boost::filesystem::path(filename).leaf().string();
loadImageToCurrentBook(name, filename);
updateImageList();
}