Updating configure for gstreamer 1.0

[Steve Cookson]

Hi Guys,

I've been playing with gstreamer 1.0/mediactrl. It's a large interface
change, so I'm probably a long way from finishing it.

At the moment it breaks down into:

1 - Fixing configure.in
2 - Updating mediactrl.cpp/.h
3 - Test the whole structure.

I'm working on 2 - at the moment. In the meantime changes to
configure.in follow, could I have feedback, please?

Regards

Steve

Index: /home/image/Alien-wxWidgets/wxWidgets-3.0.0/configure.in
index 53ccfe0..8b496c7 100644
--- a/wxWidgets-3.0.0/configure.in
+++ b/wxWidgets-3.0.0/configure.in
@@ -7517,23 +7517,38 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o
"$wxUSE_MEDIACTRL" = "auto"; then
dnl Test for at least 0.8 gstreamer module from pkg-config
dnl Even totem doesn't accept 0.9 evidently.
dnl
- dnl So, we first check to see if 0.10 if available - if not we
+ dnl So, we first check to see if 1.0 if available - if not we
+ dnl check to see if 0.10 if available - if not we
dnl try the older 0.8 version
dnl
-------------------------------------------------------------------
- GST_VERSION_MAJOR=0
- GST_VERSION_MINOR=10
+
+ GST_VERSION_MAJOR=1
+ GST_VERSION_MINOR=0
GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR

if test "$wxUSE_GSTREAMER8" = "no"; then
PKG_CHECK_MODULES(GST,
- [gstreamer-$GST_VERSION
gstreamer-plugins-base-$GST_VERSION],
+ [gstreamer-$GST_VERSION],
[
wxUSE_GSTREAMER="yes"
- GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
+ GST_LIBS=" "
],
[
- AC_MSG_WARN([GStreamer 0.10 not available, falling
back to 0.8])
- GST_VERSION_MINOR=8
+ AC_MSG_WARN([GStreamer 1.0 not available, falling
back to 0.10])
+ GST_VERSION_MAJOR=0
+ GST_VERSION_MINOR=10
+ GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
+ PKG_CHECK_MODULES(GST,
+ [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],
+ [
+ wxUSE_GSTREAMER="yes"
+ GST_LIBS="$GST_LIBS -lgstinterfaces-0.10"
+ ],
+ [
+ AC_MSG_WARN([GStreamer 0.10 not available, falling back
to 0.8])
+ GST_VERSION_MINOR=8
+ ]
+ )
]
)
else
@@ -7541,6 +7556,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o
"$wxUSE_MEDIACTRL" = "auto"; then
GST_VERSION_MINOR=8
fi

+
if test $GST_VERSION_MINOR = "8"; then
GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
PKG_CHECK_MODULES(GST,
@@ -7551,7 +7567,6 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o
"$wxUSE_MEDIACTRL" = "auto"; then
])
fi

-
if test "$wxUSE_GSTREAMER" = "yes"; then
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
EXTRALIBS_MEDIA="$GST_LIBS"