Commits on Source (77)
-
Steve Lhomme authored1743b53b
-
Steve Lhomme authoredf7ba35f7
-
Steve Lhomme authored
(cherry picked from commit 0b609afa)
e38fa342 -
Steve Lhomme authored
That's how the buildbot does it (cherry picked from commit 660de939) (rebased) rebased: - the code around is slightly different
feb960f2 -
Steve Lhomme authored
(cherry picked from commit 498619b8)
74deed0a -
Steve Lhomme authored
So that we get a similar level of verbosity as the make based targets (cherry picked from commit 5389c05b) (rebased) rebased: - 4.0 has MESON defined above
56e2cea3 -
Steve Lhomme authored
And build using cmake rather their manually edited makefiles (cherry picked from commit d44e8c06) (edited) edited: - 3.0 had GLEW_DEST=$(PREFIX) on the MAKE like
b2f26c8d -
sourceforge accepted .tar.gz but was redirecting to .tgz Our mirrors have .tgz (cherry picked from commit 3bf912cc)
f404827b -
This dependency is already setup by the dependency propagation at the end of the main.mak makefile. Signed-off-by:
Steve Lhomme <robux4@ycbcr.xyz> (cherry picked from commit bda34233) (rebased) rebased: - DBUILD_SHARED_LIBS:BOOL=OFF is not used on 3.0
d6edc329 -
Steve Lhomme authored
(cherry picked from commit 75dc8ba5) (edited) edited: - 3.0 build protoc separately
7a1352ac -
Steve Lhomme authored
(cherry picked from commit 405c8b41)
8d215010 -
Steve Lhomme authored
This shouldn't be enforced. We already use -O2 on release builds. -O4 was removed in 8d098023 -O3 was added with the contrib in 9c0b836a (cherry picked from commit 6240c4ce)
220091ac -
First, fix the conflict setting/using of CMAKE_GENERATOR. Second, call build via cmake instead of run make directly. Signed-off-by:
Alexandre Janniaux <ajanni@videolabs.io> (cherry picked from commit c74a77e7) (edited) edited: - only use the patch for glew that is now built with CMake
99834990 -
(cherry picked from commit 2277fd97)
5fd08343 -
(cherry picked from commit ed5fd417) (rebased) rebased: - 3.0 doesn't have CFLAGS/CXXFLAGS for srt
6fe74ca8 -
(cherry picked from commit 89954b5a)
31daf263 -
(cherry picked from commit a29d55b1)
c33775c4 -
(cherry picked from commit 7c5abbf3)
b2048bef -
(cherry picked from commit 69f55567)
4f00b920 -
(cherry picked from commit 83893fd0)
a9dc792b -
(cherry picked from commit 6cf7db55)
9e2e4634 -
(cherry picked from commit a1405bc9)
8e2e32b0 -
(cherry picked from commit 0d97ee8a)
d937c2d3 -
(cherry picked from commit 140cd0a3)
979ba6fa -
(cherry picked from commit 96b9ffec)
6f3e064e -
(cherry picked from commit 2f71ade4) (rebased) rebased: - 3.0 already has FLUIDLITE_CONF
e929828f -
(cherry picked from commit c8c5541c)
5ee4c35a -
(cherry picked from commit f941c3ca)
78b8d730 -
(cherry picked from commit 8c3d39bf)
4b8cce48 -
(cherry picked from commit 94415f30) (rebased) rebased: - the code around is slightly different
bd488ed0 -
Steve Lhomme authored
(cherry picked from commit 60b079bb)
82d0523e -
Steve Lhomme authored
It can be removed once we update to the next release. The previous patch potentially hides an error handling. (cherry picked from commit 183ecb2e)
929bdda5 -
Steve Lhomme authored
We do force CMAKE_INSTALL_LIBDIR which makes srt not use any other of the GNU directories... Merged upstream: https://github.com/Haivision/srt/pull/2450 (cherry picked from commit 055841ec)
f1bf9e2a -
Steve Lhomme authored
(cherry picked from commit 375d5a48)
972ee391 -
Steve Lhomme authored
rather than manually. (cherry picked from commit 7017b973) (rebased) rebased: - 3.0 does't have PROJECTM_CONF
ada3105d -
Steve Lhomme authored
These options don't exist. The others are set to non default values. (cherry picked from commit 9ac24e74) (rebased) rebased: - on 3.0 projectM uses -DCMAKE_CXX_STANDARD=98
ffb160a0 -
Steve Lhomme authored
This is how it's done for autotools target and some cmake targets. It makes long lines a little better to read. (cherry picked from commit 780b04d3) (edited) edited: - 3.0 some contribs don't exist (glslang, libebur128) - on 3.0 soxr uses -Wno-dev - on 3.0 projectM uses -DCMAKE_CXX_STANDARD=98
fffb78c3 -
Steve Lhomme authored
The CMAKE variable already sets it for all targets. (cherry picked from commit 49ff728d) (edited) edited: - 3.0 some contribs don't exist (glslang, libebur128)
bead67a3 -
Steve Lhomme authored
It's used to set the library prefix between glew (dynamic) and glew_s (static). But only the static target (glew_s) is selected in our environment. It will pick the proper prefix on its own. It's not even a public option to set. (cherry picked from commit bf1793ee)
9a485ace -
Steve Lhomme authored
It's off by default. (cherry picked from commit 9aee5328)
d80b45c8 -
Steve Lhomme authored
Submitted upstream https://github.com/acoustid/chromaprint/pull/119 (cherry picked from commit 7a772424)
a7899a98 -
Steve Lhomme authored
FLUIDSYNTH_NOT_A_DLL is not used anymore when built statically. Here's the file used to generate the public header: https://github.com/FluidSynth/fluidsynth/blob/v2.1.8/include/fluidsynth.cmake (cherry picked from commit e1fb8bcb)
17210091 -
Steve Lhomme authored
Just like we do with autotools builds, we configure the target every time we build a contrib. In the case of cmake, touching `toolchain.cmake` does rebuild the cmake contribs but if there's a cache it's not reconfigured and doesn't rebuild anything. (cherry picked from commit 575c4acd) (edited) edited: - 3.0 some contribs don't exist (glslang, libebur128, vulkan-headers)
d3d4c94e -
Steve Lhomme authored
We just need to tell CMake where to find the root CMakeLists.txt file. CMake already puts all its build files in a CMakeFiles folder. There's only libaom that generates an error if you build the library from the root... (cherry picked from commit cd41528c)
15141855 -
Steve Lhomme authored
(cherry picked from commit dd0c79a7) (edited) edited: - 3.0 some contribs don't exist (libaribcaption)
572cd363 -
Steve Lhomme authored
It is the default behavior. We could change that in CMAKE for all targets at once. (cherry picked from commit 3513e834)
5b2499ac -
Steve Lhomme authored
via https://github.com/ctarbide/musepack_libmpc It transforms the SHARED option into proper BUILD_SHARED_LIBS. Fix the old patches and apply them as commits. The MSVC patch can be applied no matter what. The macOS patching is useless since CFLAGS are respected thanks to the first patch. The sed is not needed since the second patch removes build of all the programs. The decoder and encoder code has not changed since revision 481. Only the tools have been slightly updated. We don't need to copy the .a manually anymore. (cherry picked from commit 48caea17) (edited) edited: - 3.0 used $@_src_r$(MUSE_REV) instead of UNPACK_DIR
58026bf2 -
Steve Lhomme authored
Meson targets already do it. We don't need to create the build folder prior to using it, CMake will do it for us. We don't need to cd in the folder either, we can tell CMake where to find the CMakeLists.txt file in the same call. (cherry picked from commit 8f474129) (edited) edited: - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)
bd2900f4 -
Steve Lhomme authored
LDFLAGS is already set in HOSTVARS (cherry picked from commit 0857e1c9)
6f298bb9 -
Steve Lhomme authored
We don't need to destroy nor create the build folder each time. (cherry picked from commit bb04ae46)
f86adb2f -
Steve Lhomme authored
We always use the same name and always use it. (cherry picked from commit 44ccea2f) (edited) edited: - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)
4edc0582 -
Steve Lhomme authored
We always use the same name and always use it. (cherry picked from commit 8fa16a23) (edited) edited: - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)
e690bd15 -
Steve Lhomme authored
It can be overriden when calling $(CMAKE). Remove the stray '.' that was left after -S was used in all cases. (cherry picked from commit b2e78e25) (edited) edited: - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)
fae2865c -
Steve Lhomme authored
Now the cmake build folder is handled in a single place. (cherry picked from commit b6503634) (edited) edited: - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)
70d22dbe -
(cherry picked from commit 52971aeb)
c345ce71 -
Steve Lhomme authored
(cherry picked from commit c637a0bd)
a5968cb2 -
Steve Lhomme authored
(cherry picked from commit 52add02a) (edited) edited: - 3.0 doesn't have rnnoise - ssh2 has a flag for gcc 4.9
a13f6c4e -
Steve Lhomme authored
(cherry picked from commit 3f557ee5) (edited) edited: - on 3.0 x262 is in the same build script as x264
5c4f13f0 -
Steve Lhomme authored
(cherry picked from commit 88b6c195) (edited) edited: - 3.0 doesn't have a VNCCLIENT_CONF - 3.0 had SHOUT_CONF an empty because 85268b42 is not backported - 3.0 doesn't use the sqlite anymore - 3.0 has FONTCONFIG_ENV
3c2f5583 -
Steve Lhomme authored
It should make no different where the variables are. They should be before the target name if there is one. (cherry picked from commit cfeea778) (edited) edited: - PROTOBUFVARS is already in the right place - 3.0 doesn't use sqlite anymore
747e969f -
Steve Lhomme authored
(cherry picked from commit 66fdd2d8) (edited) edited: - 3.0 doesn't have MAKEBUILD - don't modify MESON
83f98942 -
Steve Lhomme authored
(cherry picked from commit 0f2caa56)
90368e8f -
Steve Lhomme authored
(cherry picked from commit 8d0461dd) (edited) edited: - only keep the AOM change building with CMake
e4e0727f -
Steve Lhomme authored
We use it with the C++ interface. (cherry picked from commit 2599291b) (rebased) rebased: - 3.0 doesn't patch the same files
ea11a0d8 -
Steve Lhomme authored
If the contrib install sub-directories it may install some and fail later. We should only install when we know everything built correctly. Do each build step in a separate make line. zlib had issues building all at once on emscripten https://code.videolan.org/robUx4/vlc/-/jobs/1149115 (cherry picked from commit 420e9f62) (edited) edited: - 3.0 some contribs are not build with CMake (flac, freetype2) - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)
cbabeb44 -
Steve Lhomme authored
We don't need to know the prefix when compiling. We also don't need multiple threads to install files. They will be better used for compiling files. (cherry picked from commit 6c86ff70) (edited) edited: - 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib) - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)
2313453b -
Steve Lhomme authored
It is cleaner than using an internal "install" target which may not be on all CMake generators. We don't need multiple threads to install files. They will be better used for compiling files. (cherry picked from commit d2b9059d)
75ad2577 -
(cherry picked from commit eb7ec442) (edited) edited: - 3.0 didn't have the emscripten patch - 3.0 already used $(GITHUB)
774abe26 -
Steve Lhomme authored
...for static library builds. So we have a clearer view of which target uses PIC and which doesn't. aom does it with the CONFIG_PIC variable that we set with the same conditions we set PIC. (cherry picked from commit c3ceacfd) (edited) edited: - 3.0 some contribs are not build with CMake (libxml2)
f96fd3c1 -
Steve Lhomme authored
It may differ between compilers and is internally handled by CMake, including not doing it on Windows targets. (cherry picked from commit e1b6661e) (edited) edited: - 3.0 doesn't use BUILD_DIR for autotools - 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib)
ddbbf247 -
Steve Lhomme authored
It's used for static libraries and only for some targets that need it. CMake takes care of picking the right configuration. (cherry picked from commit 1266db2b) (rebased) rebased: - the code around is slightly different
7a12274a -
Steve Lhomme authored
(cherry picked from commit c3d55dc1) (rebased) rebased: - 3.0 uses pthreads instead of winpthreads
c7c249b7 -
Steve Lhomme authored
We don't need a specific CMAKE_PIC anymore (cherry picked from commit 61eff32a) (edited) edited: - 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib) - 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)
cac14437 -
Steve Lhomme authored
We need to set ANDROID so that the code can tell it's building for Android. This is until we use the proper CMake Android configuration. (cherry picked from commit 7e172702) (rebased) rebased: - 3.0 doesn't have the following MSYS_BUILD check
9d47a81b -
Steve Lhomme authored
This triggers the use of CreateFile2 instead of CreateFileW. (cherry picked from commit c133bc4b)
b8768a50 -
Steve Lhomme authored
It doesn't describe the toolchain we use. We can pass the value as a regular flag. (cherry picked from commit 89fe89ee) (edited) edited: - 3.0 doesn't use gen-cmake-toolchain.py
b8e6e008
Showing
- contrib/src/aom/rules.mak 5 additions, 8 deletionscontrib/src/aom/rules.mak
- contrib/src/aribb25/rules.mak 3 additions, 1 deletioncontrib/src/aribb25/rules.mak
- contrib/src/asdcplib/rules.mak 3 additions, 1 deletioncontrib/src/asdcplib/rules.mak
- contrib/src/bluray/rules.mak 1 addition, 1 deletioncontrib/src/bluray/rules.mak
- contrib/src/breakpad/rules.mak 3 additions, 1 deletioncontrib/src/breakpad/rules.mak
- contrib/src/cddb/rules.mak 3 additions, 1 deletioncontrib/src/cddb/rules.mak
- contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch 39 additions, 0 deletions...t/0002-add-the-C-runtime-to-the-packages-to-link-to.patch
- contrib/src/chromaprint/rules.mak 6 additions, 3 deletionscontrib/src/chromaprint/rules.mak
- contrib/src/daala/rules.mak 2 additions, 2 deletionscontrib/src/daala/rules.mak
- contrib/src/dvdcss/rules.mak 3 additions, 1 deletioncontrib/src/dvdcss/rules.mak
- contrib/src/dvdread/rules.mak 3 additions, 1 deletioncontrib/src/dvdread/rules.mak
- contrib/src/ebml/rules.mak 4 additions, 2 deletionscontrib/src/ebml/rules.mak
- contrib/src/faad2/rules.mak 3 additions, 1 deletioncontrib/src/faad2/rules.mak
- contrib/src/flac/rules.mak 4 additions, 3 deletionscontrib/src/flac/rules.mak
- contrib/src/fluid/rules.mak 4 additions, 2 deletionscontrib/src/fluid/rules.mak
- contrib/src/fluidlite/rules.mak 4 additions, 3 deletionscontrib/src/fluidlite/rules.mak
- contrib/src/fontconfig/rules.mak 2 additions, 4 deletionscontrib/src/fontconfig/rules.mak
- contrib/src/gcrypt/rules.mak 1 addition, 1 deletioncontrib/src/gcrypt/rules.mak
- contrib/src/glew/SHA512SUMS 1 addition, 1 deletioncontrib/src/glew/SHA512SUMS
- contrib/src/glew/glew-drop-debug-postfix.patch 11 additions, 0 deletionscontrib/src/glew/glew-drop-debug-postfix.patch