From ac30a317f58da1385ed5c3e58aa15c9fda8c8792 Mon Sep 17 00:00:00 2001 From: kenmays Date: Thu, 10 Aug 2023 22:46:23 -0700 Subject: [PATCH] agg: bump version (#9150) * agg: bump version * Delete agg-2.5.patchset * agg: bump version * Delete agg-2.5.recipe * agg: updated recipe - bumped version * Delete agg-2.7.recipe --- .../{agg-2.5.recipe => agg-2.7.0~r138.recipe} | 18 +- .../{agg-2.5.patchset => agg-2.7.patchset} | 223 +++++++----------- 2 files changed, 94 insertions(+), 147 deletions(-) rename x11-libs/agg/{agg-2.5.recipe => agg-2.7.0~r138.recipe} (89%) rename x11-libs/agg/patches/{agg-2.5.patchset => agg-2.7.patchset} (52%) diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.7.0~r138.recipe similarity index 89% rename from x11-libs/agg/agg-2.5.recipe rename to x11-libs/agg/agg-2.7.0~r138.recipe index f45966a74..ec6b625e9 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.7.0~r138.recipe @@ -2,17 +2,19 @@ SUMMARY="Anti-Grain Geometry (AGG)" DESCRIPTION="Anti-Grain Geometry (AGG) is an Open Source, free of charge \ graphic library, written in industrially standard C++." HOMEPAGE="https://en.wikipedia.org/wiki/Anti-Grain_Geometry" -COPYRIGHT="2002-2006 Maxim Shemanarev" +COPYRIGHT="2002-2006 Maxim Shemanarev + 2021 John Horigan" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://sourceforge.net/projects/cross-stuff/files/OldFiles/agg-2.5.tar.gz" -CHECKSUM_SHA256="ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f" -PATCHES="agg-2.5.patchset" +REVISION="1" +SOURCE_URI="https://sourceforge.net/code-snapshots/svn/a/ag/agg/svn/agg-svn-r138.zip" +CHECKSUM_SHA256="d111ccf4f983b01ab18b19e3689b665d6b8a179ccc6ed945db2287b8084a557f" +PATCHES="agg-2.7.patchset" +SOURCE_DIR="agg-svn-r138" -ARCHITECTURES="x86_gcc2 x86_64" +ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86" -libVersion="2.0.4" +libVersion="2.0.7" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -81,6 +83,7 @@ defineDebugInfoPackage agg$secondaryArchSuffix \ BUILD() { + cd agg-2.4 if [ -d src/platform/BeOS ]; then mv src/platform/BeOS src/platform/Haiku fi @@ -97,6 +100,7 @@ BUILD() INSTALL() { + cd agg-2.4 make install # remove libtool files diff --git a/x11-libs/agg/patches/agg-2.5.patchset b/x11-libs/agg/patches/agg-2.7.patchset similarity index 52% rename from x11-libs/agg/patches/agg-2.5.patchset rename to x11-libs/agg/patches/agg-2.7.patchset index 481f8d654..4f5d3da0f 100644 --- a/x11-libs/agg/patches/agg-2.5.patchset +++ b/x11-libs/agg/patches/agg-2.7.patchset @@ -1,23 +1,23 @@ -From c5cda046a3d03dac394734473dfad114be35c502 Mon Sep 17 00:00:00 2001 +From 01282c6ef54e33af49f5ac112f63d7e0e5acad2a Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Thu, 24 Apr 2014 20:00:29 +0000 Subject: Haiku support -diff --git a/configure.in b/configure.in -index fceca82..d06dc7f 100644 ---- a/configure.in -+++ b/configure.in -@@ -8,7 +8,7 @@ dnl Checks for programs. +diff --git a/agg-2.4/configure.ac b/agg-2.4/configure.ac +index 4e1cb48..995c641 100644 +--- a/agg-2.4/configure.ac ++++ b/agg-2.4/configure.ac +@@ -9,7 +9,7 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_CXX AC_ISC_POSIX --AM_C_PROTOTYPES +-dnl AM_C_PROTOTYPES + - if test "x$U" != "x"; then - AC_MSG_ERROR(Compiler not ANSI compliant) - fi -@@ -58,9 +58,18 @@ dnl #### Check if we are compiling for win32 ##### + dnl if test "x$U" != "x"; then + dnl AC_MSG_ERROR(Compiler not ANSI compliant) + dnl fi +@@ -59,9 +59,18 @@ dnl #### Check if we are compiling for win32 ##### AC_SUBST(WINDOWS_LIBS) PREFERED_PLATFORM=win32 ;; @@ -36,7 +36,7 @@ index fceca82..d06dc7f 100644 dnl then enable font_win32tt AC_ARG_ENABLE(win32tt, AC_HELP_STRING([--enable-win32tt],[Win32 TrueType font support library]), -@@ -154,7 +163,7 @@ AC_OUTPUT( +@@ -155,7 +164,7 @@ AC_OUTPUT( src/platform/sdl/Makefile src/platform/mac/Makefile src/platform/win32/Makefile @@ -45,44 +45,21 @@ index fceca82..d06dc7f 100644 src/platform/AmigaOS/Makefile include/Makefile include/ctrl/Makefile -diff --git a/src/platform/BeOS/Makefile.am b/src/platform/BeOS/Makefile.am -index 474153c..2095717 100644 ---- a/src/platform/BeOS/Makefile.am -+++ b/src/platform/BeOS/Makefile.am -@@ -1 +1,10 @@ --EXTRA_DIST=agg_platform_support.cpp -+if ENABLE_HAIKU -+ -+lib_LTLIBRARIES = libaggplatformHaiku.la -+ -+libaggplatformHaiku_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -+libaggplatformHaiku_la_SOURCES = agg_platform_support.cpp -+libaggplatformHaiku_la_CXXFLAGS = -I$(top_srcdir)/include @HAIKU_CFLAGS@ -+libaggplatformHaiku_la_LIBADD = @HAIKU_LIBS@ -+endif -+ -diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am -index ebe5e7e..c6622bc 100644 ---- a/src/platform/Makefile.am -+++ b/src/platform/Makefile.am -@@ -1 +1 @@ --SUBDIRS = X11 sdl win32 AmigaOS BeOS mac -+SUBDIRS = X11 sdl win32 AmigaOS Haiku mac -- -2.21.0 +2.37.3 -From 8c170e5f049f679281f2bffbe9641ce3589cfaf0 Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Fri, 25 Apr 2014 12:52:34 +0000 -Subject: fix unsigned integer overflows +From 7075e1a5d1ca816b0a7af50cb328a4cb85949f6f Mon Sep 17 00:00:00 2001 +From: Jonathan Schleifer +Date: Thu, 19 Dec 2013 01:45:04 +0100 +Subject: Fix the agg headers to be proper C++. -diff --git a/include/agg_array.h b/include/agg_array.h -index 5c6d390..c25947a 100644 ---- a/include/agg_array.h -+++ b/include/agg_array.h -@@ -366,9 +366,10 @@ namespace agg +diff --git a/agg-2.4/include/agg_array.h b/agg-2.4/include/agg_array.h +index b48010b..c5eec01 100644 +--- a/agg-2.4/include/agg_array.h ++++ b/agg-2.4/include/agg_array.h +@@ -356,9 +356,10 @@ namespace agg void add_array(const T* ptr, unsigned num_elem) { @@ -94,7 +71,7 @@ index 5c6d390..c25947a 100644 } } -@@ -526,10 +527,11 @@ namespace agg +@@ -516,10 +517,11 @@ namespace agg if(m_num_blocks) { T** blk = m_blocks + m_num_blocks - 1; @@ -107,7 +84,7 @@ index 5c6d390..c25947a 100644 } } pod_allocator::deallocate(m_blocks, m_max_blocks); -@@ -802,10 +804,11 @@ namespace agg +@@ -792,10 +794,11 @@ namespace agg if(m_num_blocks) { block_type* blk = m_blocks + m_num_blocks - 1; @@ -120,28 +97,11 @@ index 5c6d390..c25947a 100644 } pod_allocator::deallocate(m_blocks, m_max_blocks); } -diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h -index 79d10dc..73937d0 100644 ---- a/include/agg_pixfmt_rgba.h -+++ b/include/agg_pixfmt_rgba.h -@@ -703,9 +703,9 @@ namespace agg - } - if(sa) - { -- calc_type dr = p[Order::R] - sr; -- calc_type dg = p[Order::G] - sg; -- calc_type db = p[Order::B] - sb; -+ calc_type dr = (sr > p[Order::R]) ? 0 : p[Order::R] - sr; -+ calc_type dg = (sg > p[Order::G]) ? 0 : p[Order::G] - sg; -+ calc_type db = (sb > p[Order::B]) ? 0 : p[Order::B] - sb; - p[Order::R] = (dr > base_mask) ? 0 : dr; - p[Order::G] = (dg > base_mask) ? 0 : dg; - p[Order::B] = (db > base_mask) ? 0 : db; -diff --git a/include/agg_rasterizer_cells_aa.h b/include/agg_rasterizer_cells_aa.h -index d3bb138..6aa3852 100644 ---- a/include/agg_rasterizer_cells_aa.h -+++ b/include/agg_rasterizer_cells_aa.h -@@ -140,10 +140,11 @@ namespace agg +diff --git a/agg-2.4/include/agg_rasterizer_cells_aa.h b/agg-2.4/include/agg_rasterizer_cells_aa.h +index 4dd905f..bc229e4 100644 +--- a/agg-2.4/include/agg_rasterizer_cells_aa.h ++++ b/agg-2.4/include/agg_rasterizer_cells_aa.h +@@ -131,10 +131,11 @@ namespace agg if(m_num_blocks) { cell_type** ptr = m_cells + m_num_blocks - 1; @@ -154,15 +114,10 @@ index d3bb138..6aa3852 100644 } pod_allocator::deallocate(m_cells, m_max_blocks); } -@@ -666,23 +667,26 @@ namespace agg - cell_type* cell_ptr; - unsigned nb = m_num_cells >> cell_block_shift; - unsigned i; -- while(nb--) -+ while(nb > 0) - { +@@ -665,10 +666,11 @@ namespace agg cell_ptr = *block_ptr++; - i = cell_block_size; + i = (nb > cell_block_size) ? unsigned(cell_block_size) : nb; + nb -= i; - while(i--) + while(i > 0) { @@ -170,31 +125,14 @@ index d3bb138..6aa3852 100644 ++cell_ptr; + --i; } -+ --nb; } - cell_ptr = *block_ptr++; - i = m_num_cells & cell_block_mask; -- while(i--) -+ while(i > 0) - { - m_sorted_y[cell_ptr->y - m_min_y].start++; - ++cell_ptr; -+ --i; - } - - // Convert the Y-histogram into the array of starting indexes -@@ -697,27 +701,30 @@ namespace agg - // Fill the cell pointer array sorted by Y - block_ptr = m_cells; - nb = m_num_cells >> cell_block_shift; -- while(nb--) -+ while(nb > 0) - { +@@ -689,12 +691,13 @@ namespace agg cell_ptr = *block_ptr++; - i = cell_block_size; -- while(i--) -+ while(i > 0) + i = (nb > cell_block_size) ? unsigned(cell_block_size) : nb; + nb -= i; +- while(i--) ++ while(i > 0) { sorted_y& curr_y = m_sorted_y[cell_ptr->y - m_min_y]; m_sorted_cells[curr_y.start + curr_y.num] = cell_ptr; @@ -202,27 +140,26 @@ index d3bb138..6aa3852 100644 ++cell_ptr; + --i; } -+ --nb; } - cell_ptr = *block_ptr++; - i = m_num_cells & cell_block_mask; -- while(i--) -+ while(i > 0) - { - sorted_y& curr_y = m_sorted_y[cell_ptr->y - m_min_y]; - m_sorted_cells[curr_y.start + curr_y.num] = cell_ptr; - ++curr_y.num; - ++cell_ptr; -+ --i; - } +diff --git a/agg-2.4/include/agg_renderer_outline_aa.h b/agg-2.4/include/agg_renderer_outline_aa.h +index a1a248c..ca48577 100644 +--- a/agg-2.4/include/agg_renderer_outline_aa.h ++++ b/agg-2.4/include/agg_renderer_outline_aa.h +@@ -1366,7 +1366,7 @@ namespace agg + //--------------------------------------------------------------------- + void profile(line_profile_aa& prof) { m_profile = &prof; } + const line_profile_aa& profile() const { return *m_profile; } +- line_profile_aa& profile() { return *m_profile; } ++ line_profile_aa& profile() { return *(line_profile_aa*)m_profile; } - // Finally arrange the X-arrays -diff --git a/include/agg_rendering_buffer.h b/include/agg_rendering_buffer.h -index 3a39caa..1fddb4e 100644 ---- a/include/agg_rendering_buffer.h -+++ b/include/agg_rendering_buffer.h -@@ -191,10 +191,11 @@ namespace agg + //--------------------------------------------------------------------- + int subpixel_width() const { return m_profile->subpixel_width(); } +diff --git a/agg-2.4/include/agg_rendering_buffer.h b/agg-2.4/include/agg_rendering_buffer.h +index 175bcd8..c89308b 100644 +--- a/agg-2.4/include/agg_rendering_buffer.h ++++ b/agg-2.4/include/agg_rendering_buffer.h +@@ -187,10 +187,11 @@ namespace agg T** rows = &m_rows[0]; @@ -236,32 +173,38 @@ index 3a39caa..1fddb4e 100644 } -- -2.21.0 +2.37.3 -From 89c616262f6791889bfbe721da3a4218a25affd2 Mon Sep 17 00:00:00 2001 -From: Jonathan Schleifer -Date: Thu, 19 Dec 2013 01:45:04 +0100 -Subject: Fix the agg headers to be proper C++. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From ad89b5ea6767a870301e57633f879a1ab520f536 Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Thu, 24 Apr 2014 20:00:29 +0000 +Subject: Haiku support -Signed-off-by: Axel Dörfler -diff --git a/include/agg_renderer_outline_aa.h b/include/agg_renderer_outline_aa.h -index ce25a2e..fa3f747 100644 ---- a/include/agg_renderer_outline_aa.h -+++ b/include/agg_renderer_outline_aa.h -@@ -1375,7 +1375,7 @@ namespace agg - //--------------------------------------------------------------------- - void profile(const line_profile_aa& prof) { m_profile = &prof; } - const line_profile_aa& profile() const { return *m_profile; } -- line_profile_aa& profile() { return *m_profile; } -+ line_profile_aa& profile() { return *(line_profile_aa*)m_profile; } - - //--------------------------------------------------------------------- - int subpixel_width() const { return m_profile->subpixel_width(); } +diff --git a/agg-2.4/src/platform/BeOS/Makefile.am b/agg-2.4/src/platform/BeOS/Makefile.am +index 474153c..2095717 100644 +--- a/agg-2.4/src/platform/BeOS/Makefile.am ++++ b/agg-2.4/src/platform/BeOS/Makefile.am +@@ -1 +1,10 @@ +-EXTRA_DIST=agg_platform_support.cpp ++if ENABLE_HAIKU ++ ++lib_LTLIBRARIES = libaggplatformHaiku.la ++ ++libaggplatformHaiku_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ ++libaggplatformHaiku_la_SOURCES = agg_platform_support.cpp ++libaggplatformHaiku_la_CXXFLAGS = -I$(top_srcdir)/include @HAIKU_CFLAGS@ ++libaggplatformHaiku_la_LIBADD = @HAIKU_LIBS@ ++endif ++ +diff --git a/agg-2.4/src/platform/Makefile.am b/agg-2.4/src/platform/Makefile.am +index ebe5e7e..c6622bc 100644 +--- a/agg-2.4/src/platform/Makefile.am ++++ b/agg-2.4/src/platform/Makefile.am +@@ -1 +1 @@ +-SUBDIRS = X11 sdl win32 AmigaOS BeOS mac ++SUBDIRS = X11 sdl win32 AmigaOS Haiku mac -- -2.21.0 +2.37.3