]> git.sesse.net Git - mlt/commitdiff
Fix JackRack build on MinGW.
authorDan Dennedy <dan@dennedy.org>
Fri, 31 Dec 2010 20:27:43 +0000 (12:27 -0800)
committerDan Dennedy <dan@dennedy.org>
Mon, 24 Jan 2011 01:39:43 +0000 (17:39 -0800)
src/modules/jackrack/configure
src/modules/jackrack/jack_rack.c

index 789764d60ceb6e28dce830af90bee9d379c8cc15..ea8ef5e4e5e4cf4d0c9de27e0facd7ce8abd52b4 100755 (executable)
@@ -9,13 +9,14 @@ then
        pkg-config libxml-2.0 > /dev/null 2>&1
        disable_xml2=$?
 
-       disable_ladspa=1
        ladspa_prefix=`which listplugins 2> /dev/null`
        if [ "$ladspa_prefix" != "" ]
        then
                ladspa_prefix=`dirname "$ladspa_prefix"`
-               disable_ladspa=`[ -f "$ladspa_prefix/include/ladspa.h" ] && echo 1 || echo 0`
+       else
+               ladspa_prefix=`pkg-config --variable=prefix jack`
        fi
+       disable_ladspa=`[ -f "$ladspa_prefix/include/ladspa.h" ] && echo 0 || echo 1`
 
        if [ "$disable_jack" = "1" -o "$disable_xml2" = "1" -o "$disable_ladspa" = "1" ]
        then
index 92f82721c2452486ac418598d668a5dbf353e19a..e16244ba619175d5044c02832e8742f9a8f6b0ef 100644 (file)
@@ -164,6 +164,10 @@ saved_rack_parse_plugin (jack_rack_t * jack_rack, saved_rack_t * saved_rack, sav
   xmlChar *content;
   unsigned long num;
   unsigned long control = 0;
+#ifdef WIN32
+  xmlFreeFunc xmlFree = NULL;
+  xmlMemGet( &xmlFree, NULL, NULL, NULL);
+#endif
 
   for (node = plugin->children; node; node = node->next)
     {
@@ -257,6 +261,10 @@ saved_rack_parse_jackrack (jack_rack_t * jack_rack, saved_rack_t * saved_rack, c
   xmlNodePtr node;
   xmlChar *content;
   saved_plugin_t * saved_plugin;
+#ifdef WIN32
+  xmlFreeFunc xmlFree = NULL;
+  xmlMemGet( &xmlFree, NULL, NULL, NULL);
+#endif
 
   for (node = jackrack->children; node; node = node->next)
     {