2021-07-22 23:35:12 +01:00
|
|
|
From 6a3e539ea26eec1bfc2a6e722e923bd5221f8d26 Mon Sep 17 00:00:00 2001
|
|
|
|
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
|
|
|
|
Date: Thu, 8 Jul 2021 10:47:30 +0100
|
|
|
|
Subject: [PATCH] Fix Libs.private in .pc file.
|
|
|
|
|
|
|
|
---
|
|
|
|
CMakeLists.txt | 7 +++++--
|
|
|
|
libmodplug.pc.in | 2 +-
|
|
|
|
2 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 03:06:55 +10:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2021-07-22 23:35:12 +01:00
|
|
|
index 468f1a3..3164fc6 100644
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 03:06:55 +10:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
+++ b/CMakeLists.txt
|
2021-07-22 23:35:12 +01:00
|
|
|
@@ -141,7 +141,11 @@ if(HAVE_SINF)
|
|
|
|
add_definitions(-DHAVE_SINF)
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 03:06:55 +10:00
|
|
|
endif(HAVE_SINF)
|
|
|
|
|
2021-07-22 23:35:12 +01:00
|
|
|
-if (NOT WIN32)
|
|
|
|
+if(WIN32)
|
|
|
|
+ set(LIBS_PRIVATE "-luser32")
|
|
|
|
+else(WIN32)
|
|
|
|
+ set(LIBS_PRIVATE "-lstdc++ -lm")
|
|
|
|
+endif(WIN32)
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 03:06:55 +10:00
|
|
|
set(prefix "${CMAKE_INSTALL_PREFIX}")
|
|
|
|
set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
|
|
|
|
set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
|
2021-07-22 23:35:12 +01:00
|
|
|
@@ -152,4 +156,3 @@ if (NOT WIN32)
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 03:06:55 +10:00
|
|
|
install(FILES "${PROJECT_BINARY_DIR}/libmodplug.pc"
|
|
|
|
DESTINATION lib/pkgconfig
|
|
|
|
)
|
|
|
|
-endif (NOT WIN32)
|
|
|
|
diff --git a/libmodplug.pc.in b/libmodplug.pc.in
|
2021-07-22 23:35:12 +01:00
|
|
|
index bbf05f9..e4a43cc 100644
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 03:06:55 +10:00
|
|
|
--- a/libmodplug.pc.in
|
|
|
|
+++ b/libmodplug.pc.in
|
|
|
|
@@ -8,5 +8,5 @@ Description: The ModPlug mod file playing library.
|
|
|
|
Version: @VERSION@
|
|
|
|
Requires:
|
|
|
|
Libs: -L${libdir} -lmodplug
|
|
|
|
-Libs.private: -lstdc++ -lm
|
2021-07-22 23:35:12 +01:00
|
|
|
+Libs.private: @LIBS_PRIVATE@
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 03:06:55 +10:00
|
|
|
Cflags: -I${includedir}
|
2021-07-22 23:35:12 +01:00
|
|
|
--
|
|
|
|
2.21.0.windows.1
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 03:06:55 +10:00
|
|
|
|