From 21a7ede5cdde89b7fcef19aacbf2e223b9040f54 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Fri, 14 Jul 2017 14:09:50 -0400 Subject: Port libmikmod to vcpkg --- ports/libmikmod/CONTROL | 3 +++ ports/libmikmod/portfile.cmake | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/libmikmod/CONTROL create mode 100644 ports/libmikmod/portfile.cmake diff --git a/ports/libmikmod/CONTROL b/ports/libmikmod/CONTROL new file mode 100644 index 000000000..59a573ff6 --- /dev/null +++ b/ports/libmikmod/CONTROL @@ -0,0 +1,3 @@ +Source: libmikmod +Version: +Description: diff --git a/ports/libmikmod/portfile.cmake b/ports/libmikmod/portfile.cmake new file mode 100644 index 000000000..336e13922 --- /dev/null +++ b/ports/libmikmod/portfile.cmake @@ -0,0 +1,36 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libmikmod-3.3.11.1) +vcpkg_download_distfile(ARCHIVE + URLS "https://downloads.sourceforge.net/project/mikmod/libmikmod/3.3.11.1/libmikmod-3.3.11.1.tar.gz" + FILENAME "libmikmod-3.3.11.1.tar.gz" + SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS -DENABLE_DOC=OFF -DENABLE_THREADS=ON + OPTIONS_RELEASE -DENABLE_SIMD=ON + OPTIONS_DEBUG -DENABLE_SIMD=OFF +) + +vcpkg_install_cmake() + +# Handle copyright +file(COPY ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmikmod) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmikmod/COPYING.LESSER ${CURRENT_PACKAGES_DIR}/share/libmikmod/copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) \ No newline at end of file -- cgit v1.2.3 From 6af7b6716cba48d44d2935da4b4499fd4a3cd187 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Fri, 14 Jul 2017 19:32:16 -0400 Subject: Handle static builds of libmikmod --- ports/libmikmod/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/libmikmod/portfile.cmake b/ports/libmikmod/portfile.cmake index 336e13922..7af2b684e 100644 --- a/ports/libmikmod/portfile.cmake +++ b/ports/libmikmod/portfile.cmake @@ -33,4 +33,8 @@ vcpkg_install_cmake() file(COPY ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmikmod) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmikmod/COPYING.LESSER ${CURRENT_PACKAGES_DIR}/share/libmikmod/copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) \ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() \ No newline at end of file -- cgit v1.2.3 From 6d986f5112ab9dfa4f3a67e13a347cc6f40f62b1 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Fri, 14 Jul 2017 19:46:45 -0400 Subject: Add a port for allegro5 --- ports/allegro5/CONTROL | 4 ++++ ports/allegro5/portfile.cmake | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 ports/allegro5/CONTROL create mode 100644 ports/allegro5/portfile.cmake diff --git a/ports/allegro5/CONTROL b/ports/allegro5/CONTROL new file mode 100644 index 000000000..2f7ff0ccd --- /dev/null +++ b/ports/allegro5/CONTROL @@ -0,0 +1,4 @@ +Source: allegro5 +Version: 5.2.1.0 +Description: Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like. +Build-Depends: opengl, zlib, freetype, libogg, libvorbis, opus, libflac, openal-soft, libpng, bzip2 \ No newline at end of file diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake new file mode 100644 index 000000000..0028a090a --- /dev/null +++ b/ports/allegro5/portfile.cmake @@ -0,0 +1,36 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-5.2.1.0) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/liballeg/allegro5/archive/5.2.1.0.zip" + FILENAME "allegro5-5.2.1.0.zip" + SHA512 3271483714699e10d6ec0c0d94491d20d227b5a767d5134b592418bd0838c64d3a6448ba8448d568aeb846a6b50004656507deabb2d82dfe748f4ccc83ba1a53 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS -DSHARED=OFF -DWANT_DOCS=OFF -DALLEGRO_SDL=OFF -DWANT_STATIC_RUNTIME=ON -DWANT_DEMO=OFF -DWANT_EXAMPLES=OFF -DWANT_CURL_EXAMPLE=OFF -DWANT_TESTS=OFF + OPTIONS_RELEASE -DWANT_ALLOW_SSE=ON + OPTIONS_DEBUG -DWANT_ALLOW_SSE=OFF +) + +vcpkg_install_cmake() + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/allegro5) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/allegro5/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/allegro5/copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) \ No newline at end of file -- cgit v1.2.3 From af1aa04b56c2933fe0699a77d12cdd841aadf89d Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Fri, 14 Jul 2017 23:45:50 -0400 Subject: Add support for physfs and libtheora to allegro5 --- ports/allegro5/CONTROL | 2 +- ports/allegro5/portfile.cmake | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ports/allegro5/CONTROL b/ports/allegro5/CONTROL index 2f7ff0ccd..becfe1966 100644 --- a/ports/allegro5/CONTROL +++ b/ports/allegro5/CONTROL @@ -1,4 +1,4 @@ Source: allegro5 Version: 5.2.1.0 Description: Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like. -Build-Depends: opengl, zlib, freetype, libogg, libvorbis, opus, libflac, openal-soft, libpng, bzip2 \ No newline at end of file +Build-Depends: opengl, zlib, freetype, libogg, libvorbis, opus, libflac, openal-soft, libpng, bzip2, physfs, libtheora \ No newline at end of file diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 0028a090a..7481f7f3c 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -22,7 +22,44 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DSHARED=OFF -DWANT_DOCS=OFF -DALLEGRO_SDL=OFF -DWANT_STATIC_RUNTIME=ON -DWANT_DEMO=OFF -DWANT_EXAMPLES=OFF -DWANT_CURL_EXAMPLE=OFF -DWANT_TESTS=OFF + OPTIONS + -DWANT_DOCS=OFF + -DALLEGRO_SDL=OFF + -DWANT_DEMO=OFF + -DWANT_EXAMPLES=OFF + -DWANT_CURL_EXAMPLE=OFF + -DWANT_TESTS=OFF + -DWANT_AUDIO=ON + -DWANT_COLOR=ON + -DWANT_D3D=ON + -DWANT_D3D9EX=ON + -DWANT_DSOUND=ON + -DWANT_FLAC=ON + -DWANT_FONT=ON + -DWANT_GLES2=ON + -DWANT_GLES3=ON + -DWANT_IMAGE=ON + -DWANT_IMAGE_JPG=ON + -DWANT_IMAGE_PNG=ON + -DWANT_MEMFILE=ON + -DWANT_MODAUDIO=ON + -DWANT_NATIVE_DIALOG=ON + -DWANT_NATIVE_IMAGE_LOADER=ON + -DWANT_OGG_VIDEO=ON + -DWANT_OPENAL=ON + -DWANT_OPENGL=ON + -DWANT_OPUS=ON + -DWANT_PHYSFS=ON + -DWANT_POPUP_EXAMPLES=OFF + -DWANT_PRIMITIVES=ON + -DWANT_RELEASE_LOGGING=OFF + -DWANT_SHADERS_D3D=ON + -DWANT_SHADERS_GL=ON + -DWANT_TREMOR=ON + -DWANT_TTF=ON + -DWANT_VIDEO=ON + -DWANT_VORBIS=ON + -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_RELEASE -DWANT_ALLOW_SSE=ON OPTIONS_DEBUG -DWANT_ALLOW_SSE=OFF ) -- cgit v1.2.3 From 8d2313181324c7df95d9d5e772e8e33d1509b3ff Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Fri, 14 Jul 2017 23:46:03 -0400 Subject: Flesh out libmikmod --- ports/libmikmod/CONTROL | 5 +++-- ports/libmikmod/portfile.cmake | 14 +++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ports/libmikmod/CONTROL b/ports/libmikmod/CONTROL index 59a573ff6..b9f970959 100644 --- a/ports/libmikmod/CONTROL +++ b/ports/libmikmod/CONTROL @@ -1,3 +1,4 @@ Source: libmikmod -Version: -Description: +Version: 3.3.11.1 +Description: Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm. +Build-Depends: openal-soft \ No newline at end of file diff --git a/ports/libmikmod/portfile.cmake b/ports/libmikmod/portfile.cmake index 7af2b684e..1231f5bfa 100644 --- a/ports/libmikmod/portfile.cmake +++ b/ports/libmikmod/portfile.cmake @@ -22,7 +22,19 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DENABLE_DOC=OFF -DENABLE_THREADS=ON + OPTIONS + -DENABLE_DOC=OFF + -DENABLE_THREADS=ON + -DDISABLE_HQMIXER=OFF + -DENABLE_AF=ON + -DENABLE_AIFF=ON + -DENABLE_NAS=ON + -DENABLE_OPENAL=ON + -DENABLE_PIPE=ON + -DENABLE_RAW=ON + -DENABLE_STDOUT=ON + -DENABLE_WAV=ON + -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_RELEASE -DENABLE_SIMD=ON OPTIONS_DEBUG -DENABLE_SIMD=OFF ) -- cgit v1.2.3 From 7a732c9d20577f88e209decd1f6bd4132f2e215b Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 00:08:54 -0400 Subject: Remove some dependencies that we don't yet have on vcpkg --- ports/allegro5/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 7481f7f3c..f969424d7 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -48,6 +48,7 @@ vcpkg_configure_cmake( -DWANT_OGG_VIDEO=ON -DWANT_OPENAL=ON -DWANT_OPENGL=ON + -DWANT_OPENSL=OFF # Not yet available on vcpkg -DWANT_OPUS=ON -DWANT_PHYSFS=ON -DWANT_POPUP_EXAMPLES=OFF @@ -55,7 +56,7 @@ vcpkg_configure_cmake( -DWANT_RELEASE_LOGGING=OFF -DWANT_SHADERS_D3D=ON -DWANT_SHADERS_GL=ON - -DWANT_TREMOR=ON + -DWANT_TREMOR=OFF # Not yet available on vcpkg -DWANT_TTF=ON -DWANT_VIDEO=ON -DWANT_VORBIS=ON -- cgit v1.2.3 From d973fe70b0cbb7c4820e9e08dd4c527266d8b22a Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 00:09:06 -0400 Subject: Clarify two include directories for allegro5 --- ports/allegro5/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index f969424d7..956632112 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -61,6 +61,8 @@ vcpkg_configure_cmake( -DWANT_VIDEO=ON -DWANT_VORBIS=ON -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DOPUS_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_RELEASE -DWANT_ALLOW_SSE=ON OPTIONS_DEBUG -DWANT_ALLOW_SSE=OFF ) -- cgit v1.2.3 From db1cf01b36808c76e789d0c7fdab67567bcf5e27 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 00:39:27 -0400 Subject: Remove modaudio for now - modaudio support relies on DUMB, which is not available on vcpkg right now --- ports/allegro5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 956632112..59464e652 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -42,7 +42,7 @@ vcpkg_configure_cmake( -DWANT_IMAGE_JPG=ON -DWANT_IMAGE_PNG=ON -DWANT_MEMFILE=ON - -DWANT_MODAUDIO=ON + -DWANT_MODAUDIO=OFF # Not available on vcpkg right now -DWANT_NATIVE_DIALOG=ON -DWANT_NATIVE_IMAGE_LOADER=ON -DWANT_OGG_VIDEO=ON -- cgit v1.2.3 From 1b9546aea4d8fd0193843ac8a6ed21cdaaec128a Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 00:46:09 -0400 Subject: Guess we don't need d3d9ex either --- ports/allegro5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 59464e652..59f5e54c3 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -32,7 +32,7 @@ vcpkg_configure_cmake( -DWANT_AUDIO=ON -DWANT_COLOR=ON -DWANT_D3D=ON - -DWANT_D3D9EX=ON + -DWANT_D3D9EX=OFF # Not available on vcpkg -DWANT_DSOUND=ON -DWANT_FLAC=ON -DWANT_FONT=ON -- cgit v1.2.3 From 2da5aac5edb625d958854fec664b60f0be7c34b5 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 00:49:19 -0400 Subject: Go a little deeper with OPENAL_INCLUDE_DIR --- ports/allegro5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 59f5e54c3..85fece836 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -60,7 +60,7 @@ vcpkg_configure_cmake( -DWANT_TTF=ON -DWANT_VIDEO=ON -DWANT_VORBIS=ON - -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/AL -DOPUS_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_RELEASE -DWANT_ALLOW_SSE=ON -- cgit v1.2.3 From 8b802d3ffaeb1f173d081be20209fb4863944da7 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 01:07:22 -0400 Subject: opusfile isn't available on vcpkg, let's not include it --- ports/allegro5/CONTROL | 2 +- ports/allegro5/portfile.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/allegro5/CONTROL b/ports/allegro5/CONTROL index becfe1966..2d3003935 100644 --- a/ports/allegro5/CONTROL +++ b/ports/allegro5/CONTROL @@ -1,4 +1,4 @@ Source: allegro5 Version: 5.2.1.0 Description: Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like. -Build-Depends: opengl, zlib, freetype, libogg, libvorbis, opus, libflac, openal-soft, libpng, bzip2, physfs, libtheora \ No newline at end of file +Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora \ No newline at end of file diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 85fece836..83ab6e5d9 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -49,7 +49,7 @@ vcpkg_configure_cmake( -DWANT_OPENAL=ON -DWANT_OPENGL=ON -DWANT_OPENSL=OFF # Not yet available on vcpkg - -DWANT_OPUS=ON + -DWANT_OPUS=OFF # opus is available on vcpkg, but opusfile isn't -DWANT_PHYSFS=ON -DWANT_POPUP_EXAMPLES=OFF -DWANT_PRIMITIVES=ON @@ -61,7 +61,6 @@ vcpkg_configure_cmake( -DWANT_VIDEO=ON -DWANT_VORBIS=ON -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/AL - -DOPUS_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_RELEASE -DWANT_ALLOW_SSE=ON OPTIONS_DEBUG -DWANT_ALLOW_SSE=OFF -- cgit v1.2.3 From d4f924f7537700dfc25f265eb68cbf377b7c32d3 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 10:45:14 -0400 Subject: Add vcpkg_copy_pdbs() to allegro5's portfile - Maybe this'll resolve those errors? --- ports/allegro5/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 83ab6e5d9..0c3a8a42c 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -72,4 +72,6 @@ vcpkg_install_cmake() file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/allegro5) file(RENAME ${CURRENT_PACKAGES_DIR}/share/allegro5/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/allegro5/copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) \ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From b0ade3ed2ef18240715d0aec6e8d0866c6bf9e8d Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 11:00:37 -0400 Subject: Nope, let's try globbing --- ports/allegro5/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 0c3a8a42c..69863649c 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -74,4 +74,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/allegro5/LICENSE.txt ${CURRENT_PACKAGE file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(GLOB PDB_GLOB ${CURRENT_BUILDTREES_DIR}-dbg/lib/*.dbg) +file(COPY ${PDB_GLOB} DESTINATION ${CURRENT_BUILDTREES_DIR}-dbg/lib/Debug) + vcpkg_copy_pdbs() -- cgit v1.2.3 From 7dfa5b6bb987dab4e94a3d4eedefccf070b24e6b Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 11:47:50 -0400 Subject: Oops --- ports/allegro5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 69863649c..9f5aa3416 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -74,7 +74,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/allegro5/LICENSE.txt ${CURRENT_PACKAGE file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB PDB_GLOB ${CURRENT_BUILDTREES_DIR}-dbg/lib/*.dbg) +file(GLOB PDB_GLOB ${CURRENT_BUILDTREES_DIR}-dbg/lib/*.pdb) file(COPY ${PDB_GLOB} DESTINATION ${CURRENT_BUILDTREES_DIR}-dbg/lib/Debug) vcpkg_copy_pdbs() -- cgit v1.2.3 From a29b5e4612d921b2fbf22e36a016616061da99af Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 15 Jul 2017 13:56:02 -0400 Subject: Let's try this --- ports/allegro5/portfile.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 9f5aa3416..e1f18baaa 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -19,6 +19,11 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(ALLEGRO_USE_STATIC -DSHARED=ON) +else() + set(ALLEGRO_USE_STATIC -DSHARED=OFF) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja @@ -26,6 +31,7 @@ vcpkg_configure_cmake( -DWANT_DOCS=OFF -DALLEGRO_SDL=OFF -DWANT_DEMO=OFF + ${ALLEGRO_USE_STATIC} -DWANT_EXAMPLES=OFF -DWANT_CURL_EXAMPLE=OFF -DWANT_TESTS=OFF -- cgit v1.2.3 From f8f6628eecb8d2df9b7262d8d50752c33f8cfc12 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 16:37:30 -0400 Subject: Let's try making that directory --- ports/allegro5/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index e1f18baaa..626bec45a 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -81,6 +81,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/allegro5/LICENSE.txt ${CURRENT_PACKAGE file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(GLOB PDB_GLOB ${CURRENT_BUILDTREES_DIR}-dbg/lib/*.pdb) +file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}-dbg/lib/Debug) file(COPY ${PDB_GLOB} DESTINATION ${CURRENT_BUILDTREES_DIR}-dbg/lib/Debug) vcpkg_copy_pdbs() -- cgit v1.2.3 From 4f5f505f360fb332f860de2a64f969ebeadaa8f9 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 17:25:17 -0400 Subject: Let's try vcpkg_from_github --- ports/allegro5/portfile.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 626bec45a..dad86f1b6 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -11,11 +11,12 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-5.2.1.0) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/liballeg/allegro5/archive/5.2.1.0.zip" - FILENAME "allegro5-5.2.1.0.zip" - SHA512 3271483714699e10d6ec0c0d94491d20d227b5a767d5134b592418bd0838c64d3a6448ba8448d568aeb846a6b50004656507deabb2d82dfe748f4ccc83ba1a53 +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-5.2.3.0) +vcpkg_from_github( + OUT_SOURCE_PATH ${SOURCE_PATH} + REPO liballeg/allegro5 + REF 7d8892a + HEAD_REF master ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 6d64cf15fb528c16223c6868bdceeb47f864d4a1 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 17:27:26 -0400 Subject: Ah, wait --- ports/allegro5/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index dad86f1b6..3be645c6b 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( OUT_SOURCE_PATH ${SOURCE_PATH} REPO liballeg/allegro5 REF 7d8892a + SHA512 1 HEAD_REF master ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 65081aa44cbe2c872e2e846a7d90cd5a0d8007f6 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 17:29:05 -0400 Subject: Fix the SHA512 --- ports/allegro5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 3be645c6b..c01ea932e 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_from_github( OUT_SOURCE_PATH ${SOURCE_PATH} REPO liballeg/allegro5 REF 7d8892a - SHA512 1 + SHA512 b1531fa2f22023ecd4e053d03d1c54bf0b94aa3af004a3a06245c4d8278fea64e9d354467873ebd665301903d954795fed88e2467c88441f39c273e7e0d87d6e HEAD_REF master ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 9604264ac296dc1eef3ce025f985adb2c0e819da Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 17:30:33 -0400 Subject: Let's try the hash --- ports/allegro5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index c01ea932e..b67e150dc 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -11,7 +11,7 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-5.2.3.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-7d8892a) vcpkg_from_github( OUT_SOURCE_PATH ${SOURCE_PATH} REPO liballeg/allegro5 -- cgit v1.2.3 From 69f63b1904a7c106efb678f9dbd2ba06909a9bda Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 17:32:12 -0400 Subject: Oh, the FULL hash --- ports/allegro5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index b67e150dc..8024c6b73 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -11,7 +11,7 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-7d8892a) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-7d8892a9278c57f2d8bb1e555f9ec59cf9ed4f73) vcpkg_from_github( OUT_SOURCE_PATH ${SOURCE_PATH} REPO liballeg/allegro5 -- cgit v1.2.3 From a56ace5ee421234c2cce31e4d9f33a940d505b21 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 17:34:46 -0400 Subject: Guh --- ports/allegro5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 8024c6b73..f9935dfd1 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -15,7 +15,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-7d8892a9278c57f2d8bb1e555 vcpkg_from_github( OUT_SOURCE_PATH ${SOURCE_PATH} REPO liballeg/allegro5 - REF 7d8892a + REF 7d8892a9278c57f2d8bb1e555f9ec59cf9ed4f73 SHA512 b1531fa2f22023ecd4e053d03d1c54bf0b94aa3af004a3a06245c4d8278fea64e9d354467873ebd665301903d954795fed88e2467c88441f39c273e7e0d87d6e HEAD_REF master ) -- cgit v1.2.3 From 6170eddeb7761aa3fa6b5542cd903c7e6b8b922d Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 17:36:21 -0400 Subject: Don't need that function --- ports/allegro5/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index f9935dfd1..094219a83 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -19,7 +19,6 @@ vcpkg_from_github( SHA512 b1531fa2f22023ecd4e053d03d1c54bf0b94aa3af004a3a06245c4d8278fea64e9d354467873ebd665301903d954795fed88e2467c88441f39c273e7e0d87d6e HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(ALLEGRO_USE_STATIC -DSHARED=ON) -- cgit v1.2.3 From d1ff4a83b5d539e036bb35dd7d3221b12ceafd8c Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 18:43:30 -0400 Subject: Try the /Z7 flag - Debug info is not generated in PDB's, it's within the binaries instead --- ports/allegro5/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 094219a83..a1d075727 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -70,7 +70,9 @@ vcpkg_configure_cmake( -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/AL -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_RELEASE -DWANT_ALLOW_SSE=ON - OPTIONS_DEBUG -DWANT_ALLOW_SSE=OFF + OPTIONS_DEBUG + -DWANT_ALLOW_SSE=OFF + -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1" ) vcpkg_install_cmake() -- cgit v1.2.3 From a8a1ad9374f59bc94835f6f4e988f5970848c8dd Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 18:52:48 -0400 Subject: Need C flags, too --- ports/allegro5/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index a1d075727..3769f227e 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -73,6 +73,7 @@ vcpkg_configure_cmake( OPTIONS_DEBUG -DWANT_ALLOW_SSE=OFF -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1" + -DCMAKE_C_FLAGS_DEBUG="/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1" ) vcpkg_install_cmake() -- cgit v1.2.3 From f90508f3be64ac68d06420ab16ba2d362e35298f Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 19:22:33 -0400 Subject: Eh, actually, no --- ports/allegro5/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 3769f227e..094219a83 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -70,10 +70,7 @@ vcpkg_configure_cmake( -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/AL -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_RELEASE -DWANT_ALLOW_SSE=ON - OPTIONS_DEBUG - -DWANT_ALLOW_SSE=OFF - -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1" - -DCMAKE_C_FLAGS_DEBUG="/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1" + OPTIONS_DEBUG -DWANT_ALLOW_SSE=OFF ) vcpkg_install_cmake() -- cgit v1.2.3 From a354afaae34f3c1525271da8f58044b7a3b5ea40 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 20 Jul 2017 19:32:22 -0400 Subject: This is personal now --- ports/allegro5/fix-pdb-install.patch | 13 +++++++++++++ ports/allegro5/portfile.cmake | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 ports/allegro5/fix-pdb-install.patch diff --git a/ports/allegro5/fix-pdb-install.patch b/ports/allegro5/fix-pdb-install.patch new file mode 100644 index 000000000..ef964b9f3 --- /dev/null +++ b/ports/allegro5/fix-pdb-install.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Common.cmake b/cmake/Common.cmake +index 782196f..de29535 100644 +--- a/cmake/Common.cmake ++++ b/cmake/Common.cmake +@@ -223,7 +223,7 @@ function(install_our_library target filename) + # PUBLIC_HEADER DESTINATION "include" + ) + if(MSVC AND BUILD_SHARED_LIBS) +- install(FILES ${CMAKE_BINARY_DIR}/lib/\${CMAKE_INSTALL_CONFIG_NAME}/${filename}.pdb ++ install(FILES ${CMAKE_BINARY_DIR}/lib/${filename}.pdb + DESTINATION lib + CONFIGURATIONS Debug RelWithDebInfo + ) diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 094219a83..d2801d5d4 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -25,6 +25,13 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") else() set(ALLEGRO_USE_STATIC -DSHARED=OFF) endif() + +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-pdb-install.patch +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja -- cgit v1.2.3