Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-22 19:44:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/Blender: Use Slackware's openjpeg (libopenmj2)

Browse source 
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Robby Workman 2016-01-09 20:20:42 -06:00 committed by Willy Sudiarto Raharjo
parent cd7d2d9c06
commit a6f17bb17d
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
graphics/Blender/Blender.SlackBuild
View file

@ -25,7 +25,7 @@
SRCNAM=blender
PKGNAM=Blender
VERSION=${VERSION:-2.74}
BUILD=${BUILD:-2}
BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PYTHON_VERSION=$(python3 -c "import sys; print(sys.version[:3])")
@ -64,8 +64,6 @@ cd $TMP
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $SRCNAM-$VERSION
patch -p0 < $CWD/buildinfo-$VERSION.diff
patch -p0 < $CWD/patch-${VERSION}-use-python35.diff
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@ -73,6 +71,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p0 < $CWD/buildinfo-$VERSION.diff
patch -p0 < $CWD/patch-${VERSION}-use-python35.diff
patch -p1 < $CWD/use-libopenmj2-for-openjpeg.diff
mkdir -p build
cd build
cmake ../ \

17
graphics/Blender/use-libopenmj2-for-openjpeg.diff Normal file
View file

@ -0,0 +1,17 @@
diff -Nru blender-2.74.orig/build_files/cmake/Modules/FindOpenJPEG.cmake blender-2.74/build_files/cmake/Modules/FindOpenJPEG.cmake
--- blender-2.74.orig/build_files/cmake/Modules/FindOpenJPEG.cmake 2015-03-25 05:56:13.000000000 -0500
+++ blender-2.74/build_files/cmake/Modules/FindOpenJPEG.cmake 2016-01-09 20:17:20.521735656 -0600
@@ -43,11 +43,12 @@
PATH_SUFFIXES
include
include/openjpeg-1.5
+ include/openmj2-2.1
)
FIND_LIBRARY(OPENJPEG_LIBRARY
NAMES
- openjpeg
+ openmj2
HINTS
${_openjpeg_SEARCH_DIRS}
PATH_SUFFIXES