OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Dec-2005 20:40:23
Branch: HEAD Handle: 2005122319402300
Modified files:
openpkg-src/gd gd.spec
Log:
allow GD to optionally use fontconfig library, too
Summary:
Revision Changes Path
1.86 +15 -3 openpkg-src/gd/gd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gd/gd.spec
============================================================================
$ cvs diff -u -r1.85 -r1.86 gd.spec
--- openpkg-src/gd/gd.spec 15 Jun 2005 07:36:26 -0000 1.85
+++ openpkg-src/gd/gd.spec 23 Dec 2005 19:40:23 -0000 1.86
@@ -33,10 +33,11 @@
Group: Graphics
License: GPL
Version: 2.0.33
-Release: 20050615
+Release: 20051223
# package options
-%option with_xpm no
+%option with_xpm no
+%option with_fontconfig no
# list of sources
Source0: http://www.boutell.com/gd/http/gd-%{version}.tar.gz
@@ -53,6 +54,10 @@
BuildPreReq: X11, xpm
PreReq: X11, xpm
%endif
+%if "%{with_fontconfig}" == "yes"
+BuildPreReq: fontconfig, pkgconfig
+PreReq: fontconfig
+%endif
AutoReq: no
AutoReqProv: no
@@ -94,7 +99,11 @@
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags . libpng}" \
LDFLAGS="%{l_ldflags}" \
+%if "%{with_fontconfig}" == "yes"
+ LIBS="`pkg-config --libs fontconfig` -lm" \
+%else
LIBS="-lm" \
+%endif
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
@@ -108,8 +117,11 @@
--without-xpm \
%endif
--with-png=%{l_prefix} \
- --with-freetype=%{l_prefix} \
--with-jpeg=%{l_prefix} \
+ --with-freetype=%{l_prefix} \
+%if "%{with_fontconfig}" == "yes"
+ --with-fontconfig=%{l_prefix} \
+%endif
--disable-shared
%{l_shtool} subst -e 's;-LNONE;;' Makefile
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
