aboutsummaryrefslogtreecommitdiff
path: root/ports/x264
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2020-05-21 19:46:07 +0200
committerGitHub <noreply@github.com>2020-05-21 10:46:07 -0700
commit27c6c9420277c533cc4333bdd880f9862012cb72 (patch)
treeffb9a979edc97e987ebca77590400e3577b93567 /ports/x264
parentf6dd5aee5b2ed144a8313a92290771947028e5b6 (diff)
downloadvcpkg-27c6c9420277c533cc4333bdd880f9862012cb72.tar.gz
vcpkg-27c6c9420277c533cc4333bdd880f9862012cb72.zip
[vcpkg] Improve make builds (#10402)
* update all 16 configure_make ports * add make wrappers for msvc * improve make builds * fix relativ path errors on linux (and osx?) * revisit all 16 portfiles again * remove trace from install * fix relative build path issues. * bump control of the 16 configure ports * never forget .... real linux is case sensitive .... * Revert "bump control of the 16 configure ports" This reverts commit 40d6d81c01d2709c4acbdbec503b4787c3fd8282. * Revert "Revert "bump control of the 16 configure ports"" This reverts commit 9c9851ddfcd01bfad604ab9c9aed7379238d619a. * bump control again for real ci rebuild * add copy_source * remove message * pass parameters to vcpkg_build_make * fix healpix build. * fix libmagic regression * fix libwandio regression * pfring changes regression fix? (cannot test in wsl) * ws change to retrigger CI * fix libpq regression * fix libudns regression * add share/pkgconfig to PKG_CONFIG_PATH * cleanup of deprecated options * cleanup docs * Revert "bump control again for real ci rebuild" This reverts commit b4bc18edc2376eba6c3aa3dda52bd82286f23616. * shared binaries on linux should stay in lib. Only dlls are mvoed to bin * move pkgconfig check and add message about missing system packages * added autopoint as a build requirement * fix prerun shell working dir. * a few fixes from the x windows pr - add libpath setting - fixed pkgconfig search on windows platforms - fixed autopoint msys package on windows * fix release prefix * minimal cleanup and ws changes to trigger true CI rebuild * fix tcl by upgrading * remove unnecessary rename * fix pfring? can't test in WSL. Linux kernel headers required. * fix lowercase in patch * fix libwandio * remove x264 from fail list * replace wrappers with wrappers from automake * update make ports * remove unnecessary message * refactor vcpkg_configure_make * [tcl] remove stray ? * [farmhash] fix build * [freexl] ws change to retrigger ci build * [x264] add pthread as a dependency * [vcpkg/scripts] add ignore flag correctly * [sdl] fix vcpkg_fixup_pkgconfig call * [farmhash/freexl] delete configure and recreate it. * [libudns] remove trailing ? * [freexl] use empty build target * [freexl] add system library; remove previous change * Update ports/x264/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [libwandio] remove unncessary comment Co-authored-by: dan-shaw <51385773+dan-shaw@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/x264')
-rw-r--r--ports/x264/CONTROL5
-rw-r--r--ports/x264/portfile.cmake10
2 files changed, 6 insertions, 9 deletions
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL
index 58dab0c35..b49bf0a77 100644
--- a/ports/x264/CONTROL
+++ b/ports/x264/CONTROL
@@ -1,4 +1,5 @@
Source: x264
-Version: 157-303c484ec828ed0-7
+Version: 157-303c484ec828ed0-8
Homepage: https://github.com/mirror/x264
-Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format \ No newline at end of file
+Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format
+Build-Depends: pthread (linux&osx) \ No newline at end of file
diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index d1ed982a5..d7aff89d7 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -1,6 +1,6 @@
set(X264_VERSION 157)
-vcpkg_fail_port_install(ON_TARGET "Linux" "OSX")
+vcpkg_fail_port_install(ON_TARGET "OSX")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -27,11 +27,7 @@ vcpkg_configure_make(
)
vcpkg_install_make()
-
-if(NOT VCPKG_TARGET_IS_UWP)
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/x264)
- file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x264.exe ${CURRENT_PACKAGES_DIR}/tools/x264/x264.exe)
-endif()
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES -lpthread -lm -ldl)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/lib/pkgconfig
@@ -57,4 +53,4 @@ endif()
vcpkg_copy_pdbs()
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)