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.

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

Fix PACKAGE_VERSION output in sdl2_image-config-version.cmake #389

Merged
merged 1 commit into from
Oct 2, 2023

Conversation

bcarmo-caio
Copy link

Currently, when executing ./autogen.sh and ./configure we get the following sdl2_image-config-version.cmake

...
set(PACKAGE_VERSION "@MAJOR_VERSION_MACRO@.@MINOR_VERSION_MACRO@.@MICRO_VERSION_MACRO@")
...

This PR fixes this issue using the correct variable names and producing a proper file like

...
set(PACKAGE_VERSION "2.6.3")
...

@sezero sezero requested a review from madebr October 2, 2023 19:34
@sezero sezero changed the base branch from release-2.6.x to SDL2 October 2, 2023 20:24
@sezero sezero changed the base branch from SDL2 to release-2.6.x October 2, 2023 20:24
@sezero
Copy link
Contributor

sezero commented Oct 2, 2023

I tried to change target branch from release-2.6.x to SDL2 but that
doesn't work. If we do merge this to the release branch, we can cherry pick
to SDL2 branch, though.

P.S.: Curious failure in CI macos runs: any ideas @madebr ?

==> Fetching sdl2
==> Downloading https://raw.githubusercontent.com/Homebrew/homebrew-core/79823708f871f744e3aa0e6630b6f837c3d2981f/Formula/s/sdl2.rb
==> Cloning https://github.com/libsdl-org/SDL.git
Cloning into '/Users/runner/Library/Caches/Homebrew/sdl2--git'...
==> Checking out branch main
Already on 'main'
Your branch is up to date with 'origin/main'.
Error: An exception occurred within a child process:
  Errno::ENOENT: No such file or directory @ rb_sysopen - sdl2.pc.in
Error: Process completed with exit code 1.

@madebr madebr changed the base branch from release-2.6.x to SDL2 October 2, 2023 20:32
@madebr madebr changed the base branch from SDL2 to release-2.6.x October 2, 2023 20:32
@madebr
Copy link
Contributor

madebr commented Oct 2, 2023

P.S.: Curious failure in CI macos runs: any ideas @madebr ?

Homebrew/homebrew-core#149190

We don't need the --HEAD anymore.
It was introduced to work around a bug in a early CMake configuration file.

@sezero
Copy link
Contributor

sezero commented Oct 2, 2023

Should we merge this as is to release branch and cherry-pick to SDL2 later?

@madebr
Copy link
Contributor

madebr commented Oct 2, 2023

Should we merge this as is to release branch and cherry-pick to SDL2 later?

That's the normal procedure, but imho the order does not matter much since the change looks trivial (I've not yet tested it).

@madebr madebr merged commit 786f9b2 into libsdl-org:release-2.6.x Oct 2, 2023
6 of 8 checks passed
@madebr
Copy link
Contributor

madebr commented Oct 2, 2023

Cherry-picked to SDL2 in 70527e1

@bcarmo-caio
Copy link
Author

Hi there. Thank you for merging the PR so fast and sorry for mistaking the branch names.

I would like to open one more PR. Should I set the base to SDL2 instead of release-2.6.x this time?

Regards

@sezero
Copy link
Contributor

sezero commented Oct 3, 2023

I would like to open one more PR. Should I set the base to SDL2 instead of release-2.6.x this time?

Yes: SDL2-related changes should be against SDL2 branch. If found necessary, they will be applied back to the release branch.

@madebr
Copy link
Contributor

madebr commented Oct 3, 2023

In order of preference, depending on what you want to propose and whether it's still present in SDL3:

  1. main (SDL3)
  2. SDL2
  3. release-2.6.x

@bcarmo-caio bcarmo-caio deleted the release-2.6.x branch October 4, 2023 01:00
@bcarmo-caio bcarmo-caio restored the release-2.6.x branch October 4, 2023 01:00
@bcarmo-caio
Copy link
Author

Great. Thank you for letting me know

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants