aboutsummaryrefslogtreecommitdiff
path: root/ports/libmodplug
diff options
context:
space:
mode:
authorMatthew Oliver <protogonoi@gmail.com>2021-04-08 03:06:55 +1000
committerGitHub <noreply@github.com>2021-04-07 10:06:55 -0700
commit85a48c1ed558210cab67a03209510c4bf6e5e285 (patch)
treea09d9080713e8979579d35e8540eb59bbafeadb0 /ports/libmodplug
parent4278a5f9eafbdadfaa65d7aafd914964841cba42 (diff)
downloadvcpkg-85a48c1ed558210cab67a03209510c4bf6e5e285.tar.gz
vcpkg-85a48c1ed558210cab67a03209510c4bf6e5e285.zip
[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>
Diffstat (limited to 'ports/libmodplug')
-rw-r--r--ports/libmodplug/004-export-pkgconfig.patch30
-rw-r--r--ports/libmodplug/CONTROL3
-rw-r--r--ports/libmodplug/portfile.cmake35
3 files changed, 47 insertions, 21 deletions
diff --git a/ports/libmodplug/004-export-pkgconfig.patch b/ports/libmodplug/004-export-pkgconfig.patch
new file mode 100644
index 000000000..28201a961
--- /dev/null
+++ b/ports/libmodplug/004-export-pkgconfig.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 468f1a3..8e94458 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,6 +142,8 @@ if(HAVE_SINF)
+ endif(HAVE_SINF)
+
+ if (NOT WIN32)
++ set(UNIXLIBS "-lstdc++ -lm")
++endif (NOT WIN32)
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
+ set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
+@@ -152,4 +154,3 @@ if (NOT WIN32)
+ install(FILES "${PROJECT_BINARY_DIR}/libmodplug.pc"
+ DESTINATION lib/pkgconfig
+ )
+-endif (NOT WIN32)
+diff --git a/libmodplug.pc.in b/libmodplug.pc.in
+index bbf05f9..1699d76 100644
+--- 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
++Libs.private: @UNIXLIBS@
+ Cflags: -I${includedir}
+
diff --git a/ports/libmodplug/CONTROL b/ports/libmodplug/CONTROL
index c8339b104..2d05f206a 100644
--- a/ports/libmodplug/CONTROL
+++ b/ports/libmodplug/CONTROL
@@ -1,5 +1,6 @@
Source: libmodplug
Version: 0.8.9.0
-Port-Version: 6
+Port-Version: 7
Homepage: https://github.com/Konstanty/libmodplug
Description: The ModPlug mod file playing library.
+Supports: !uwp
diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake
index 261544349..6ead190d8 100644
--- a/ports/libmodplug/portfile.cmake
+++ b/ports/libmodplug/portfile.cmake
@@ -1,28 +1,21 @@
set(MODPLUG_HASH 5a39f5913d07ba3e61d8d5afdba00b70165da81d)
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
- vcpkg_from_github(ARCHIVE
- OUT_SOURCE_PATH SOURCE_PATH
- REPO Konstanty/libmodplug
- REF ${MODPLUG_HASH}
- SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
- PATCHES
- "001-automagically-define-modplug-static.patch"
- "002-detect_sinf.patch"
- "003-use-static-cast-for-ctype.patch"
- )
-else()
- vcpkg_from_github(ARCHIVE
- OUT_SOURCE_PATH SOURCE_PATH
- REPO Konstanty/libmodplug
- REF ${MODPLUG_HASH}
- SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
- PATCHES
- "002-detect_sinf.patch"
- "003-use-static-cast-for-ctype.patch"
- )
+ set(STATIC_PATCH "001-automagically-define-modplug-static.patch")
endif()
+vcpkg_from_github(ARCHIVE
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO Konstanty/libmodplug
+ REF ${MODPLUG_HASH}
+ SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
+ PATCHES
+ ${STATIC_PATCH}
+ 002-detect_sinf.patch
+ 003-use-static-cast-for-ctype.patch
+ 004-export-pkgconfig.patch
+)
+
vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA)
vcpkg_install_cmake()
@@ -42,5 +35,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_TARGET_IS_WINDOWS)
vcpkg_copy_pdbs()
endif()
+vcpkg_fixup_pkgconfig()
+
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmodplug)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmodplug/COPYING ${CURRENT_PACKAGES_DIR}/share/libmodplug/copyright)