diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | gst-libs/Makefile.am | 5 | ||||
| -rw-r--r-- | gst-libs/gst/Makefile.am | 69 | ||||
| -rw-r--r-- | gst-plugins.spec.in | 12 |
5 files changed, 20 insertions, 76 deletions
diff --git a/Makefile.am b/Makefile.am index 2aa23f37..ca0ef277 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,14 +13,14 @@ GCONF_DIR = # endif SUBDIRS = \ - gst sys ext \ + gst sys ext gst-libs \ $(GCONF_DIR) \ m4 common # disabled # $(SUBDIRS_DOCS) DIST_SUBDIRS = \ - gst sys ext \ + gst sys ext gst-libs \ m4 common # disabled diff --git a/configure.ac b/configure.ac index f351af22..254f2505 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,6 @@ dnl AC_SUBST(GETTEXT_PACKAGE) dnl AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", dnl [gettext package name]) - dnl decide on error flags AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no") @@ -433,7 +432,8 @@ GST_CHECK_FEATURE(ESD, [esound plug-ins], esdsink, [ ]) ]) -GST_CFLAGS="$GST_CFLAGS $GST_ERROR" +dnl also add builddir include for enumtypes and marshal +GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_ERROR" AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) @@ -500,6 +500,8 @@ gst/smpte/Makefile gst/udp/Makefile gst/videobox/Makefile gst/videofilter/Makefile +gst-libs/Makefile +gst-libs/gst/Makefile sys/Makefile ext/Makefile ext/aalib/Makefile diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am new file mode 100644 index 00000000..6ac3e24a --- /dev/null +++ b/gst-libs/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = \ + gst + +DIST_SUBDIRS = \ + gst diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index ac8f5952..2df58b3b 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -1,68 +1 @@ -if USE_GCONF -GCONF_DIR = gconf -else -GCONF_DIR = -endif - -if USE_X -X_DIR = xwindowlistener -else -X_DIR = -endif - -SUBDIRS = \ - audio \ - colorbalance \ - floatcast \ - $(GCONF_DIR) \ - idct \ - media-info \ - mixer \ - navigation \ - propertyprobe \ - resample \ - riff \ - tag \ - tuner \ - video \ - xoverlay \ - $(X_DIR) \ - . \ - play - -DIST_SUBDIRS = \ - audio \ - colorbalance \ - floatcast \ - gconf \ - idct \ - media-info \ - mixer \ - navigation \ - play \ - propertyprobe \ - resample \ - riff \ - tag \ - tuner \ - video \ - xoverlay \ - xwindowlistener - - -lib_LTLIBRARIES = libgstinterfaces-@GST_MAJORMINOR@.la - -libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = - -libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = \ - colorbalance/libgstcolorbalance.la \ - mixer/libgstmixer.la \ - navigation/libgstnavigation.la \ - propertyprobe/libgstpropertyprobe.la \ - tuner/libgsttuner.la \ - xoverlay/libgstxoverlay.la \ - $(GST_LIBS) - -libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@ - -noinst_HEADERS = gettext.h gst-i18n-plugin.h +noinst_HEADERS = gst-i18n-plugin.h gettext.h diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in index 70b4561c..50ac3217 100644 --- a/gst-plugins.spec.in +++ b/gst-plugins.spec.in @@ -132,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gstreamer-%{majorminor}/libgstudp.so %{_libdir}/gstreamer-%{majorminor}/libgstalpha.so %{_libdir}/gstreamer-%{majorminor}/libgstgoom.so +%{_libdir}/gstreamer-%{majorminor}/libgstrmdemux.so +%{_libdir}/gstreamer-%{majorminor}/libgstavi.so +%{_libdir}/gstreamer-%{majorminor}/libgstlevel.so +%{_libdir}/gstreamer-%{majorminor}/libgstvideobox.so # gstreamer-plugins with external dependencies but in the main package # @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so @@ -215,8 +219,8 @@ Group: Applications/Multimedia # @USE_FAAD_TRUE@BuildRequires: faad2-devel >= 2.0 # @USE_GSM_TRUE@BuildRequires: gsm-devel >= 1.0.10 # @USE_LAME_TRUE@BuildRequires: lame-devel >= 3.89 -# @USE_MAD_TRUE@BuildRequires: libid3tag-devel >= 0.15.0 -# @USE_MAD_TRUE@BuildRequires: libmad-devel >= 0.15.0 +@USE_MAD_TRUE@BuildRequires: libid3tag-devel >= 0.15.0 +@USE_MAD_TRUE@BuildRequires: libmad-devel >= 0.15.0 Requires: gstreamer09-plugins >= %{gstp_minver} Requires(pre): %{_bindir}/gst-register-%{majorminor} @@ -225,7 +229,7 @@ Requires(post): %{_bindir}/gst-register-%{majorminor} # @USE_FAAD_TRUE@Provides: gstreamer-faad = %{version}-%{release} # @USE_GSM_TRUE@Provides: gstreamer-gsm = %{version}-%{release} # @USE_LAME_TRUE@Provides: gstreamer-lame = %{version}-%{release} -# @USE_MAD_TRUE@Provides: gstreamer-mad = %{version}-%{release} +@USE_MAD_TRUE@Provides: gstreamer-mad = %{version}-%{release} %description extra-audio This package contains extra audio plugins for GStreamer, including @@ -244,7 +248,7 @@ This package contains extra audio plugins for GStreamer, including # @USE_FAAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstfaad.so # @USE_GSM_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so # @USE_LAME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstlame.so -# @USE_MAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmad.so +@USE_MAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmad.so %package extra-dvd Summary: DVD plugins for GStreamer |