diff options
| author | evpobr <evpobr@gmail.com> | 2021-04-03 01:24:18 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 13:24:18 -0700 |
| commit | 4ec290c716a258ec9c5e8c51051ee1f8a693d31d (patch) | |
| tree | 7e8a11f5a4a8d552147e68c8632082448f2d11f3 | |
| parent | 0a251caefd77da030782748898950832b3dcf9b6 (diff) | |
| download | vcpkg-4ec290c716a258ec9c5e8c51051ee1f8a693d31d.tar.gz vcpkg-4ec290c716a258ec9c5e8c51051ee1f8a693d31d.zip | |
[mpg123] Upgrade to 1.26.3-1 (#16910)
* [mpg123] Upgrade to 1.26.3-1
Fix invalid MPG123_API_VERSION value in mpg123.h.in for Windows
platform. It was equal to @API_VERSION@, now it is read from
configure.ac and set to correct value.
See also libsndfile/libsndfile#499.
* [mpg123] Update 1.26.3-1 baseline version
| -rw-r--r-- | ports/mpg123/portfile.cmake | 24 | ||||
| -rw-r--r-- | ports/mpg123/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/mpg123.json | 5 |
4 files changed, 29 insertions, 3 deletions
diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index b96d2fade..b438340ba 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -36,6 +36,12 @@ vcpkg_from_sourceforge( include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) yasm_tool_helper(APPEND_TO_PATH) +macro(read_api_version) + file(READ "${SOURCE_PATH}/configure.ac" configure_ac) + string(REGEX MATCH "API_VERSION=([0-9]+)" result ${configure_ac}) + set(API_VERSION ${CMAKE_MATCH_1}) +endmacro() + if(VCPKG_TARGET_IS_UWP) vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} @@ -45,12 +51,19 @@ if(VCPKG_TARGET_IS_UWP) RELEASE_CONFIGURATION Release_uwp DEBUG_CONFIGURATION Debug_uwp ) + file(INSTALL ${SOURCE_PATH}/ports/MSVC++/mpg123.h ${SOURCE_PATH}/src/libmpg123/fmt123.h - ${SOURCE_PATH}/src/libmpg123/mpg123.h.in DESTINATION ${CURRENT_PACKAGES_DIR}/include ) + + read_api_version() + configure_file( + ${SOURCE_PATH}/src/libmpg123/mpg123.h.in + ${CURRENT_PACKAGES_DIR}/include/mpg123.h.in @ONLY + ) + elseif(VCPKG_TARGET_IS_WINDOWS) vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} @@ -59,12 +72,19 @@ elseif(VCPKG_TARGET_IS_WINDOWS) RELEASE_CONFIGURATION Release${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} DEBUG_CONFIGURATION Debug${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} ) + file(INSTALL ${SOURCE_PATH}/ports/MSVC++/mpg123.h ${SOURCE_PATH}/src/libmpg123/fmt123.h - ${SOURCE_PATH}/src/libmpg123/mpg123.h.in DESTINATION ${CURRENT_PACKAGES_DIR}/include ) + + read_api_version() + configure_file( + ${SOURCE_PATH}/src/libmpg123/mpg123.h.in + ${CURRENT_PACKAGES_DIR}/include/mpg123.h.in @ONLY + ) + elseif(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) set(MPG123_OPTIONS --disable-dependency-tracking diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 080bc57d0..e03100757 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mpg123", "version-string": "1.26.3", + "port-version": 1, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3de498655..57742facb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4030,7 +4030,7 @@ }, "mpg123": { "baseline": "1.26.3", - "port-version": 0 + "port-version": 1 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 7861b984e..5870bbfbb 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b143abaf1493952c9a04569e7d8379dac8ff8c1c", + "version-string": "1.26.3", + "port-version": 1 + }, + { "git-tree": "19e2118fcd63fde61be2fd29d54a7bc8699ffa75", "version-string": "1.26.3", "port-version": 0 |