Skip to content

Commit ac8966a

Browse files
authored
Merge pull request #558 from OpenShot/juce-547
JUCE 5.4.7 changes
2 parents 22f8968 + 6acc1c1 commit ac8966a

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ mac-builder:
4343
- unzip artifacts.zip
4444
- export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64
4545
- mkdir -p build; cd build;
46-
- cmake -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_SHARED_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../
46+
- cmake -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_SHARED_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../
4747
- make
4848
- make install
4949
- echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "install-x64/share/$CI_PROJECT_NAME"

README.md

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
OpenShot Video Library (libopenshot) is a free, open-source C++ library dedicated to
2-
delivering high quality video editing, animation, and playback solutions to the
3-
world.
1+
OpenShot Video Library (libopenshot) is a free, open-source C++ library
2+
dedicated to delivering high quality video editing, animation, and playback
3+
solutions to the world.
44

55
## Build Status
66

@@ -15,7 +15,8 @@ world.
1515
* Time Mapping (Curve-based Slow Down, Speed Up, Reverse)
1616
* Audio Mixing & Resampling (Curve-based)
1717
* Audio Plug-ins (VST & AU)
18-
* Audio Drivers (ASIO, WASAPI, DirectSound, CoreAudio, iPhone Audio, ALSA, JACK, and Android)
18+
* Audio Drivers (ASIO, WASAPI, DirectSound, CoreAudio, iPhone Audio,
19+
ALSA, JACK, and Android)
1920
* Telecine and Inverse Telecine (Film to TV, TV to Film)
2021
* Frame Rate Conversions
2122
* Multi-Processor Support (Performance)
@@ -27,19 +28,21 @@ world.
2728

2829
## Install
2930

30-
Detailed instructions for building libopenshot and libopenshot-audio for each OS. These instructions
31-
are also available in the /docs/ source folder.
31+
Detailed instructions for building libopenshot and libopenshot-audio for
32+
each OS. These instructions are also available in the `/docs/` source folder.
3233

3334
* [Linux](https://github.com/OpenShot/libopenshot/wiki/Linux-Build-Instructions)
3435
* [Mac](https://github.com/OpenShot/libopenshot/wiki/Mac-Build-Instructions)
3536
* [Windows](https://github.com/OpenShot/libopenshot/wiki/Windows-Build-Instructions)
3637

3738
## Hardware Acceleration
3839

39-
OpenShot now supports experimental hardware acceleration, both for encoding and
40-
decoding videos. When enabled, this can either speed up those operations or slow
41-
them down, depending on the power and features supported by your graphics card.
42-
Please see [doc/HW-ACCELL.md](doc/HW-ACCEL.md) for more information.
40+
OpenShot now supports experimental hardware acceleration, both for encoding
41+
and decoding videos. When enabled, this can either speed up those operations
42+
or slow them down, depending on the power and features supported by your
43+
graphics card.
44+
45+
Please see [`doc/HW-ACCEL.md`](doc/HW-ACCEL.md) for more information.
4346

4447
## Documentation
4548

@@ -51,10 +54,11 @@ make doc
5154

5255
## Developers
5356

54-
Are you interested in becoming more involved in the development of
55-
OpenShot? Build exciting new features, fix bugs, make friends, and become a hero!
56-
Please read the [step-by-step](https://github.com/OpenShot/openshot-qt/wiki/Become-a-Developer)
57-
instructions for getting source code, configuring dependencies, and building OpenShot.
57+
Are you interested in becoming more involved in the development of OpenShot?
58+
Build exciting new features, fix bugs, make friends, and become a hero!
59+
Please read the [step-by-step](https://github.com/OpenShot/openshot-qt/wiki/Become-a-Developer)
60+
instructions for getting source code, configuring dependencies, and building
61+
OpenShot.
5862

5963
## Report a bug
6064

@@ -72,7 +76,7 @@ https://github.com/OpenShot/libopenshot/issues
7276

7377
### License
7478

75-
Copyright (c) 2008-2019 OpenShot Studios, LLC.
79+
Copyright (c) 2008-2020 OpenShot Studios, LLC.
7680

7781
OpenShot Library (libopenshot) is free software: you can redistribute it
7882
and/or modify it under the terms of the GNU Lesser General Public License

0 commit comments

Comments
 (0)