Revision: 77924
          http://sourceforge.net/p/brlcad/code/77924
Author:   starseeker
Date:     2020-12-04 02:40:16 +0000 (Fri, 04 Dec 2020)
Log Message:
-----------
Merge from trunk - r77870-r77923

Modified Paths:
--------------
    brlcad/branches/extbuild/TODO

Property Changed:
----------------
    brlcad/branches/extbuild/
    brlcad/branches/extbuild/src/other/

Index: brlcad/branches/extbuild
===================================================================
--- brlcad/branches/extbuild    2020-12-04 02:37:37 UTC (rev 77923)
+++ brlcad/branches/extbuild    2020-12-04 02:40:16 UTC (rev 77924)

Property changes on: brlcad/branches/extbuild
___________________________________________________________________
Modified: svn:mergeinfo
## -11,4 +11,4 ##
 /brlcad/branches/osg:62110-62113
 /brlcad/branches/prep-cache:68236-68933
 /brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:77547-77869
\ No newline at end of property
+/brlcad/trunk:77547-77923
\ No newline at end of property
Modified: brlcad/branches/extbuild/TODO
===================================================================
--- brlcad/branches/extbuild/TODO       2020-12-04 02:37:37 UTC (rev 77923)
+++ brlcad/branches/extbuild/TODO       2020-12-04 02:40:16 UTC (rev 77924)
@@ -122,17 +122,6 @@
   routines that need to autogenerate names to use the new
   bu_vls_incr/bu_vls_simplify functions.
 
-* rename zlib and libpng when building bundled to avoid conflicting
-  with system-installed libs.  e.g., default to ENABLE_Z_PREFIX=ON
-  with name z_brlcad (perhaps as a post-compile rename custom command)
-  and png_brlcad respectively.
-
-* investigate possibility of using simple, compact libs
-  like miniz and lodepng to replace the complexity of
-  managing zlib and libpng in src/other.  These have been
-  a source of ongoing annoyance, particularly (but not
-  exclusively) on OSX.
-
 * f_dbopen in MGED doesn't seem to be reporting failure
   if a non-.g file is fed to opendb.  That doesn't seem
   right... shouldn't the open process completely fail
@@ -243,7 +232,6 @@
 * procedural studio box generation allowing for specification of size,
   shape, material, and lighting characteristics
 
->>>>>>> .r77755
 * verify all of the src/util utilities behave correctly on Windows
   with respect to mode (i.e. correctly using setmode/O_BINARY when
   performing file I/O.)
@@ -554,11 +542,6 @@
   parallel.  This would be a way to easily parallelize existing code
   without needing to create wrapper functions for bu_parallel().
 
-* Now that we have >3.0 CMake required, look into replacing our custom
-  time stamping code in favor of using  the CMake time stamp mechanism.
-  Also get rid of the fallback in src/libgcv/plugins/CMakeLists.txt
-  (and any others that have crept in over the years...)
-
 * convert usages of Tcl_InitHashTable() and friends to libbu
   containers (see src/conv/enf-g.c for example usage)
 

Index: brlcad/branches/extbuild/src/other
===================================================================
--- brlcad/branches/extbuild/src/other  2020-12-04 02:37:37 UTC (rev 77923)
+++ brlcad/branches/extbuild/src/other  2020-12-04 02:40:16 UTC (rev 77924)

Property changes on: brlcad/branches/extbuild/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
 /brlcad/branches/osg/src/other:62110-62113
 /brlcad/branches/prep-cache/src/other:68236-68933
 /brlcad/branches/tcltk86/src/other:68300-75257
-/brlcad/trunk/src/other:77547-77657,77836-77857
\ No newline at end of property
+/brlcad/trunk/src/other:77547-77657,77836-77857,77870-77920
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to