From 4d56ca1df4f39ef3e510474807fbe483e9e1280a Mon Sep 17 00:00:00 2001 From: Yth - Arnaud Date: Tue, 6 Feb 2018 16:12:39 +0000 Subject: graphics/brlcad: Updated for version 7.26.4 + new maintainer. Signed-off-by: David Spencer --- graphics/brlcad/README.SLACKWARE | 1 - graphics/brlcad/brlcad.SlackBuild | 26 ++++++++++++++++------- graphics/brlcad/brlcad.info | 12 +++++------ graphics/brlcad/brlcad.patch | 43 -------------------------------------- graphics/brlcad/brlcad.png | Bin 28128 -> 8638 bytes 5 files changed, 24 insertions(+), 58 deletions(-) delete mode 100644 graphics/brlcad/brlcad.patch (limited to 'graphics') diff --git a/graphics/brlcad/README.SLACKWARE b/graphics/brlcad/README.SLACKWARE index bc1b680c96..c50373a452 100644 --- a/graphics/brlcad/README.SLACKWARE +++ b/graphics/brlcad/README.SLACKWARE @@ -15,4 +15,3 @@ To read the brlcad man-pages, use "brlman " from the command line. This was necessary, as some of BRL-CAD's man-pages conflict with standard man- pages. Example: "man kill" explains how to kill a process, while "brlman kill" explains how to remove an object from a model. - diff --git a/graphics/brlcad/brlcad.SlackBuild b/graphics/brlcad/brlcad.SlackBuild index 4a96920aa2..12a3fe7163 100644 --- a/graphics/brlcad/brlcad.SlackBuild +++ b/graphics/brlcad/brlcad.SlackBuild @@ -2,6 +2,8 @@ # Slackware build script for BRL-CAD +# Yth | Pont-en-Royans, France | yth@ythogtha.org + # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org # Originally written by Nikolai Saika @@ -14,13 +16,13 @@ # ... and again to fix tcl/tk breakage PRGNAM=brlcad -VERSION=${VERSION:-7.24.2} +VERSION=${VERSION:-7.26.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -31,8 +33,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,21 +62,24 @@ 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/brlcad.patch mkdir -p build cd build # There is a "known issue" according to the guys on #brlcad and we need # the cmake define "-DBRLCAD_ENABLE_STRICT=OFF" for now LDFLAGS="-lpng16" \ cmake \ + -DBRLCAD_ASTYLE=BUNDLED \ + -DBRLCAD_GDIAM=BUNDLED \ -DBRLCAD_FLAGS_OPTIMIZATION=ON \ -DBRLCAD_ENABLE_STRICT=OFF \ -DBRLCAD_FLAGS_DEBUG=OFF \ -DBRLCAD_FLAGS_ENABLE_RUNTIME_DEBUG=OFF \ -DBRLCAD_ENABLE_OPENGL=ON \ + -DBRLCAD_ENABLE_EXTRADOCS=ON \ + -DBRLCAD_INSTALL_EXAMPLE_GEOMETRY=ON \ -DBRLCAD_BUNDLED_LIBS=OFF \ -DBRLCAD_REGEX=SYSTEM \ - -DBRLCAD_TERMLIB=BUNDLED \ + -DBRLCAD_TERMLIB=SYSTEM \ -DBRLCAD_XMLLINT=SYSTEM \ -DBRLCAD_XSLTPROC=SYSTEM \ -DBRLCAD_ZLIB=SYSTEM \ @@ -83,15 +88,20 @@ cmake \ -DBRLCAD_ITCL=BUNDLED \ -DBRLCAD_ITK=BUNDLED \ -DBRLCAD_IWIDGETS=BUNDLED \ - -DBRLCAD_LEMON=BUNDLED \ + -DBRLCAD_LZ4=SYSTEM \ -DBRLCAD_LIBVDS=BUNDLED \ + -DBRLCAD_VDS=BUNDLED \ -DBRLCAD_OPENNURBS=BUNDLED \ + -DBRLCAD_PNG=SYSTEM \ + -DBRLCAD_LEMON=BUNDLED \ -DBRLCAD_PERPLEX=BUNDLED \ - -DBRLCAD_PNG=OFF \ -DBRLCAD_RE2C=BUNDLED \ + -DBRLCAD_NETPBM=BUNDLED \ + -DBRLCAD_SC=BUNDLED \ -DBRLCAD_SCL=BUNDLED \ -DBRLCAD_TKHTML=BUNDLED \ -DBRLCAD_TKPNG=BUNDLED \ + -DBRLCAD_TINYCTHREAD=BUNDLED \ -DBRLCAD_TKTABLE=BUNDLED \ -DBRLCAD_UTAHRLE=BUNDLED \ -DCMAKE_INSTALL_PREFIX=/opt/$PRGNAM \ diff --git a/graphics/brlcad/brlcad.info b/graphics/brlcad/brlcad.info index 0aa1af496c..c29b6ca2e8 100644 --- a/graphics/brlcad/brlcad.info +++ b/graphics/brlcad/brlcad.info @@ -1,10 +1,10 @@ PRGNAM="brlcad" -VERSION="7.24.2" +VERSION="7.26.4" HOMEPAGE="http://brlcad.org" -DOWNLOAD="http://downloads.sourceforge.net/brlcad/brlcad-7.24.2.tar.bz2" -MD5SUM="6e69da4a4854de2acf36be9ce95f3ec8" +DOWNLOAD="http://downloads.sourceforge.net/brlcad/brlcad-7.26.4.tar.bz2" +MD5SUM="78468bd4e84c35124eae42ce921753d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Ryan P.C. McQuen" -EMAIL="ryanpcmcquen@member.fsf.org" +REQUIRES="lz4" +MAINTAINER="Yth - Arnaud" +EMAIL="yth@ythogtha.org" diff --git a/graphics/brlcad/brlcad.patch b/graphics/brlcad/brlcad.patch deleted file mode 100644 index 0624f3a34a..0000000000 --- a/graphics/brlcad/brlcad.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -2079,16 +2079,10 @@ if(NOT BRLCAD_IS_SUBBUILD) - list(REMOVE_DUPLICATES CMAKE_EXTERNAL_TARGET_LIST) - endif(CMAKE_EXTERNAL_TARGET_LIST) - foreach(libtarget ${CMAKE_LIBRARY_TARGET_LIST}) -- #TODO - can this locate test be replaced with if(TARGET ${libtarget}) ? -- if(NOT CMAKE_BUILD_TYPE) -- get_target_property(target_location ${libtarget} LOCATION) -- else(NOT CMAKE_BUILD_TYPE) -- get_target_property(target_location ${libtarget} LOCATION_${CMAKE_BUILD_TYPE}) -- endif(NOT CMAKE_BUILD_TYPE) -- if(target_location) -+ if(TARGET ${libtarget}) - add_dependencies(${libtarget} timestamp) - add_dependencies(buildtimedelta ${libtarget}) -- endif(target_location) -+ endif(TARGET ${libtarget}) - endforeach(libtarget ${CMAKE_LIBRARY_TARGET_LIST}) - foreach(exectarget ${CMAKE_EXEC_TARGET_LIST}) - if(NOT CMAKE_BUILD_TYPE) ---- misc/CMake/BRLCAD_CMakeFiles.cmake -+++ misc/CMake/BRLCAD_CMakeFiles.cmake -@@ -65,7 +65,7 @@ macro(CMAKEFILES) - # make sure the file is there. Normally attempting to ignore - # a non-existent file is a fatal error, but these keywords - # don't necessarily refer to files. -- set(TARGET_FLAGS SHARED STATIC OBJECT WIN32 UNKNOWN IMPORTED) -+ set(TARGET_FLAGS SHARED STATIC OBJECT WIN32 UNKNOWN IMPORTED MODULE INTERFACE) - foreach(TARGET_FLAG ${TARGET_FLAGS}) - if("${TARGET_FLAG}" STREQUAL "${ITEM}") - if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${ITEM}) ---- src/libpc/CMakeLists.txt -+++ src/libpc/CMakeLists.txt -@@ -58,6 +58,7 @@ set(LIBPC_SOURCES - - add_definitions( - -DOBJ_BREP=1 -+ -DBOOST_DETAIL_NO_CONTAINER_FWD - ) - - BRLCAD_ADDLIB(libpc "${LIBPC_SOURCES}" "libbu;${OPENNURBS_LIBRARY};${STDCXX_LIBRARIES}" NO_STRICT_CXX) - diff --git a/graphics/brlcad/brlcad.png b/graphics/brlcad/brlcad.png index dddbe4823e..05840fef72 100644 Binary files a/graphics/brlcad/brlcad.png and b/graphics/brlcad/brlcad.png differ -- cgit v1.2.3