diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2016-01-09 20:20:42 -0600 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | a6f17bb17d219ab9c63ac110babb1f3bd43a39ee (patch) | |
| tree | 31c055da16584498f0794934739b9a505e0efa8e | |
| parent | cd7d2d9c06c4ebb2c803773f05e0e186f964b9e8 (diff) | |
graphics/Blender: Use Slackware's openjpeg (libopenmj2)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | graphics/Blender/Blender.SlackBuild | 8 | ||||
| -rw-r--r-- | graphics/Blender/use-libopenmj2-for-openjpeg.diff | 17 |
2 files changed, 22 insertions, 3 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild index 8359268966268..07bfc679ad322 100644 --- a/graphics/Blender/Blender.SlackBuild +++ b/graphics/Blender/Blender.SlackBuild @@ -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 ../ \ diff --git a/graphics/Blender/use-libopenmj2-for-openjpeg.diff b/graphics/Blender/use-libopenmj2-for-openjpeg.diff new file mode 100644 index 0000000000000..712337382e745 --- /dev/null +++ b/graphics/Blender/use-libopenmj2-for-openjpeg.diff @@ -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 |