summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7df5e89)
raw | patch | inline | side by side (parent: 7df5e89)
author | Thomas Vander Stichele <thomas@apestaart.org> | |
Wed, 11 Dec 2002 21:58:36 +0000 (21:58 +0000) | ||
committer | Thomas Vander Stichele <thomas@apestaart.org> | |
Wed, 11 Dec 2002 21:58:36 +0000 (21:58 +0000) |
Original commit message from CVS:
merge back from release branch
merge back from release branch
index 209963c7c3bc5cd1950a98466da3c14dc5ff76da..c7769749c1414d72849ba73455fc3d041f08d55d 100644 (file)
--- a/TODO
+++ b/TODO
+* version the element check m4
+
* check qcam plugin; it includes source of the qcam package that might
be librified
index 3d74dda3c3986e6cc4c4fef0ec36be15e51cb960..e6efc8e2fa23f118e3221242069f36315b342dcc 100644 (file)
libgstaudio_la_SOURCES = audio.c
-# libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio
-noinst_HEADERS = audio.h
+libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio
+libgstaudioinclude_HEADERS = audio.h
libgstaudio_la_LIBADD =
libgstaudio_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
index 1f3b12275958af884e4c724fc86c507499664f5e..bdf92d378e8351b8af27e15af10e5724255d151e 100644 (file)
intidct.c \
$(GSTIDCTARCH_SRCS)
-## libgstidctincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/idct
-## libgstidctinclude_HEADERS = idct.h
-noinst_HEADERS = idct.h dct.h
+libgstidctincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/idct
+libgstidctinclude_HEADERS = idct.h
+noinst_HEADERS = dct.h
## check_PROGRAMS = ieeetest
index 82abb56a5a48bfe0b46bb99c60eec270550a77f0..3c23638a3c38c0a9db5f309a6b26d25345105ce4 100644 (file)
libgstresample_la_CFLAGS = $(GST_CFLAGS) -ffast-math $(ARCHCFLAGS)
libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-#libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample
-#libgstresampleinclude_HEADERS = resample.h
+libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample
+libgstresampleinclude_HEADERS = resample.h
-noinst_HEADERS = private.h resample.h
+noinst_HEADERS = private.h
#check_PROGRAMS = test
#test_SOURCES = test.c
index 0f7b8a724eafaa84c05f06344f0b53d21adf94ab..4290948f5bc8873f1280c2403b5a9a5bc178a90d 100644 (file)
libgstriff_la_SOURCES = riffparse.c riffencode.c riffutil.c riff.c
-## libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff
-## libgstriffinclude_HEADERS = riff.h
-noinst_HEADERS = riff.h
+libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff
+libgstriffinclude_HEADERS = riff.h
libgstriff_la_LIBADD =
libgstriff_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
index a3c593411d9b232c8795f946e2194eed3c37a383..3e6f9bd31fa85c4709608ebf0bcca93fbbe815d5 100644 (file)
libgstvideo_la_SOURCES = video.c
-#libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
-#libgstvideoinclude_HEADERS = video.h
-noinst_HEADERS = video.h
+libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
+libgstvideoinclude_HEADERS = video.h
libgstvideo_la_LIBADD =
libgstvideo_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
index bdc618896e0ee8255743095b31a43678832605ca..fce9eea9262b4e0b13970def6bc6759c422eed9a 100644 (file)
--- a/gst-plugins-ugly.spec.in
+++ b/gst-plugins-ugly.spec.in
%files -n gstreamer-plugins-devel
%defattr(-, root, root)
+%{_includedir}/gstreamer-%{majorminor}/gst/gconf/gconf.h
+%{_includedir}/gstreamer-%{majorminor}/gst/play/play.h
%{_includedir}/gstreamer-%{majorminor}/gst/audio/audio.h
%{_includedir}/gstreamer-%{majorminor}/gst/floatcast/floatcast.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gconf/gconf.h
%{_includedir}/gstreamer-%{majorminor}/gst/idct/idct.h
%{_includedir}/gstreamer-%{majorminor}/gst/resample/resample.h
%{_includedir}/gstreamer-%{majorminor}/gst/riff/riff.h
%{_includedir}/gstreamer-%{majorminor}/gst/video/video.h
-%{_includedir}/gstreamer-%{majorminor}/gst/play/play.h
%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4
%{_libdir}/pkgconfig/gstreamer-libs-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-play-%{majorminor}.pc
+@USE_GCONF_TRUE@%{_libdir}/libgstgconf-%{majorminor}.so
+%{_libdir}/libgstplay-%{majorminor}.so
# Here are all the packages depending on external libs #
@USE_LIBPNG_TRUE@
@USE_LIBPNG_TRUE@%files -n gstreamer-libpng
@USE_LIBPNG_TRUE@%defattr(-, root, root)
-@USE_LIBPNG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstlibpng.so
+@USE_LIBPNG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstpng.so
@USE_LIBPNG_TRUE@
@USE_LIBPNG_TRUE@%post -n gstreamer-libpng
@USE_LIBPNG_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null
%{_libdir}/gstreamer-%{majorminor}/libgstcutter.so
%{_libdir}/gstreamer-%{majorminor}/libgstfilter.so
%{_libdir}/gstreamer-%{majorminor}/libmixmatrix.so
-@USE_LIBPNG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstpng.so
%post -n gstreamer-audio-effects
%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null
@USE_GCONF_TRUE@Requires: gstreamer-plugins = %{version}
@USE_GCONF_TRUE@Requires: GConf2
@USE_GCONF_TRUE@BuildRequires: GConf2-devel
-
+@USE_GCONF_TRUE@
@USE_GCONF_TRUE@%description -n gstreamer-GConf
@USE_GCONF_TRUE@Installation of GStreamer GConf schemas.
@USE_GCONF_TRUE@These set usable defaults used by all GStreamer-enabled Gnome applications.
-
+@USE_GCONF_TRUE@
@USE_GCONF_TRUE@%files -n gstreamer-GConf
@USE_GCONF_TRUE@%defattr(-, root, root)
@USE_GCONF_TRUE@%{_sysconfdir}/gconf/schemas/gstreamer.schemas
-@USE_GCONF_TRUE@%{_libdir}/libgstgconf.so
-@USE_GCONF_TRUE@%{_libdir}/libgstgconf-%{version}.so.*
-
+@USE_GCONF_TRUE@%{_libdir}/libgstgconf-%{majorminor}.so.*
+@USE_GCONF_TRUE@
@USE_GCONF_TRUE@%post -n gstreamer-GConf
@USE_GCONF_TRUE@export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@USE_GCONF_TRUE@gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer.schemas > /dev/null
%files -n gstreamer-play
%defattr(-, root, root)
-%{_sysconfdir}/gconf/schemas/gstreamer.schemas
-%{_libdir}/libgstplay-%{majorminor}.so*
+%{_libdir}/libgstplay-%{majorminor}.so.*
%post -n gstreamer-play
/sbin/ldconfig
/sbin/ldconfig
%changelog
+* Tue Dec 10 2002 Thomas Vander Stichele <thomas at apestaart dot org>
+- only install schema once
+- move out devel lib stuff to -devel package
+
* Sun Dec 08 2002 Thomas Vander Stichele <thomas at apestaart dot org>
- fix location of libgstpng
- changes for parallel installability