pkgsrc-Users archive

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

[PATCH] make libvpx dependency optional in gd



Hi,

building gnuplot on an ancient SuSE system results in failure because
that pulls in gd, which pulls in libvpx, which doesn't build with the
old toolchain (missing assembly instructions in gas). The attached
patch against 2014Q3 solves that by offering an option to disable
libvpx. LibGD is no FFmpeg ... I'm fine with static images;-)


Alrighty then,

Thomas


PS: Yes, the system at hand is obsolete and I'm going to install pkgsrc
also with an updated toolchain anyway. But I'd like to have the option
of some basic tools that don't border into multimedia funland, using
the system-provided compiler.

-- 
Dr. Thomas Orgis
Universität Hamburg
RRZ / Zentrale Dienste / HPC
Schlüterstr. 70
20146 Hamburg
Tel.: 040/42838 8826
Fax: 040/428 38 6270
diff -ruN pkgsrc-2014Q3/graphics/gd/Makefile pkgsrc/graphics/gd/Makefile
--- pkgsrc-2014Q3/graphics/gd/Makefile	2014-05-30 01:36:37.000000000 +0200
+++ pkgsrc/graphics/gd/Makefile	2014-12-08 16:03:17.000000000 +0100
@@ -23,7 +23,6 @@
 CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
 CONFIGURE_ARGS+=	--with-png=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=	--with-tiff=${BUILDLINK_PREFIX.tiff}
-CONFIGURE_ARGS+=	--with-vpx=${BUILDLINK_PREFIX.libvpx}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 REPLACE_PERL+=		src/bdftogd
 PTHREAD_AUTO_VARS=	yes
@@ -34,7 +33,6 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -ruN pkgsrc-2014Q3/graphics/gd/buildlink3.mk pkgsrc/graphics/gd/buildlink3.mk
--- pkgsrc-2014Q3/graphics/gd/buildlink3.mk	2013-09-04 14:31:24.000000000 +0200
+++ pkgsrc/graphics/gd/buildlink3.mk	2014-12-08 19:08:14.000000000 +0100
@@ -21,7 +21,9 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.gd:Mvpx)
 .include "../../multimedia/libvpx/buildlink3.mk"
+.endif
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GD_BUILDLINK3_MK
diff -ruN pkgsrc-2014Q3/graphics/gd/options.mk pkgsrc/graphics/gd/options.mk
--- pkgsrc-2014Q3/graphics/gd/options.mk	2013-09-02 23:17:42.000000000 +0200
+++ pkgsrc/graphics/gd/options.mk	2014-12-08 16:03:17.000000000 +0100
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.2 2013/09/02 21:17:42 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gd
-PKG_SUPPORTED_OPTIONS=	x11
-PKG_SUGGESTED_OPTIONS=	# empty
+PKG_SUPPORTED_OPTIONS=	x11 vpx
+PKG_SUGGESTED_OPTIONS=	vpx
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,3 +13,10 @@
 .else
 CONFIGURE_ARGS+=	--without-xpm
 .endif
+
+.if !empty(PKG_OPTIONS:Mvpx)
+.include "../../multimedia/libvpx/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-vpx=${BUILDLINK_PREFIX.libvpx}
+.else
+CONFIGURE_ARGS+=        --without-vpx
+.endif

Attachment: smime.p7s
Description: S/MIME cryptographic signature



Home | Main Index | Thread Index | Old Index