[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11313: clean up configuration of Gs
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11313: clean up configuration of Gstreamer, and build with the renamed config variables. |
|
Date: |
Fri, 24 Jul 2009 14:42:41 -0600 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 11313
committer: address@hidden
branch nick: trunk
timestamp: Fri 2009-07-24 14:42:41 -0600
message:
clean up configuration of Gstreamer, and build with the renamed config
variables.
modified:
configure.ac
gui/Makefile.am
libmedia/Makefile.am
libmedia/gst/GstUtil.cpp
macros/gnashpkgtool.m4
utilities/Makefile.am
utilities/findmicrophones.cpp
=== modified file 'configure.ac'
--- a/configure.ac 2009-07-16 18:46:00 +0000
+++ b/configure.ac 2009-07-24 20:42:41 +0000
@@ -1980,9 +1980,13 @@
fi
done
fi
- GNASH_PKG_FIND(gstinterfaces, [gst/gstinterface.h], [gstreamer interfaces
library], gst_mixer_type_get_type, [0.10])
- GNASH_PKG_FIND(gstapp, [gst/app/gstappsink.h], [gstreamer app library],
call_gmon_start, [0.10])
+ GNASH_PKG_FIND(gstreamer_plugins_base, [gst/interfaces/probeprobe.h],
[gstreamer interfaces library], gst_mixer_type_get_type, [0.10])
+ GNASH_PKG_FIND(gstreamer_app, [gst/app/gstappsink.h], [gstreamer app
library], call_gmon_start, [0.10])
GNASH_PKG_FIND(gstreamer, [gst/gst.h], [gstreamer library], gst_init, [0.10])
+ GNASH_PKG_FIND(gstpbutils, [gstreamer-0.10/gst/pbutils/install-plugins.h],
[gstreamer PB Utils library], gst_install_plugins_supported, [0.10])
+ if test x"${has_gstreamer_plugins_base}" = xyes; then
+ GSTREAMER_LIBS="-lgstinterfaces-0.10 $(GSTREAMER_LIBS)"
+ fi
if test x"${media_handler_specified}" = xfalse; then
if test x"$GSTREAMER_LIBS" = x; then
AC_MSG_WARN([No appropriate gstreamer library found, will try using
ffmpeg.])
@@ -2002,28 +2006,6 @@
fi
fi
-if test x"$media_handler" = x"gst"; then
- AC_MSG_CHECKING([for modern pbutils])
- save_cflags=$CFLAGS
- CFLAGS=$GSTREAMER_CFLAGS
- AC_TRY_COMPILE([#include <gst/pbutils/install-plugins.h>],[void* pointer =
&gst_install_plugins_async],
- GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstpbutils-0.10",
- has_gst_install_plugins_async='no')
- AC_TRY_COMPILE([#include <gst/pbutils/install-plugins.h>],[void* pointer =
&gst_install_plugins_supported],
- AC_DEFINE([HAVE_GST_INSTALL_PLUGINS_SUPPORTED], [], [GStreamer provides
the gst_install_plugins_supported function]),
- has_gst_install_plugins_supported='no')
- CFLAGS=$save_cflags
- if test x$has_gst_install_plugins_async = xno -o
x$has_gst_install_plugins_supported = xno; then
- has_modern_gstpbutils='no'
- AC_MSG_RESULT([no {GSTREAMER_CFLAGS=$GSTREAMER_CFLAGS}])
- else
- AC_DEFINE([GST_HAS_MODERN_PBUTILS], [], [GStreamer has pbutils with
missing codec install routines installed])
- AC_MSG_RESULT([ok])
- fi
-fi
-
-
-
if test x$build_cairo = xyes; then
GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
dnl if test x"${CAIRO_CFLAGS}" != x; then
@@ -2842,6 +2824,11 @@
echo " Install gstpbutils (>= 0.10.15) from
http://www.gstreamer.net for that to be enabled" >&4
echo " or .deb users: apt-get install
libgstreamer-plugins-base0.10-dev" >&4
fi
+ if test x"$has_gstreamer_plugins_base" = "xno"; then
+ echo " Install it from http://www.gstreamer.net"; >&3
+ echo " or .rpm users: yum install
gstreamer-plugins-base-devel" >&3
+ echo " or .deb users: apt-get install
libgstreamer-plugins-base0.10-dev" >&4
+ fi
else
echo " ERROR: GST media handling requested but gstreamer-0.10+ not
found" >&3
echo " Install it from http://www.gstreamer.net"; >&3
=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am 2009-07-09 07:22:22 +0000
+++ b/gui/Makefile.am 2009-07-24 20:42:41 +0000
@@ -154,8 +154,9 @@
endif
if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
-AM_LDFLAGS += $(GSTREAMER_LIBS)
+GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS)
$(GSTREAMER_LIBS)
+AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
+AM_LDFLAGS += $(GSTREAMER_STUFF)
endif
# if USE_GUI_FLTK
=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am 2009-07-16 18:44:25 +0000
+++ b/libmedia/Makefile.am 2009-07-24 20:42:41 +0000
@@ -118,12 +118,15 @@
-I$(top_srcdir)/libmedia/gst \
$(GSTREAMER_CFLAGS) \
$(GSTAPP_CFLAGS) \
- $(GSTINTERFACES_CFLAGS) \
+ $(GSTPBUTILS_CFLAGS) \
$(NULL)
libgnashmedia_la_LIBADD += \
- $(GSTREAMER_LIBS) -lgstbase-0.10 \
- $(GSTAPP_LIBS) $(GSTINTERFACES_LIBS) \
+ -lgstbase-0.10 \
+ $(GSTREAMER_APP_LIBS) \
+ $(GSTPBUTILS_LIBS) \
+ $(GSTREAMER_PLUGINS_BASE_LIBS) \
+ $(GSTREAMER_LIBS) \
$(NULL)
endif
=== modified file 'libmedia/gst/GstUtil.cpp'
--- a/libmedia/gst/GstUtil.cpp 2009-05-29 12:30:46 +0000
+++ b/libmedia/gst/GstUtil.cpp 2009-07-24 20:42:41 +0000
@@ -29,11 +29,11 @@
#include "swfdec_codec_gst.h"
-#ifdef GST_HAS_MODERN_PBUTILS
+#ifdef HAVE_GSTREAMER_0_10_GST_PBUTILS_INSTALL_PLUGINS_H
#include <gst/pbutils/pbutils.h>
#include <gst/pbutils/missing-plugins.h>
#include <gst/pbutils/install-plugins.h>
-#endif // GST_HAS_MODERN_PBUTILS
+#endif // HAVE_GSTREAMER_0_10_GST_PBUTILS_INSTALL_PLUGINS_H
namespace gnash {
@@ -107,7 +107,7 @@
return true;
}
-#ifdef GST_HAS_MODERN_PBUTILS
+#ifdef HAVE_GSTREAMER_0_10_GST_PBUTILS_INSTALL_PLUGINS_H
gst_pb_utils_init();
@@ -140,7 +140,7 @@
#else
log_error(_("Missing plugin, but automatic plugin installation not "
"available."));
-#endif
+#endif // end of HAVE_GSTREAMER_0_10_GST_PBUTILS_INSTALL_PLUGINS_H
return false;
}
=== modified file 'macros/gnashpkgtool.m4'
--- a/macros/gnashpkgtool.m4 2009-03-30 23:21:33 +0000
+++ b/macros/gnashpkgtool.m4 2009-07-24 20:42:41 +0000
@@ -31,33 +31,34 @@
[
pushdef([UP], translit([$1], [a-z], [A-Z]))dnl Uppercase
pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl Lowercase
- pushdef([UPHEADER], translit([$2], [a-z./], [A-Z__]))dnl Uppercase header
+ pushdef([DASHDOWN], translit([$1], [A-Z_], [a-z-]))dnl Lowercase
+ pushdef([UPHEADER], translit([$2], [a-z./-], [A-Z___]))dnl Uppercase header
$1=yes
if test x$4 = x; then
- name=$1
+ name=DASHDOWN
else
- name=$1-$4
+ name=DASHDOWN-$4
fi
dnl Look for the header
if test x"${$1}" = x"yes"; then
AC_ARG_WITH($1_incl, AC_HELP_STRING([--with-$1-incl], [directory where
$2 is]), with_$1_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_$1_incl, [
- if test x"${with_$1_incl}" != x ; then
- if test -f ${with_$1_incl}/$2 ; then
- ac_cv_path_$1_incl="-I`(cd ${with_$1_incl}; pwd)`"
- found_$1_incl="yes"
- else
- AC_MSG_ERROR([${with_$1_incl} directory doesn't contain $2.])
- fi
- fi
- ])
+ AC_CACHE_VAL(ac_cv_path_$1_incl, [
+ if test x"${with_$1_incl}" != x ; then
+ if test -f ${with_$1_incl}/$2 ; then
+ ac_cv_path_$1_incl="-I`(cd ${with_$1_incl}; pwd)`"
+ found_$1_incl="yes"
+ else
+ AC_MSG_ERROR([${with_$1_incl} directory doesn't contain $2.])
+ fi
+ fi
+ ])
if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_incl}" = x; then
AC_MSG_CHECKING([for $2 header using pkg-config])
- $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_incl="`$PKG_CONFIG --cflags
DOWN[]`"
+ $PKG_CONFIG --exists DASHDOWN[] && ac_cv_path_$1_incl="`$PKG_CONFIG
--cflags DASHDOWN[]`"
$PKG_CONFIG --exists $name && ac_cv_path_$1_incl="`$PKG_CONFIG --cflags
$name`"
if test x"${ac_cv_path_$1_incl}" != x; then
AC_MSG_RESULT(${ac_cv_path_$1_incl})
@@ -80,42 +81,39 @@
fi
fi
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_$1_incl}" = x; then
- AC_CHECK_HEADER($2, [ac_cv_path_$1_incl=""; found_$1_incl="yes"], [
- AC_CHECK_HEADER($1/$2, [ac_cv_path_$1_incl="-I/usr/include/$1";
found_$1_incl="yes"], [
- AC_CHECK_HEADER($name/$2,
[ac_cv_path_$1_incl="-I/usr/include/$name"; found_$1_incl="yes"], [
- AC_CHECK_HEADER($2, [ac_cv_path_$1_incl="-I/usr/include/$2";
found_$1_incl="yes"], [
- if test x"${ac_cv_path_$1_incl}" = x; then
- for i in $incllist; do
- if test -f $i/$name; then
- found_$1_incl="yes"
- if test x"$i" != x"/usr/include"; then
- ac_cv_path_$1_incl="-I$i"
- break
- else
- ac_cv_path_$1_incl=""
- break
- fi
- else
- if test -f $i/$name/$2; then
- found_$1_incl="yes"
- ac_cv_path_$1_incl="-I$i/$name"
- break
- else
- if test -f $i/$2; then
- found_$1_incl="yes"
- ac_cv_path_$1_incl="-I$i"
- break
- fi
- fi
- fi
- done
- fi
- ])
+ dnl If the path hasn't been specified, go look for it.
+ if test x"${ac_cv_path_$1_incl}" = x; then
+ AC_CHECK_HEADER($2, [ac_cv_path_$1_incl=""; found_$1_incl="yes"], [
+ AC_CHECK_HEADER($1/$2, [ac_cv_path_$1_incl="-I/usr/include/$1";
found_$1_incl="yes"], [
+ AC_CHECK_HEADER($name/$2, [ac_cv_path_$1_incl="-I/usr/include/$name";
found_$1_incl="yes"], [
+ AC_CHECK_HEADER($2, [ac_cv_path_$1_incl="-I/usr/include/$2";
found_$1_incl="yes"], [
+ if test x"${ac_cv_path_$1_incl}" = x; then
+ for i in $incllist; do
+ if test -f $i/$name; then
+ found_$1_incl="yes"
+ if test x"$i" != x"/usr/include"; then
+ ac_cv_path_$1_incl="-I$i"
+ else
+ ac_cv_path_$1_incl=""
+ fi
+ break
+ else
+ found_$1_incl="yes"
+ if test -f $i/$name/$2; then
+ ac_cv_path_$1_incl="-I$i/$name"
+ else
+ if test -f $i/$2; then
+ ac_cv_path_$1_incl="-I$i"
+ fi
+ fi
+ break
+ fi
+ done
+ fi
+ ])
])
])
- ])
+ ])
fi
if test x"${found_$1_incl}" = "xyes"; then
@@ -143,36 +141,37 @@
[
pushdef([UP], translit([$1], [a-z], [A-Z]))dnl Uppercase
pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl Lowercase
+pushdef([DASHDOWN], translit([$1], [A-Z_], [a-z-]))dnl Lowercase
has_$1=no
if test x"${$1}" = x"yes"; then
- dnl Look for the library
- AC_ARG_WITH($1_lib, AC_HELP_STRING([--with-$1-lib], [directory where $1
library is]), with_$1_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_$1_lib,[
- if test x"${with_$1_lib}" != x ; then
- AC_MSG_CHECKING([for lib$1 library in specified directory])
- if test -f ${with_$1_lib}/lib$name.a -o -f
${with_$1_lib}/lib$name.${shlibext}; then
- tmp="`(cd ${with_$1_lib}; pwd)`"
- ac_cv_path_$1_lib="-L${tmp} -l$name"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([${with_$1_lib} directory doesn't contain
library $name.])
- AC_MSG_RESULT([no])
- fi
- fi
- ])
+ dnl Look for the library
+ AC_ARG_WITH($1_lib, AC_HELP_STRING([--with-$1-lib], [directory where $1
library is]), with_$1_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_$1_lib,[
+ if test x"${with_$1_lib}" != x ; then
+ AC_MSG_CHECKING([for lib$1 library in specified directory])
+ if test -f ${with_$1_lib}/lib$name.a -o -f
${with_$1_lib}/lib$name.${shlibext}; then
+ tmp="`(cd ${with_$1_lib}; pwd)`"
+ ac_cv_path_$1_lib="-L${tmp} -l$name"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([${with_$1_lib} directory doesn't contain library $name.])
+ AC_MSG_RESULT([no])
+ fi
+ fi
+ ])
- dnl If the header doesn't exist, there is no point looking for the
library.
+ dnl If the header doesn't exist, there is no point looking for the library.
if test x$cross_compiling = xno; then
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_lib}" = x; then
- $PKG_CONFIG --exists libDOWN[] &&
ac_cv_path_$1_lib="`$PKG_CONFIG --libs-only-l libDOWN[]`"
- $PKG_CONFIG --exists DOWN[] &&
ac_cv_path_$1_lib="`$PKG_CONFIG --libs-only-l DOWN[]`"
- $PKG_CONFIG --exists lib$name &&
ac_cv_path_$1_lib="`$PKG_CONFIG --libs-only-l lib$name`"
- $PKG_CONFIG --exists $name && ac_cv_path_$1_lib="`$PKG_CONFIG
--libs-only-l $name`"
- AC_MSG_CHECKING([for lib$1 library])
- AC_MSG_RESULT(${ac_cv_path_$1_lib})
- fi
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_lib}" = x; then
+ $PKG_CONFIG --exists [lib]DASHDOWN && ac_cv_path_$1_lib="`$PKG_CONFIG
--libs-only-l libDOWN[]`"
+ $PKG_CONFIG --exists DASHDOWN && ac_cv_path_$1_lib="`$PKG_CONFIG
--libs-only-l DASHDOWN`"
+ $PKG_CONFIG --exists lib$name && ac_cv_path_$1_lib="`$PKG_CONFIG
--libs-only-l lib$name`"
+ $PKG_CONFIG --exists $name && ac_cv_path_$1_lib="`$PKG_CONFIG
--libs-only-l $name`"
+ AC_MSG_CHECKING([for lib$1 library])
+ AC_MSG_RESULT(${ac_cv_path_$1_lib})
+ fi
if test x"${ac_cv_path_$1_lib}" = x; then
AC_PATH_PROG(UP[]_CONFIG, $1-config)
if test x"${UP[]_CONFIG}" != x; then
@@ -183,48 +182,46 @@
fi
fi
- if test x"${ac_cv_path_$1_lib}" = x; then
- ac_save_LIBS=$LIBS
- LIBS=""
- for i in $libslist; do
- if test -f $i/lib$1.a -o -f $i/lib$1.${shlibext}; then
- if test -f "$i/lib$1.a" -o -f
"$i/lib$1.${shlibext}"; then
- if test ! x"$i" = x"/usr/lib" -a !
x"$i" = x"/usr/lib64"; then
- ac_cv_path_$1_lib="-L$i -l$1 $5"
- break
- else
- ac_cv_path_$1_lib="-l$1 $5"
- break
- fi
- fi
- else
- if test -f "$i/lib$name.a" -o -f
"$i/lib$name.${shlibext}"; then
- if test ! x"$i" = x"/usr/lib" -a !
x"$i" = x"/usr/lib64"; then
- ac_cv_path_$1_lib="-L$i -l$name
$5"
- break
- else
- ac_cv_path_$1_lib="-l$name $5"
- break
- fi
- fi
- fi
- done
- LIBS=$ac_save_LIBS
- fi
+ if test x"${ac_cv_path_$1_lib}" = x; then
+ ac_save_LIBS=$LIBS
+ LIBS=""
+ for i in $libslist; do
+ if test -f $i/lib$1.a -o -f $i/lib$1.${shlibext}; then
+ if test -f "$i/lib$1.a" -o -f "$i/lib$1.${shlibext}"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
+ ac_cv_path_$1_lib="-L$i -l$1 $5"
+ else
+ ac_cv_path_$1_lib="-l$1 $5"
+ fi
+ break
+ fi
+ else
+ if test -f "$i/lib$name.a" -o -f "$i/lib$name.${shlibext}"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
+ ac_cv_path_$1_lib="-L$i -l$name $5"
+ else
+ ac_cv_path_$1_lib="-l$name $5"
+ fi
+ break
+ fi
+ fi
+ done
+ LIBS=$ac_save_LIBS
+ fi
- if test x"${ac_cv_path_$1_lib}" = x ; then
+ if test x"${ac_cv_path_$1_lib}" = x ; then
AC_SEARCH_LIBS($2, $1 $name, [ac_cv_path_$1_lib="$LIBS $5"])
fi
- if test x"${ac_cv_path_$1_lib}" != x ; then
- UP[]_LIBS="${ac_cv_path_$1_lib}"
- has_$1=yes
- else
- UP[]_LIBS=""
- fi
+ if test x"${ac_cv_path_$1_lib}" != x ; then
+ UP[]_LIBS="${ac_cv_path_$1_lib}"
+ has_$1=yes
+ else
+ UP[]_LIBS=""
+ fi
fi
- AC_SUBST(UP[]_LIBS)
+AC_SUBST(UP[]_LIBS)
popdef([UP])
popdef([DOWN])
=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am 2009-07-20 21:10:47 +0000
+++ b/utilities/Makefile.am 2009-07-24 20:42:41 +0000
@@ -61,9 +61,11 @@
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
-DLOCALEDIR=\"$(localedir)\" \
+ $(GSTREAMER_CFLAGS) \
+ $(GSTREAMER_PLUGINS_BASE_CFLAGS) \
+ $(BOOST_CFLAGS) \
$(PTHREAD_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(MYSQL_CFLAGS) \
+ $(MYSQL_CFLAGS) \
$(NULL)
if WIN32
@@ -106,11 +108,12 @@
flvdumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
if USE_GST_ENGINE
+ GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS)
$(GSTREAMER_LIBS)
findwebcams_SOURCES = findwebcams.cpp
- findwebcams_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
-
+ findwebcams_LDADD = $(GST_STUFF) $(GNASH_LIBS) $(AM_LDFLAGS)
+
findmicrophones_SOURCES = findmicrophones.cpp
- findmicrophones_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
+ findmicrophones_LDADD = $(GST_STUFF) $(GNASH_LIBS) $(AM_LDFLAGS)
endif
# Rebuild with GCC 4.x Mudflap support
=== modified file 'utilities/findmicrophones.cpp'
--- a/utilities/findmicrophones.cpp 2009-07-22 21:34:00 +0000
+++ b/utilities/findmicrophones.cpp 2009-07-24 20:42:41 +0000
@@ -20,8 +20,13 @@
#endif
#include "rc.h"
+#ifdef HAVE_GST_GST_H
#include "gst/gst.h"
+#endif
+
+#ifdef HAVE_GST_INTERFACES_PROBEPROBE_H
#include <gst/interfaces/propertyprobe.h>
+#endif
#include <vector>
#include <string>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11313: clean up configuration of Gstreamer, and build with the renamed config variables.,
rob <=