pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/gd handle for the case using pre-libvpx optio...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9857ecb62126
branches:  trunk
changeset: 643303:9857ecb62126
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Dec 14 07:25:34 2014 +0000

description:
handle for the case using pre-libvpx optional version.

diffstat:

 graphics/gd/buildlink3.mk |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 021e1802975c -r 9857ecb62126 graphics/gd/buildlink3.mk
--- a/graphics/gd/buildlink3.mk Sun Dec 14 05:47:45 2014 +0000
+++ b/graphics/gd/buildlink3.mk Sun Dec 14 07:25:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2014/12/09 11:42:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2014/12/14 07:25:34 obache Exp $
 
 BUILDLINK_TREE+=       gd
 
@@ -9,6 +9,15 @@
 BUILDLINK_ABI_DEPENDS.gd+=     gd>=2.1.0
 BUILDLINK_PKGSRCDIR.gd?=       ../../graphics/gd
 
+_GD_PRE_LIBVPX_OPTION!= \
+       if ${PKG_INFO} -qe 'gd<=2.1.0nb1'; then                 \
+               ${ECHO} yes;                                            \
+       else                                                            \
+               ${ECHO} no;                                             \
+       fi
+
+pkgbase := imlib2
+.include "../../mk/pkg-build-options.mk"
 pkgbase := gd
 .include "../../mk/pkg-build-options.mk"
 
@@ -21,7 +30,7 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.gd:Mlibvpx)
+.if ${_GD_PRE_LIBVPX_OPTION} == "yes" || !empty(PKG_BUILD_OPTIONS.gd:Mlibvpx)
 .include "../../multimedia/libvpx/buildlink3.mk"
 .endif
 .include "../../mk/jpeg.buildlink3.mk"



Home | Main Index | Thread Index | Old Index