mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-08 16:35:40 +00:00
no good reason to require glib 1.3.15 so back to 1.3.12 put version checking for glib and libxml in configure.ac subs...
Original commit message from CVS: * no good reason to require glib 1.3.15 so back to 1.3.12 * put version checking for glib and libxml in configure.ac * subst'd these minimum required versions so they can be used in spec file
This commit is contained in:
parent
e1347f2974
commit
c09d4144ba
3 changed files with 32 additions and 14 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 2adced54d821c7870fd4d9e5e19482418a64c931
|
Subproject commit de68be0c16181a66f42fad60319e273097f60245
|
15
configure.ac
15
configure.ac
|
@ -91,8 +91,13 @@ AC_MSG_RESULT(no)
|
||||||
dnl Check for essential libraries first:
|
dnl Check for essential libraries first:
|
||||||
dnl ====================================
|
dnl ====================================
|
||||||
|
|
||||||
|
dnl === GLib 2 ===
|
||||||
|
dnl Minimum required version of GLib2
|
||||||
|
GLIB2_REQ="1.3.12"
|
||||||
|
AC_SUBST(GLIB2_REQ)
|
||||||
|
|
||||||
dnl Check for glib2
|
dnl Check for glib2
|
||||||
PKG_CHECK_MODULES(GLIB2, glib-2.0 gobject-2.0 gthread-2.0 gmodule-2.0,
|
PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0,
|
||||||
HAVE_GLIB2=yes,HAVE_GLIB2=no)
|
HAVE_GLIB2=yes,HAVE_GLIB2=no)
|
||||||
GLIB_LIBS=$GLIB2_LIBS
|
GLIB_LIBS=$GLIB2_LIBS
|
||||||
GLIB_CFLAGS=$GLIB2_CFLAGS
|
GLIB_CFLAGS=$GLIB2_CFLAGS
|
||||||
|
@ -106,8 +111,14 @@ fi
|
||||||
GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0"
|
GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0"
|
||||||
AC_SUBST(GST_PKG_DEPS)
|
AC_SUBST(GST_PKG_DEPS)
|
||||||
|
|
||||||
|
dnl === libxml 2 ===
|
||||||
|
dnl Minimum required version of libxml2
|
||||||
|
LIBXML2_REQ="2.4.0"
|
||||||
|
AC_SUBST(LIBXML2_REQ)
|
||||||
|
|
||||||
|
dnl check for libxml2
|
||||||
LIBXML_PKG=', libxml-2.0'
|
LIBXML_PKG=', libxml-2.0'
|
||||||
PKG_CHECK_MODULES(XML, libxml-2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
|
PKG_CHECK_MODULES(XML, libxml-2.0 >= $LIBXML2_REQ, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
|
||||||
if test "x$HAVE_LIBXML2" = "xyes"; then
|
if test "x$HAVE_LIBXML2" = "xyes"; then
|
||||||
AC_DEFINE(HAVE_LIBXML2)
|
AC_DEFINE(HAVE_LIBXML2)
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,16 +1,23 @@
|
||||||
# File generated by dobey, DO NOT EDIT
|
# File generated by dobey, DO NOT EDIT
|
||||||
|
|
||||||
Summary: GStreamer Streaming-media framework runtime
|
Summary: GStreamer Streaming-media framework runtime
|
||||||
Name: gstreamer
|
Name: gstreamer
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Release: @GST_VERSION_RELEASE@
|
Release: @GST_VERSION_RELEASE@
|
||||||
Copyright: LGPL
|
|
||||||
Group: Libraries/Multimedia
|
Copyright: LGPL
|
||||||
Source: %{name}-%{version}.tar.gz
|
Group: Libraries/Multimedia
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
Source: %{name}-%{version}.tar.gz
|
||||||
Requires: glib2 >= 1.3.15
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||||
Requires: libxml2 >= 2.4.0
|
|
||||||
BuildRequires: nasm => 0.90
|
%define _glib2 @GLIB2_REQ@
|
||||||
|
%define _libxml2 @LIBXML2_REQ@
|
||||||
|
|
||||||
|
Requires: glib2 >= %_glib2
|
||||||
|
Requires: libxml2 >= %_libxml2
|
||||||
|
BuildRequires: glib2-devel >= %_glib2
|
||||||
|
BuildRequires: libxml2 >= %_libxml2
|
||||||
|
BuildRequires: nasm => 0.90
|
||||||
|
|
||||||
%description
|
%description
|
||||||
GStreamer is a streaming-media framework, based on graphs of filters which
|
GStreamer is a streaming-media framework, based on graphs of filters which
|
||||||
|
|
Loading…
Reference in a new issue