Changeset 131982


Ignore:
Timestamp:
Jan 22, 2015, 7:55:17 PM (5 years ago)
Author:
mmoll@…
Message:

science/solid: update to version 3.5.7, consolidate GLUT patches, reenable port on Mavericks and newer, make sure compilation flags get set in autoreconf stage

Location:
trunk/dports/science/solid
Files:
1 added
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/solid/Portfile

    r113161 r131982  
    44
    55name                solid
    6 version             3.5.6
    7 revision            1
     6version             3.5.7
    87categories          science math devel
    98platforms           darwin
    10 license             LGPL-2
     9license             {GPL-2 QPL-1}
    1110maintainers         mww openmaintainer
    1211description         SOLID is a software library for collision detection of geometric objects in 3D space
     
    1514homepage            http://www.dtecta.com/
    1615master_sites        http://www.dtecta.com/files/
    17 checksums           rmd160  0b2e305c323caef96e182ec75529bad92c41f35a \
    18                     sha256  4acfa20266f0aa5722732794f8e93d7bb446e467719c947a3ca583f197923af0
    19 
    20 extract.suffix      .tgz
    21 patchfiles          patch-examples-mnm.cpp.diff patch-examples-physics.cpp.diff \
    22                     patch-examples-gldemo.cpp.diff patch-configure.ac.diff
     16checksums           rmd160  3040717b9e890bde74c71f4f0c8c4bcc8b8c666e \
     17                    sha256  7f78cffd83bbed93b0ec4421866ebd97d16db74a8068b25e45df231a49cc7d04
     18use_zip             yes
     19patchfiles          patch-configure.ac.diff patch-GLUT.diff
    2320
    2421depends_lib         port:qhull
     
    2623# This project has buggy C++ code
    2724compiler.blacklist  *clang*
     25compiler.fallback   macports-gcc-4.9
    2826
    2927use_autoreconf      yes
    3028autoreconf.args     -fvi
    31 autoreconf.env      AUTOMAKE="automake --foreign"
    32 
    33 configure.cflags    -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive
    34 configure.cxxflags  -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive
    3529
    3630build.args          GLLIBS="-framework OpenGL -framework GLUT"
    3731
    38 platform darwin {
    39     if {${os.major} >= 13} {
    40         depends_lib
    41         depends_run
    42         pre-fetch {
    43             ui_error "$name does not build on Mavericks or later."
    44             error "unsupported platform"
    45         }
    46     }
    47 }
    48 
    4932livecheck.type      none
  • trunk/dports/science/solid/files/patch-configure.ac.diff

    r109105 r131982  
    1 --- configure.ac.orig   2013-08-07 18:31:33.000000000 -0700
    2 +++ configure.ac        2013-08-07 18:31:44.000000000 -0700
    3 @@ -39,20 +39,6 @@ AC_MSG_RESULT(no)
    4  fi
    5  AC_SUBST([TRACER_FLAG])
     1--- configure.ac        2006-10-03 10:55:34.000000000 -0500
     2+++ configure.ac        2015-01-21 13:42:39.000000000 -0600
     3@@ -5,7 +5,7 @@
     4 AC_INIT(SOLID, 3.5)
     5 AC_CONFIG_SRCDIR([include/SOLID.h])
     6 AC_CONFIG_HEADER([include/config.h])
     7-AM_INIT_AUTOMAKE
     8+AM_INIT_AUTOMAKE([foreign])
    69 
    7 -AC_MSG_CHECKING(whether to enable debugging)
    8 -debug_default="no"
    9 -AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging
    10 -                       [default=$debug_default]],, enable_debug=$debug_default)
    11 -if test "x$enable_debug" = "xyes"; then
    12 -   CFLAGS="-g"
    13 -   CXXFLAGS="-g"
    14 -AC_MSG_RESULT(yes)
    15 -else
     10 # Checks for programs.
     11 AC_PROG_CXX
     12@@ -48,8 +48,8 @@
     13    CXXFLAGS="-g"
     14 AC_MSG_RESULT(yes)
     15 else
    1616-   CFLAGS="-O2 -fno-gcse -DNDEBUG"     
    1717-   CXXFLAGS="-O2 -fno-gcse -DNDEBUG"
    18 -AC_MSG_RESULT(no)
    19 -fi
    20 -
    21  AC_CHECK_LIB([glut], [glutInit])
     18+   CFLAGS="-O2 -fno-gcse -fno-strict-aliasing -DNDEBUG"       
     19+   CXXFLAGS="-O2 -fno-gcse -fno-strict-aliasing -fpermissive -DNDEBUG"
     20 AC_MSG_RESULT(no)
     21 fi
    2222 
    23  # Checks for libraries.
     23@@ -78,14 +78,5 @@
     24 # Checks for library functions.
     25 AC_CHECK_FUNCS([memset sqrt])
     26 
     27-AC_CONFIG_FILES([Makefile
     28-                 doc/Makefile
     29-                                src/broad/Makefile
     30-                                src/convex/Makefile
     31-                                src/complex/Makefile
     32-                                src/qhull/Makefile
     33-                 src/Makefile
     34-                                include/Makefile
     35-                                examples/dynamics/Makefile
     36-                                examples/Makefile])
     37+AC_CONFIG_FILES([Makefile doc/Makefile src/broad/Makefile src/convex/Makefile src/complex/Makefile src/qhull/Makefile src/Makefile include/Makefile examples/dynamics/Makefile examples/Makefile])
     38 AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.