Merge branch 'master' into glsl

Author: deltaoscarmike

configure.ac

@@ -4,6 +4,18 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
 
+# Check if we should disable rpath.
+#
+# For advanced users: In certain configurations, the rpath attributes
+# added by libtool cause problems as rpath will be preferred over
+# LD_LIBRARY_PATH. This does not seem to be a problem with
+# clang. When using --disable-rpath you will likely need to set
+# LD_LIBRARY_PATH if you are using libraries in non-system locations.
+# YMMV.
+#
+
+DISABLE_RPATH
+
 AC_PROG_CXX
 AC_LANG(C++)
 
@@ -133,7 +145,7 @@ AS_IF([test "x$enable_qt" = "xyes"], [
 
   AC_CHECK_PROGS(MOC, [moc-qt5 moc])
   AC_CHECK_PROGS(UIC, [uic-qt5 uic])
-  AC_CHECK_PROGS(RCC, [rcc])
+  AC_CHECK_PROGS(RCC, [rcc-qt5 rcc])
   if test -z "$MOC" || test -z "$UIC" || test -z "$RCC"; then
     AC_MSG_ERROR([Qt utility programs moc, uic, and rcc are required.])
   fi

m4/disable-rpath.m4

@@ -0,0 +1,27 @@
+dnl file      : m4/disable-rpath.m4
+dnl author    : Boris Kolpackov <[email protected]>
+dnl copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+dnl license   : GNU GPL v2; see accompanying LICENSE file
+dnl
+AC_DEFUN([DISABLE_RPATH],[
+
+AC_MSG_CHECKING([whether to use rpath])
+AC_ARG_ENABLE(
+  [rpath],
+  [AC_HELP_STRING([--disable-rpath], [patch libtool to not use rpath])],
+  [libtool_rpath="$enable_rpath"],
+  [libtool_rpath="yes"])
+AC_MSG_RESULT($libtool_rpath)
+
+# Patch libtool to not use rpath if requested.
+#
+AC_CONFIG_COMMANDS(
+  [libtool-rpath-patch],
+  [if test "$libtool_use_rpath" = "no"; then
+     sed < libtool > libtool-2 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_NO_RPATH__ "/'
+     mv libtool-2 libtool
+     chmod 755 libtool
+  fi],
+  [libtool_use_rpath=$libtool_rpath])
+])dnl
+

presets/presets_bltc201/Zylot - Digiscape Advanced Processor.milk.bak

@@ -27,3 +27,10 @@ libRovastarDarkSecret_la_SOURCES = RovastarDarkSecret.cpp
 libRovastarDriftingChaos_la_SOURCES = RovastarDriftingChaos.cpp
 libRovastarFractalSpiral_la_SOURCES = RovastarFractalSpiral.cpp
 libRovastarFractopiaFrantic_la_SOURCES = RovastarFractopiaFrantic.cpp
+
+libMstressJuppyDancer_la_LDFLAGS = -avoid-version
+libRLGFractalDrop7c_la_LDFLAGS = -avoid-version
+libRovastarDarkSecret_la_LDFLAGS = -avoid-version
+libRovastarDriftingChaos_la_LDFLAGS = -avoid-version
+libRovastarFractalSpiral_la_LDFLAGS = -avoid-version
+libRovastarFractopiaFrantic_la_LDFLAGS = -avoid-version

src/NativePresets/Makefile.am

@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
 lib_LTLIBRARIES = libprojectM.la  # public, possibly-shared library
 
 # link flags
-libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 0:2:0
+libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 2:0:0
 
 # link libRenderer, MilkdropPresetFactory, NativePresetFactory, and libprojectM sources
 libprojectM_la_LIBADD = \

src/libprojectM/Makefile.am

@@ -180,6 +180,11 @@ class MultAndAddExpr : public Expr
 		a(_a), b(_b), c(_c)
 	{
 	}
+    ~MultAndAddExpr() {
+        delete a;
+        delete b;
+        delete c;
+    }
 	float eval(int mesh_i, int mesh_j)
 	{
 		float a_value = a->eval(mesh_i,mesh_j);

src/libprojectM/MilkdropPresetFactory/Expr.cpp

@@ -93,11 +93,7 @@ MilkdropPreset::~MilkdropPreset()
 	delete(*pos);
   }
   customWaves.clear();
- customShapes.clear();
- presetOutputs().customWaves.clear();
- presetOutputs().customShapes.clear();
-  presetOutputs().drawables.clear();
-
+  customShapes.clear();
 }
 
 /* Adds a per pixel equation according to its string name. This

src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp

@@ -62,7 +62,6 @@ class Preset;
 #include <immintrin.h>
 #endif
 
-
 /* Parameter Type */
 class Param {
 public:

src/libprojectM/MilkdropPresetFactory/Param.hpp

@@ -986,6 +986,10 @@ Expr * Parser::parse_gen_expr ( std::istream &  fs, TreeExpr * tree_expr, Milkdr
     return NULL;
   //std::cout << gen_expr << std::endl;
   Expr *opt = gen_expr->optimize();
+
+  if (opt != gen_expr) {
+      delete gen_expr;
+  }
   //std::cout << opt << std::endl << std::endl;
   return opt;
 }
@@ -2461,6 +2465,8 @@ int Parser::parse_shape_per_frame_init_eqn(std::istream &  fs, CustomShape * cus
 
   line_mode = CUSTOM_SHAPE_PER_FRAME_INIT_LINE_MODE;
   init_cond->evaluate(true);
+
+  delete init_cond;
   return PROJECTM_SUCCESS;
 }
 

src/libprojectM/MilkdropPresetFactory/Parser.cpp

@@ -122,6 +122,10 @@ PresetOutputs::~PresetOutputs()
 	this->rot_mesh = free_mesh(this->rot_mesh);
 	this->orig_x   = free_mesh(this->orig_x);
 	this->orig_y   = free_mesh(this->orig_y);
+
+    customWaves.clear();
+    customShapes.clear();
+    drawables.clear();
 }
 
 
@@ -460,7 +464,6 @@ void PresetOutputs::Initialize ( int gx, int gy )
 	this->gy = gy;
 
 	staticPerPixel = true;
-	setStaticPerPixel(gx,gy);
 
 	assert(this->gx > 0);
 	int x;