[gentoo-commits] repo/gentoo:master commit in: media-gfx/libimagequant/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/libimagequant/files/

[Sam James]

commit:     314c292447d9cbcf5f32e941fcb9692190777b28
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 21:30:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 14 21:30:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314c2924

media-gfx/libimagequant: tidy patches

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch   | 4 ----
 .../files/libimagequant-2.14.0-fix-openmp-pragma.patch             | 7 -------
 .../libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch   | 4 ----
 3 files changed, 15 deletions(-)

diff --git a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
index 0b058fbecc2..ce9cc2b8c99 100644
--- a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
+++ b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 2666b3d..ba58cf1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -133,7 +133,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
@@ -11,8 +9,6 @@ index 2666b3d..ba58cf1 100644
  
  .PHONY: all static shared clean dist distclean dll java cargo
  .DELETE_ON_ERROR:
-diff --git a/imagequant.pc.in b/imagequant.pc.in
-index 980da8c..6c6569d 100644
 --- a/imagequant.pc.in
 +++ b/imagequant.pc.in
 @@ -1,6 +1,6 @@

diff --git a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
index 7e2d5861961..f355453ece6 100644
--- a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
+++ b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
@@ -2,13 +2,6 @@ From 44525d34b738f733a81037286ece603ca0fdcf10 Mon Sep 17 00:00:00 2001
 From: Kornel <kornel@geekhood.net>
 Date: Wed, 27 Jan 2021 17:36:33 +0000
 Subject: [PATCH] Update OMP pragma
-
----
- libimagequant.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/libimagequant.c b/libimagequant.c
-index 4f0b48f..828f768 100644
 --- a/libimagequant.c
 +++ b/libimagequant.c
 @@ -1279,10 +1279,7 @@ LIQ_NONNULL static float remap_to_palette(liq_image *const input_image, unsigned

diff --git a/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch
index f0e150385a4..fbf3bc73557 100644
--- a/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch
+++ b/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 3210d54..ca2acf6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -134,7 +134,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
@@ -11,8 +9,6 @@ index 3210d54..ca2acf6 100644
  
  .PHONY: all static shared clean dist distclean dll java cargo
  .DELETE_ON_ERROR:
-diff --git a/imagequant.pc.in b/imagequant.pc.in
-index 16935b7..4810a25 100644
 --- a/imagequant.pc.in
 +++ b/imagequant.pc.in
 @@ -1,6 +1,6 @@

[gentoo-commits] repo/gentoo:master commit in: media-gfx/libimagequant/files/

[Joonas Niilola]

commit:     dbc303b62abba2c47f200be679d33784d6f9beae
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar  7 07:29:14 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 08:31:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc303b6

media-gfx/libimagequant: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24434
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/libimagequant-2.12.2-fix-pkgconfig.patch  | 21 ---------------------
 .../libimagequant-2.14.0-fix-openmp-pragma.patch    | 18 ------------------
 2 files changed, 39 deletions(-)

diff --git a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
deleted file mode 100644
index ce9cc2b8c99f..000000000000
--- a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -133,7 +133,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
- endif
- 
- $(PKGCONFIG): config.mk
--	sed 's|PREFIX|$(PREFIX)|;s|VERSION|$(VERSION)|' < imagequant.pc.in > $(PKGCONFIG)
-+	sed 's|PREFIX|$(PREFIX)|;s|VERSION|$(VERSION)|;s|LIBDIR|$(LIBDIR)|' < imagequant.pc.in > $(PKGCONFIG)
- 
- .PHONY: all static shared clean dist distclean dll java cargo
- .DELETE_ON_ERROR:
---- a/imagequant.pc.in
-+++ b/imagequant.pc.in
-@@ -1,6 +1,6 @@
- prefix=PREFIX
- includedir=${prefix}/include
--libdir=${prefix}/lib
-+libdir=LIBDIR
- 
- Name: imagequant
- Description: Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.

diff --git a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
deleted file mode 100644
index f355453ece6c..000000000000
--- a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 44525d34b738f733a81037286ece603ca0fdcf10 Mon Sep 17 00:00:00 2001
-From: Kornel <kornel@geekhood.net>
-Date: Wed, 27 Jan 2021 17:36:33 +0000
-Subject: [PATCH] Update OMP pragma
---- a/libimagequant.c
-+++ b/libimagequant.c
-@@ -1279,10 +1279,7 @@ LIQ_NONNULL static float remap_to_palette(liq_image *const input_image, unsigned
- 
- #if __GNUC__ >= 9 || __clang__
-     #pragma omp parallel for if (rows*cols > 3000) \
--        schedule(static) default(none) shared(acolormap,average_color,cols,input_image,map,n,output_pixels,rows,transparent_index) reduction(+:remapping_error)
--#else
--    #pragma omp parallel for if (rows*cols > 3000) \
--        schedule(static) default(none) shared(acolormap) shared(average_color) reduction(+:remapping_error)
-+        schedule(static) default(none) shared(background,acolormap,average_color,cols,input_image,map,n,output_pixels,rows,transparent_index) reduction(+:remapping_error)
- #endif
-     for(int row = 0; row < rows; ++row) {
-         const f_pixel *const row_pixels = liq_image_get_row_f(input_image, row);