[PATCH 1/2] plugins-base: build: don't fail with old pango versions

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] plugins-base: build: don't fail with old pango versions

Felipe Contreras
Somebody forgot that 'pangocairo >= 1.15.4' can fail.

Signed-off-by: Felipe Contreras <[hidden email]>
---
 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8c47d3c..a9c36ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,7 +586,8 @@ dnl *** pango ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true)
 AG_GST_CHECK_FEATURE(PANGO, [Pango font rendering], pango, [
   AG_GST_PKG_CHECK_MODULES(PANGO, pango pangocairo)
-  PKG_CHECK_MODULES(PANGOCAIRO_1_15_4, pangocairo >= 1.15.4, [ AC_DEFINE(HAVE_PANGO_VERTICAL_WRITING, 1, [Defined if pango can write vertically])])
+  PKG_CHECK_MODULES(PANGOCAIRO_1_15_4, pangocairo >= 1.15.4, [new_pango=1], [new_pango=0])
+  AC_DEFINE_UNQUOTED(HAVE_PANGO_VERTICAL_WRITING, [$new_pango], [Defined if pango can write vertically])
 ])
 
 dnl *** theora ***
--
1.6.5.4.g31fc3


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
gstreamer-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gstreamer-devel
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] plugins-base: build: avoid pango version check if it's not there

Felipe Contreras
Signed-off-by: Felipe Contreras <[hidden email]>
---
 configure.ac |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index a9c36ea..ca1b9d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,8 +586,10 @@ dnl *** pango ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true)
 AG_GST_CHECK_FEATURE(PANGO, [Pango font rendering], pango, [
   AG_GST_PKG_CHECK_MODULES(PANGO, pango pangocairo)
-  PKG_CHECK_MODULES(PANGOCAIRO_1_15_4, pangocairo >= 1.15.4, [new_pango=1], [new_pango=0])
-  AC_DEFINE_UNQUOTED(HAVE_PANGO_VERTICAL_WRITING, [$new_pango], [Defined if pango can write vertically])
+  if test $HAVE_PANGO = yes; then
+    PKG_CHECK_MODULES(PANGOCAIRO_1_15_4, pangocairo >= 1.15.4, [new_pango=1], [new_pango=0])
+    AC_DEFINE_UNQUOTED(HAVE_PANGO_VERTICAL_WRITING, [$new_pango], [Defined if pango can write vertically])
+  fi
 ])
 
 dnl *** theora ***
--
1.6.5.4.g31fc3


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
gstreamer-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gstreamer-devel