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

povray, bump version (#6055)

Browse Source
This commit is contained in:
Schrijvers Luc
2021-07-14 08:58:13 +02:00
committed by GitHub
parent 96f30aa151
commit d737c4fa4f
2 changed files with 29 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
media-gfx/povray/patches/povray-3.7.0.8.patchset → media-gfx/povray/patches/povray-3.7.0.10.patchset
View File

@@ -1,4 +1,4 @@
From a64f8ff30796c2db712abea7b72034fa3cc19a9d Mon Sep 17 00:00:00 2001
From df7473b109703122e8af7848d2bac90bc911f6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 12 Nov 2017 11:00:37 +0100
Subject: POVRAY: Haiku support
@@ -20,17 +20,17 @@ index 42d8bb3..fdfcfb3 100644
// Sun/Oracle Solaris detected.
// Not officially supported yet; comment-out the following line to try with default POSIX settings.
--
2.15.0
2.30.2
From 54f220b12f1086661066de6aa9cc96beb9c1b1a8 Mon Sep 17 00:00:00 2001
From 859e491deb14bdf5c88aaa2fde86541bdc887e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 12 Nov 2017 11:11:58 +0100
Date: Sun, 12 Nov 2017 11:34:59 +0100
Subject: Haiku needs -lpthread
diff --git a/unix/config/ax_boost_thread.m4 b/unix/config/ax_boost_thread.m4
index 79e12cd..64c207c 100644
index 79e12cd..a812ba9 100644
--- a/unix/config/ax_boost_thread.m4
+++ b/unix/config/ax_boost_thread.m4
@@ -72,6 +72,8 @@ AC_DEFUN([AX_BOOST_THREAD],
@@ -42,21 +42,7 @@ index 79e12cd..64c207c 100644
else
CXXFLAGS="-pthread $CXXFLAGS"
fi
--
2.15.0
From 5a7db3b42bfc7b2c58fce659f4e8848732a37f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 12 Nov 2017 11:34:59 +0100
Subject: Haiku needs -lpthread (2. part)
diff --git a/unix/config/ax_boost_thread.m4 b/unix/config/ax_boost_thread.m4
index 64c207c..a812ba9 100644
--- a/unix/config/ax_boost_thread.m4
+++ b/unix/config/ax_boost_thread.m4
@@ -89,6 +89,8 @@ AC_DEFUN([AX_BOOST_THREAD],
@@ -87,6 +89,8 @@ AC_DEFUN([AX_BOOST_THREAD],
BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
elif test "x$host_os" = "xmingw32" ; then
BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
@@ -66,30 +52,30 @@ index 64c207c..a812ba9 100644
BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
fi
--
2.15.0
2.30.2
From 7a7b736b634ec33e1e236dabd67b58aa0a7c22b7 Mon Sep 17 00:00:00 2001
From c8ba7556d4ccd04a816477715acc0bffa59f7cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 12 Nov 2017 13:01:38 +0100
Subject: Install fix
diff --git a/unix/configure.ac b/unix/configure.ac
index 29c65c6..79e5b6d 100644
index 3335781..84206ff 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -1002,8 +1002,8 @@ AC_DEFINE_UNQUOTED([BUILTIN_XWIN_DISPLAY], ["$pov_xwin_msg"], [X Window display.
@@ -1024,8 +1024,8 @@ AC_DEFINE_UNQUOTED([BUILTIN_XWIN_DISPLAY], ["$pov_xwin_msg"], [X Window display.
AC_DEFINE_UNQUOTED([BUILTIN_IMG_FORMATS], ["$pov_img_fmt_builtin $pov_img_fmt_enabled"], [Supported image formats.])
AC_DEFINE_UNQUOTED([MISSING_IMG_FORMATS], ["$pov_img_fmt_disabled"], [Unsupported image formats.])
-povowner=`stat --format=%u ${HOME} || stat -f %u ${HOME}`
-povgroup=`stat --format=%g ${HOME} || stat -f %g ${HOME}`
-povowner=`stat ${stat_format}%u ${HOME}`
-povgroup=`stat ${stat_format}%g ${HOME}`
+povowner=`echo user`
+povgroup=`echo root`
AC_SUBST([povowner])
AC_SUBST([povgroup])
--
2.15.0
2.30.2

47
media-gfx/povray/povray-3.7.0.8.recipe → media-gfx/povray/povray-3.7.0.10.recipe
View File

@@ -8,12 +8,12 @@ Commodore Amiga computers."
HOMEPAGE="http://www.povray.org/"
COPYRIGHT="1991-2013 Persistence of Vision Raytracer Pty. Ltd."
LICENSE="GNU GPL v3"
REVISION="5"
REVISION="1"
SOURCE_URI="https://github.com/POV-Ray/povray/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="53d11ebd2972fc452af168a00eb83aefb61387662c10784e81b63e44aa575de4"
CHECKSUM_SHA256="7bee83d9296b98b7956eb94210cf30aa5c1bbeada8ef6b93bb52228bbc83abff"
PATCHES="povray-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
GLOBAL_WRITABLE_FILES="
@@ -29,43 +29,33 @@ REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_date_time$secondaryArchSuffix
lib:libboost_thread$secondaryArchSuffix
lib:libHalf_2_4$secondaryArchSuffix
lib:libiex_2_4$secondaryArchSuffix
lib:libiexmath_2_4$secondaryArchSuffix
lib:libilmthread_2_4$secondaryArchSuffix
lib:libimath_2_4$secondaryArchSuffix
lib:libIex_3_0$secondaryArchSuffix
lib:libIlmThread_3_0$secondaryArchSuffix
lib:libImath_3_0$secondaryArchSuffix
lib:libOpenEXR_3_0$secondaryArchSuffix
lib:libOpenEXRUtil_3_0$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
REQUIRES+="
lib:libilmimf_2_4$secondaryArchSuffix
"
fi
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_date_time$secondaryArchSuffix >= 1.69
devel:libboost_thread$secondaryArchSuffix >= 1.69
devel:libHalf_2_4$secondaryArchSuffix
devel:libiex_2_4$secondaryArchSuffix
devel:libiexmath_2_4$secondaryArchSuffix
devel:libilmthread_2_4$secondaryArchSuffix
devel:libimath_2_4$secondaryArchSuffix
devel:libboost_date_time$secondaryArchSuffix >= 1.70.0
devel:libboost_thread$secondaryArchSuffix >= 1.70.0
devel:libIex_3_0$secondaryArchSuffix
devel:libIlmThread_3_0$secondaryArchSuffix
devel:libImath_3_0$secondaryArchSuffix
devel:libOpenEXR_3_0$secondaryArchSuffix
devel:libOpenEXRUtil_3_0$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
BUILD_REQUIRES+="
devel:libilmimf_2_4$secondaryArchSuffix
"
fi
BUILD_PREREQUIRES="
cmd:autoconf
cmd:automake
@@ -88,17 +78,12 @@ BUILD()
autoupdate
popd
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
KeepEXR="--without-openexr"
fi
LIBS="-lbsd -lnetwork -lboost_date_time" \
CXXFLAGS="-std=c++11 -DBOOST_NO_CXX11_CONSTEXPR -D_BSD_SOURCE" \
runConfigure ./configure \
COMPILED_BY="HaikuPorts" \
--disable-optimiz \
--with-boost-libdir=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir \
$KeepEXR
--with-boost-libdir=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir
make $jobArgs
}