mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Require at least Gtk 2.8.0 for the demos (that's the oldest I can test with; I'm fairly certain Gtk 2.0...

Browse source 
Original commit message from CVS:
* configure.ac:
Require at least Gtk 2.8.0 for the demos (that's the oldest I can
test with; I'm fairly certain Gtk 2.0.0 is not good enough any
longer); clean up some unused Gtk-related configure cruft.
* examples/scaletempo/demo-gui.c:
Define Gtk 2.12 function to noop when compiling against older Gtk.
This commit is contained in:
Tim-Philipp Müller 2008-10-30 15:31:59 +00:00
parent 8d54b879f9
commit aa67ed1d14
3 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-10-30 Tim-Philipp Müller <tim.muller at collabora co uk>
* configure.ac:
Require at least Gtk 2.8.0 for the demos (that's the oldest I can
test with; I'm fairly certain Gtk 2.0.0 is not good enough any
longer); clean up some unused Gtk-related configure cruft.
* examples/scaletempo/demo-gui.c:
Define Gtk 2.12 function to noop when compiling against older Gtk.
2008-10-30 Sebastian Dröge <slomo@circular-chaos.org> 2008-10-30 Sebastian Dröge <slomo@circular-chaos.org>
* gst/speexresample/gstspeexresample.c: * gst/speexresample/gstspeexresample.c:

22
configure.ac
View file

@ -190,27 +190,7 @@ AC_SUBST(GSTPB_PREFIX)
dnl GTK is optional and used in examples dnl GTK is optional and used in examples
HAVE_GTK=NO HAVE_GTK=NO
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0, HAVE_GTK=yes, HAVE_GTK=no)
if test "x$HAVE_GTK_22" = "xyes"; then
HAVE_GTK=yes
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
AC_SUBST(GTK_VERSION)
GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
AC_SUBST(GTK_BASE_DIR)
GDK_PIXBUF_LIBDIR=`$PKG_CONFIG --variable=libdir gdk-pixbuf-2.0`
GDK_PIXBUF_PREFIXDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
AC_SUBST(GTK_BASE_DIR)
else
PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK_20=yes, HAVE_GTK_20=no)
fi
if test "x$HAVE_GTK_20" = "xyes"; then
HAVE_GTK=yes
fi
GTK_CFLAGS=$GTK2_CFLAGS
GTK_LIBS=$GTK2_LIBS
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(HAVE_GTK)
AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
dnl libglade is optional and only used in examples dnl libglade is optional and only used in examples

4
examples/scaletempo/demo-gui.c
View file

@ -27,6 +27,10 @@
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "demo-gui" #define G_LOG_DOMAIN "demo-gui"
#if !GTK_CHECK_VERSION(2,12,0)
#define gtk_widget_error_bell(w) /* nop */
#endif
enum enum
{ {
SIGNAL_ERROR, SIGNAL_ERROR,