[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/, media-libs/libafterimage/files/

2021-05-19 Thread Andrew Savchenko 
commit: b22db36af30264f2cde7c55e627cae4a125c0af9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 21:04:23 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 21:13:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22db36a

media-libs/libafterimage: fix multiple bugs

- Update to EAPI 7
- Use $(AR) if any, fallback to direct ar, bug 731044
- Drop non-standard 'l' from ar args, bug 784182
- Properly detect freetype: use pkg-config, bug 783375

Bug: https://bugs.gentoo.org/784182
Bug: https://bugs.gentoo.org/731044
Bug: https://bugs.gentoo.org/783375
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../libafterimage/files/libafterimage-ar.patch |  39 
 .../files/libafterimage-freetype.patch |  23 +
 .../libafterimage/libafterimage-1.20-r4.ebuild | 110 +
 3 files changed, 172 insertions(+)

diff --git a/media-libs/libafterimage/files/libafterimage-ar.patch 
b/media-libs/libafterimage/files/libafterimage-ar.patch
new file mode 100644
index 000..6e8d0bb8cd4
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-ar.patch
@@ -0,0 +1,39 @@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/Makefile.in 
libAfterImage-1.20/Makefile.in
+--- libAfterImage-1.20.orig/Makefile.in2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/Makefile.in 2021-05-19 23:32:32.793826120 +0300
+@@ -78,7 +78,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/aftershow/Makefile.in 
libAfterImage-1.20/aftershow/Makefile.in
+--- libAfterImage-1.20.orig/aftershow/Makefile.in  2011-01-15 
08:52:22.0 +0300
 libAfterImage-1.20/aftershow/Makefile.in   2021-05-19 23:32:53.158905472 
+0300
+@@ -11,7 +11,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/apps/Makefile.in 
libAfterImage-1.20/apps/Makefile.in
+--- libAfterImage-1.20.orig/apps/Makefile.in   2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/apps/Makefile.in2021-05-19 23:33:15.769993568 
+0300
+@@ -8,7 +8,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@

diff --git a/media-libs/libafterimage/files/libafterimage-freetype.patch 
b/media-libs/libafterimage/files/libafterimage-freetype.patch
new file mode 100644
index 000..575a68fd7ca
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-freetype.patch
@@ -0,0 +1,23 @@
+--- libAfterImage-1.20.orig/configure.in   2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/configure.in2021-05-19 23:40:50.359764859 +0300
+@@ -561,9 +561,9 @@
+ else
+   if test "x$ttf_includes" = "xno"; then
+ AC_MSG_CHECKING(headers required by TTF support)
+-if freetype-config --cflags >/dev/null  ;then
++if pkg-config freetype2 --cflags >/dev/null  ;then
+ present_incs="$CCFLAGS $x_includes";
+-for l in `freetype-config --cflags` ; do
++for l in `pkg-config freetype2 --cflags` ;do
+   inc_found=no
+   for p in `echo "$present_incs"` ; do
+   if test "x$l" = "x$p" ; then
+@@ -636,7 +636,7 @@
+ have_ttf=yes
+   fi
+   if test "$have_ttf" = yes; then
+-AFTERIMAGE_LIBS="`freetype-config --libs` $AFTERIMAGE_LIBS"
++AFTERIMAGE_LIBS="`pkg-config freetype2 --libs` $AFTERIMAGE_LIBS"
+   fi
+ fi;
+ AC_SUBST(TTF_INCLUDES)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
new file mode 100644
index 000..33cb313ecb7
--- /dev/null
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PN=libAfterImage
+
+DESCRIPTION="Afterstep's standalone generic image manipulation library"
+HOMEPAGE="http://www.afterstep.org/afterimage/index.php;
+SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
+
+RDEPEND="
+   X?  ( x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXrender )
+   gif?(

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/, media-libs/libafterimage/files/

2017-01-29 Thread Jeroen Roovers 
commit: 9cb83c1e90f21cfa14c10b66a530071cce27bf37
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan 29 21:54:26 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan 29 21:59:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb83c1e

media-libs/libafterimage: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libafterimage-giflib42.patch |  19 -
 .../files/libafterimage-giflib5.patch  | 382 -
 .../libafterimage/libafterimage-1.20-r1.ebuild | 108 --
 media-libs/libafterimage/libafterimage-1.20.ebuild |  95 -
 4 files changed, 604 deletions(-)

diff --git a/media-libs/libafterimage/files/libafterimage-giflib42.patch 
b/media-libs/libafterimage/files/libafterimage-giflib42.patch
deleted file mode 100644
index b1b1f72..
--- a/media-libs/libafterimage/files/libafterimage-giflib42.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix build failure with giflib 4.2.
-Patch by Andrew Savchenko .
-https://bugs.gentoo.org/486804
-
 libAfterImage-1.20/ungif.h.orig
-+++ libAfterImage-1.20/ungif.h
-@@ -7,6 +7,12 @@
- extern "C" {
- #endif
- 
-+#if (GIFLIB_MAJOR>4) || ((GIFLIB_MAJOR==4) && (GIFLIB_MINOR>=2)) 
-+static inline void PrintGifError(void) {
-+fprintf(stderr, "%s\n", GifErrorString());
-+}
-+#endif
-+
- #ifdef __GNUC__
- #define ASIM_PrintGifError() do{ fprintf( stderr, "%s():%d:<%s> 
",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(); }while(0)
- #else

diff --git a/media-libs/libafterimage/files/libafterimage-giflib5.patch 
b/media-libs/libafterimage/files/libafterimage-giflib5.patch
deleted file mode 100644
index b650b24..
--- a/media-libs/libafterimage/files/libafterimage-giflib5.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-diff -Naurd libAfterImage-1.20.orig/export.c libAfterImage-1.20/export.c
 libAfterImage-1.20.orig/export.c   2016-05-01 11:44:19.0 +0300
-+++ libAfterImage-1.20/export.c2016-05-02 10:57:59.688984491 +0300
-@@ -1048,6 +1048,9 @@
-   Bool new_image = True ;
-   START_TIME(started);
-   int cmap_size = 1;
-+#if (GIFLIB_MAJOR>=5)
-+  int errcode;
-+#endif
- #define GIF_NETSCAPE_EXT_BYTES 3
-   unsigned char netscape_ext_bytes[GIF_NETSCAPE_EXT_BYTES] = { 0x1, 0x0, 
0x0};
- #define GIF_GCE_BYTES 4   
-@@ -1086,10 +1089,18 @@
- 
-   while( cmap_size < 256 && cmap_size < 
(int)cmap.count+(gce_bytes[0]&0x01) )
-   cmap_size = cmap_size<<1 ;
-+#if (GIFLIB_MAJOR>=5)
-+  if( (gif_cmap = GifMakeMapObject(cmap_size, NULL )) == NULL )
-+#else
-   if( (gif_cmap = MakeMapObject(cmap_size, NULL )) == NULL )
-+#endif
-   {
-   free( mapped_im );
-+#if (GIFLIB_MAJOR>=5)
-+  ASIM_PrintGifError(E_GIF_ERR_NOT_ENOUGH_MEM);
-+#else
-   ASIM_PrintGifError();
-+#endif
-   return False;
-   }
-   memcpy( &(gif_cmap->Colors[0]), &(cmap.entries[0]), 
MIN(cmap.count,(unsigned int)cmap_size)*3 );
-@@ -1101,13 +1112,25 @@
-   SavedImage *images = NULL ;
-   int count = 0 ;
-   /* TODO: do something about multiimage files !!! */
-+#if (GIFLIB_MAJOR>=5)
-+  gif = open_gif_read(infile, );
-+#else
-   gif = open_gif_read(infile);
-+#endif
-   if( gif == NULL || get_gif_saved_images(gif, -1, , 
) == GIF_ERROR)
-   {
-+#if (GIFLIB_MAJOR>=5)
-+  ASIM_PrintGifError(errcode);
-+#else
-   ASIM_PrintGifError();
-+#endif
-   if( gif )
-   {
-+#if (GIFLIB_MAJOR>=5)
-+  DGifCloseFile(gif, );
-+#else
-   DGifCloseFile(gif);
-+#endif
-   gif = NULL ;
-   }
-   if (infile)
-@@ -1123,14 +1146,22 @@
-   gif_src = *gif ;
-   gif->SColorMap = NULL ;
-   gif->Image.ColorMap = NULL ;
-+#if (GIFLIB_MAJOR>=5)
-+DGifCloseFile(gif, );
-+#else
-   DGifCloseFile(gif);
-+#endif
-   gif = NULL;
-   fclose (infile);
-   infile = NULL;
-   outfile = open_writeable_image_file( path );
- 
-   if (outfile)
-+#if (GIFLIB_MAJOR>=5)
-+  gif = EGifOpenFileHandle(fileno(outfile), 
);
-+#else
-   gif = EGifOpenFileHandle(fileno(outfile));
-+#endif
-   
-   if (gif)
-   {
-@@ -1141,26 +1172,46 @@
-  
gif_src.SColorMap )) == GIF_OK )
-   status = write_gif_saved_images( gif, 
images, count );
-   if( status != GIF_OK )
-+#if (GIFLIB_MAJOR>=5)
-+

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/, media-libs/libafterimage/files/

2016-05-02 Thread Andrew Savchenko 
commit: 3d5b16d3365e80c281e9131e011a6d88ddf61167
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Mon May  2 15:51:22 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Mon May  2 15:51:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5b16d3

media-libs/libafterimage-1.20-r1: fix bug 571654

- port to giflib-5 API;
- update ebuild to EAPI 6;
- add new USE flags and deps for previously ignored dependencies.

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../files/libafterimage-giflib5.patch  | 382 +
 .../libafterimage/libafterimage-1.20-r1.ebuild | 108 ++
 media-libs/libafterimage/metadata.xml  |   4 +
 3 files changed, 494 insertions(+)

diff --git a/media-libs/libafterimage/files/libafterimage-giflib5.patch 
b/media-libs/libafterimage/files/libafterimage-giflib5.patch
new file mode 100644
index 000..32037d9
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-giflib5.patch
@@ -0,0 +1,382 @@
+diff -Naurd libAfterImage-1.20.orig/export.c libAfterImage-1.20/export.c
+--- libAfterImage-1.20.orig/export.c   2016-05-01 11:44:19.0 +0300
 libAfterImage-1.20/export.c2016-05-02 10:57:59.688984491 +0300
+@@ -1048,6 +1048,9 @@
+   Bool new_image = True ;
+   START_TIME(started);
+   int cmap_size = 1;
++#if (GIFLIB_MAJOR>=5)
++  int errcode;
++#endif
+ #define GIF_NETSCAPE_EXT_BYTES 3
+   unsigned char netscape_ext_bytes[GIF_NETSCAPE_EXT_BYTES] = { 0x1, 0x0, 
0x0};
+ #define GIF_GCE_BYTES 4   
+@@ -1086,10 +1089,18 @@
+ 
+   while( cmap_size < 256 && cmap_size < 
(int)cmap.count+(gce_bytes[0]&0x01) )
+   cmap_size = cmap_size<<1 ;
++#if (GIFLIB_MAJOR>=5)
++  if( (gif_cmap = GifMakeMapObject(cmap_size, NULL )) == NULL )
++#else
+   if( (gif_cmap = MakeMapObject(cmap_size, NULL )) == NULL )
++#endif
+   {
+   free( mapped_im );
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(E_GIF_ERR_NOT_ENOUGH_MEM);
++#else
+   ASIM_PrintGifError();
++#endif
+   return False;
+   }
+   memcpy( &(gif_cmap->Colors[0]), &(cmap.entries[0]), 
MIN(cmap.count,(unsigned int)cmap_size)*3 );
+@@ -1101,13 +1112,25 @@
+   SavedImage *images = NULL ;
+   int count = 0 ;
+   /* TODO: do something about multiimage files !!! */
++#if (GIFLIB_MAJOR>=5)
++  gif = open_gif_read(infile, );
++#else
+   gif = open_gif_read(infile);
++#endif
+   if( gif == NULL || get_gif_saved_images(gif, -1, , 
) == GIF_ERROR)
+   {
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(errcode);
++#else
+   ASIM_PrintGifError();
++#endif
+   if( gif )
+   {
++#if (GIFLIB_MAJOR>=5)
++  DGifCloseFile(gif, );
++#else
+   DGifCloseFile(gif);
++#endif
+   gif = NULL ;
+   }
+   if (infile)
+@@ -1123,14 +1146,22 @@
+   gif_src = *gif ;
+   gif->SColorMap = NULL ;
+   gif->Image.ColorMap = NULL ;
++#if (GIFLIB_MAJOR>=5)
++DGifCloseFile(gif, );
++#else
+   DGifCloseFile(gif);
++#endif
+   gif = NULL;
+   fclose (infile);
+   infile = NULL;
+   outfile = open_writeable_image_file( path );
+ 
+   if (outfile)
++#if (GIFLIB_MAJOR>=5)
++  gif = EGifOpenFileHandle(fileno(outfile), 
);
++#else
+   gif = EGifOpenFileHandle(fileno(outfile));
++#endif
+   
+   if (gif)
+   {
+@@ -1141,26 +1172,46 @@
+  
gif_src.SColorMap )) == GIF_OK )
+   status = write_gif_saved_images( gif, 
images, count );
+   if( status != GIF_OK )
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(status);
++#else
+   ASIM_PrintGifError();
++#endif
+   }
+   if (gif_src.SColorMap)
+   {  /* we only want to save private colormap if it is 
any different from
+   * screen colormap ( saves us  768 bytes per image ) 
*/
+   if( gif_cmap->ColorCount == 
gif_src.SColorMap->ColorCount )
+   dont_save_cmap = ( memcmp( 
gif_cmap->Colors, gif_src.SColorMap->Colors, 
gif_cmap->ColorCount*sizeof(GifColorType)) == 0 );
++#if (GIFLIB_MAJOR>=5)
++  GifFreeMapObject(gif_src.SColorMap);