Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: haikuports/haikuports
Choose a Base Repository
haikuports/haikuports
11thdimension0/haikuports
3541/haikuports
Ace002/haikuports
AetherealLlama/haikuports
Akujiism/haikuports
AlexanderLusth/haikuports
AlwaysLivid/haikuports
Aulene2/haikuports
Barrett17/haikuports
BeOSRefugee/haikuports
Begasus/haikuports
BenjaminAmos/haikuports
CodeforEvolution/haikuports
Crestwave/haikuports
CrisisGamer007/haikuports
Damillora/haikuports
DarkmatterVale/haikuports
DarkmooN420/haikuports
DethroTull/haikuports
DeweyTaylor/haikuports
EppMouse/haikuports
Giova84/haikuports
GodofDragons/haikuports
HelgeCPH/haikuports
IuliaDragoiu/haikuports
JeffroMF/haikuports
Juliush0604/haikuports
KapiX/haikuports
Knezzen/haikuports
Lan72/haikuports
Lesliemanzanerao/haikuports
LordOfDragons/haikuports
Max-Might/haikuports
Nikolay0054/haikuports
Olayemi12/haikuports
Oyami-Srk/haikuports
Paradoxianer/haikuports
Perelandra0x309/haikuports
R167/haikuports
R4H33M/haikuports
Ra-V2/haikuports
RobertoCMCosta/haikuports
Serentty/haikuports
Sudoxo/haikuports
Sylvain78/haikuports
TURX/gci2019-haikuports
Tunas1337/haikuports
TwoFX/haikuports
Val6789/haikuports
Vidrep/haikuports
Vrondir/haikuports
X547/haikuports
adamfowleruk/haikuports
agmsmith/haikuports
ahitech/haikuports
alaviss/haikuports
aligator/haikuports
alphaonex86/haikuports
ambroff/haikuports
andimachovec/haikuports
anirudhjain75/haikuports
annagrram/haikuports
areyoudeveloper/haikuports
arfonzocoward/haikuports
arnavbhatt288/haikuports
bach5000/haikuports
batburger/haikuports
bbjimmy/haikuports
bgroff/haikuports
bitigchi/haikuports
cb88/haikuports
chinopit18cm/haikuports
chris100pher/haikuports
citrix123/haikuports
cnelmortimer/haikuports
dacianf/haikuports
dalmemail/haikuports-gnusocialshell
dash102/haikuports
dasouth1/haikuports
dcatt-haiku/haikuports
devopsdilthar/haikuports
digib0y/haikuports
diversys/haikuports
dominikstrak2001/haikuports
dragonmaus/haikuports
drawkula/haikuports
eddrda/haikuports
ekusaimark/haikuports
emily0618/haikuports
eniehack/haikuports
enzo1982/haikuports
extrowerk/haikuports
freddietilley/haikuports
fun-alex-alex2006hw/haikuports
gci2017/haikuports
gl00my/haikuports
gouchi/haikuports
hako/haikuports
hannahyp/haikuports
hanya/haikuports
harsh-98/haikuports
hometue/haikuports
humdingerb/haikuports
i80and/haikuports
iam-git/haikuports
ivmai/haikuports
j-koreth/haikuports
jackburton79/haikuports
jamesdtyler/haikuports
jarekpelczar/haikuports
jessicah/haikuports
jmairboeck/haikuports
jrabbit/haikuports-tree
jsteinaker/haikuports
khallebal/haikuports
kikadf/haikuports
koletzky/haikuports
korli/haikuports
ksterker/haikuports
kwyxz/haikuports
lavadew/haikuports
linok9757/haikuports
localanu/haikuports
long8a2hgybvn/haikuports
lorglas/haikuports
luka177/haikuports
m199/haikuports
mangoes1024/haikuports
mauritslamers/haikuports
mazbrili/haikuports
mgubi/haikuports
moochris/haikuports
netpositive36/haikuports
netroby/haikuports
nielx/haikuports
nikolaszimmermann/haikuports
nmelnick/haikuports
ocerman/haikuports
oco27/haikuports
ohnx/haikuports
osomat123/haikuports
owenca/haikuports
pgrobelniak/haikuports
phoudoin/haikuports
phw/haikuports
picapi/haikuports
pisculichi/haikuports
pjht/haikuports
probonopd/haikuports
projectgenesis/haikuports
przemub/haikuports
punsith/haikuports
raefaldhia/haikuports
rainlance/haikuports
rbarraud/haikuports
redsPL/haikuports
return/haikuports
richienyhus/haikuports
robcsi/haikuports
roired/haikuports
roptat/haikuports
saswatpp/haikuports
scottmc/haikuports
sfanxiang/haikuports
sikmir/haikuports
skykinetic/haikuports
snetting/haikuports
soakbot/haikuports
stenstorp/haikuports
tangya3158613488/haikuports
taosxx/haikuports
tckmn/haikuports
tehnick/haikuports
th-otto/haikuports
theclue/haikuports
theunrealgeek/haikuports
tidux/haikuports
timfel/haikuports
trungnt2910/haikuports
tsimblist/haikuports
tsundeoku/haikuports
tts2k/haikuports
unspacyar/haikuports
vanishakesswani/haikuports
vegardw/haikuports
vickykage/haikuports
waddlesplash/haikuports
walkerlala/haikuports
whitone/haikuports
win8linux/haikuports
zooter68/haikuports
zzzzzzzzz/haikuports
Nothing to show
base: 67e05bfc2c74
head repository: haikuports/haikuports
Choose a Head Repository
haikuports/haikuports
11thdimension0/haikuports
3541/haikuports
Ace002/haikuports
AetherealLlama/haikuports
Akujiism/haikuports
AlexanderLusth/haikuports
AlwaysLivid/haikuports
Aulene2/haikuports
Barrett17/haikuports
BeOSRefugee/haikuports
Begasus/haikuports
BenjaminAmos/haikuports
CodeforEvolution/haikuports
Crestwave/haikuports
CrisisGamer007/haikuports
Damillora/haikuports
DarkmatterVale/haikuports
DarkmooN420/haikuports
DethroTull/haikuports
DeweyTaylor/haikuports
EppMouse/haikuports
Giova84/haikuports
GodofDragons/haikuports
HelgeCPH/haikuports
IuliaDragoiu/haikuports
JeffroMF/haikuports
Juliush0604/haikuports
KapiX/haikuports
Knezzen/haikuports
Lan72/haikuports
Lesliemanzanerao/haikuports
LordOfDragons/haikuports
Max-Might/haikuports
Nikolay0054/haikuports
Olayemi12/haikuports
Oyami-Srk/haikuports
Paradoxianer/haikuports
Perelandra0x309/haikuports
R167/haikuports
R4H33M/haikuports
Ra-V2/haikuports
RobertoCMCosta/haikuports
Serentty/haikuports
Sudoxo/haikuports
Sylvain78/haikuports
TURX/gci2019-haikuports
Tunas1337/haikuports
TwoFX/haikuports
Val6789/haikuports
Vidrep/haikuports
Vrondir/haikuports
X547/haikuports
adamfowleruk/haikuports
agmsmith/haikuports
ahitech/haikuports
alaviss/haikuports
aligator/haikuports
alphaonex86/haikuports
ambroff/haikuports
andimachovec/haikuports
anirudhjain75/haikuports
annagrram/haikuports
areyoudeveloper/haikuports
arfonzocoward/haikuports
arnavbhatt288/haikuports
bach5000/haikuports
batburger/haikuports
bbjimmy/haikuports
bgroff/haikuports
bitigchi/haikuports
cb88/haikuports
chinopit18cm/haikuports
chris100pher/haikuports
citrix123/haikuports
cnelmortimer/haikuports
dacianf/haikuports
dalmemail/haikuports-gnusocialshell
dash102/haikuports
dasouth1/haikuports
dcatt-haiku/haikuports
devopsdilthar/haikuports
digib0y/haikuports
diversys/haikuports
dominikstrak2001/haikuports
dragonmaus/haikuports
drawkula/haikuports
eddrda/haikuports
ekusaimark/haikuports
emily0618/haikuports
eniehack/haikuports
enzo1982/haikuports
extrowerk/haikuports
freddietilley/haikuports
fun-alex-alex2006hw/haikuports
gci2017/haikuports
gl00my/haikuports
gouchi/haikuports
hako/haikuports
hannahyp/haikuports
hanya/haikuports
harsh-98/haikuports
hometue/haikuports
humdingerb/haikuports
i80and/haikuports
iam-git/haikuports
ivmai/haikuports
j-koreth/haikuports
jackburton79/haikuports
jamesdtyler/haikuports
jarekpelczar/haikuports
jessicah/haikuports
jmairboeck/haikuports
jrabbit/haikuports-tree
jsteinaker/haikuports
khallebal/haikuports
kikadf/haikuports
koletzky/haikuports
korli/haikuports
ksterker/haikuports
kwyxz/haikuports
lavadew/haikuports
linok9757/haikuports
localanu/haikuports
long8a2hgybvn/haikuports
lorglas/haikuports
luka177/haikuports
m199/haikuports
mangoes1024/haikuports
mauritslamers/haikuports
mazbrili/haikuports
mgubi/haikuports
moochris/haikuports
netpositive36/haikuports
netroby/haikuports
nielx/haikuports
nikolaszimmermann/haikuports
nmelnick/haikuports
ocerman/haikuports
oco27/haikuports
ohnx/haikuports
osomat123/haikuports
owenca/haikuports
pgrobelniak/haikuports
phoudoin/haikuports
phw/haikuports
picapi/haikuports
pisculichi/haikuports
pjht/haikuports
probonopd/haikuports
projectgenesis/haikuports
przemub/haikuports
punsith/haikuports
raefaldhia/haikuports
rainlance/haikuports
rbarraud/haikuports
redsPL/haikuports
return/haikuports
richienyhus/haikuports
robcsi/haikuports
roired/haikuports
roptat/haikuports
saswatpp/haikuports
scottmc/haikuports
sfanxiang/haikuports
sikmir/haikuports
skykinetic/haikuports
snetting/haikuports
soakbot/haikuports
stenstorp/haikuports
tangya3158613488/haikuports
taosxx/haikuports
tckmn/haikuports
tehnick/haikuports
th-otto/haikuports
theclue/haikuports
theunrealgeek/haikuports
tidux/haikuports
timfel/haikuports
trungnt2910/haikuports
tsimblist/haikuports
tsundeoku/haikuports
tts2k/haikuports
unspacyar/haikuports
vanishakesswani/haikuports
vegardw/haikuports
vickykage/haikuports
waddlesplash/haikuports
walkerlala/haikuports
whitone/haikuports
win8linux/haikuports
zooter68/haikuports
zzzzzzzzz/haikuports
Nothing to show
compare: fd059c6620be
  • 1 commit
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 12, 2019
@@ -0,0 +1,120 @@
SUMMARY="A stream based reader and writer library for COLLADA files"
DESCRIPTION="COLLADA defines an open standard XML schema for exchanging \
digital assets among various graphics software applications that might \
otherwise store their assets in incompatible file formats. COLLADA documents \
that describe digital assets are XML files, usually identified with a .dae \
(digital asset exchange) filename extension."
HOMEPAGE="http://www.opencollada.org/"
COPYRIGHT="2013 The Khronos Group Inc."
LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="d9db0c0a518aa6ac0359626f222707c6ca1b63a83cbf229d97a5999c9cde347b"
SOURCE_FILENAME="opencollada-$portVersion.tar.gz"
SOURCE_DIR="OpenCOLLADA-$portVersion"
PATCHES="opencollada-$portVersion.patchset"

ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"

PROVIDES="
opencollada$secondaryArchSuffix = $portVersion
lib:libbuffer$secondaryArchSuffix = $portVersion
lib:libftoa$secondaryArchSuffix = $portVersion
lib:libGeneratedSaxParser$secondaryArchSuffix = $portVersion
lib:libMathMLSolver$secondaryArchSuffix = $portVersion
lib:libOpenCOLLADABaseUtils$secondaryArchSuffix = $portVersion
lib:libOpenCOLLADAFramework$secondaryArchSuffix = $portVersion
lib:libOpenCOLLADASaxFrameworkLoader$secondaryArchSuffix = $portVersion
lib:libOpenCOLLADAStreamWriter$secondaryArchSuffix = $portVersion
lib:libUTF$secondaryArchSuffix = $portVersion
lib:libzlib$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libpcre$secondaryArchSuffix
lib:libpcreposix$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
"

PROVIDES_devel="
opencollada${secondaryArchSuffix}_devel = $portVersion
devel:libbuffer$secondaryArchSuffix = $portVersion
devel:libftoa$secondaryArchSuffix = $portVersion
devel:libGeneratedSaxParser$secondaryArchSuffix = $portVersion
devel:libMathMLSolver$secondaryArchSuffix = $portVersion
devel:libOpenCOLLADABaseUtils$secondaryArchSuffix = $portVersion
devel:libOpenCOLLADAFramework$secondaryArchSuffix = $portVersion
devel:libOpenCOLLADASaxFrameworkLoader$secondaryArchSuffix = $portVersion
devel:libOpenCOLLADAStreamWriter$secondaryArchSuffix = $portVersion
devel:libUTF$secondaryArchSuffix = $portVersion
devel:libzlib$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
opencollada$secondaryArchSuffix == $portVersion base
"

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libpcre$secondaryArchSuffix
devel:libpcreposix$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"

defineDebugInfoPackage opencollada$secondaryArchSuffix \
$libDir/libbuffer.so \
$libDir/libftoa.so \
$libDir/libGeneratedSaxParser.so \
$libDir/libMathMLSolver.so \
$libDir/libOpenCOLLADABaseUtils.so \
$libDir/libOpenCOLLADAFramework.so \
$libDir/libOpenCOLLADASaxFrameworkLoader.so \
$libDir/libOpenCOLLADAStreamWriter.so \
$libDir/libUTF.so \
$libDir/libzlib.so

PATCH()
{
sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, CMakeLists.txt
sed -i 's,${CMAKE_INSTALL_PREFIX}/lib/opencollada',$libDir, CMakeLists.txt
}

BUILD()
{
mkdir -p build
cd build
cmake .. \
-DCMAKE_CXX_FLAGS="-D_BSD_SOURCE" \
-DUSE_SHARED=ON \
$cmakeDirArgs

make $jobArgs
}

INSTALL()
{
cd build
make install $jobArgs

prepareInstalledDevelLibs \
libbuffer \
libftoa \
libGeneratedSaxParser \
libMathMLSolver \
libOpenCOLLADABaseUtils \
libOpenCOLLADAFramework \
libOpenCOLLADASaxFrameworkLoader \
libOpenCOLLADAStreamWriter \
libUTF \
libzlib

packageEntries devel \
$developDir \
$libDir/cmake
}
@@ -0,0 +1,112 @@
From 69a140c63022d89c0a0e04e35626635a3a802be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Fri, 8 Dec 2017 18:14:31 +0100
Subject: Build fix


diff --git a/COLLADABaseUtils/include/COLLADABUPlatform.h b/COLLADABaseUtils/include/COLLADABUPlatform.h
index 097845b..0b7b46f 100644
--- a/COLLADABaseUtils/include/COLLADABUPlatform.h
+++ b/COLLADABaseUtils/include/COLLADABUPlatform.h
@@ -23,7 +23,7 @@
# define COLLADABU_OS_WIN64
#elif (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__))
# define COLLADABU_OS_WIN32
-#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
+#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__) || defined(__HAIKU__)
# define COLLADABU_OS_LINUX
#endif

diff --git a/DAEValidator/library/src/PathUtil.cpp b/DAEValidator/library/src/PathUtil.cpp
index fd2afae..529355c 100644
--- a/DAEValidator/library/src/PathUtil.cpp
+++ b/DAEValidator/library/src/PathUtil.cpp
@@ -125,8 +125,16 @@ namespace opencollada
if ((dir = opendir(dirs.front().c_str())) != nullptr) {
while ((ent = readdir(dir)) != nullptr) {
string d_name = ent->d_name;
+ #ifdef __HAIKU__
+ struct stat sp;
+ stat(ent->d_name, &sp);
+ #endif
if (recursive &&
- (ent->d_type & DT_DIR) &&
+ #ifndef __HAIKU__
+ (ent->d_type & DT_DIR) &&
+ #else
+ (S_ISDIR(sp.st_mode)) &&
+ #endif
d_name != "." &&
d_name != "..")
{
diff --git a/common/libBuffer/include/CommonFWriteBufferFlusher.h b/common/libBuffer/include/CommonFWriteBufferFlusher.h
index c7af45b..42ff162 100644
--- a/common/libBuffer/include/CommonFWriteBufferFlusher.h
+++ b/common/libBuffer/include/CommonFWriteBufferFlusher.h
@@ -35,7 +35,7 @@ namespace std {
#ifdef __GNUC__
# include <cstdlib> /* size_t */
# include <cstdio> /* FILE */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__HAIKU__)
#include <stdint.h> /* int64_t */
#endif
#endif
diff --git a/common/libBuffer/src/CommonFWriteBufferFlusher.cpp b/common/libBuffer/src/CommonFWriteBufferFlusher.cpp
index 97480a1..2c1d2cb 100644
--- a/common/libBuffer/src/CommonFWriteBufferFlusher.cpp
+++ b/common/libBuffer/src/CommonFWriteBufferFlusher.cpp
@@ -90,7 +90,7 @@ namespace Common
FilePosType currentPos = ftello64(mStream);
#elif defined( _WIN32)
FilePosType currentPos = _ftelli64(mStream);
-#elif defined (__APPLE__) || defined(__FreeBSD__)
+#elif defined (__APPLE__) || defined(__FreeBSD__) || defined(__HAIKU__)
FilePosType currentPos = ftello(mStream);
#else
FilePosType currentPos = ftello64(mStream);
@@ -115,7 +115,7 @@ namespace Common
return (fseeko64(mStream,0,SEEK_END) == 0);
#elif defined( _WIN32)
return (_fseeki64(mStream, 0, SEEK_END) == 0);
-#elif defined (__APPLE__) || defined(__FreeBSD__)
+#elif defined (__APPLE__) || defined(__FreeBSD__) || defined(__HAIKU__)
return (fseeko(mStream, 0, SEEK_END) == 0);
#else
return (fseeko64(mStream, 0, SEEK_END) == 0);
@@ -135,7 +135,7 @@ namespace Common
bool success = (fseeko64(mStream,pos,SEEK_SET) == 0);
#elif defined( _WIN32)
bool success = (_fseeki64(mStream, pos, SEEK_SET) == 0);
-#elif defined (__APPLE__) || defined(__FreeBSD__)
+#elif defined (__APPLE__) || defined(__FreeBSD__) || defined(__HAIKU__)
bool success = (fseeko(mStream, pos, SEEK_SET) == 0);
#else
bool success = (fseeko64(mStream, pos, SEEK_SET) == 0);
--
2.16.4


From e3ac6f3a6f7f85ba014a3a74bab074a316e65f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 4 Aug 2018 23:24:44 +0200
Subject: PCRE build fix


diff --git a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
index 22f2598..f20e6cf 100644
--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
@@ -13,8 +13,7 @@

#include "COLLADABUPrerequisites.h"

-struct real_pcre;
-typedef struct real_pcre pcre;
+#include "pcre.h"


namespace COLLADABU
--
2.16.4

No commit comments for this range

You can’t perform that action at this time.