removing snapshot from the build because we need to fix it adding gconf schema to...

Original commit message from CVS:
removing snapshot from the build because we need to fix it
adding gconf schema to build and spec

diff --git a/ChangeLog b/ChangeLog
index c54708595d72b84bfb22a853da29541686dcff0e..e442d48f39194f35a0a8f2a1bbc87ddda7ccca82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/Makefile.am b/Makefile.am
index c637fa8e2d06af01ed478ebea527070c419265af..ae6c76704a69d9b4307840131b34f2eb88106735 100644 (file)
--- a/Makefile.am
+++ b/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

diff --git a/common b/common
index 69cfea918b2840b5076e60becdb39b96a8ca5ef5..3ce22b87b251e36d30660b72b8020011246b0c64 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 69cfea918b2840b5076e60becdb39b96a8ca5ef5
+Subproject commit 3ce22b87b251e36d30660b72b8020011246b0c64

diff --git a/configure.ac b/configure.ac
index 83230534bb1721ca7396b6fa01a5593e4e2fa2fb..25b22013424e4676929da396dfe312e635fa4890 100644 (file)
--- a/configure.ac
+++ b/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
 )
 

diff --git a/ext/mpeg2dec/Makefile.am b/ext/mpeg2dec/Makefile.am
index dc0f895d04edb3beadbdf8a40fd54303ccce3f9f..cd714eadf3c3eb9f1b21e50b8b05739a269681e8 100644 (file)
--- a/ext/mpeg2dec/Makefile.am
+++ b/ext/mpeg2dec/Makefile.am
@@ -2,15 +2,15 @@ plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libgstmpeg2dec.la
 
-if HAVE_CPU_I386
-ARCHFLAGS = -mcpu=i486
-else
+##if HAVE_CPU_I386
+##ARCHFLAGS = -mcpu=i486
+##else
 ARCHFLAGS = 
-endif
+##endif
 
 libgstmpeg2dec_la_SOURCES = gstmpeg2dec.c
 libgstmpeg2dec_la_CFLAGS = $(GST_CFLAGS) $(MPEG2DEC_CFLAGS) $(ARCHFLAGS) $(FOMIT_FRAME_POINTER) -ffast-math
 libgstmpeg2dec_la_LIBADD = $(MPEG2DEC_LIBS)
-libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MPEG2DEC_LIBS)
 
 noinst_HEADERS = gstmpeg2dec.h

diff --git a/ext/mpeg2dec/gstmpeg2dec.h b/ext/mpeg2dec/gstmpeg2dec.h
index 865fb7c915fa400dabb6e356aec08e9a2c32f03a..6ebab65754dbe3e0d2130c159cd65cc6d08c0686 100644 (file)
--- a/ext/mpeg2dec/gstmpeg2dec.h
+++ b/ext/mpeg2dec/gstmpeg2dec.h
@@ -25,6 +25,7 @@
 #include <config.h>
 #include <gst/gst.h>
 #include <mpeg2dec/mpeg2.h>
+#include <mpeg2dec/mm_accel.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/gst-plugins-ugly.spec.in b/gst-plugins-ugly.spec.in
index 83201b6c81cbda9bbd6e0759f1decf6756aac7fe..aa32ec4729781ea181945fe8f813e8b07c539cce 100644 (file)
--- a/gst-plugins-ugly.spec.in
+++ b/gst-plugins-ugly.spec.in
@@ -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