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

Jump to bottom

libwebp: remove old versions #18416

Merged
merged 3 commits into from
Sep 29, 2023
Merged

libwebp: remove old versions #18416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ea7fe9
libwebp: remove old versions
mayeut Jul 3, 2023
55a68b3
remove 1.3.0
mayeut Jul 20, 2023
06be5d6
Merge branch 'master' into libwebp-remove-old
mayeut Sep 15, 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
52 changes: 2 additions & 50 deletions recipes/libwebp/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,12 @@ sources:
"1.3.1":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.3.1.tar.gz"
sha256: "b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66"
"1.3.0":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.3.0.tar.gz"
sha256: "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c"
"1.2.4":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.4.tar.gz"
sha256: "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df"
"1.2.3":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.3.tar.gz"
sha256: "f5d7ab2390b06b8a934a4fc35784291b3885b557780d099bd32f09241f9d83f9"
"1.2.2":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.2.tar.gz"
sha256: "7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6"
"1.2.1":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz"
sha256: "808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018"
"1.2.0":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz"
sha256: "2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c"
"1.1.0":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.1.0.tar.gz"
sha256: "98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043"
"1.0.3":
url: "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.3.tar.gz"
sha256: "e20a07865c8697bba00aebccc6f54912d6bc333bb4d604e6b07491c1a226b34f"
patches:
"1.3.2":
- patch_file: "patches/1.3.1-0001-fix-cmake.patch"
Expand All @@ -38,35 +20,12 @@ patches:
- patch_file: "patches/1.3.1-0001-fix-cmake.patch"
patch_description: "disable PIC, disable prefix library name on MSVC"
patch_type: "conan"
"1.3.0":
- patch_file: "patches/1.3.0-0001-fix-cmake.patch"
patch_description: "disable PIC, disable prefix library name on MSVC"
patch_type: "conan"
"1.2.4":
- patch_file: "patches/1.0.3-0001-fix-dll-export.patch"
patch_description: "define WEBP_EXTERN for windows shared build"
patch_type: "portability"
"1.2.3":
- patch_file: "patches/1.0.3-0001-fix-dll-export.patch"
patch_description: "define WEBP_EXTERN for windows shared build"
patch_type: "portability"
"1.2.2":
- patch_file: "patches/1.0.3-0001-fix-dll-export.patch"
patch_description: "define WEBP_EXTERN for windows shared build"
patch_type: "portability"
"1.2.1":
- patch_file: "patches/1.0.3-0001-fix-dll-export.patch"
- patch_file: "patches/1.1.0-0001-fix-dll-export.patch"
patch_description: "define WEBP_EXTERN for windows shared build"
patch_type: "portability"
"1.2.0":
- patch_file: "patches/1.0.3-0001-fix-dll-export.patch"
patch_description: "define WEBP_EXTERN for windows shared build"
patch_type: "portability"
- patch_file: "patches/1.2.0-0003-build-libwebpmux.patch"
patch_description: "always build libwebpmux"
patch_type: "conan"
"1.1.0":
- patch_file: "patches/1.0.3-0001-fix-dll-export.patch"
- patch_file: "patches/1.1.0-0001-fix-dll-export.patch"
patch_description: "define WEBP_EXTERN for windows shared build"
patch_type: "portability"
- patch_file: "patches/1.1.0-0002-qnx.patch"
Expand All @@ -76,10 +35,3 @@ patches:
- patch_file: "patches/1.1.0-0003-build-libwebpmux.patch"
patch_description: "always build libwebpmux"
patch_type: "conan"
"1.0.3":
- patch_file: "patches/1.0.3-0001-fix-dll-export.patch"
patch_description: "define WEBP_EXTERN for windows shared build"
patch_type: "portability"
- patch_file: "patches/1.0.3-0002-build-libwebpmux.patch"
patch_description: "always build libwebpmux"
patch_type: "conan"
5 changes: 1 addition & 4 deletions recipes/libwebp/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ def generate(self):
tc = CMakeToolchain(self)
# should be an option but it doesn't work yet
tc.variables["WEBP_ENABLE_SIMD"] = self.options.with_simd
if Version(self.version) >= "1.0.0":
tc.variables["WEBP_NEAR_LOSSLESS"] = self.options.near_lossless
else:
tc.variables["WEBP_ENABLE_NEAR_LOSSLESS"] = self.options.near_lossless
tc.variables["WEBP_NEAR_LOSSLESS"] = self.options.near_lossless
tc.variables["WEBP_ENABLE_SWAP_16BIT_CSP"] = self.options.swap_16bit_csp
# avoid finding system libs
tc.variables["CMAKE_DISABLE_FIND_PACKAGE_GIF"] = True
Expand Down
11 changes: 0 additions & 11 deletions recipes/libwebp/all/patches/1.0.3-0002-build-libwebpmux.patch
View file
Open in desktop

This file was deleted.

0 ...l/patches/1.0.3-0001-fix-dll-export.patch → ...l/patches/1.1.0-0001-fix-dll-export.patch
View file
Open in desktop
File renamed without changes.
11 changes: 0 additions & 11 deletions recipes/libwebp/all/patches/1.2.0-0003-build-libwebpmux.patch
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions recipes/libwebp/all/patches/1.3.0-0001-fix-cmake.patch
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions recipes/libwebp/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,7 @@ versions:
folder: all
"1.3.1":
folder: all
"1.3.0":
folder: all
"1.2.4":
folder: all
"1.2.3":
folder: all
"1.2.2":
folder: all
"1.2.1":
folder: all
"1.2.0":
folder: all
"1.1.0":
folder: all
"1.0.3":
folder: all