From 1ea7fe96f8b1a58fa324cac5a198e87e4ee63b59 Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 3 Jul 2023 20:37:21 +0200 Subject: [PATCH 1/2] libwebp: remove old versions --- recipes/libwebp/all/conandata.yml | 45 +------------------ recipes/libwebp/all/conanfile.py | 5 +-- .../patches/1.0.3-0002-build-libwebpmux.patch | 11 ----- ....patch => 1.1.0-0001-fix-dll-export.patch} | 0 .../patches/1.2.0-0003-build-libwebpmux.patch | 11 ----- recipes/libwebp/config.yml | 10 ----- 6 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 recipes/libwebp/all/patches/1.0.3-0002-build-libwebpmux.patch rename recipes/libwebp/all/patches/{1.0.3-0001-fix-dll-export.patch => 1.1.0-0001-fix-dll-export.patch} (100%) delete mode 100644 recipes/libwebp/all/patches/1.2.0-0003-build-libwebpmux.patch diff --git a/recipes/libwebp/all/conandata.yml b/recipes/libwebp/all/conandata.yml index b036ea65e6055..f34371d322c7a 100644 --- a/recipes/libwebp/all/conandata.yml +++ b/recipes/libwebp/all/conandata.yml @@ -8,24 +8,9 @@ sources: "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.1": - patch_file: "patches/1.3.1-0001-fix-cmake.patch" @@ -36,30 +21,11 @@ patches: 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_file: "patches/1.1.0-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_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" @@ -69,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" diff --git a/recipes/libwebp/all/conanfile.py b/recipes/libwebp/all/conanfile.py index 0044f425b95b1..5e7c1354176a4 100644 --- a/recipes/libwebp/all/conanfile.py +++ b/recipes/libwebp/all/conanfile.py @@ -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 diff --git a/recipes/libwebp/all/patches/1.0.3-0002-build-libwebpmux.patch b/recipes/libwebp/all/patches/1.0.3-0002-build-libwebpmux.patch deleted file mode 100644 index 0892ee3bdacd9..0000000000000 --- a/recipes/libwebp/all/patches/1.0.3-0002-build-libwebpmux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -401,7 +401,7 @@ if(WEBP_BUILD_CWEBP) - install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - --if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP) -+if(1) - parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") - add_library(libwebpmux ${WEBP_MUX_SRCS}) - target_link_libraries(libwebpmux webp) diff --git a/recipes/libwebp/all/patches/1.0.3-0001-fix-dll-export.patch b/recipes/libwebp/all/patches/1.1.0-0001-fix-dll-export.patch similarity index 100% rename from recipes/libwebp/all/patches/1.0.3-0001-fix-dll-export.patch rename to recipes/libwebp/all/patches/1.1.0-0001-fix-dll-export.patch diff --git a/recipes/libwebp/all/patches/1.2.0-0003-build-libwebpmux.patch b/recipes/libwebp/all/patches/1.2.0-0003-build-libwebpmux.patch deleted file mode 100644 index 5f228670d57c8..0000000000000 --- a/recipes/libwebp/all/patches/1.2.0-0003-build-libwebpmux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -449,7 +449,7 @@ if(WEBP_BUILD_CWEBP) - install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - --if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP) -+if(1) - parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") - add_library(libwebpmux ${WEBP_MUX_SRCS}) - target_link_libraries(libwebpmux webp) diff --git a/recipes/libwebp/config.yml b/recipes/libwebp/config.yml index 3bf80d4385ecd..5f767f0e4167e 100644 --- a/recipes/libwebp/config.yml +++ b/recipes/libwebp/config.yml @@ -5,15 +5,5 @@ versions: 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 From 55a68b3cf647472aba5f50355abc8a8e5ef700a5 Mon Sep 17 00:00:00 2001 From: mayeut Date: Thu, 20 Jul 2023 08:52:47 +0200 Subject: [PATCH 2/2] remove 1.3.0 --- recipes/libwebp/all/conandata.yml | 7 ------- .../all/patches/1.3.0-0001-fix-cmake.patch | 21 ------------------- recipes/libwebp/config.yml | 2 -- 3 files changed, 30 deletions(-) delete mode 100644 recipes/libwebp/all/patches/1.3.0-0001-fix-cmake.patch diff --git a/recipes/libwebp/all/conandata.yml b/recipes/libwebp/all/conandata.yml index f34371d322c7a..cced24ed78404 100644 --- a/recipes/libwebp/all/conandata.yml +++ b/recipes/libwebp/all/conandata.yml @@ -2,9 +2,6 @@ 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" @@ -16,10 +13,6 @@ 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.1.0-0001-fix-dll-export.patch" patch_description: "define WEBP_EXTERN for windows shared build" diff --git a/recipes/libwebp/all/patches/1.3.0-0001-fix-cmake.patch b/recipes/libwebp/all/patches/1.3.0-0001-fix-cmake.patch deleted file mode 100644 index f9c41d4f6a541..0000000000000 --- a/recipes/libwebp/all/patches/1.3.0-0001-fix-cmake.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/a/CMakeLists.txt b/b/CMakeLists.txt -index 0a5af42..781f4c7 100644 ---- a/a/CMakeLists.txt -+++ b/b/CMakeLists.txt -@@ -58,7 +58,6 @@ if(WEBP_LINK_STATIC) - else() - set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) - endif() -- set(CMAKE_POSITION_INDEPENDENT_CODE ON) - # vwebp does not compile on Ubuntu with static libraries so disabling it for - # now. - set(WEBP_BUILD_VWEBP OFF) -@@ -142,7 +141,7 @@ endif() - set(PTHREAD_LIBS ${CMAKE_THREAD_LIBS_INIT}) - set(INSTALLED_LIBRARIES) - --if(MSVC) -+if(0) - # match the naming convention used by nmake - set(webp_libname_prefix "lib") - set(CMAKE_SHARED_LIBRARY_PREFIX "${webp_libname_prefix}") diff --git a/recipes/libwebp/config.yml b/recipes/libwebp/config.yml index 5f767f0e4167e..9e2ea5ad9a0f0 100644 --- a/recipes/libwebp/config.yml +++ b/recipes/libwebp/config.yml @@ -1,8 +1,6 @@ versions: "1.3.1": folder: all - "1.3.0": - folder: all "1.2.4": folder: all "1.1.0":