Menu
▾
▴
[gst-cvs] thomasvs gst-plugins: gst-plugins/ gst-plugins/m4/
|
From: Thomas V. S. <tho...@us...> - 2003-07-18 19:11:49
|
CVS Root: /cvsroot/gstreamer
Module: gst-plugins
Changes by: thomasvs
Date: Fri Jul 18 2003 12:11:48 PDT
Branch: BRANCH-GSTREAMER-0_6
Log message:
sid build fix
Modified files:
. : gst-plugins.spec.in
m4 : gst-sid.m4
Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-plugins.spec.in.diff?r1=1.118.4.7&r2=1.118.4.8
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/m4/gst-sid.m4.diff?r1=1.2&r2=1.2.20.1
====Begin Diffs====
Index: gst-plugins.spec.in
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst-plugins.spec.in,v
retrieving revision 1.118.4.7
retrieving revision 1.118.4.8
diff -u -d -r1.118.4.7 -r1.118.4.8
--- gst-plugins.spec.in 3 Jun 2003 13:58:14 -0000 1.118.4.7
+++ gst-plugins.spec.in 18 Jul 2003 19:11:36 -0000 1.118.4.8
@@ -1,15 +1,11 @@
Name: gstreamer-plugins
Version: @VERSION@
Release: @GST_PLUGINS_VERSION_RELEASE@
-Summary: GStreamer Streaming-media framework plug-ins.
+Summary: GStreamer streaming media framework plug-ins.
%define majorminor @GST_MAJORMINOR@
-#%define prefix /usr
-#%define sysconfdir /etc
-#Docdir: %{prefix}/share/doc
-#Prefix: %prefix
-Group: Libraries/Multimedia
+Group: System/Libraries
License: LGPL
URL: http://gstreamer.net/
Vendor: GStreamer Backpackers Team <pa...@gs...>
@@ -21,67 +17,30 @@
Requires: glib2 >= %_glib2
BuildRequires: glib2-devel >= %_glib2
Requires: gstreamer >= 0.5.1
-BuildRequires: nasm => 0.90
BuildRequires: gstreamer-devel >= 0.5.1
BuildRequires: gstreamer-tools >= 0.5.1
Obsoletes: gstreamer-plugin-libs
%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
operate on media data. Applications using this library can do anything
from real-time sound processing to playing videos, and just about anything
-else media-related. Its plugin-based architecture means that new data
+else media-related. Its plug-in-based architecture means that new data
types or processing capabilities can be added simply by installing new
plug-ins.
%prep
-%setup -n gst-plugins-%{version}
+%setup -q -n gst-plugins-%{version}
+
%build
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-%{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} ; \
-./configure \
- --prefix=%{_prefix} \
- --exec-prefix=%{_exec_prefix} \
- --bindir=%{_bindir} \
- --sbindir=%{_sbindir} \
- --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} \
- --includedir=%{_includedir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --enable-debug \
- --enable-DEBUG
+%configure --enable-debug -enable-DEBUG --disable-examples
+make %{?_smp_mflags}
-if [ "$SMP" != "" ]; then
- (make "MAKE=make -k -j $SMP"; exit 0)
- make 2>&1 | tee make.log
-else
- make 2>&1 | tee make.log
-fi
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make prefix=%{?buildroot:%{buildroot}}%{_prefix} \
- exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \
- bindir=%{?buildroot:%{buildroot}}%{_bindir} \
- sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \
- sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \
- datadir=%{?buildroot:%{buildroot}}%{_datadir} \
- includedir=%{?buildroot:%{buildroot}}%{_includedir} \
- libdir=%{?buildroot:%{buildroot}}%{_libdir} \
- libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \
- localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \
- sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \
- mandir=%{?buildroot:%{buildroot}}%{_mandir} \
- infodir=%{?buildroot:%{buildroot}}%{_infodir} \
- install
+%makeinstall
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Clean out files that should not be part of the rpm.
@@ -95,7 +54,7 @@
%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
@@ -111,15 +70,23 @@
%{_libdir}/gstreamer-%{majorminor}/libgstriff.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideo.so
-%package -n gstreamer-plugins-devel
+%package -n devel
Summary: GStreamer Plugin Library Headers.
Group: Development/Libraries
Requires: gstreamer-plugins = %{version}
Provides: gstreamer-play-devel = %{version}
Provides: gstreamer-gconf-devel = %{version}
-%description -n gstreamer-plugins-devel
-GStreamer support libraries header files.
+%description -n devel
+GStreamer is a streaming media framework, based on graphs of filters which
+operate on media data. Applications using this library can do anything
+from real-time sound processing to playing videos, and just about anything
+else media-related. Its plug-in-based architecture means that new data
+types or processing capabilities can be added simply by installing new
+plug-ins.
+
+This package contains libraries and includes files necessary to develop
+applications and plug-ins for GStreamer.
%files -n gstreamer-plugins-devel
%defattr(-, root, root)
@@ -148,7 +115,7 @@
@USE_A52DEC_TRUE@BuildRequires: a52dec-devel >= 0.7.3
@USE_A52DEC_TRUE@
@USE_A52DEC_TRUE@%description -n gstreamer-a52dec
-@USE_A52DEC_TRUE@Plug-in for decoding of VOB files.
+@USE_A52DEC_TRUE@Decodes ATSC A/52 encoded audio streams.
@USE_A52DEC_TRUE@
@USE_A52DEC_TRUE@%files -n gstreamer-a52dec
@USE_A52DEC_TRUE@%defattr(-, root, root)
Index: gst-sid.m4
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/m4/gst-sid.m4,v
retrieving revision 1.2
retrieving revision 1.2.20.1
diff -u -d -r1.2 -r1.2.20.1
--- gst-sid.m4 6 Jan 2002 21:52:21 -0000 1.2
+++ gst-sid.m4 18 Jul 2003 19:11:36 -0000 1.2.20.1
@@ -9,7 +9,7 @@
AC_CHECK_HEADER(sidplay/player.h, HAVE_SIDPLAY="yes", HAVE_SIDPLAY="no")
if test $HAVE_SIDPLAY = "yes"; then
- SIDPLAY_LIBS="-lsidplay"
+ SIDPLAY_LIBS="-lsidplay -lstdc++"
AC_MSG_CHECKING([whether -lsidplay works])
ac_libs_safe=$LIBS
|