Re: [PR PATCH] [Updated] agg: update to 2.6.1

[bugcrazy <bugcrazy@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1278 bytes --]

There is an updated pull request by bugcrazy against master on the void-packages repository

https://github.com/bugcrazy/void-packages patch-11
https://github.com/void-linux/void-packages/pull/44851

agg: update to 2.6.1
Update patch for agg version 2.6.x

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/44851.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-11-44851.patch --]
[-- Type: text/x-diff, Size: 6573 bytes --]

From f49777267ed39639d0cb52ae2cdd1689e5ab07f5 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Wed, 5 Jul 2023 04:27:14 -0300
Subject: [PATCH] agg: update to 2.6.1

Update patch for agg version 2.6.x

Added agg_trans_perspective.patch created by Zardshard
---
 ....4-depends.patch => agg-2.6-depends.patch} | 14 ++--
 .../agg/patches/agg_trans_perspective.patch   | 66 +++++++++++++++++++
 srcpkgs/agg/template                          | 20 +++---
 3 files changed, 85 insertions(+), 15 deletions(-)
 rename srcpkgs/agg/patches/{agg-2.4-depends.patch => agg-2.6-depends.patch} (79%)
 create mode 100644 srcpkgs/agg/patches/agg_trans_perspective.patch

diff --git a/srcpkgs/agg/patches/agg-2.4-depends.patch b/srcpkgs/agg/patches/agg-2.6-depends.patch
similarity index 79%
rename from srcpkgs/agg/patches/agg-2.4-depends.patch
rename to srcpkgs/agg/patches/agg-2.6-depends.patch
index 8f3fd6f377a95..db0f4841cc2f4 100644
--- a/srcpkgs/agg/patches/agg-2.4-depends.patch
+++ b/srcpkgs/agg/patches/agg-2.6-depends.patch
@@ -21,9 +21,9 @@
 +libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
  endif
  
---- a/configure.in	2006-10-09 05:06:36.000000000 +0100
-+++ b/configure.in	2007-01-07 14:07:39.000000000 +0000
-@@ -122,7 +122,8 @@
+--- a/configure.ac	2023-04-01 07:28:38.000000000 -0300
++++ b/configure.ac	2023-07-05 02:14:00.092376054 -0300
+@@ -123,7 +123,8 @@
  fi
  AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
  AC_SUBST(x_includes)
@@ -33,16 +33,16 @@
  dnl ###############################################
  
  dnl Settung up library version
---- a/src/platform/X11/Makefile.am	2006-12-11 00:59:45.000000000 +0000
-+++ b/src/platform/X11/Makefile.am	2007-01-07 14:07:39.000000000 +0000
+--- a/src/platform/X11/Makefile.am	2023-04-01 07:28:38.000000000 -0300
++++ b/src/platform/X11/Makefile.am	2023-07-05 01:49:38.771562173 -0300
 @@ -1,8 +1,8 @@
  if ENABLE_X11
  lib_LTLIBRARIES = libaggplatformX11.la
  
--libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L@x_libraries@
+-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
 +libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@
  libaggplatformX11_la_SOURCES = agg_platform_support.cpp
- libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include -I@x_includes@
+ libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include @x_includes@
 -libaggplatformX11_la_LIBADD = -lX11
 +libaggplatformX11_la_LIBADD = ../../libagg.la -lX11
  endif
diff --git a/srcpkgs/agg/patches/agg_trans_perspective.patch b/srcpkgs/agg/patches/agg_trans_perspective.patch
new file mode 100644
index 0000000000000..c9c3f0aefe84c
--- /dev/null
+++ b/srcpkgs/agg/patches/agg_trans_perspective.patch
@@ -0,0 +1,66 @@
+diff --git a/agg-src/include/agg_trans_perspective.h b/agg-src/include/agg_trans_perspective.h
+index 1c650aa..b7979e1 100644
+--- a/include/agg_trans_perspective.h
++++ b/include/agg_trans_perspective.h
+@@ -502,7 +502,7 @@ namespace agg
+     }
+ 
+     //------------------------------------------------------------------------
+-    const trans_perspective& 
++    inline const trans_perspective&
+     trans_perspective::multiply_inv(const trans_perspective& m)
+     {
+         trans_perspective t = m;
+@@ -511,7 +511,7 @@ namespace agg
+     }
+ 
+     //------------------------------------------------------------------------
+-    const trans_perspective&
++    inline const trans_perspective&
+     trans_perspective::multiply_inv(const trans_affine& m)
+     {
+         trans_affine t = m;
+@@ -520,7 +520,7 @@ namespace agg
+     }
+ 
+     //------------------------------------------------------------------------
+-    const trans_perspective&
++    inline const trans_perspective&
+     trans_perspective::premultiply_inv(const trans_perspective& m)
+     {
+         trans_perspective t = m;
+@@ -529,7 +529,7 @@ namespace agg
+     }
+ 
+     //------------------------------------------------------------------------
+-    const trans_perspective&
++    inline const trans_perspective&
+     trans_perspective::premultiply_inv(const trans_affine& m)
+     {
+         trans_perspective t(m);
+@@ -697,14 +697,14 @@ namespace agg
+     }
+ 
+     //------------------------------------------------------------------------
+-    void trans_perspective::translation(double* dx, double* dy) const
++    inline void trans_perspective::translation(double* dx, double* dy) const
+     {
+         *dx = tx;
+         *dy = ty;
+     }
+ 
+     //------------------------------------------------------------------------
+-    void trans_perspective::scaling(double* x, double* y) const
++    inline void trans_perspective::scaling(double* x, double* y) const
+     {
+         double x1 = 0.0;
+         double y1 = 0.0;
+@@ -719,7 +719,7 @@ namespace agg
+     }
+ 
+     //------------------------------------------------------------------------
+-    void trans_perspective::scaling_abs(double* x, double* y) const
++    inline void trans_perspective::scaling_abs(double* x, double* y) const
+     {
+         *x = std::sqrt(sx  * sx  + shx * shx);
+         *y = std::sqrt(shy * shy + sy  * sy);
diff --git a/srcpkgs/agg/template b/srcpkgs/agg/template
index 2069096d4cdf0..1678bf1d7ec73 100644
--- a/srcpkgs/agg/template
+++ b/srcpkgs/agg/template
@@ -1,21 +1,21 @@
 # Template file for 'agg'
 pkgname=agg
-version=2.5
-revision=5
+version=2.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-examples"
 hostmakedepends="SDL-devel automake gettext-devel libtool pkg-config"
 makedepends="SDL-devel freetype-devel"
 short_desc="High Quality Rendering Engine for C++"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://agg.sourceforge.net/antigrain.com/"
-distfiles="http://www.antigrain.com/agg-${version}.tar.gz"
-checksum=ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="custom:Anti-Grain Geometry Public License, custom:Modified BSD License"
+homepage="https://github.com/aggeom/agg-2.6"
+distfiles="https://github.com/aggeom/agg-2.6/archive/agg-${version}.tar.gz"
+checksum=685966f880f1c2aae19479b60525fafba8cbd88e4c62d1947767780df8f6a3d0
 disable_parallel_build=yes
 
 pre_configure() {
-	sed -e '/AM_C_PROTOTYPES/d' -i configure.in
+	sed -e '/AM_C_PROTOTYPES/d' -i configure.ac
 	touch NEWS README AUTHORS
 	autoreconf -fi
 }
@@ -31,3 +31,7 @@ agg-devel_package() {
 		vmove usr/share
 	}
 }
+
+post_install() {
+	vlicense copying
+}