Commit Graph

16 Commits

Author SHA1 Message Date
Kai Pastor
7a199e7786
[sdl1] Enable mingw (#25095)
* Portfile CMake style

* Fix mingw

* Add polyfill for missing 'which'

* Add patch for relocatable sdl-config

Fixes mingw on Windows builds.

* Update versions

* CR requests

* Remove man3

* Update versions
2022-06-08 14:30:48 -07:00
autoantwort
5eeffb9036
[sdl1] add support expression (#24232) 2022-04-19 08:16:52 -07:00
autoantwort
8ce7e2a2ac
[sdl1] no absolute paths (#22718) 2022-01-24 15:08:18 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986)
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
2021-09-09 01:24:04 -07:00
ankurverma85
57b4c4c73a
[sdl1] x64-windows-static-md fixes (#15126) 2020-12-26 22:22:21 -08:00
Alexander Neumann
458c20e94b
[vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries (#11550)
* [vcpkg/scripts/pkgconfig] rewrite pkgconfig check for libraries.

* [vcpkg/scripts/pkgconfig] fix more details.

* [vcpkg/scripts/pkgconfig] smaller improvements

* ws change to check functionallity of script for testing.

* [vcpkg/scripts/pkgconfig] update to latest test version

* Revert "ws change to check functionallity of script for testing."

This reverts commit 26269e9e77.

* [nettle] bump control for vcpkg_fixup_pkgconfig test

* [gmp] rerun CI to create new *.pc files

* [gmp/nettle] enable port debug

* [vcpkg/script/pkgconfig] fix path conversion regex for CI

* [CI|OSX] install pkg-config on osx

* [gmp/nettle] disable port debug

* [vcpkg/scripts/pkgconfig] update to latest version of x windows pr

* [zlib] add pkgconfig file

* [zstd] add fixup pkgconfig

* [libpng] add pc file installation

* [bzip2] install pc file and leave a TODO for somebody else ;)

* [bzip2] bump control

* [vcpkg/scripts/pkgconfig] skip checks if pkgconfig cannot be found.
- small bugfix in ignore flags regex

* retry zstd and zlib

* [libpng] retry by adding dl and m to system libraries for osx

* [libpng] add missing vcpkg_fixup_pkgconfig()

* [vcpkg/scripts/pkgconfig] unset var if found. 

fixes checks for other configurations which will be always succesful otherwise

* [libpng] bump control

* [libpng] enable port debug to debug osx regression

* ws change to retrigger osx ci and hopeing that it works

* fix typo

* [libpng] remove -lm flag on apple platforms

* ws change to rerun some ports in ci for good measure after the merge with master

* Re-trigger CI test

* [zstd] add pkgconfig

* [zstd] correct debug link

* [vcpkg/script/pkgconfig] - add more search suffixes for static libs
- add additional debug messages for debuging
- fix unsetting of cache variables hiding issues with debug libraries
- fixed pkgconfig fix in the debug case

* [pcre] add pthread dependency to pcre

* [protobuf] fix pkgconfig

* include quotes around the prefix in the case the prefix path was quoted (fixes some regressions)
add option NOT_STATIC_PKGCONFIG to run pkg-config without the --static argument

* [ignition-msgs5] get rid of a dev warning

* [apr] fix apr regression

* [protobuf] fix protobuf regression

* [sdl1] fix regression due to variable expansion of pkg-config. Use similar regex to the library removal for ignored flags.

* [ignition] fix regression

* remove changes of zlib portfile.

* reset changes in osx ci pipeline

* add DISABLE_PARALLEL_CONFIGURE

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
2020-07-24 11:39:21 -07:00
Alexander Neumann
27c6c94202
[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 40d6d81c01.

* Revert "Revert "bump control of the 16 configure ports""

This reverts commit 9c9851ddfc.

* 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 b4bc18edc2.

* 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>
2020-05-21 10:46:07 -07:00
nicole mazzuca
bf75bdfe92
[sdl1] Fix incorrect compilation type after dynamic build (#10105)
* [sdl1] Fix incorrect compilation type after dynamic build

* [sdl1] Add homepage
2020-03-05 14:06:50 -08:00
Jack·Boos·Yu
8bec8b516b [sdl1]Change build method to vcpkg_*_make (#9207)
* [sdl1]Change build method to vcpkg_*_make

* [sdl1] Fix output message

* [sdl1]Fix build.

* [sdl1] Correct message

* update baseline
2020-01-09 14:39:10 -08:00
Tatsuro Shibamura
a17d8cbf95 [sdl1] Add build support for ARM64 Windows 10 (#9301)
* [sdl1] Add build support for ARM64 Windows 10

* update baseline

* [sdl1] update version info

* update baseline

* Revert 5f71592f54

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-01-06 12:32:55 -08:00
Phil Christensen
59b8e3cdb2
[sdl1] fix windows sdk 18362 build failure (#8327)
Adding macro definition to silence new compile time diagnostics from
updated windows SDK.  This is not expected to change the behavior, only
supress a new diagnostic that is warning about existing behavior.
2019-09-25 10:49:40 -07:00
JackBoosY
87df6592ff [sdl1]Support linux build. (#8070)
* [sdl1]Support linux build.

* [sdl1]Remove linux configure args.

* [sdl1]Use vcpkg_execute_build_process instead of vcpkg_execute_required_process.

* [sdl1]Add vcpkg_execute_build_process args.

* [sdl1]Add NO_PARALLEL_COMMAND param with vcpkg_execute_build_process.
2019-09-11 10:42:07 -07:00
JackBoosY
bacbcf3527 [manyports]Regenerate patches and modify how the patches are used. (#7484)
* [ccfits]Regenerate patches and modify how the patches are used.

* [itpp]Regenerate patches and modify how the patches are used.

* [mpg123]Regenerate patches and modify how the patches are used.

* [qwt]Regenerate patches and modify how the patches are used.

* [sdl1]Remove a patche and modify how the patches are used.
2019-08-01 17:54:45 -07:00
LarryIII
68d1d2b1eb [sdl1]Fix sdl1 conflict with sdl2 (#6011) 2019-04-09 09:54:47 -07:00
MistGebaut
228289f450 sdl1: static build (#5903)
* sdl1: static build

* Update CONTROL file
2019-04-02 10:48:36 -07:00
Neil McNeight
4bc01b00e0 [sdl1][sdl1-net] Add new port for SDL v1.2.15 & SDL_net v1.2.8 (#4492)
* [sdl1][sdl1-net] Add new port for SDL v1.2.15 & SDL_net v1.2.8
* Version 1.2 is still required for building DOSbox

* [sdl1][sdl1-net] Revise to install to expected paths
* Headers go in include\ instead of include\SDL1
* Use updated .sln and .vcxproj files

* [sdl1] Modernize
2018-10-25 11:57:39 -07:00