mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-30 13:41:48 +00:00
removing snapshot from the build because we need to fix it adding gconf schema to build and spec
Original commit message from CVS: removing snapshot from the build because we need to fix it adding gconf schema to build and spec
This commit is contained in:
parent
8ac992ea60
commit
a18f44638b
4 changed files with 54 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
|||
2002-05-06 Thomas Vander Stichele <thomas@apestaart.org>
|
||||
|
||||
* GConf stuff : from http://www.gnome.org/projects/gconf/ and eog
|
||||
- added gstreamer-gconf package
|
||||
|
||||
2002-02-06 Thomas Vander Stichele <thomas@apestaart.org>
|
||||
|
||||
* more build cleanup : merging over changes from gst-player
|
||||
|
|
10
Makefile.am
10
Makefile.am
|
@ -1,5 +1,11 @@
|
|||
SUBDIRS=gst-libs gst sys ext examples tools ## testsuite
|
||||
if HAVE_GCONF
|
||||
GCONF_DIR=gconf
|
||||
else
|
||||
GCONF_DIR=
|
||||
endif
|
||||
|
||||
DIST_SUBDIRS=gst-libs gst sys ext examples tools ## testsuite
|
||||
SUBDIRS=gst-libs gst sys ext examples tools $(GCONF_DIR) ## testsuite
|
||||
|
||||
DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf ## testsuite
|
||||
|
||||
EXTRA_DIST=gst-plugins.spec depcomp AUTHORS COPYING README RELEASE ChangeLog autogen.sh
|
||||
|
|
14
configure.ac
14
configure.ac
|
@ -93,6 +93,18 @@ else
|
|||
HAVE_NASM="yes"
|
||||
fi
|
||||
|
||||
dnl check for gconf
|
||||
translit(dnm, m, l) AM_CONDITIONAL(HAVE_GCONF, true)
|
||||
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
|
||||
if test x$GCONFTOOL = xno; then
|
||||
AC_MSG_WARN(Not installing GConf schemas)
|
||||
HAVE_GCONF="no"
|
||||
else
|
||||
AM_GCONF_SOURCE_2
|
||||
HAVE_GCONF="yes"
|
||||
fi
|
||||
AC_SUBST(HAVE_GCONF)
|
||||
|
||||
dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1)
|
||||
PKG_CHECK_MODULES(GST, gstreamer >= $GST_PLUGINS_MAJOR.$GST_PLUGINS_MINOR.$GST_PLUGINS_MICRO,
|
||||
HAVE_GST="yes", HAVE_GST="no")
|
||||
|
@ -842,7 +854,6 @@ ext/sdl/Makefile
|
|||
ext/shout/Makefile
|
||||
ext/sidplay/Makefile
|
||||
ext/smoothwave/Makefile
|
||||
ext/snapshot/Makefile
|
||||
ext/vorbis/Makefile
|
||||
ext/tarkin/Makefile
|
||||
ext/xmms/Makefile
|
||||
|
@ -856,6 +867,7 @@ gst-libs/gst/floatcast/Makefile
|
|||
examples/capsfilter/Makefile
|
||||
examples/Makefile
|
||||
tools/Makefile
|
||||
gconf/Makefile
|
||||
testsuite/seeking/Makefile
|
||||
)
|
||||
|
||||
|
|
|
@ -65,7 +65,12 @@ else
|
|||
make 2>&1 | tee make.log
|
||||
fi
|
||||
|
||||
%makeinstall
|
||||
%install
|
||||
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
||||
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
||||
make install prefix=$RPM_BUILD_ROOT%{prefix} \
|
||||
sysconfdir=$RPM_BUILD_ROOT%{sysconfdir}
|
||||
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
||||
|
||||
%clean
|
||||
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
||||
|
@ -862,7 +867,29 @@ Plugin for playback of wav, au and mod audio files as well as mp3 type
|
|||
%post -n gstreamer-audio-formats
|
||||
%{prefix}/bin/gst-register --gst-mask=0 2> /dev/null
|
||||
|
||||
%package -n gstreamer-GConf
|
||||
Summary: GStreamer GConf schemas
|
||||
Group: Libraries/Multimedia
|
||||
Requires: gstreamer-plugins >= %{version}
|
||||
Requires: GConf2
|
||||
BuildRequires: GConf2-devel
|
||||
|
||||
%description -n gstreamer-GConf
|
||||
Installation of GStreamer GConf schemas.
|
||||
These set usable defaults used by all GStreamer-enabled Gnome applications.
|
||||
|
||||
%files -n gstreamer-GConf
|
||||
%defattr(-, root, root)
|
||||
%{_sysconfdir}/gconf/schemas/gstreamer.schemas
|
||||
|
||||
%post -n gstreamer-GConf
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer.schemas > /dev/null
|
||||
|
||||
%changelog
|
||||
* Mon May 06 2002 Thomas Vander Stichele <thomas@apestaart.org>
|
||||
- added gstreamer-GConf package
|
||||
|
||||
* Wed Mar 13 2002 Thomas Vander Stichele <thomas@apestaart.org>
|
||||
- added more BuildRequires and Requires
|
||||
- rearranged some plugins
|
||||
|
|
Loading…
Reference in a new issue