From 30a64c7baf9bb26797b34de2460696aa4cf93115 Mon Sep 17 00:00:00 2001 From: Ingo Saitz Date: Thu, 26 Apr 2018 09:07:30 +0200 Subject: [PATCH 02/17] revert to agg >= 2.4 --- desmume/src/frontend/modules/osd/agg/agg2d.h | 4 ++-- desmume/src/frontend/posix/configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desmume/src/frontend/modules/osd/agg/agg2d.h b/desmume/src/frontend/modules/osd/agg/agg2d.h index 20b39978..85f529fb 100644 --- a/desmume/src/frontend/modules/osd/agg/agg2d.h +++ b/desmume/src/frontend/modules/osd/agg/agg2d.h @@ -242,7 +242,7 @@ public: BlendDstAtop = agg::comp_op_dst_atop, BlendXor = agg::comp_op_xor, BlendAdd = agg::comp_op_plus, - BlendSub = agg::comp_op_minus, + //BlendSub = agg::comp_op_minus, BlendMultiply = agg::comp_op_multiply, BlendScreen = agg::comp_op_screen, BlendOverlay = agg::comp_op_overlay, @@ -254,7 +254,7 @@ public: BlendSoftLight = agg::comp_op_soft_light, BlendDifference = agg::comp_op_difference, BlendExclusion = agg::comp_op_exclusion, - BlendContrast = agg::comp_op_contrast + //BlendContrast = agg::comp_op_contrast }; enum Direction diff --git a/desmume/src/frontend/posix/configure.ac b/desmume/src/frontend/posix/configure.ac index e300e31b..f199b185 100644 --- a/desmume/src/frontend/posix/configure.ac +++ b/desmume/src/frontend/posix/configure.ac @@ -202,7 +202,7 @@ if test ! "x$HAVE_OPENAL" = "xyes" ; then fi AM_CONDITIONAL([HAVE_ALSA], [test "${HAVE_ALSA}" = "yes"]) -PKG_CHECK_MODULES(LIBAGG, libagg >= 2.5.0, FOUND_LIBAGG=yes, FOUND_LIBAGG=no) +PKG_CHECK_MODULES(LIBAGG, libagg >= 2.4.0, FOUND_LIBAGG=yes, FOUND_LIBAGG=no) AM_CONDITIONAL([HAVE_LIBAGG], [test "x$libagg" = "xyes" -a "${FOUND_LIBAGG}" = "yes"]) if test "x$libagg" = "xyes" ; then if test "x$FOUND_LIBAGG" = "xyes" ; then -- 2.18.0