mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

merge back from release branch

Browse source 
Original commit message from CVS:
merge back from release branch
This commit is contained in:
Thomas Vander Stichele 2002-12-11 21:58:36 +00:00
parent 6bbe57144b
commit 48d140aee2
8 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -1,3 +1,5 @@
* version the element check m4
* check qcam plugin; it includes source of the qcam package that might
be librified

2
common

@ -1 +1 @@
Subproject commit 92ff5101d55c0f853620bf13f8dd528992824137
Subproject commit 773e3a64961084c37477faa464f12add3dfcd6dc

4
gst-libs/gst/audio/Makefile.am
View file

@ -4,8 +4,8 @@ library_LTLIBRARIES = libgstaudio.la
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

6
gst-libs/gst/idct/Makefile.am
View file

@ -15,9 +15,9 @@ libgstidct_la_SOURCES = \
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

6
gst-libs/gst/resample/Makefile.am
View file

@ -17,10 +17,10 @@ libgstresample_la_LIBADD =
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

5
gst-libs/gst/riff/Makefile.am
View file

@ -4,9 +4,8 @@ library_LTLIBRARIES = libgstriff.la
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

5
gst-libs/gst/video/Makefile.am
View file

@ -4,9 +4,8 @@ library_LTLIBRARIES = libgstvideo.la
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

25
gst-plugins.spec.in
View file

@ -122,17 +122,19 @@ GStreamer support libraries header files.
%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 #
@ -734,7 +736,7 @@ Plug-ins for playback of AVI format media files.
@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
@ -1177,7 +1179,6 @@ integer to float conversion, LAW conversion and level detection plug-ins.
%{_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
@ -1495,17 +1496,16 @@ Plug-in for demuxing Quicktime movies
@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
@ -1521,8 +1521,7 @@ This package contains a basic audio and video playback library.
%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
@ -1531,6 +1530,10 @@ This package contains a basic audio and video playback library.
/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