haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

OIIO: bump version (#1459)

Browse Source
This commit is contained in:
miqlas
2017-07-21 01:45:04 +02:00
committed by waddlesplash
parent 06e8159a89
commit 5fbb17a9eb
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
media-libs/openimageio/openimageio-1.7.11.recipe → media-libs/openimageio/openimageio-1.7.15.recipe
View File

@@ -6,11 +6,11 @@ animation and visual effects work for film.
OpenImageIO is used extensively in animation and VFX studios all over the \
world, and is also incorporated into several commercial products."
HOMEPAGE="http://github.com/OpenImageIO/"
COPYRIGHT="2008-2015 Larry Gritz et al."
COPYRIGHT="2008-2017 Larry Gritz et al."
LICENSE="BSD (3-clause)"
REVISION="2"
REVISION="1"
SOURCE_URI="$HOMEPAGE/oiio/archive/Release-$portVersion.tar.gz"
CHECKSUM_SHA256="52992720488fe255f77a6fdbc44d716e3b0db922e741fa4d13ac15841dc8331d"
CHECKSUM_SHA256="5db80981a3f87ad4a2a0c684884ad28f8c879570318dc79ba485b69e6fe77e73"
SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
SOURCE_DIR="oiio-Release-$portVersion"
PATCHES="openimageio-$portVersion.patchset"
@@ -38,10 +38,17 @@ REQUIRES="
lib:libboost_regex$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_thread$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libglew$secondaryArchSuffix
lib:libhalf$secondaryArchSuffix
lib:libilmimf$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libopencolorio$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libssl$secondaryArchSuffix #yeah, really
lib:libtiff$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
lib:libz$secondaryArchSuffix
@@ -60,10 +67,17 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_system$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libglew$secondaryArchSuffix
devel:libhalf$secondaryArchSuffix
devel:libilmimf$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libopencolorio$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
devel:libz$secondaryArchSuffix
@@ -78,7 +92,7 @@ BUILD_PREREQUIRES="
BUILD()
{
export CXXFLAGS="-std=c++11 -DBOOST_NO_CXX11_CONSTEXPR"
make $jobArgs
make USE_OPENSSL=1 $jobArgs
}
INSTALL()

40
media-libs/openimageio/patches/openimageio-1.7.11.patchset → media-libs/openimageio/patches/openimageio-1.7.15.patchset
View File

@@ -1,14 +1,8 @@
From 4718cb2a5bf8ab1936f738118d7235af5bd07073 Mon Sep 17 00:00:00 2001
From 0d155647f10278b130cf4cd74489665177656d35 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 7 Jun 2015 22:05:26 +0000
Subject: Haiku patch
---
src/libutil/farmhash.cpp | 7 +++++++
src/libutil/sysutil.cpp | 8 +++++++-
src/libutil/xxhash.cpp | 2 ++
src/make/detectplatform.mk | 8 ++++++++
4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/libutil/farmhash.cpp b/src/libutil/farmhash.cpp
index 256ce4d..e8baa21 100644
@@ -89,7 +83,37 @@ index dacdc2e..bd9ccb6 100644
ifeq (${uname},cygwin)
platform := windows
--
2.11.0
2.12.2
From 7fff1ebe616dee4d87698d4aac5155016f8da9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 21 Jun 2017 19:15:08 +0200
Subject: Search path fix
diff --git a/src/cmake/modules/FindFreetype.cmake b/src/cmake/modules/FindFreetype.cmake
index 9f3d16f..5619e3e 100644
--- a/src/cmake/modules/FindFreetype.cmake
+++ b/src/cmake/modules/FindFreetype.cmake
@@ -24,6 +24,8 @@ FIND_PATH (FREETYPE_INCLUDE_DIRS ft2build.h
/usr/local/include/freetype2/freetype
/sw/include
/opt/local/include
+ /system/develop/headers/freetype2
+ /system/develop/headers/x86/freetype2
DOC "The directory where freetype.h resides")
FIND_LIBRARY (FREETYPE_LIBRARIES
NAMES FREETYPE freetype
@@ -36,6 +38,8 @@ FIND_LIBRARY (FREETYPE_LIBRARIES
/usr/local/lib
/sw/lib
/opt/local/lib
+ /system/lib
+ /system/lib/x86
DOC "The FREETYPE library")
if (FREETYPE_INCLUDE_DIRS AND FREETYPE_LIBRARIES)
set (FREETYPE_FOUND TRUE)
--
2.12.2