Submitted upstream https://github.com/acoustid/chromaprint/pull/119

(cherry picked from commit 7a772424)

It's off by default.

(cherry picked from commit 9aee5328)

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)

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)

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

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

rather than manually.

(cherry picked from commit 7017b973) (rebased)
rebased:
- 3.0 does't have PROJECTM_CONF

(cherry picked from commit 375d5a48)

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)

It can be removed once we update to the next release.

The previous patch potentially hides an error handling.

(cherry picked from commit 183ecb2e)

(cherry picked from commit 60b079bb)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 94415f30) (rebased)
rebased:
- the code around is slightly different

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 8c3d39bf)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit f941c3ca)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit c8c5541c)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 2f71ade4) (rebased)
rebased:
- 3.0 already has FLUIDLITE_CONF

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 96b9ffec)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 140cd0a3)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 0d97ee8a)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit a1405bc9)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 6cf7db55)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 83893fd0)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 69f55567)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 7c5abbf3)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit a29d55b1)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 89954b5a)

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit ed5fd417) (rebased)
rebased:
- 3.0 doesn't have CFLAGS/CXXFLAGS for srt

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 5 months ago

(cherry picked from commit 2277fd97)

Zhao Zhili authored 4 years ago and Steve Lhomme committed 5 months ago

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

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)

(cherry picked from commit 405c8b41)

(cherry picked from commit 75dc8ba5) (edited)
edited:
- 3.0 build protoc separately

Konstantin Pavlov authored 5 years ago and Steve Lhomme committed 5 months ago

With 4d57652c the Cmake BUILD_TYPE is
set to Debug when optimizations are disabled, which is then used by glew
to determine the resulting library name.

This in turn confuses our build of projectM, which uses glew32 as a name
to use when linking.

(cherry picked from commit 31d47ca7)

Alexandre Janniaux authored 5 years ago and Steve Lhomme committed 5 months ago

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

Hugo Beauzée-Luyssen authored 6 years ago and Steve Lhomme committed 5 months ago

sourceforge accepted .tar.gz but was redirecting to .tgz
Our mirrors have .tgz

(cherry picked from commit 3bf912cc)

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

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

(cherry picked from commit 498619b8)

That's how the buildbot does it

(cherry picked from commit 660de939) (rebased)
rebased:
- the code around is slightly different

(cherry picked from commit 0b609afa)