Merge branch 'release/1.9.x'

Conflicts:
	pandatool/src/assimp/pandaLogger.h

makepanda/makepandacore.py

@@ -1553,7 +1553,7 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
             if (have_all_pkgs):
                 return
 
-    if pkgconfig is not None and not libs:
+    if not custom_loc and pkgconfig is not None and not libs:
         # pkg-config is all we can do, abort if it wasn't found.
         if pkg in PkgListGet():
             print("%sWARNING:%s Could not locate pkg-config package %s, excluding from build" % (GetColor("red"), GetColor(), pkgconfig))

pandatool/src/assimp/pandaLogger.h

@@ -29,8 +29,12 @@ public:
   static void set_default();
 
 protected:
-  INLINE bool attachStream(Assimp::LogStream*, unsigned int) {};
-  INLINE bool detatchStream(Assimp::LogStream*, unsigned int) {}; // sic
+  INLINE bool attachStream(Assimp::LogStream*, unsigned int) {
+    return false;
+  };
+  INLINE bool detatchStream(Assimp::LogStream*, unsigned int) {
+    return false;
+  };
 
   void OnDebug(const char *message);
   void OnError(const char *message);