diff --git a/ports/bcg729/disable-alt-packaging.patch b/ports/bcg729/disable-alt-packaging.patch new file mode 100644 index 00000000000000..b53c77d245bb41 --- /dev/null +++ b/ports/bcg729/disable-alt-packaging.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69dbaef..695f4d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -125,5 +125,4 @@ install(FILES + DESTINATION ${CONFIG_PACKAGE_LOCATION} + ) + +-add_subdirectory(build) + diff --git a/ports/bcg729/portfile.cmake b/ports/bcg729/portfile.cmake index 2dccea634ca35e..02b510a5bf9876 100644 --- a/ports/bcg729/portfile.cmake +++ b/ports/bcg729/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 1.1.1 SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8 HEAD_REF master + PATCHES + disable-alt-packaging.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) @@ -19,10 +21,26 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME Bcg729) - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(GLOB cmake_files "${CURRENT_PACKAGES_DIR}/share/Bcg729/cmake/*.cmake") +file(COPY ${cmake_files} DESTINATION "${CURRENT_PACKAGES_DIR}/share/bcg729") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Bcg729/cmake") +file(GLOB_RECURSE remaining_files "${CURRENT_PACKAGES_DIR}/share/Bcg729/*") +if(NOT remaining_files) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Bcg729") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() + +file(READ "${SOURCE_PATH}/LICENSE.txt" GPL3) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" [[ +bcg729 is dual licensed, and is available either: + - under a GNU/GPLv3 license, for free (open source). See below. + - under a proprietary license, for a fee, to be used in closed source applications. + Contact Belledonne Communications (https://www.linphone.org/contact) + for any question about costs and services. + + +]] ${GPL3}) diff --git a/ports/bcg729/vcpkg.json b/ports/bcg729/vcpkg.json index 3f47ddac1b7696..4a08dcd9cc7355 100644 --- a/ports/bcg729/vcpkg.json +++ b/ports/bcg729/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bcg729", "version": "1.1.1", - "port-version": 2, + "port-version": 3, "description": "Bcg729 is an open source implementation of the ITU G.729 Annex A and B codec.", "homepage": "https://github.com/BelledonneCommunications/bcg729", "dependencies": [ diff --git a/versions/b-/bcg729.json b/versions/b-/bcg729.json index 39cae81b8863a5..ce2969ea11a1a0 100644 --- a/versions/b-/bcg729.json +++ b/versions/b-/bcg729.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3ab650b9aee68c1967ab35c8890ffcfd721b485", + "version": "1.1.1", + "port-version": 3 + }, { "git-tree": "d515bbfce335039dc7edaa083d7ab334888f8254", "version": "1.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 08e122171290f1..c132d91276dc99 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -398,7 +398,7 @@ }, "bcg729": { "baseline": "1.1.1", - "port-version": 2 + "port-version": 3 }, "bddisasm": { "baseline": "1.34.7",