Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[winpcap/SDL1-mixer] Change the extension of the template MSBuild solution #31749

Merged
merged 2 commits into from
Jun 1, 2023
Merged

[winpcap/SDL1-mixer] Change the extension of the template MSBuild solution #31749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdb09d4
Modify the name of the template solutions
Jun 1, 2023
dabd838
update version
Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ports/sdl1-mixer/SDL_mixer_2017.sln → ports/sdl1-mixer/SDL_mixer_2017.sln.in
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ports/sdl1-mixer/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ vcpkg_from_github(
)

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/")
configure_file("${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL_mixer_2017.sln" COPYONLY)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(LIB_TYPE StaticLibrary)
Expand Down Expand Up @@ -73,7 +73,7 @@ else()
vcpkg_install_make()
vcpkg_fixup_pkgconfig()

file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
endif()

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/sdl1-mixer/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sdl1-mixer",
"version-date": "2023-03-25",
"port-version": 1,
"port-version": 2,
"description": "An audio mixer that supports various file formats for Simple Directmedia Layer.",
"homepage": "https://www.libsdl.org",
"license": "Zlib",
Expand Down
0 ports/winpcap/Packet.vcxproj → ports/winpcap/Packet.vcxproj.in
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions ports/winpcap/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ vcpkg_execute_required_process(
)

if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(COPY "${CURRENT_PORT_DIR}/Packet.vcxproj" DESTINATION "${SOURCE_PATH}/packetNtx/Dll/Project/")
configure_file("${CURRENT_PORT_DIR}/Packet.vcxproj.in" "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.vcxproj" COPYONLY)
endif()

vcpkg_build_msbuild(
Expand Down Expand Up @@ -84,7 +84,7 @@ vcpkg_execute_required_process(
)

if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(COPY "${CURRENT_PORT_DIR}/wpcap.vcxproj" DESTINATION "${SOURCE_PATH}/wpcap/PRJ/")
configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" COPYONLY)
endif()

vcpkg_build_msbuild(
Expand Down Expand Up @@ -168,5 +168,4 @@ endif()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif")

file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.
")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.")
2 changes: 1 addition & 1 deletion ports/winpcap/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "winpcap",
"version": "4.1.3",
"port-version": 9,
"port-version": 10,
"description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.",
"homepage": "https://www.winpcap.org",
"supports": "windows"
Expand Down
0 ports/winpcap/wpcap.vcxproj → ports/winpcap/wpcap.vcxproj.in
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7322,7 +7322,7 @@
},
"sdl1-mixer": {
"baseline": "2023-03-25",
"port-version": 1
"port-version": 2
},
"sdl1-net": {
"baseline": "1.2.8",
Expand Down Expand Up @@ -8590,7 +8590,7 @@
},
"winpcap": {
"baseline": "4.1.3",
"port-version": 9
"port-version": 10
},
"winpty": {
"baseline": "0.4.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl1-mixer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d9948f6d30a19d1be8d0de5406f7874c5991aec1",
"version-date": "2023-03-25",
"port-version": 2
},
{
"git-tree": "2e208f00e12332057ca6986afe060ff5fc1ef7cc",
"version-date": "2023-03-25",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/winpcap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "93484c8257a6ac5a90f5d540d143a6f4fe5968f2",
"version": "4.1.3",
"port-version": 10
},
{
"git-tree": "5444737a0b6d0d6a1c5129ae7435f52ac5f6bcb4",
"version": "4.1.3",
Expand Down