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

- use swprintf() now that it's available

Browse Source 
- adjust include path

from pascal stumpf (MAINTAINER)
This commit is contained in:
jasper 2011-05-04 11:33:16 +00:00
parent 0e68c15c20
commit 21b246857c
5 changed files with 1535 additions and 1664 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
x11/irrlicht/Makefile
View File

@ -3,6 +3,8 @@
COMMENT = fast, real time 3D engine COMMENT = fast, real time 3D engine
DISTNAME = irrlicht-1.7.2 DISTNAME = irrlicht-1.7.2
REVISION = 0
SO_VERSION = 0.0 SO_VERSION = 0.0
SHARED_LIBS = Irrlicht ${SO_VERSION} SHARED_LIBS = Irrlicht ${SO_VERSION}
@ -18,7 +20,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes PERMIT_DISTFILES_FTP = Yes
WANTLIB += GL Xxf86vm bz2 jpeg m png stdc++ z WANTLIB += GL Xxf86vm bz2 jpeg m png stdc++>=51.0 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=irrlicht/} MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=irrlicht/}
@ -68,34 +70,34 @@ pre-patch:
ninja\ animation\ ranges.txt opengl.{frag,psh,vert,vsh} ninja\ animation\ ranges.txt opengl.{frag,psh,vert,vsh}
do-install: do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/${PORTNAME} ${INSTALL_DATA_DIR} ${PREFIX}/include/irrlicht
${INSTALL_DATA} ${WRKDIST}/include/*.h ${PREFIX}/include/${PORTNAME}/ ${INSTALL_DATA} ${WRKDIST}/include/*.h ${PREFIX}/include/irrlicht/
${INSTALL_DATA} ${WRKDIST}/lib/OpenBSD/libIrrlicht.a ${PREFIX}/lib/ ${INSTALL_DATA} ${WRKDIST}/lib/OpenBSD/libIrrlicht.a ${PREFIX}/lib/
${INSTALL_DATA} ${WRKDIST}/lib/OpenBSD/libIrrlicht.so.${LIBIrrlicht_VERSION} \ ${INSTALL_DATA} ${WRKDIST}/lib/OpenBSD/libIrrlicht.so.${LIBIrrlicht_VERSION} \
${PREFIX}/lib/ ${PREFIX}/lib/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PORTNAME} ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/irrlicht
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PORTNAME}/doc ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/irrlicht/doc
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PORTNAME}/doc/html ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/irrlicht/doc/html
cd ${WRKDIST}/doc && ${INSTALL_DATA} aesGladman.txt bzip2-license.txt \ cd ${WRKDIST}/doc && ${INSTALL_DATA} aesGladman.txt bzip2-license.txt \
index.html readme.txt upgrade-guide.txt \ index.html readme.txt upgrade-guide.txt \
${PREFIX}/share/doc/${PORTNAME}/doc ${PREFIX}/share/doc/irrlicht/doc
find ${WRKDIST}/doc/html -type f -exec ${INSTALL_DATA} "{}" \ find ${WRKDIST}/doc/html -type f -exec ${INSTALL_DATA} "{}" \
${PREFIX}/share/doc/${PORTNAME}/doc/html/ \; ${PREFIX}/share/doc/irrlicht/doc/html/ \;
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PORTNAME}/media ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/irrlicht/media
find ${WRKDIST}/media -type f -exec ${INSTALL_DATA} "{}" \ find ${WRKDIST}/media -type f -exec ${INSTALL_DATA} "{}" \
${PREFIX}/share/doc/${PORTNAME}/media/ \; ${PREFIX}/share/doc/irrlicht/media/ \;
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PORTNAME}/examples ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/irrlicht/examples
${INSTALL_DATA} ${WRKDIST}/examples/Makefile \ ${INSTALL_DATA} ${WRKDIST}/examples/Makefile \
${PREFIX}/share/doc/${PORTNAME}/examples/ ${PREFIX}/share/doc/irrlicht/examples/
. for DIR in ${EXAMPLEDIRS} . for DIR in ${EXAMPLEDIRS}
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PORTNAME}/examples/${DIR} ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/irrlicht/examples/${DIR}
find ${WRKDIST}/examples/${DIR} -type f \( -name "*.cpp" -or -name \ find ${WRKDIST}/examples/${DIR} -type f \( -name "*.cpp" -or -name \
"*.h" -or -name Makefile \) -exec ${INSTALL_DATA} "{}" \ "*.h" -or -name Makefile \) -exec ${INSTALL_DATA} "{}" \
${PREFIX}/share/doc/${PORTNAME}/examples/${DIR}/ \; ${PREFIX}/share/doc/irrlicht/examples/${DIR}/ \;
. endfor . endfor

14
x11/irrlicht/patches/patch-source_Irrlicht_CAttributeImpl_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-source_Irrlicht_CAttributeImpl_h,v 1.1.1.1 2011/05/04 09:41:50 jasper Exp $
--- source/Irrlicht/CAttributeImpl.h.orig Sun Dec 26 20:30:16 2010
+++ source/Irrlicht/CAttributeImpl.h Sun Dec 26 20:30:18 2010
@@ -1937,8 +1937,8 @@ class CUserPointerAttribute : public IAttribute (publi
virtual core::stringw getStringW()
{
- wchar_t buf[32];
- swprintf(buf, 32, L"%p", Value);
+ char buf[32];
+ snprintf(buf, 32, (const char *)"0x%x", *(int*)(&Value));
return core::stringw(buf);
}

17
x11/irrlicht/patches/patch-source_Irrlicht_CGUISpinBox_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-source_Irrlicht_CGUISpinBox_cpp,v 1.1.1.1 2011/05/04 09:41:50 jasper Exp $
--- source/Irrlicht/CGUISpinBox.cpp.orig Sun Dec 26 20:30:18 2010
+++ source/Irrlicht/CGUISpinBox.cpp Sun Dec 26 20:30:19 2010
@@ -109,10 +109,10 @@ IGUIEditBox* CGUISpinBox::getEditBox() const
void CGUISpinBox::setValue(f32 val)
{
- wchar_t str[100];
+ char str[100];
- swprintf(str, 99, FormatString.c_str(), val);
- EditBox->setText(str);
+ snprintf(str, 99, (const char*)FormatString.c_str(), val);
+ EditBox->setText((wchar_t *)str);
verifyValueRange();
}

102
x11/irrlicht/patches/patch-source_Irrlicht_CZipReader_cpp
View File

@ -1,102 +0,0 @@
$OpenBSD: patch-source_Irrlicht_CZipReader_cpp,v 1.1.1.1 2011/05/04 09:41:50 jasper Exp $
--- source/Irrlicht/CZipReader.cpp.orig Sun Dec 26 20:30:20 2010
+++ source/Irrlicht/CZipReader.cpp Sun Dec 26 20:30:23 2010
@@ -522,7 +522,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
//99 - AES encryption, WinZip 9
const SZipFileEntry &e = FileInfo[Files[index].ID];
- wchar_t buf[64];
+ char buf[64];
s16 actualCompressionMethod=e.header.CompressionMethod;
IReadFile* decrypted=0;
u8* decryptedBuf=0;
@@ -621,7 +621,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
c8* pBuf = new c8[ uncompressedSize ];
if (!pBuf)
{
- swprintf ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char*)"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
if (decrypted)
decrypted->drop();
@@ -634,7 +634,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
pcData = new u8[decryptedSize];
if (!pcData)
{
- swprintf ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char*)"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
delete [] pBuf;
return 0;
@@ -675,7 +675,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
if (err != Z_OK)
{
- swprintf ( buf, 64, L"Error decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char *)"Error decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
delete [] pBuf;
return 0;
@@ -695,7 +695,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
c8* pBuf = new c8[ uncompressedSize ];
if (!pBuf)
{
- swprintf ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char *)"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
if (decrypted)
decrypted->drop();
@@ -708,7 +708,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
pcData = new u8[decryptedSize];
if (!pcData)
{
- swprintf ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char *)"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
delete [] pBuf;
return 0;
@@ -746,7 +746,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
if (err != BZ_OK)
{
- swprintf ( buf, 64, L"Error decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char *)"Error decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
delete [] pBuf;
return 0;
@@ -767,7 +767,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
c8* pBuf = new c8[ uncompressedSize ];
if (!pBuf)
{
- swprintf ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char *)"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
if (decrypted)
decrypted->drop();
@@ -780,7 +780,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
pcData = new u8[decryptedSize];
if (!pcData)
{
- swprintf ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char *)"Not enough memory for decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
delete [] pBuf;
return 0;
@@ -807,7 +807,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
if (err != SZ_OK)
{
- swprintf ( buf, 64, L"Error decompressing %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char *)"Error decompressing %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
delete [] pBuf;
return 0;
@@ -825,7 +825,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
os::Printer::log("Decryption support not enabled. File cannot be read.", ELL_ERROR);
return 0;
default:
- swprintf ( buf, 64, L"file has unsupported compression method. %s", Files[index].FullName.c_str() );
+ snprintf ( buf, 64, (const char *)"file has unsupported compression method. %s", Files[index].FullName.c_str() );
os::Printer::log( buf, ELL_ERROR);
return 0;
};

3036
x11/irrlicht/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff