Commit Graph

41 Commits

Author SHA1 Message Date
eisneinechse
8b1a7ceb67 Merge branch 'develop' into hardware-support 2019-04-06 09:33:22 -07:00
eisneinechse
5648261e4f Merge branch 'develop' into hardware-support 2019-04-05 07:50:07 -07:00
FeRD (Frank Dana)
6ee1ab17a4 Use updated, improved UseDoxygen.cmake 2019-04-05 00:07:59 -04:00
FeRD (Frank Dana)
3e5dc1d727 Streamline libopenshot-audio discovery 2019-03-29 08:10:31 -04:00
eisneinechse
56ae085d8b Merge branch 'develop' into hardware-support 2019-02-11 10:05:25 -08:00
Jonathan Thomas
62fa7176a4 Update README and INSTALL files (including build instructions) (#194)
* Update README.md
* Create INSTALL.md
* Delete InstallationGuide.pdf
* Create INSTALL-LINUX.md
* Create INSTALL-MAC.md
* Create INSTALL-WINDOWS.md
2019-02-08 15:30:56 -06:00
eisneinechse
29b5fcac60 Merge branch 'develop' into hardware-support 2019-01-25 13:07:26 -08:00
Frank Dana
c4321f3f8e Some polishing for the cmake ReSVG discovery (#187)
* Search for libresvg.so in RESVGDIR also

This means that RESVGDIR can be pointed to the `target/release` dir 
where resvg was built, and both `libresvg.so` and `include/resvg.h` will 
be found.

* ReSVG: Fix up discovery module

`find_package_handle_standard_args` is supposed to set the `_FOUND` 
variable automatically (as the comment right above it says), as well as 
handling things like REQUIRED, QUIETLY, etc. It should always be run at 
the end of a module, for this reason.

This change removes the conditionals around the call, lets it handle 
what it's meant to handle, and defines a custom failure message for 
discovery that replaces the one in `src/CMakeList.txt`. 

In addition, the `REQRUIRED` is removed from `tests/CMakeLists.txt`, 
since it's _supposed_ to mark the module as required (which ReSVG is 
not), and was only working due to the aforementioned improper 
conditional wrapping of the module's cleanup.

* FindRESVG.cmake does not set RESVG_DEFINITIONS

Remove the comment that claims it does.
2019-01-24 13:43:40 -06:00
Jonathan Thomas
7b6eb9c21b Integration of resvg SVG library (optional during build) (#185)
* Integration of libresvg SVG library (optional during build)

* Major refactor of max_width and max_height for preview optimization

* Fixed many bugs related to preview resizing, with regards to cached frames

* Updating gitlab CI to find RESVGDIR correctly for windows, and adding svgz support

* Updating cmake findresvg module to search for windows locations first, to prevent an issue on our windows builders and updating some CMake output.

* Removing folder path from resvg header, since it could be installed in different named folders. This is an attempt to fix Windows include issues.

* Making call to AV_FREE_FRAME conditional for non windows systems (because it crashes on Windows for seemingly no reason). Needs more investigation.
2019-01-19 02:18:52 -06:00
eisneinechse
533c59ae97 Merge branch 'develop' into hardware-support 2018-09-26 09:44:59 -07:00
Jonathan Thomas
e879188a7d FFmpeg 3 & 4 support, Travis CI support, OpenMP schedule change (#160)
* FFmpeg4 support. Compile warnings fixes. Credit goes to many people, including ferdnyc, peterM, and other awesome folks!

* Adding environment checking to enable/disable omp taskwait after each video/audio frame is processed. This is experimental for some users with crashes.

* Moving `omp taskwait` to after the ProcessVideoPacket() method, since that is the only place it is useful.

* Fixing crashes on missing Clip source file, and changing FFmpeg scaling algorthm from SWS_BILINEAR to  SWS_LANCZOS (for higher quality scaling)

* Update FindFFmpeg.cmake module, and updating build script. Also enabling debug builds.

* Updating experimental travis build script

* Fixed unit test for newer version of FFmpeg (audio resampling)

* Experimental travis multiple jobs

* Adding OMP schedule hint (thanks PeterM), which prevents crashes in some circumstances.
2018-09-11 00:40:31 -05:00
Jonathan Thomas
95abdcf66b FFmpeg4 support. Compile warnings fixes. Credit goes to many people, including ferdnyc, peterM, and other awesome folks! 2018-08-11 18:22:18 -05:00
Jonathan Thomas
da07ff4818 Fix cmake module lookup for libopenshot-audio, to always try the ENV variable first (#123) 2018-06-20 14:07:55 -05:00
Jonathan Thomas
98fa55feb3 Updating cmake file for libopenshot-audio to search $ENV first, and then static folders 2018-05-21 23:12:21 -05:00
Jonathan Thomas
9a93391240 Adding "dbghelp" dependency for Windows builds (for crash handling support), and improved Windows build instructions using MSYS2. 2018-01-21 03:19:14 -06:00
Jonathan Thomas
98ccfb5ee1 Fixing cmake build scripts to support 64bit on Windows. Also refactoring some pointer handling to support 64bit on Windows (Linux and Mac have always supported it). Adding instructions for setting up a Windows 64 bit build environment using MSYS2. 2016-08-12 19:15:19 -05:00
Jonathan Thomas
d7f4b08844 Making some small tweaks for consistency / code format 2016-08-02 18:18:24 -05:00
Jonathan Thomas
d743d4988b Merge branch 'enable_system_jsoncpp' of https://github.com/komackaj/libopenshot into komackaj-enable_system_jsoncpp
# Conflicts:
#	src/CMakeLists.txt
2016-08-02 18:08:02 -05:00
Jonathan Thomas
10f0881241 Merge pull request #10 from mlocati/win-fix-build-imagemagick
Fix build ImageMagick under Windows
2016-08-02 17:35:50 -05:00
Jonathan Thomas
723bd24e5c Adding new dependency: libzmq (ZeroMQ). Adding a new debug logging class powered by sockets and ZeroMQ, to allow a threadsafe way to communicate debug messages to a client application (i.e. openshot-qt). Also, removing unneeded Sleep.h functions. There will be lots more code utilizing ZeroMQ soon. 2016-04-04 23:09:18 -05:00
Juraj Komacka
e954b2ff80 Add USE_SYSTEM_JSONCPP option 2016-03-29 14:07:10 +02:00
Jonathan Thomas
bb6102f46f Added support for newer versions of libav media library. 2016-01-07 23:50:48 -06:00
Michele Locati
f471c3268f Fix build ImageMagick under Windows 2015-12-14 14:25:59 +01:00
Jonathan Thomas
ff39fdaaf4 Updated Eclipse/Aptana project file with improved cmake build targets
Updated Doxygen definition file (for generating documention)
2015-02-04 23:53:39 -06:00
Jonathan Thomas
66dfed502b Added FindPythonLibs cmake module to address issues with older versions of Cmake that dont correctly identify new versions of Python. 2014-08-06 13:42:29 -05:00