Merge branch '0.9.4'

openframeworks · Mar 22, 2016 · 8f82b13 · 8f82b13
2 parents aebb6fa + 42e5709
commit 8f82b13
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,40 @@
+   ___   ___  _  _   
+  / _ \ / _ \| || |  
+ | | | | (_) | || |_ 
+ | | | |\__, |__   _|
+ | |_| |  / /   | |  
+  \___(_)/_(_)  |_|  
+
+
+OF 0.9.3
+========                          
+
+#### change key
+          + added
+          - removed
+          / modified
+
+------------------------------------------------------------------------------
+
+CORE
+---- 
+
+### types
+   / ofParameterGroup: fix for clear not freeing the children weak_ptrs
+   / ofParameter: clean invalid weak_ptr
+
+
+PLATFORM SPECIFIC
+-----------------
+
+### osx
+    / recompiled freeimage to fix support for 32bits
+
+### linux
+    / install_dependencies: add check to see if all packages are up to date
+
+
+
    ___         ___        ____  
   / _ \       / _ \      |___ \ 
  | | | |     | (_) |       __) |

diff --git a/examples/3d/assimpExample/src/ofApp.cpp b/examples/3d/assimpExample/src/ofApp.cpp
@@ -11,7 +11,7 @@ void ofApp::setup(){
     bAnimateMouse = false;
     animationPosition = 0;
 
-    model.loadModel("astroBoy_walk.dae", true);
+    model.loadModel("astroBoy_walk.dae", false);
     model.setPosition(ofGetWidth() * 0.5, (float)ofGetHeight() * 0.75 , 0);
     model.setLoopStateForAllAnimations(OF_LOOP_NORMAL);
     model.playAllAnimations();

diff --git a/libs/FreeImage/lib/osx/freeimage.a b/libs/FreeImage/lib/osx/freeimage.a
diff --git a/libs/FreeImage/license/license-fi.txt b/libs/FreeImage/license/license-fi.txt
diff --git a/libs/FreeImage/license/license-gplv2.txt b/libs/FreeImage/license/license-gplv2.txt
diff --git a/libs/FreeImage/license/license-gplv3.txt b/libs/FreeImage/license/license-gplv3.txt
diff --git a/libs/openFrameworks/types/ofParameter.h b/libs/openFrameworks/types/ofParameter.h
@@ -488,9 +488,11 @@ class ofParameter: public ofAbstractParameter{
 	void setParent(ofParameterGroup & _parent);
 
 	const ofParameterGroup getFirstParent() const{
-		auto first = std::find_if(obj->parents.begin(),obj->parents.end(),[](weak_ptr<ofParameterGroup::Value> p){return p.lock()!=nullptr;});
-		if(first!=obj->parents.end()){
-			return first->lock();
+		obj->parents.erase(std::remove_if(obj->parents.begin(),obj->parents.end(),
+						   [](weak_ptr<ofParameterGroup::Value> p){return p.lock()==nullptr;}),
+						obj->parents.end());
+		if(!obj->parents.empty()){
+			return obj->parents.front().lock();
 		}else{
 			return shared_ptr<ofParameterGroup::Value>(nullptr);
 		}

diff --git a/libs/openFrameworks/types/ofParameterGroup.cpp b/libs/openFrameworks/types/ofParameterGroup.cpp
@@ -2,7 +2,7 @@
 #include "ofParameter.h"
 
 ofParameterGroup::ofParameterGroup()
-:obj(std::make_shared<Value>())
+:obj(new Value)
 {
 
 }
@@ -15,8 +15,7 @@ void ofParameterGroup::add(ofAbstractParameter & parameter){
 }
 
 void ofParameterGroup::clear(){
-	obj->parameters.clear();
-	obj->parametersIndex.clear();
+	obj.reset(new Value);
 }
 
 const ofParameter<bool> & ofParameterGroup::getBool(const string& name) const	{

diff --git a/scripts/apothecary/formulas/FreeImage/FreeImage.sh b/scripts/apothecary/formulas/FreeImage/FreeImage.sh
@@ -14,7 +14,7 @@ VER=3170 # 3.16.0
 
 # tools for git use
 GIT_URL=https://github.com/danoli3/FreeImage
-GIT_TAG=3.17.0
+GIT_TAG=3.17.0-header-changes
 
 # download the source code and unpack it into LIB_NAME
 function download() {
@@ -26,7 +26,7 @@ function download() {
 		rm FreeImage"$VER"Win32Win64.zip
 	elif [[ "${TYPE}" == "osx" || "${TYPE}" == "ios" || "${TYPE}" == "tvos" ]]; then
         # Fixed issues for OSX / iOS for FreeImage compiling in git repo.
-        echo "Downloading from $GIT_URL for OSX/iOS"
+        echo "Downloading from $GIT_URL $GIT_TAG for OSX/iOS"
 		echo $GIT_URL
 		curl -Lk $GIT_URL/archive/$GIT_TAG.tar.gz -o FreeImage-$GIT_TAG.tar.gz
 		tar -xf FreeImage-$GIT_TAG.tar.gz

diff --git a/scripts/apothecary/formulas/FreeImage/Makefile.osx b/scripts/apothecary/formulas/FreeImage/Makefile.osx
@@ -12,26 +12,15 @@ MACOSX_MIN_SDK = 10.7
 MACOSX_SYSROOT = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(MACOSX_SDK).sdk
 
 # General configuration variables:
-CC_I386 = $(shell xcrun -find clang)
 CC_X86_64 = $(shell xcrun -find clang)
-CPP_I386 = $(shell xcrun -find clang++)
 CPP_X86_64 = $(shell xcrun -find clang++)
 
-COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -fPIC -DNDEBUG -D__ANSI__ -DDISABLE_PERF_MEASUREMENT -mmacosx-version-min=$(MACOSX_MIN_SDK)
+COMPILERFLAGS = -arch x86_64 -arch i386 -Wno-ctor-dtor-privacy -stdlib=libc++ -Wc++11-narrowing -Os -fexceptions -fvisibility=hidden -DNO_LCMS -fPIC -DNDEBUG -D__ANSI__ -DDISABLE_PERF_MEASUREMENT -mmacosx-version-min=$(MACOSX_MIN_SDK)
 
-COMPILERPPFLAGS_I386 = -arch i386 -Wno-ctor-dtor-privacy -stdlib=libc++ -Wc++11-narrowing
-COMPILERPPFLAGS_X86_64 = -arch x86_64 -Wno-ctor-dtor-privacy -stdlib=libc++ -Wc++11-narrowing
-
-INCLUDE_I386 = -isysroot $(MACOSX_SYSROOT)
 INCLUDE_X86_64 = -isysroot $(MACOSX_SYSROOT)
+CFLAGS_X86_64 = $(COMPILERFLAGS) $(INCLUDE) $(INCLUDE_X86_64)
 
-CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386)
-CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64)
-
-CPPFLAGS_I386 = $(COMPILERPPFLAGS_I386) $(CFLAGS_I386)
-CPPFLAGS_X86_64 = $(COMPILERPPFLAGS_X86_64) $(CFLAGS_X86_64)
-
-LIBRARIES_I386 = -Wl,-syslibroot $(MACOSX_SYSROOT) -mmacosx-version-min=$(MACOSX_MIN_SDK)
+CPPFLAGS_X86_64 = $(CFLAGS_X86_64)
 LIBRARIES_X86_64 = -Wl,-syslibroot $(MACOSX_SYSROOT) -mmacosx-version-min=$(MACOSX_MIN_SDK)
 
 LIBTOOL = libtool
@@ -42,11 +31,8 @@ STATICLIB = lib$(TARGET).a
 
 HEADER = Source/FreeImage.h
 
-.SUFFIXES: .o-i386 .o-x86_64
-MODULES_PPC = $(SRCS:.c=.o-ppc)
-MODULES_I386 = $(SRCS:.c=.o-i386)
+.SUFFIXES: .o-x86_64
 MODULES_X86_64 = $(SRCS:.c=.o-x86_64)
-MODULES_I386 := $(MODULES_I386:.cpp=.o-i386)
 MODULES_X86_64 := $(MODULES_X86_64:.cpp=.o-x86_64)
 
 PREFIX = /usr/local
@@ -64,26 +50,12 @@ dist: FreeImage
 
 FreeImage: $(STATICLIB) 
 
-
-
-$(STATICLIB): $(STATICLIB)-i386 $(STATICLIB)-x86_64
-	$(LIPO) -create $(STATICLIB)-i386 $(STATICLIB)-x86_64 -output $(STATICLIB)
-
-$(STATICLIB)-i386: $(MODULES_I386)
-	$(LIBTOOL) -arch_only i386 -o $@ $(MODULES_I386)
-
-$(STATICLIB)-x86_64: $(MODULES_X86_64)
-	$(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64)
-
-.c.o-i386:
-	$(CC_I386) $(CFLAGS_I386) -c $< -o $@
+$(STATICLIB): $(MODULES_X86_64)
+	$(LIBTOOL) -o $@ $(MODULES_X86_64)
 
 .c.o-x86_64:
 	$(CC_X86_64) $(CFLAGS_X86_64) -c $< -o $@
 
-.cpp.o-i386:
-	$(CPP_I386) $(CPPFLAGS_I386) -c $< -o $@
-
 .cpp.o-x86_64:
 	$(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@
 
@@ -94,5 +66,5 @@ install:
 	ranlib -sf $(INSTALLDIR)/$(STATICLIB)
 
 clean:
-	rm -f core Dist/*.* u2dtmp* $(MODULES_I386) $(MODULES_X86_64) $(STATICLIB) $(STATICLIB)-i386
+	rm -f core Dist/*.* u2dtmp* $(MODULES_X86_64) $(STATICLIB)
 
diff --git a/scripts/linux/ubuntu/install_dependencies.sh b/scripts/linux/ubuntu/install_dependencies.sh
@@ -80,6 +80,20 @@ else
 fi
 
 apt-get update
+REGULAR_UPDATES=$(/usr/lib/update-notifier/apt-check 2>&1 | cut -d ';' -f 1)
+SECURITY_UPDATES=$(/usr/lib/update-notifier/apt-check 2>&1 | cut -d ';' -f 2)
+
+if [ $REGULAR_UPDATES -ne 0 ] || [ $SECURITY_UPDATES -ne 0 ]; then
+    read -p "Your system is not updated, that can create problems when installing the OF dependencies. Do you want to update all the packages now? [Y/n]"
+    if [[ $REPLY =~ ^[Nn]$ ]]; then
+        read -p "Do you want to try installing the OF dependencies anyway?"
+        if [[ $REPLY =~ ^[Nn]$ ]]; then
+            exit 0
+        fi
+    else
+        apt-get dist-upgrade
+    fi
+fi
 
 GSTREAMER_VERSION=0.10
 GSTREAMER_FFMPEG=gstreamer${GSTREAMER_VERSION}-ffmpeg