mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-21 19:20:08 +02:00
partio, bump version (#6069)
This commit is contained in:
@@ -14,10 +14,9 @@ interface
|
||||
HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
|
||||
COPYRIGHT="2010-2012 Disney Enterprises"
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/wdas/partio/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="133f386f076bd6958292646b6ba0e3db6d1e37bde3b8a6d1bc4b7809d693999d"
|
||||
PATCHES="partio-$portVersion.patchset"
|
||||
CHECKSUM_SHA256="f98874b781e92ab9b5d0575cabc437d27274cd91cb581f80960918efa491f902"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -34,9 +33,13 @@ fi
|
||||
PROVIDES="
|
||||
partio$secondaryArchSuffix = $portVersion compat >= 1
|
||||
cmd:partattr$commandSuffix = $portVersion
|
||||
cmd:partconv$commandSuffix = $portVersion
|
||||
cmd:partconvert$commandSuffix = $portVersion
|
||||
cmd:partedit = $portVersion
|
||||
cmd:partinfo$commandSuffix = $portVersion
|
||||
cmd:partinspect = $portVersion
|
||||
cmd:partjson = $portVersion
|
||||
cmd:partview$commandSuffix = $portVersion
|
||||
lib:libpartio$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -65,36 +68,31 @@ BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
# cmd:python
|
||||
cmd:python3.7
|
||||
cmd:swig
|
||||
"
|
||||
|
||||
defineDebugInfoPackage partio$secondaryArchSuffix \
|
||||
$commandBinDir/partattr \
|
||||
$commandBinDir/partconv \
|
||||
$commandBinDir/partconvert \
|
||||
$commandBinDir/partinfo \
|
||||
$commandBinDir/partview
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir -p build
|
||||
cd build
|
||||
mkdir -p install
|
||||
cmake -LA .. \
|
||||
-DCMAKE_INSTALL_PREFIX="$PWD/install" \
|
||||
cmake -B build -S . \
|
||||
$cmakeDirArgs \
|
||||
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DPARTIO_USE_GLVND=OFF \
|
||||
-Wno-dev
|
||||
|
||||
make $jobArgs
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd build
|
||||
make install
|
||||
|
||||
mkdir -p $commandBinDir && cp install/bin/* $commandBinDir
|
||||
mkdir -p $libDir && cp install/lib/* $libDir
|
||||
mkdir -p $includeDir && cp install/include/* $includeDir
|
||||
make -C build install
|
||||
|
||||
prepareInstalledDevelLib libpartio
|
||||
|
||||
@@ -104,6 +102,5 @@ INSTALL()
|
||||
|
||||
TEST()
|
||||
{
|
||||
cd build
|
||||
make test
|
||||
make -C build test
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
From 243d16f1f15310e279408d87bc76fab012d46f1c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Wed, 10 Jan 2018 09:12:51 +0100
|
||||
Subject: Install path fix
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e331c9c..9c592ca 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -77,7 +77,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
|
||||
## Set install location
|
||||
EXECUTE_PROCESS(COMMAND sh -c "echo `uname`-`uname -r | cut -d'-' -f1`-`uname -m`" OUTPUT_VARIABLE VARIANT_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
#EXECUTE_PROCESS(COMMAND uname OUTPUT_VARIABLE VARIANT_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
-SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/${VARIANT_DIRECTORY}")
|
||||
+#SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/${VARIANT_DIRECTORY}")
|
||||
|
||||
## Search for useful libraries
|
||||
find_package(GLUT REQUIRED)
|
||||
--
|
||||
2.24.1
|
||||
|
||||
From 32bdb4e2973eba6f35c4982a94f87ec1a2a59bc7 Mon Sep 17 00:00:00 2001
|
||||
From: X512 <danger_mail@list.ru>
|
||||
Date: Fri, 31 Jan 2020 03:36:52 +0900
|
||||
Subject: CharArrayLen: fix build
|
||||
|
||||
---
|
||||
src/lib/io/MC.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/lib/io/MC.cpp b/src/lib/io/MC.cpp
|
||||
index 7125954..7460c0b 100644
|
||||
--- a/src/lib/io/MC.cpp
|
||||
+++ b/src/lib/io/MC.cpp
|
||||
@@ -105,8 +105,8 @@ bool ReadAttrHeader(std::istream& input, Attribute_Header& attribute){
|
||||
|
||||
int CharArrayLen(char** charArray){
|
||||
int i = 0;
|
||||
- if(charArray != false){
|
||||
- while(charArray[i] != '\0'){
|
||||
+ if(charArray){
|
||||
+ while(charArray[i]){
|
||||
i++;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.24.1
|
||||
|
||||
Reference in New Issue
Block a user