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

sdl_net: add v2.2.0, bump sdl #22002

Merged
merged 2 commits into from
Jun 11, 2024
Merged

sdl_net: add v2.2.0, bump sdl #22002

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
93356ca
sdl_net: add v2.2.0, bump sdl
valgur Dec 27, 2023
bba2850
sdl_net: update license file name
valgur Mar 19, 2024
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
3 changes: 3 additions & 0 deletions recipes/sdl_net/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"2.2.0":
url: "https://github.com/libsdl-org/SDL_net/releases/download/release-2.2.0/SDL2_net-2.2.0.tar.gz"
sha256: "4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb"
"2.0.1":
url: "https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz"
sha256: "15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21"
5 changes: 3 additions & 2 deletions recipes/sdl_net/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def layout(self):

def requirements(self):
# SDL_net.h includes SDL.h, SDL_endian.h and SDL_version.h
self.requires("sdl/2.28.2", transitive_headers=True)
self.requires("sdl/2.28.5", transitive_headers=True)

def validate(self):
if Version(self.version).major != Version(self.dependencies["sdl"].ref.version).major:
Expand All @@ -65,7 +65,8 @@ def build(self):
cmake.build()

def package(self):
copy(self, "COPYING.txt", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
license_file = "COPYING.txt" if Version(self.version) < "2.2.0" else "LICENSE.txt"
copy(self, license_file, self.source_folder, os.path.join(self.package_folder, "licenses"))
cmake = CMake(self)
cmake.install()

Expand Down
2 changes: 1 addition & 1 deletion recipes/sdl_net/all/test_package/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def layout(self):

def requirements(self):
self.requires(self.tested_reference_str)
self.requires("sdl/2.28.2")
self.requires("sdl/2.28.5")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 2 additions & 0 deletions recipes/sdl_net/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"2.2.0":
folder: all
"2.0.1":
folder: all
Loading