diff options
Diffstat (limited to 'graphics/brlcad')
| -rw-r--r-- | graphics/brlcad/brlcad-tcltk_match_includes.patch | 36 | ||||
| -rw-r--r-- | graphics/brlcad/brlcad.SlackBuild | 39 |
2 files changed, 26 insertions, 49 deletions
diff --git a/graphics/brlcad/brlcad-tcltk_match_includes.patch b/graphics/brlcad/brlcad-tcltk_match_includes.patch deleted file mode 100644 index 76da965f51..0000000000 --- a/graphics/brlcad/brlcad-tcltk_match_includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur a/src/bwish/CMakeLists.txt b/src/bwish/CMakeLists.txt ---- a/src/bwish/CMakeLists.txt 2013-06-14 01:55:27.000000000 -0400 -+++ b/src/bwish/CMakeLists.txt 2013-11-21 20:57:03.386263490 -0500 -@@ -14,6 +14,8 @@ - include_directories( - ${CMAKE_SOURCE_DIR}/src/other/tcl/generic - ${CMAKE_SOURCE_DIR}/src/other/tcl/unix -+ ${CMAKE_SOURCE_DIR}/src/other/tk/generic -+ ${CMAKE_SOURCE_DIR}/src/other/tk/unix - ${CMAKE_SOURCE_DIR}/src/other/incrTcl/itcl/generic - ${CMAKE_SOURCE_DIR}/src/other/incrTcl/itk/generic - ) -diff -Naur a/src/libtclcad/CMakeLists.txt b/src/libtclcad/CMakeLists.txt ---- a/src/libtclcad/CMakeLists.txt 2013-06-14 01:55:25.000000000 -0400 -+++ b/src/libtclcad/CMakeLists.txt 2013-11-21 20:43:02.865252378 -0500 -@@ -10,6 +10,8 @@ - set(TCLCAD_LOCAL_INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/src/other/tcl/generic - ${CMAKE_SOURCE_DIR}/src/other/tcl/unix -+ ${CMAKE_SOURCE_DIR}/src/other/tk/generic -+ ${CMAKE_SOURCE_DIR}/src/other/tk/unix - ${CMAKE_SOURCE_DIR}/src/other/incrTcl/itcl/generic - ${CMAKE_SOURCE_DIR}/src/other/incrTcl/itk/generic - ${PNG_INCLUDE_DIR} -diff -Naur a/src/mged/CMakeLists.txt b/src/mged/CMakeLists.txt ---- a/src/mged/CMakeLists.txt 2013-06-14 01:55:49.000000000 -0400 -+++ b/src/mged/CMakeLists.txt 2013-11-21 21:07:51.444272058 -0500 -@@ -15,6 +15,8 @@ - include_directories( - ${CMAKE_SOURCE_DIR}/src/other/tcl/generic - ${CMAKE_SOURCE_DIR}/src/other/tcl/unix -+ ${CMAKE_SOURCE_DIR}/src/other/tk/generic -+ ${CMAKE_SOURCE_DIR}/src/other/tk/unix - ${CMAKE_SOURCE_DIR}/src/other/incrTcl/itcl/generic - ${CMAKE_SOURCE_DIR}/src/other/incrTcl/itk/generic - ) diff --git a/graphics/brlcad/brlcad.SlackBuild b/graphics/brlcad/brlcad.SlackBuild index cefb44758b..8d460deeae 100644 --- a/graphics/brlcad/brlcad.SlackBuild +++ b/graphics/brlcad/brlcad.SlackBuild @@ -8,11 +8,12 @@ # Maintained as of version 7.16.6 by Niels Horn <niels.horn@gmail.com> # Revision date: 2012/09/13 -# Modified 2013/11/22 for build with cmake by John Vogel <jvogel4@stny.rr.com> +# Modified by John Vogel <jvogel4@stny.rr.com> for build with cmake +# ... and again to fix tcl/tk breakage PRGNAM=brlcad VERSION=${VERSION:-7.24.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -57,8 +58,6 @@ 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 -p1 -i ${CWD}/brlcad-tcltk_match_includes.patch - mkdir -p build cd build # There is a "known issue" according to the guys on #brlcad and we need @@ -67,19 +66,33 @@ cmake \ -DBRLCAD_FLAGS_OPTIMIZATION=ON \ -DBRLCAD_ENABLE_STRICT=OFF \ -DBRLCAD_FLAGS_DEBUG=OFF \ + -DBRLCAD_FLAGS_ENABLE_RUNTIME_DEBUG=OFF \ + -DBRLCAD_ENABLE_OPENGL=ON \ -DBRLCAD_BUNDLED_LIBS=OFF \ - -DBRLCAD_ITCL=ON \ - -DBRLCAD_ITK=ON \ - -DBRLCAD_IWIDGETS=ON \ - -DBRLCAD_TKHTML=ON \ - -DBRLCAD_TKPNG=ON \ - -DBRLCAD_TKTABLE=ON \ - -DBRLCAD_PNG=ON \ + -DBRLCAD_REGEX=SYSTEM \ + -DBRLCAD_TERMLIB=SYSTEM \ + -DBRLCAD_XMLLINT=SYSTEM \ + -DBRLCAD_XSLTPROC=SYSTEM \ + -DBRLCAD_ZLIB=SYSTEM \ + -DBRLCAD_TCL=BUNDLED \ + -DBRLCAD_TK=BUNDLED \ + -DBRLCAD_ITCL=BUNDLED \ + -DBRLCAD_ITK=BUNDLED \ + -DBRLCAD_IWIDGETS=BUNDLED \ + -DBRLCAD_LEMON=BUNDLED \ + -DBRLCAD_LIBVDS=BUNDLED \ + -DBRLCAD_OPENNURBS=BUNDLED \ + -DBRLCAD_PERPLEX=BUNDLED \ + -DBRLCAD_PNG=BUNDLED \ + -DBRLCAD_RE2C=BUNDLED \ + -DBRLCAD_SCL=BUNDLED \ + -DBRLCAD_TKHTML=BUNDLED \ + -DBRLCAD_TKPNG=BUNDLED \ + -DBRLCAD_TKTABLE=BUNDLED \ + -DBRLCAD_UTAHRLE=BUNDLED \ -DCMAKE_INSTALL_PREFIX=/opt/$PRGNAM \ -DMAN_DIR=man \ -DDATA_DIR=share \ - -DTCL_INCLUDE_PATH=/usr/include \ - -DTCL_INCLUDE_PATH=/usr/include \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" .. |