Merge branch 'frac-python-types' of github.com:ferdnyc/libopenshot into frac-python-types

README.md

@@ -76,7 +76,7 @@ https://github.com/OpenShot/libopenshot/issues
 
 ### License
 
-Copyright (c) 2008-2020 OpenShot Studios, LLC.
+Copyright (c) 2008-2021 OpenShot Studios, LLC.
 
 OpenShot Library (libopenshot) is free software: you can redistribute it
 and/or modify it under the terms of the GNU Lesser General Public License

bindings/python/CMakeLists.txt

@@ -58,6 +58,26 @@ endif()
 set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON)
 set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot)
 
+# Set the SWIG_FLAGS from the library target, IFF its
+# COMPILE_DEFINITIONS property is set (in practice, always true)
+if(CMAKE_VERSION VERSION_GREATER 3.15)
+  set(_defs
+    $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>>)
+elseif(CMAKE_VERSION VERSION_GREATER 3.12)
+  set(_defs $<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>)
+endif()
+if(DEFINED _defs)
+  set_property(SOURCE openshot.i PROPERTY
+    COMPILE_DEFINITIONS ${_defs})
+else()
+  get_property(_defs TARGET openshot PROPERTY COMPILE_DEFINITIONS)
+  foreach(_d ${_defs})
+    list(APPEND _flags -D${_d})
+  endforeach()
+  set_property(SOURCE openshot.i PROPERTY
+    SWIG_FLAGS ${_flags})
+endif()
+
 ### Suppress a ton of warnings in the generated SWIG C++ code
 set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \
   -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \
@@ -65,13 +85,15 @@ set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \
 separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
 set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
 
-### Take include dirs from target, automatically if possible
-if (CMAKE_VERSION VERSION_GREATER 3.13)
-  set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
-elseif (CMAKE_VERSION VERSION_GREATER 3.12)
-  set_property(SOURCE openshot.i PROPERTY
-    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
-endif ()
+### Take include dirs from target
+if(CMAKE_VERSION VERSION_GREATER 3.15)
+  set(_inc $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>>)
+elseif(CMAKE_VERSION VERSION_GREATER 3.12)
+  set(_inc $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
+endif()
+if (DEFINED _inc)
+  set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES ${_inc})
+endif()
 
 ### Add the SWIG interface file (which defines all the SWIG methods)
 if (CMAKE_VERSION VERSION_LESS 3.8.0)

bindings/ruby/CMakeLists.txt

@@ -74,6 +74,26 @@ endif()
 set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON)
 set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot)
 
+# Set the SWIG_FLAGS from the library target, IFF its
+# COMPILE_DEFINITIONS property is set (in practice, always true)
+if(CMAKE_VERSION VERSION_GREATER 3.15)
+  set(_defs
+    $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>>)
+elseif(CMAKE_VERSION VERSION_GREATER 3.12)
+  set(_defs $<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>)
+endif()
+if(DEFINED _defs)
+  set_property(SOURCE openshot.i PROPERTY
+    COMPILE_DEFINITIONS ${_defs})
+else()
+  get_property(_defs TARGET openshot PROPERTY COMPILE_DEFINITIONS)
+  foreach(_d ${_defs})
+    list(APPEND _flags -D${_d})
+  endforeach()
+  set_property(SOURCE openshot.i PROPERTY
+    SWIG_FLAGS ${_flags})
+endif()
+
 ### Suppress a ton of warnings in the generated SWIG C++ code
 set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \
   -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \
@@ -81,13 +101,15 @@ set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \
 separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
 set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
 
-### Take include dirs from target, automatically if possible
-if (CMAKE_VERSION VERSION_GREATER 3.13)
-	set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
-else ()
-	set_property(SOURCE openshot.i PROPERTY
-    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
-endif ()
+### Take include dirs from target
+if(CMAKE_VERSION VERSION_GREATER 3.15)
+  set(_inc $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>>)
+elseif(CMAKE_VERSION VERSION_GREATER 3.12)
+  set(_inc $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
+endif()
+if (DEFINED _inc)
+  set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES ${_inc})
+endif()
 
 ### Add the SWIG interface file (which defines all the SWIG methods)
 if (CMAKE_VERSION VERSION_LESS 3.8.0)

cmake/Modules/FindResvg.cmake

@@ -50,6 +50,7 @@ endif()
 find_path(Resvg_INCLUDE_DIRS
   ResvgQt.h
   PATHS
+    ${Resvg_ROOT}
     ${RESVGDIR}
     ${RESVGDIR}/include
     $ENV{RESVGDIR}
@@ -65,6 +66,7 @@ find_path(Resvg_INCLUDE_DIRS
 find_library(Resvg_LIBRARIES
   NAMES resvg
   PATHS
+    ${Resvg_ROOT}
     ${RESVGDIR}
     ${RESVGDIR}/lib
     $ENV{RESVGDIR}

src/AudioReaderSource.cpp

@@ -29,6 +29,7 @@
  */
 
 #include "AudioReaderSource.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;

src/AudioResampler.h

@@ -32,7 +32,6 @@
 #define OPENSHOT_RESAMPLER_H
 
 #include "AudioBufferSource.h"
-#include "Exceptions.h"
 #include "JuceHeader.h"
 
 namespace openshot {

src/CMakeLists.txt

@@ -212,7 +212,6 @@ if(ImageMagick_FOUND)
 
   # define a preprocessor macro (used in the C++ source)
   target_compile_definitions(openshot PUBLIC USE_IMAGEMAGICK=1)
-  list(APPEND CMAKE_SWIG_FLAGS -DUSE_IMAGEMAGICK=1)
 
   # Link with ImageMagick library
   target_link_libraries(openshot PUBLIC ImageMagick::Magick++)
@@ -346,8 +345,7 @@ if (TARGET Resvg::Resvg)
   #include_directories(${Resvg_INCLUDE_DIRS})
   target_link_libraries(openshot PUBLIC Resvg::Resvg)
 
-  target_compile_definitions(openshot PUBLIC -DUSE_RESVG=1)
-  list(APPEND CMAKE_SWIG_FLAGS -DUSE_RESVG=1)
+  target_compile_definitions(openshot PUBLIC USE_RESVG=1)
 
   set(HAVE_RESVG TRUE CACHE BOOL "Building with Resvg support" FORCE)
   mark_as_advanced(HAVE_RESVG)
@@ -373,8 +371,7 @@ if (ENABLE_BLACKMAGIC)
     target_link_libraries(openshot PUBLIC ${BLACKMAGIC_LIBRARY_DIR})
 
     # define a preprocessor macro (used in the C++)
-    target_compile_definitions(openshot PUBLIC -DUSE_BLACKMAGIC=1)
-    list(APPEND CMAKE_SWIG_FLAGS -DUSE_BLACKMAGIC=1)
+    target_compile_definitions(openshot PUBLIC USE_BLACKMAGIC=1)
   endif()
 endif()
 

src/CacheBase.h

@@ -34,7 +34,6 @@
 #include <memory>
 #include <cstdlib>
 #include "Frame.h"
-#include "Exceptions.h"
 #include "Json.h"
 
 namespace openshot {

src/CacheDisk.cpp

@@ -29,6 +29,7 @@
  */
 
 #include "CacheDisk.h"
+#include "Exceptions.h"
 #include "QtUtilities.h"
 #include <Qt>
 #include <QString>

src/CacheDisk.h

@@ -36,7 +36,6 @@
 #include <memory>
 #include "CacheBase.h"
 #include "Frame.h"
-#include "Exceptions.h"
 #include <QDir>
 
 namespace openshot {

src/CacheMemory.cpp

@@ -29,6 +29,7 @@
  */
 
 #include "CacheMemory.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;

src/CacheMemory.h

@@ -36,7 +36,6 @@
 #include <memory>
 #include "CacheBase.h"
 #include "Frame.h"
-#include "Exceptions.h"
 
 namespace openshot {
 

src/ChunkReader.cpp

@@ -29,6 +29,7 @@
  */
 
 #include "ChunkReader.h"
+#include "Exceptions.h"
 #include "FFmpegReader.h"
 
 #include <QDir>

src/ChunkWriter.cpp

@@ -29,6 +29,7 @@
  */
 
 #include "ChunkWriter.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

src/ChunkWriter.h

@@ -35,7 +35,6 @@
 #include "WriterBase.h"
 #include "FFmpegWriter.h"
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Json.h"
 
 #include <cmath>

src/Clip.cpp

@@ -29,6 +29,7 @@
  */
 
 #include "Clip.h"
+#include "Exceptions.h"
 #include "FFmpegReader.h"
 #include "FrameMapper.h"
 #ifdef USE_IMAGEMAGICK

src/ClipBase.h

@@ -34,7 +34,6 @@
 #include <memory>
 #include <sstream>
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Frame.h"
 #include "Point.h"
 #include "KeyFrame.h"

src/Color.cpp

@@ -29,6 +29,7 @@
  */
 
 #include "Color.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

src/Coordinate.h

@@ -32,6 +32,7 @@
 #define OPENSHOT_COORDINATE_H
 
 #include <iostream>
+#include "Fraction.h"
 #include "Json.h"
 
 namespace openshot {