diff options
62 files changed, 270 insertions, 238 deletions
diff --git a/Makefile.am b/Makefile.am index 696b60d5..cd4a884a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,11 +16,20 @@ else EXAMPLES_DIR= endif +gstreamer-libs-@GST_MAJORMINOR@.pc: gstreamer-libs.pc + cp gstreamer-libs.pc gstreamer-libs-@GST_MAJORMINOR@.pc +gstreamer-play-@GST_MAJORMINOR@.pc: gstreamer-play.pc + cp gstreamer-play.pc gstreamer-play-@GST_MAJORMINOR@.pc +gst_element_check-@GST_MAJORMINOR@.m4: gst-element-check.m4 + cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4 + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gstreamer-libs.pc gstreamer-play.pc +pkgconfig_DATA = \ + gstreamer-libs-@GST_MAJORMINOR@.pc \ + gstreamer-play-@GST_MAJORMINOR@.pc aclocaldir = $(datadir)/aclocal -aclocal_DATA = gst-element-check.m4 +aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 SUBDIRS=gst-libs gst sys $(EXT_DIR) $(EXAMPLES_DIR) tools $(GCONF_DIR) testsuite diff --git a/common b/common -Subproject 9d5642850b94f5bc21d565f8c900a0606fbb518 +Subproject 92ff5101d55c0f853620bf13f8dd52899282413 diff --git a/configure.ac b/configure.ac index 6e9958ed..cf981eb8 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,17 @@ dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 4, 2, 1, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror") AM_INIT_AUTOMAKE($PACKAGE,$VERSION) -AS_LIBTOOL(GST_PLUGINS, 0, 0, 0, yes) + +dnl our libraries and install dirs use major.minor as a version +GST_MAJORMINOR=$GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR +AC_SUBST(GST_MAJORMINOR) + +dnl CURRENT, REVISION, AGE +dnl - library source changed -> increment REVISION +dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 +dnl - interfaces added -> increment AGE +dnl - interfaces removed -> AGE = 0 +AS_LIBTOOL(GST_PLUGINS, 1, 0, 0) dnl FIXME take something else ? AC_CONFIG_SRCDIR([gst/law/alaw.c]) @@ -136,19 +146,23 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [ ]) dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1) -PKG_CHECK_MODULES(GST, gstreamer >= $GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR.$GST_PLUGINS_VERSION_MICRO, +PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR.$GST_PLUGINS_VERSION_MICRO, HAVE_GST="yes", HAVE_GST="no") if test "x$HAVE_GST" = "xno"; then AC_MSG_ERROR(no GStreamer found) fi -GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer` +GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer-$GST_MAJORMINOR` if test -z $GST_TOOLS_DIR; then AC_MSG_ERROR([no tools dir defined in GStreamer pkg-config file; core upgrade needed.]) fi AC_SUBST(GST_TOOLS_DIR) +dnl additional gstcontrol libs +GST_CONTROL_LIBS=`pkg-config --variable=gstcontrol_libs gstreamer-$GST_MAJORMINOR` +AC_SUBST(GST_CONTROL_LIBS) + dnl Set up conditionals for (target) architecture: dnl ============================================== diff --git a/examples/dynparams/Makefile.am b/examples/dynparams/Makefile.am index ed7d7f12..07314087 100644 --- a/examples/dynparams/Makefile.am +++ b/examples/dynparams/Makefile.am @@ -3,5 +3,5 @@ examples = filter noinst_PROGRAMS = $(examples) # we have nothing but apps here, we can do this safely -LIBS = $(GST_LIBS) $(GTK_LIBS) -lgstcontrol +LIBS = $(GST_LIBS) $(GTK_LIBS) $(GST_CONTROL_LIBS) AM_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am index 348e1dc4..782bc637 100644 --- a/ext/arts/Makefile.am +++ b/ext/arts/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstarts.la diff --git a/ext/artsd/Makefile.am b/ext/artsd/Makefile.am index 1be82e05..bfb84ae1 100644 --- a/ext/artsd/Makefile.am +++ b/ext/artsd/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstartsdsink.la diff --git a/ext/audiofile/Makefile.am b/ext/audiofile/Makefile.am index 9bece977..53e8716c 100644 --- a/ext/audiofile/Makefile.am +++ b/ext/audiofile/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstaudiofile.la diff --git a/ext/gsm/Makefile.am b/ext/gsm/Makefile.am index 6854ca3e..9960453d 100644 --- a/ext/gsm/Makefile.am +++ b/ext/gsm/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstgsm.la diff --git a/ext/hermes/Makefile.am b/ext/hermes/Makefile.am index 9270f085..f536a7ef 100644 --- a/ext/hermes/Makefile.am +++ b/ext/hermes/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstcolorspace.la diff --git a/ext/jack/Makefile.am b/ext/jack/Makefile.am index 981c5a9f..3d054332 100644 --- a/ext/jack/Makefile.am +++ b/ext/jack/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstjack.la diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index 9580eeb3..d393d743 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -1,10 +1,10 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstladspa.la libgstladspa_la_SOURCES = gstladspa.c search.c load.c libgstladspa_la_CFLAGS = $(GST_CFLAGS) -libgstladspa_la_LIBADD = $(GST_LIBS) -lgstcontrol +libgstladspa_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS) libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstladspa.h utils.h diff --git a/ext/lcs/Makefile.am b/ext/lcs/Makefile.am index 8a4c1d6f..b9e0ac5e 100644 --- a/ext/lcs/Makefile.am +++ b/ext/lcs/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstcolorspace.la diff --git a/ext/libfame/Makefile.am b/ext/libfame/Makefile.am index 44597ff4..05f84550 100644 --- a/ext/libfame/Makefile.am +++ b/ext/libfame/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstlibfame.la diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am index c2d672cb..96f88d44 100644 --- a/ext/mplex/Makefile.am +++ b/ext/mplex/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ CC = g++ diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am index 63045064..26c4390d 100644 --- a/ext/sdl/Makefile.am +++ b/ext/sdl/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsdlvideosink.la diff --git a/ext/shout/Makefile.am b/ext/shout/Makefile.am index 95e68919..2e4c501b 100644 --- a/ext/shout/Makefile.am +++ b/ext/shout/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstshout.la diff --git a/ext/smoothwave/Makefile.am b/ext/smoothwave/Makefile.am index c6a67abc..e70825e3 100644 --- a/ext/smoothwave/Makefile.am +++ b/ext/smoothwave/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmoothwave.la diff --git a/ext/snapshot/Makefile.am b/ext/snapshot/Makefile.am index 057a650e..81c68953 100644 --- a/ext/snapshot/Makefile.am +++ b/ext/snapshot/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsnapshot.la diff --git a/ext/swfdec/Makefile.am b/ext/swfdec/Makefile.am index e883ff35..1a6c9948 100644 --- a/ext/swfdec/Makefile.am +++ b/ext/swfdec/Makefile.am @@ -1,5 +1,5 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstswfdec.la diff --git a/ext/tarkin/Makefile.am b/ext/tarkin/Makefile.am index 6bfe71b1..a8c6a3d5 100644 --- a/ext/tarkin/Makefile.am +++ b/ext/tarkin/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgsttarkin.la diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 070d3531..3d74dda3 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -1,11 +1,11 @@ -librarydir = $(libdir)/gst +librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstaudio.la libgstaudio_la_SOURCES = audio.c -libgstaudioincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/audio -libgstaudioinclude_HEADERS = audio.h +# libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio +noinst_HEADERS = audio.h libgstaudio_la_LIBADD = libgstaudio_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math diff --git a/gst-libs/gst/floatcast/Makefile.am b/gst-libs/gst/floatcast/Makefile.am index dd213597..b18029c4 100644 --- a/gst-libs/gst/floatcast/Makefile.am +++ b/gst-libs/gst/floatcast/Makefile.am @@ -1,2 +1,2 @@ -libgstfloatcastincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/floatcast -libgstfloatcastinclude_HEADERS = floatcast.h +floatcastincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/floatcast +floatcastinclude_HEADERS = floatcast.h diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am index 9f5c9b77..1288ca82 100644 --- a/gst-libs/gst/gconf/Makefile.am +++ b/gst-libs/gst/gconf/Makefile.am @@ -1,17 +1,17 @@ librarydir = $(libdir) -library_LTLIBRARIES = libgstgconf.la +library_LTLIBRARIES = libgstgconf-@GST_MAJORMINOR@.la -libgstgconf_la_SOURCES = gconf.c +libgstgconf_@GST_MAJORMINOR@_la_SOURCES = gconf.c -libgstgconfincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/gconf -libgstgconfinclude_HEADERS = gconf.h +libgstgconf_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gconf +libgstgconf_@GST_MAJORMINOR@include_HEADERS = gconf.h noinst_PROGRAMS = test-gconf test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) -test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf.la +test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la -libgstgconf_la_LIBADD = $(GCONF_LIBS) -libgstgconf_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) -libgstgconf_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@ +libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GCONF_LIBS) +libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) +libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@ diff --git a/gst-libs/gst/idct/Makefile.am b/gst-libs/gst/idct/Makefile.am index 8716bb71..1f3b1227 100644 --- a/gst-libs/gst/idct/Makefile.am +++ b/gst-libs/gst/idct/Makefile.am @@ -4,7 +4,7 @@ else GSTIDCTARCH_SRCS = endif -librarydir = $(libdir)/gst +librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstidct.la @@ -15,8 +15,9 @@ libgstidct_la_SOURCES = \ intidct.c \ $(GSTIDCTARCH_SRCS) -libgstidctincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/idct -libgstidctinclude_HEADERS = idct.h +## libgstidctincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/idct +## libgstidctinclude_HEADERS = idct.h +noinst_HEADERS = idct.h dct.h ## check_PROGRAMS = ieeetest @@ -25,7 +26,6 @@ libgstidctinclude_HEADERS = idct.h ## ieeetest_CFLAGS = $(GST_CFLAGS) ## ieeetest_LDFLAGS = $(GST_LIBS) -noinst_HEADERS = dct.h libgstidct_la_LIBADD = libgstidct_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math diff --git a/gst-libs/gst/media-info/Makefile.am b/gst-libs/gst/media-info/Makefile.am index 265011b5..5216ec40 100644 --- a/gst-libs/gst/media-info/Makefile.am +++ b/gst-libs/gst/media-info/Makefile.am @@ -1,17 +1,17 @@ librarydir = $(libdir) -library_LTLIBRARIES = libgstmedia-info.la +library_LTLIBRARIES = libgstmedia-info-@GST_MAJORMINOR@.la -libgstmedia_info_la_SOURCES = media-info.c +libgstmedia_info_@GST_MAJORMINOR@_la_SOURCES = media-info.c -libincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/media-info +libincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/media-info libinclude_HEADERS = media-info.h -libgstmedia_info_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGIN_CFLAGS) -libgstmedia_info_la_LIBADD = $(GST_LIBS) $(GST_PLUGIN_LIBS) +libgstmedia_info_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGIN_CFLAGS) +libgstmedia_info_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GST_PLUGIN_LIBS) noinst_PROGRAMS = media-info-test media_info_test_SOURCES = media-info-test.c media_info_test_CFLAGS = $(GST_CFLAGS) -media_info_test_LDADD = $(GST_LIBS) libgstmedia-info.la +media_info_test_LDADD = $(GST_LIBS) libgstmedia-info-@GST_MAJORMINOR@.la diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am index 52b0d157..5853bac9 100644 --- a/gst-libs/gst/play/Makefile.am +++ b/gst-libs/gst/play/Makefile.am @@ -1,13 +1,14 @@ librarydir = $(libdir) -library_LTLIBRARIES = libgstplay.la +library_LTLIBRARIES = libgstplay-@GST_MAJORMINOR@.la -libgstplay_la_SOURCES = play.c +libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c -libgstplayincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/play -libgstplayinclude_HEADERS = play.h +libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/play +libgstplay_@GST_MAJORMINOR@include_HEADERS = play.h -libgstplay_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS) -libgstplay_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_LIBS) +libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS) +libgstplay_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_LIBS) +libgstplay_@GST_MAJORMINOR@_la_LDFLAGS = -version-info @GST_PLUGINS_LIBVERSION@ noinst_HEADERS = playpipelines.c diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am index 07722904..82abb56a 100644 --- a/gst-libs/gst/resample/Makefile.am +++ b/gst-libs/gst/resample/Makefile.am @@ -1,4 +1,4 @@ -librarydir = $(libdir)/gst +librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstresample.la @@ -17,10 +17,10 @@ libgstresample_la_LIBADD = libgstresample_la_CFLAGS = $(GST_CFLAGS) -ffast-math $(ARCHCFLAGS) libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstresampleincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/resample -libgstresampleinclude_HEADERS = resample.h +#libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample +#libgstresampleinclude_HEADERS = resample.h -noinst_HEADERS = private.h +noinst_HEADERS = private.h resample.h #check_PROGRAMS = test #test_SOURCES = test.c diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index c5bd8e8f..0f7b8a72 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -1,11 +1,12 @@ -librarydir = $(prefix)/lib/gst +librarydir = $(prefix)/lib/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstriff.la libgstriff_la_SOURCES = riffparse.c riffencode.c riffutil.c riff.c -libgstriffincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/riff -libgstriffinclude_HEADERS = riff.h +## libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff +## libgstriffinclude_HEADERS = riff.h +noinst_HEADERS = riff.h libgstriff_la_LIBADD = libgstriff_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index ef924fd7..a3c59341 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -1,11 +1,12 @@ -librarydir = $(libdir)/gst +librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstvideo.la libgstvideo_la_SOURCES = video.c -libgstvideoincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/video -libgstvideoinclude_HEADERS = video.h +#libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video +#libgstvideoinclude_HEADERS = video.h +noinst_HEADERS = video.h libgstvideo_la_LIBADD = libgstvideo_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in index 9ed4a3db..5d2126d0 100644 --- a/gst-plugins.spec.in +++ b/gst-plugins.spec.in @@ -3,10 +3,11 @@ Version: @VERSION@ Release: @GST_PLUGINS_VERSION_RELEASE@ Summary: GStreamer Streaming-media framework plug-ins. -%define prefix /usr -%define sysconfdir /etc -Docdir: %{prefix}/share/doc -Prefix: %prefix +%define majorminor @GST_MAJORMINOR@ +#%define prefix /usr +#%define sysconfdir /etc +#Docdir: %{prefix}/share/doc +#Prefix: %prefix Group: Libraries/Multimedia License: LGPL @@ -22,6 +23,7 @@ BuildRequires: glib2-devel >= %_glib2 Requires: gstreamer = %{version} BuildRequires: nasm => 0.90 BuildRequires: gstreamer-devel = %{version} +BuildRequires: gstreamer-tools >= %{version} Obsoletes: gstreamer-plugin-libs %description @@ -84,12 +86,12 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # Clean out files that should not be part of the rpm. # This is the recommended way of dealing with it for RH8 -rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}reamer-%{majorminor}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}reamer-%{majorminor}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_includedir}/gst-plugins-%{version}/gst/media-info/media-info.h -rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info.so.0.0.0 +rm -f $RPM_BUILD_ROOT%{_includedir}/gstreamer-%{majorminor}/gst/media-info/media-info.h +rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0 %clean @@ -102,34 +104,35 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info.so.0.0.0 %{_bindir}/gst-visualise %{_mandir}/man1/gst-launch-ext.* %{_mandir}/man1/gst-visualise.1.* -%{_libdir}/gst/libgstaudioscale.so -%{_libdir}/gst/libgstaudio.so -%{_libdir}/gst/libgstidct.so -%{_libdir}/gst/libgstresample.so -%{_libdir}/gst/libgstriff.so -%{_libdir}/gst/libgstvideo.so +%{_libdir}/gstreamer-%{majorminor}/libgstaudioscale.so +%{_libdir}/gstreamer-%{majorminor}/libgstaudio.so +%{_libdir}/gstreamer-%{majorminor}/libgstidct.so +%{_libdir}/gstreamer-%{majorminor}/libgstresample.so +%{_libdir}/gstreamer-%{majorminor}/libgstriff.so +%{_libdir}/gstreamer-%{majorminor}/libgstvideo.so %package -n gstreamer-plugins-devel Summary: GStreamer Plugin Library Headers. Group: Development/Libraries Requires: gstreamer-plugins = %{version} +Provides: gstreamer-play-devel = %{version} %description -n gstreamer-plugins-devel GStreamer support libraries header files. %files -n gstreamer-plugins-devel %defattr(-, root, root) -%{_includedir}/gst-plugins-%{version}/gst/audio/audio.h -%{_includedir}/gst-plugins-%{version}/gst/floatcast/floatcast.h -%{_includedir}/gst-plugins-%{version}/gst/gconf/gconf.h -%{_includedir}/gst-plugins-%{version}/gst/idct/idct.h -%{_includedir}/gst-plugins-%{version}/gst/resample/resample.h -%{_includedir}/gst-plugins-%{version}/gst/riff/riff.h -%{_includedir}/gst-plugins-%{version}/gst/video/video.h -%{_includedir}/gst-plugins-%{version}/gst/play/play.h -%{_datadir}/aclocal/gst-element-check.m4 -%{_libdir}/pkgconfig/gstreamer-libs.pc -%{_libdir}/pkgconfig/gstreamer-play.pc +%{_includedir}/gstreamer-%{major_minor}/gst/audio/audio.h +%{_includedir}/gstreamer-%{major_minor}/gst/floatcast/floatcast.h +%{_includedir}/gstreamer-%{major_minor}/gst/gconf/gconf.h +%{_includedir}/gstreamer-%{major_minor}/gst/idct/idct.h +%{_includedir}/gstreamer-%{major_minor}/gst/resample/resample.h +%{_includedir}/gstreamer-%{major_minor}/gst/riff/riff.h +%{_includedir}/gstreamer-%{major_minor}/gst/video/video.h +%{_includedir}/gstreamer-%{major_minor}/gst/play/play.h +%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4 +%{_libdir}/pkgconfig/gstreamer-libs-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-play-%{majorminor}.pc # Here are all the packages depending on external libs # @@ -146,8 +149,8 @@ GStreamer support libraries header files. @USE_A52DEC_TRUE@ @USE_A52DEC_TRUE@%files -n gstreamer-a52dec @USE_A52DEC_TRUE@%defattr(-, root, root) -@USE_A52DEC_TRUE@%{_libdir}/gst/libgsta52dec.so -@USE_A52DEC_TRUE@%{_libdir}/gst/libgstac3parse.so +@USE_A52DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsta52dec.so +@USE_A52DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstac3parse.so @USE_A52DEC_TRUE@ @USE_A52DEC_TRUE@%post -n gstreamer-a52dec @USE_A52DEC_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -170,7 +173,7 @@ GStreamer support libraries header files. @USE_AALIB_TRUE@ @USE_AALIB_TRUE@%files -n gstreamer-aalib @USE_AALIB_TRUE@%defattr(-, root, root) -@USE_AALIB_TRUE@%{_libdir}/gst/libgstaasink.so +@USE_AALIB_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstaasink.so @USE_AALIB_TRUE@ @USE_AALIB_TRUE@%post -n gstreamer-aalib @USE_AALIB_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -192,7 +195,7 @@ GStreamer support libraries header files. @USE_ALSA_TRUE@ @USE_ALSA_TRUE@%files -n gstreamer-alsa @USE_ALSA_TRUE@%defattr(-, root, root) -@USE_ALSA_TRUE@%{_libdir}/gst/libgstalsa.so +@USE_ALSA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstalsa.so @USE_ALSA_TRUE@%{_mandir}/man1/gstalsa* @USE_ALSA_TRUE@ @USE_ALSA_TRUE@%post -n gstreamer-alsa @@ -217,7 +220,7 @@ GStreamer support libraries header files. @USE_ARTS_TRUE@ @USE_ARTS_TRUE@%files -n gstreamer-arts @USE_ARTS_TRUE@%defattr(-, root, root) -@USE_ARTS_TRUE@%{_libdir}/gst/libgstarts.so +@USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so @USE_ARTS_TRUE@ @USE_ARTS_TRUE@%post -n gstreamer-arts @USE_ARTS_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -238,7 +241,7 @@ GStreamer support libraries header files. @USE_ARTSC_TRUE@ @USE_ARTSC_TRUE@%files -n gstreamer-artsd @USE_ARTSC_TRUE@%defattr(-, root, root) -@USE_ARTSC_TRUE@%{_libdir}/gst/libgstartsdsink.so +@USE_ARTSC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstartsdsink.so @USE_ARTSC_TRUE@ @USE_ARTSC_TRUE@%post -n gstreamer-artsd @USE_ARTSC_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -260,7 +263,7 @@ GStreamer support libraries header files. @USE_SWFDEC_TRUE@ @USE_SWFDEC_TRUE@%files -n gstreamer-swfdec @USE_SWFDEC_TRUE@%defattr(-, root, root) -@USE_SWFDEC_TRUE@%{_libdir}/gst/libgstswfdec.so +@USE_SWFDEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstswfdec.so @USE_SWFDEC_TRUE@ @USE_SWFDEC_TRUE@%post -n gstreamer-swfdec @USE_SWFDEC_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -284,7 +287,7 @@ GStreamer support libraries header files. @USE_AUDIOFILE_TRUE@ @USE_AUDIOFILE_TRUE@%files -n gstreamer-audiofile @USE_AUDIOFILE_TRUE@%defattr(-, root, root) -@USE_AUDIOFILE_TRUE@%{_libdir}/gst/libgstaudiofile.so +@USE_AUDIOFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstaudiofile.so @USE_AUDIOFILE_TRUE@ @USE_AUDIOFILE_TRUE@%post -n gstreamer-audiofile @USE_AUDIOFILE_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -306,8 +309,8 @@ Plug-ins for playback of AVI format media files. %files -n gstreamer-avi %defattr(-, root, root) -%{_libdir}/gst/libgstavidemux.so -%{_libdir}/gst/libgstavimux.so +%{_libdir}/gstreamer-%{majorminor}/libgstavidemux.so +%{_libdir}/gstreamer-%{majorminor}/libgstavimux.so %post -n gstreamer-avi %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -331,7 +334,7 @@ Plug-ins for playback of AVI format media files. @USE_AVIFILE_TRUE@ @USE_AVIFILE_TRUE@%files -n gstreamer-windec @USE_AVIFILE_TRUE@%defattr(-, root, root) -@USE_AVIFILE_TRUE@%{_libdir}/gst/libgstwincodec.so +@USE_AVIFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstwincodec.so @USE_AVIFILE_TRUE@ @USE_AVIFILE_TRUE@%post -n gstreamer-windec @USE_AVIFILE_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -354,7 +357,7 @@ Plug-ins for playback of AVI format media files. @USE_CDPARANOIA_TRUE@ @USE_CDPARANOIA_TRUE@%files -n gstreamer-cdparanoia @USE_CDPARANOIA_TRUE@%defattr(-, root, root) -@USE_CDPARANOIA_TRUE@%{_libdir}/gst/libgstcdparanoia.so +@USE_CDPARANOIA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so @USE_CDPARANOIA_TRUE@ @USE_CDPARANOIA_TRUE@%post -n gstreamer-cdparanoia @USE_CDPARANOIA_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -378,7 +381,7 @@ Plug-ins for playback of AVI format media files. @USE_DVDREAD_TRUE@ @USE_DVDREAD_TRUE@%files -n gstreamer-libdvdread @USE_DVDREAD_TRUE@%defattr(-, root, root) -@USE_DVDREAD_TRUE@%{_libdir}/gst/libgstdvdreadsrc.so +@USE_DVDREAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdvdreadsrc.so @USE_DVDREAD_TRUE@ @USE_DVDREAD_TRUE@%post -n gstreamer-libdvdread @USE_DVDREAD_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -402,7 +405,7 @@ Plug-ins for playback of AVI format media files. @USE_DVDNAV_TRUE@ @USE_DVDNAV_TRUE@%files -n gstreamer-libdvdnav @USE_DVDNAV_TRUE@%defattr(-, root, root) -@USE_DVDNAV_TRUE@%{_libdir}/gst/libgstdvdnavsrc.so +@USE_DVDNAV_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdvdnavsrc.so @USE_DVDNAV_TRUE@ @USE_DVDNAV_TRUE@%post -n gstreamer-libdvdnav @USE_DVDNAV_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -427,7 +430,7 @@ Plug-ins for playback of AVI format media files. @USE_DXR3_TRUE@ @USE_DXR3_TRUE@%files -n gstreamer-dxr3 @USE_DXR3_TRUE@%defattr(-, root, root) -@USE_DXR3_TRUE@%{_libdir}/gst/libgstdxr3.so +@USE_DXR3_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdxr3.so @USE_DXR3_TRUE@ @USE_DXR3_TRUE@%post -n gstreamer-dxr3 @USE_DXR3_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -451,8 +454,8 @@ Plug-ins for playback of AVI format media files. @USE_ESD_TRUE@ @USE_ESD_TRUE@%files -n gstreamer-esound @USE_ESD_TRUE@%defattr(-, root, root) -@USE_ESD_TRUE@%{_libdir}/gst/libgstesdmon.so -@USE_ESD_TRUE@%{_libdir}/gst/libgstesdsink.so +@USE_ESD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstesdmon.so +@USE_ESD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstesdsink.so @USE_ESD_TRUE@ @USE_ESD_TRUE@%post -n gstreamer-esound @USE_ESD_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -475,7 +478,7 @@ Plug-ins for playback of AVI format media files. @USE_FLAC_TRUE@ @USE_FLAC_TRUE@%files -n gstreamer-flac @USE_FLAC_TRUE@%defattr(-, root, root) -@USE_FLAC_TRUE@%{_libdir}/gst/libgstflac.so +@USE_FLAC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstflac.so @USE_FLAC_TRUE@ @USE_FLAC_TRUE@%post -n gstreamer-flac @USE_FLAC_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -498,8 +501,8 @@ Plug-ins for playback of AVI format media files. @USE_GNOME_VFS_TRUE@ @USE_GNOME_VFS_TRUE@%files -n gstreamer-gnomevfs @USE_GNOME_VFS_TRUE@%defattr(-, root, root) -@USE_GNOME_VFS_TRUE@%{_libdir}/gst/libgstgnomevfssrc.so -@USE_GNOME_VFS_TRUE@%{_libdir}/gst/libgstgnomevfssink.so +@USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfssrc.so +@USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfssink.so @USE_GNOME_VFS_TRUE@ @USE_GNOME_VFS_TRUE@%post -n gstreamer-gnomevfs @USE_GNOME_VFS_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -522,7 +525,7 @@ Plug-ins for playback of AVI format media files. @USE_GSM_TRUE@ @USE_GSM_TRUE@%files -n gstreamer-gsm @USE_GSM_TRUE@%defattr(-, root, root) -@USE_GSM_TRUE@%{_libdir}/gst/libgstgsm.so +@USE_GSM_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so @USE_GSM_TRUE@ @USE_GSM_TRUE@%post -n gstreamer-gsm @USE_GSM_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -544,7 +547,7 @@ Plug-ins for playback of AVI format media files. @USE_HERMES_TRUE@ @USE_HERMES_TRUE@%files -n gstreamer-colorspace @USE_HERMES_TRUE@%defattr(-, root, root) -@USE_HERMES_TRUE@%{_libdir}/gst/libgstcolorspace.so +@USE_HERMES_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcolorspace.so @USE_HERMES_TRUE@ @USE_HERMES_TRUE@%post -n gstreamer-colorspace @USE_HERMES_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -568,7 +571,7 @@ Plug-ins for playback of AVI format media files. @USE_HTTP_TRUE@ @USE_HTTP_TRUE@%files -n gstreamer-httpsrc @USE_HTTP_TRUE@%defattr(-, root, root) -@USE_HTTP_TRUE@%{_libdir}/gst/libgsthttpsrc.so +@USE_HTTP_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsthttpsrc.so @USE_HTTP_TRUE@ @USE_HTTP_TRUE@%post -n gstreamer-httpsrc @USE_HTTP_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -590,7 +593,7 @@ Plug-ins for playback of AVI format media files. @USE_JACK_TRUE@ @USE_JACK_TRUE@%files -n gstreamer-jack @USE_JACK_TRUE@%defattr(-, root, root) -@USE_JACK_TRUE@%{_libdir}/gst/libgstjack.so +@USE_JACK_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjack.so @USE_JACK_TRUE@ @USE_JACK_TRUE@%post -n gstreamer-jack @USE_JACK_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -613,7 +616,7 @@ Plug-ins for playback of AVI format media files. @USE_JPEG_TRUE@ @USE_JPEG_TRUE@%files -n gstreamer-jpeg @USE_JPEG_TRUE@%defattr(-, root, root) -@USE_JPEG_TRUE@%{_libdir}/gst/libgstjpeg.so +@USE_JPEG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so @USE_JPEG_TRUE@ @USE_JPEG_TRUE@%post -n gstreamer-jpeg @USE_JPEG_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -638,7 +641,7 @@ Plug-ins for playback of AVI format media files. @USE_LADSPA_TRUE@ @USE_LADSPA_TRUE@%files -n gstreamer-ladspa @USE_LADSPA_TRUE@%defattr(-, root, root) -@USE_LADSPA_TRUE@%{_libdir}/gst/libgstladspa.so +@USE_LADSPA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstladspa.so @USE_LADSPA_TRUE@ @USE_LADSPA_TRUE@%post -n gstreamer-ladspa @USE_LADSPA_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -661,7 +664,7 @@ Plug-ins for playback of AVI format media files. @USE_LAME_TRUE@ @USE_LAME_TRUE@%files -n gstreamer-lame @USE_LAME_TRUE@%defattr(-, root, root) -@USE_LAME_TRUE@%{_libdir}/gst/libgstlame.so +@USE_LAME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstlame.so @USE_LAME_TRUE@ @USE_LAME_TRUE@%post -n gstreamer-lame @USE_LAME_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -684,7 +687,7 @@ Plug-ins for playback of AVI format media files. @USE_LIBDV_TRUE@ @USE_LIBDV_TRUE@%files -n gstreamer-dv @USE_LIBDV_TRUE@%defattr(-, root, root) -@USE_LIBDV_TRUE@%{_libdir}/gst/libgstdvdec.so +@USE_LIBDV_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdvdec.so @USE_LIBDV_TRUE@ @USE_LIBDV_TRUE@%post -n gstreamer-dv @USE_LIBDV_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -708,7 +711,7 @@ Plug-ins for playback of AVI format media files. @USE_LIBFAME_TRUE@ @USE_LIBFAME_TRUE@%files -n gstreamer-libfame @USE_LIBFAME_TRUE@%defattr(-, root, root) -@USE_LIBFAME_TRUE@%{_libdir}/gst/libgstlibfame.so +@USE_LIBFAME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstlibfame.so @USE_LIBFAME_TRUE@ @USE_LIBFAME_TRUE@%post -n gstreamer-libfame @USE_LIBFAME_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -732,7 +735,7 @@ Plug-ins for playback of AVI format media files. @USE_MAD_TRUE@ @USE_MAD_TRUE@%files -n gstreamer-mad @USE_MAD_TRUE@%defattr(-, root, root) -@USE_MAD_TRUE@%{_libdir}/gst/libgstmad.so +@USE_MAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmad.so @USE_MAD_TRUE@ @USE_MAD_TRUE@%post -n gstreamer-mad @USE_MAD_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -755,7 +758,7 @@ Plug-ins for playback of AVI format media files. @USE_MIKMOD_TRUE@ @USE_MIKMOD_TRUE@%files -n gstreamer-mikmod @USE_MIKMOD_TRUE@%defattr(-, root, root) -@USE_MIKMOD_TRUE@%{_libdir}/gst/libgstmikmod.so +@USE_MIKMOD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmikmod.so @USE_MIKMOD_TRUE@ @USE_MIKMOD_TRUE@%post -n gstreamer-mikmod @USE_MIKMOD_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -778,8 +781,8 @@ Plug-ins for playback of AVI format media files. @USE_MJPEGTOOLS_TRUE@ @USE_MJPEGTOOLS_TRUE@%files -n gstreamer-jpegmmx @USE_MJPEGTOOLS_TRUE@%defattr(-, root, root) -@USE_MJPEGTOOLS_TRUE@%{_libdir}/gst/libgstjpegmmxenc.so -@USE_MJPEGTOOLS_TRUE@%{_libdir}/gst/libgstjpegmmxdec.so +@USE_MJPEGTOOLS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjpegmmxenc.so +@USE_MJPEGTOOLS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjpegmmxdec.so @USE_MJPEGTOOLS_TRUE@ @USE_MJPEGTOOLS_TRUE@%post -n gstreamer-jpegmmx @USE_MJPEGTOOLS_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -805,17 +808,17 @@ Plug-ins for playback of AVI format media files. @USE_MPEG2DEC_TRUE@ @USE_MPEG2DEC_TRUE@%files -n gstreamer-mpeg @USE_MPEG2DEC_TRUE@%defattr(-, root, root) -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpeg1types.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpeg1encoder.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpeg1systemencode.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpegaudio.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpegaudioparse.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmp1videoparse.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpegstream.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpeg2enc.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpeg2dec.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpeg2subt.so -@USE_MPEG2DEC_TRUE@%{_libdir}/gst/libgstmpeg2types.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpeg1types.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpeg1encoder.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpeg1systemencode.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpegaudio.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpegaudioparse.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmp1videoparse.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpegstream.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2enc.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2dec.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2subt.so +@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2types.so @USE_MPEG2DEC_TRUE@ @USE_MPEG2DEC_TRUE@%post -n gstreamer-mpeg @USE_MPEG2DEC_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -840,9 +843,9 @@ Plug-ins for playback of AVI format media files. @USE_OPENQUICKTIME_TRUE@ @USE_OPENQUICKTIME_TRUE@%files -n gstreamer-openquicktime @USE_OPENQUICKTIME_TRUE@%defattr(-, root, root) -@USE_OPENQUICKTIME_TRUE@%{_libdir}/gst/libgstopenquicktimedemux.so -@USE_OPENQUICKTIME_TRUE@%{_libdir}/gst/libgstopenquicktimetypes.so -@USE_OPENQUICKTIME_TRUE@%{_libdir}/gst/libgstopenquicktimedecoder.so +@USE_OPENQUICKTIME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstopenquicktimedemux.so +@USE_OPENQUICKTIME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstopenquicktimetypes.so +@USE_OPENQUICKTIME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstopenquicktimedecoder.so @USE_OPENQUICKTIME_TRUE@ @USE_OPENQUICKTIME_TRUE@%post -n gstreamer-openquicktime @USE_OPENQUICKTIME_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -866,8 +869,8 @@ Plug-ins for playback of AVI format media files. @USE_OSS_TRUE@ @USE_OSS_TRUE@%files -n gstreamer-oss @USE_OSS_TRUE@%defattr(-, root, root) -@USE_OSS_TRUE@%{_libdir}/gst/libgstossaudio.so -# @USE_OSS_TRUE@%{_libdir}/gst/libgstosshelper* +@USE_OSS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstossaudio.so +# @USE_OSS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstosshelper* @USE_OSS_TRUE@ @USE_OSS_TRUE@%post -n gstreamer-oss @USE_OSS_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -890,7 +893,7 @@ Plug-ins for playback of AVI format media files. @USE_RAW1394_TRUE@ @USE_RAW1394_TRUE@%files -n gstreamer-raw1394 @USE_RAW1394_TRUE@%defattr(-, root, root) -@USE_RAW1394_TRUE@%{_libdir}/gst/libgst1394.so +@USE_RAW1394_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgst1394.so @USE_RAW1394_TRUE@ @USE_RAW1394_TRUE@%post -n gstreamer-raw1394 @USE_RAW1394_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -912,7 +915,7 @@ Plug-ins for playback of AVI format media files. @USE_RTP_TRUE@ @USE_RTP_TRUE@%files -n gstreamer-rtp @USE_RTP_TRUE@%defattr(-, root, root) -@USE_RTP_TRUE@%{_libdir}/gst/libgstrtp.so +@USE_RTP_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstrtp.so @USE_RTP_TRUE@ @USE_RTP_TRUE@%post -n gstreamer-rtp @USE_RTP_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -935,7 +938,7 @@ Plug-ins for playback of AVI format media files. @USE_SIDPLAY_TRUE@ @USE_SIDPLAY_TRUE@%files -n gstreamer-sid @USE_SIDPLAY_TRUE@%defattr(-, root, root) -@USE_SIDPLAY_TRUE@%{_libdir}/gst/libgstsid.so +@USE_SIDPLAY_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsid.so @USE_SIDPLAY_TRUE@ @USE_SIDPLAY_TRUE@%post -n gstreamer-sid @USE_SIDPLAY_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -964,7 +967,7 @@ Plug-ins for playback of AVI format media files. @USE_SDL_TRUE@ @USE_SDL_TRUE@%files -n gstreamer-SDL @USE_SDL_TRUE@%defattr(-, root, root) -@USE_SDL_TRUE@%{_libdir}/gst/libgstsdlvideosink.so +@USE_SDL_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsdlvideosink.so @USE_SDL_TRUE@ @USE_SDL_TRUE@%post -n gstreamer-SDL @USE_SDL_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -987,7 +990,7 @@ Plug-ins for playback of AVI format media files. @USE_SHOUT_TRUE@ @USE_SHOUT_TRUE@%files -n gstreamer-icecast @USE_SHOUT_TRUE@%defattr(-, root, root) -@USE_SHOUT_TRUE@%{_libdir}/gst/libgstshout.so +@USE_SHOUT_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstshout.so @USE_SHOUT_TRUE@ @USE_SHOUT_TRUE@%post -n gstreamer-icecast @USE_SHOUT_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1012,7 +1015,7 @@ Plug-ins for playback of AVI format media files. @USE_VORBIS_TRUE@ @USE_VORBIS_TRUE@%files -n gstreamer-vorbis @USE_VORBIS_TRUE@%defattr(-, root, root) -@USE_VORBIS_TRUE@%{_libdir}/gst/libgstvorbis.so +@USE_VORBIS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvorbis.so @USE_VORBIS_TRUE@ @USE_VORBIS_TRUE@%post -n gstreamer-vorbis @USE_VORBIS_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1034,10 +1037,10 @@ Plug-ins for playback of AVI format media files. @USE_V4L_TRUE@ @USE_V4L_TRUE@%files -n gstreamer-v4l @USE_V4L_TRUE@%defattr(-, root, root) -@USE_V4L_TRUE@%{_libdir}/gst/libgstv4lelement.so -@USE_V4L_TRUE@%{_libdir}/gst/libgstv4lsrc.so -@USE_V4L_TRUE@%{_libdir}/gst/libgstv4lmjpegsrc.so -@USE_V4L_TRUE@%{_libdir}/gst/libgstv4lmjpegsink.so +@USE_V4L_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstv4lelement.so +@USE_V4L_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstv4lsrc.so +@USE_V4L_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstv4lmjpegsrc.so +@USE_V4L_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstv4lmjpegsink.so @USE_V4L_TRUE@ @USE_V4L_TRUE@%post -n gstreamer-v4l @USE_V4L_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1059,8 +1062,8 @@ Plug-ins for playback of AVI format media files. @USE_V4L2_TRUE@ @USE_V4L2_TRUE@%files -n gstreamer-v4l2 @USE_V4L2_TRUE@%defattr(-, root, root) -@USE_V4L2_TRUE@%{_libdir}/gst/libgstv4l2element.so -@USE_V4L2_TRUE@%{_libdir}/gst/libgstv4l2src.so +@USE_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstv4l2element.so +@USE_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstv4l2src.so @USE_V4L2_TRUE@ @USE_V4L2_TRUE@%post -n gstreamer-v4l2 @USE_V4L2_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1082,7 +1085,7 @@ Plug-ins for playback of AVI format media files. @USE_XVIDEO_TRUE@ @USE_XVIDEO_TRUE@%files -n gstreamer-xvideosink @USE_XVIDEO_TRUE@%defattr(-, root, root) -@USE_XVIDEO_TRUE@%{_libdir}/gst/libgstxvideosink* +@USE_XVIDEO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstxvideosink* @USE_XVIDEO_TRUE@ @USE_XVIDEO_TRUE@%post -n gstreamer-xvideosink @USE_XVIDEO_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1104,7 +1107,7 @@ Plug-ins for playback of AVI format media files. @USE_XVIDEO_TRUE@ @USE_XVIDEO_TRUE@%files -n gstreamer-videosink @USE_XVIDEO_TRUE@%defattr(-, root, root) -@USE_XVIDEO_TRUE@%{_libdir}/gst/libgstvideosink.so +@USE_XVIDEO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideosink.so @USE_XVIDEO_TRUE@ @USE_XVIDEO_TRUE@%post -n gstreamer-videosink @USE_XVIDEO_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1131,28 +1134,28 @@ integer to float conversion, LAW conversion and level detection plug-ins. %files -n gstreamer-audio-effects %defattr(-, root, root) -%{_libdir}/gst/libgstresample.so -%{_libdir}/gst/libgstsinesrc.so -%{_libdir}/gst/libgstsilence.so -%{_libdir}/gst/libgststereo.so -%{_libdir}/gst/libgststereo2mono.so -%{_libdir}/gst/libgstvolume.so -%{_libdir}/gst/libgstvolenv.so -%{_libdir}/gst/libgstplayondemand.so -%{_libdir}/gst/libgstspeed.so -%{_libdir}/gst/libgststereosplit.so -%{_libdir}/gst/libgstadder.so -%{_libdir}/gst/libgstalaw.so -%{_libdir}/gst/libgstintfloat.so -%{_libdir}/gst/libgstlevel.so -%{_libdir}/gst/libgstmono2stereo.so -%{_libdir}/gst/libgstmulaw.so -%{_libdir}/gst/libgstpassthrough.so -# %{_libdir}/gst/libgstfloatcast.so -%{_libdir}/gst/libgstcutter.so -%{_libdir}/gst/libgstfilter.so -%{_libdir}/gst/libmixmatrix.so -@USE_LIBPNG_TRUE@%{_libdir}/gst/libgstpng.so +%{_libdir}/gstreamer-%{majorminor}/libgstresample.so +%{_libdir}/gstreamer-%{majorminor}/libgstsinesrc.so +%{_libdir}/gstreamer-%{majorminor}/libgstsilence.so +%{_libdir}/gstreamer-%{majorminor}/libgststereo.so +%{_libdir}/gstreamer-%{majorminor}/libgststereo2mono.so +%{_libdir}/gstreamer-%{majorminor}/libgstvolume.so +%{_libdir}/gstreamer-%{majorminor}/libgstvolenv.so +%{_libdir}/gstreamer-%{majorminor}/libgstplayondemand.so +%{_libdir}/gstreamer-%{majorminor}/libgstspeed.so +%{_libdir}/gstreamer-%{majorminor}/libgststereosplit.so +%{_libdir}/gstreamer-%{majorminor}/libgstadder.so +%{_libdir}/gstreamer-%{majorminor}/libgstalaw.so +%{_libdir}/gstreamer-%{majorminor}/libgstintfloat.so +%{_libdir}/gstreamer-%{majorminor}/libgstlevel.so +%{_libdir}/gstreamer-%{majorminor}/libgstmono2stereo.so +%{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so +%{_libdir}/gstreamer-%{majorminor}/libgstpassthrough.so +# %{_libdir}/gstreamer-%{majorminor}/libgstfloatcast.so +%{_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 @@ -1174,11 +1177,11 @@ Plug-in for playback of wav, au and mod audio files as well as mp3 type. %files -n gstreamer-audio-formats %defattr(-, root, root) -%{_libdir}/gst/libgstwavparse.so -%{_libdir}/gst/libgstauparse.so -%{_libdir}/gst/libgstmp3types.so -%{_libdir}/gst/libgstmodplug.so -%{_libdir}/gst/libgstwavenc.so +%{_libdir}/gstreamer-%{majorminor}/libgstwavparse.so +%{_libdir}/gstreamer-%{majorminor}/libgstauparse.so +%{_libdir}/gstreamer-%{majorminor}/libgstmp3types.so +%{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so +%{_libdir}/gstreamer-%{majorminor}/libgstwavenc.so %post -n gstreamer-audio-formats %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1199,7 +1202,7 @@ Plug-in for text-to-speech using the festival server. %files -n gstreamer-festival %defattr(-, root, root) -%{_libdir}/gst/libgstfestival.so +%{_libdir}/gstreamer-%{majorminor}/libgstfestival.so %post -n gstreamer-festival %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1220,7 +1223,7 @@ Plug-in for playing FLI/FLX animations under GStreamer. %files -n gstreamer-flx %defattr(-, root, root) -%{_libdir}/gst/libgstflxdec.so +%{_libdir}/gstreamer-%{majorminor}/libgstflxdec.so %post -n gstreamer-flx %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1241,7 +1244,7 @@ Plug-in for accessing a Quickcam video source. %files -n gstreamer-qcam %defattr(-, root, root) -%{_libdir}/gst/libgstqcam.so +%{_libdir}/gstreamer-%{majorminor}/libgstqcam.so %post -n gstreamer-qcam %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1262,7 +1265,7 @@ Plug-ins for UDP transport under GStreamer. %files -n gstreamer-udp %defattr(-, root, root) -%{_libdir}/gst/libgstudp.so +%{_libdir}/gstreamer-%{majorminor}/libgstudp.so %post -n gstreamer-udp %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1283,8 +1286,8 @@ Video CD parsing and playback plug-in for GStreamer. %files -n gstreamer-vcd %defattr(-, root, root) -%{_libdir}/gst/libgstvcdsrc.so -%{_libdir}/gst/libgstcdxaparse.so +%{_libdir}/gstreamer-%{majorminor}/libgstvcdsrc.so +%{_libdir}/gstreamer-%{majorminor}/libgstcdxaparse.so %post -n gstreamer-vcd %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1308,13 +1311,13 @@ plug-ins. %files -n gstreamer-video-effects %defattr(-, root, root) -%{_libdir}/gst/libgsteffectv.so -%{_libdir}/gst/libgstdeinterlace.so -%{_libdir}/gst/libgstmedian.so -%{_libdir}/gst/libgstrtjpeg.so -%{_libdir}/gst/libgstvideocrop.so -%{_libdir}/gst/libgstvideoscale.so -%{_libdir}/gst/libgstsmpte.so +%{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so +%{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so +%{_libdir}/gstreamer-%{majorminor}/libgstmedian.so +%{_libdir}/gstreamer-%{majorminor}/libgstrtjpeg.so +%{_libdir}/gstreamer-%{majorminor}/libgstvideocrop.so +%{_libdir}/gstreamer-%{majorminor}/libgstvideoscale.so +%{_libdir}/gstreamer-%{majorminor}/libgstsmpte.so %post -n gstreamer-video-effects %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1337,13 +1340,13 @@ and vumeter. %files -n gstreamer-visualisation %defattr(-, root, root) -%{_libdir}/gst/libgstsmooth.so -%{_libdir}/gst/libgstspectrum.so -%{_libdir}/gst/libgstvumeter.so -%{_libdir}/gst/libgstgoom.so -%{_libdir}/gst/libgstchart.so -%{_libdir}/gst/libgstmonoscope.so -%{_libdir}/gst/libgstsynaesthesia.so +%{_libdir}/gstreamer-%{majorminor}/libgstsmooth.so +%{_libdir}/gstreamer-%{majorminor}/libgstspectrum.so +%{_libdir}/gstreamer-%{majorminor}/libgstvumeter.so +%{_libdir}/gstreamer-%{majorminor}/libgstgoom.so +%{_libdir}/gstreamer-%{majorminor}/libgstchart.so +%{_libdir}/gstreamer-%{majorminor}/libgstmonoscope.so +%{_libdir}/gstreamer-%{majorminor}/libgstsynaesthesia.so %post -n gstreamer-visualisation %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1366,7 +1369,7 @@ processed with the lavtools from mjpegtools. %files -n gstreamer-yuv4mjpeg %defattr(-, root, root) -%{_libdir}/gst/libgsty4menc.so +%{_libdir}/gstreamer-%{majorminor}/libgsty4menc.so %post -n gstreamer-yuv4mjpeg %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1387,7 +1390,7 @@ Lets you get sound from audio cd's using GStreamer %files -n gstreamer-cdplayer %defattr(-, root, root) -%{_libdir}/gst/libgstcdplayer.so +%{_libdir}/gstreamer-%{majorminor}/libgstcdplayer.so %post -n gstreamer-cdplayer %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1408,7 +1411,7 @@ This plugin provides a videotest plugin. This plugin can be used to generate a v %files -n gstreamer-videotest %defattr(-, root, root) -%{_libdir}/gst/libgstvideotestsrc.so +%{_libdir}/gstreamer-%{majorminor}/libgstvideotestsrc.so %post -n gstreamer-videotest %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1432,7 +1435,7 @@ This plugin provides a videotest plugin. This plugin can be used to generate a v @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@ @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@%files -n gstreamer-snapshot @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@%defattr(-, root, root) -@USE_HERMES_TRUE@@USE_LIBPNG_TRUE@%{_libdir}/gst/libgstsnapshot.so +@USE_HERMES_TRUE@@USE_LIBPNG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsnapshot.so @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@ @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@%post -n gstreamer-snapshot @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1453,7 +1456,7 @@ Plug-in for demuxing Quicktime movies %files -n gstreamer-quicktime %defattr(-, root, root) -%{_libdir}/gst/libgstqtdemux.so +%{_libdir}/gstreamer-%{majorminor}/libgstqtdemux.so %post -n gstreamer-quicktime %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1497,7 +1500,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.so* +%{_libdir}/libgstplay-%{majorminor}.so* %post -n gstreamer-play /sbin/ldconfig @@ -1506,6 +1509,9 @@ This package contains a basic audio and video playback library. /sbin/ldconfig %changelog +* Sun Dec 08 2002 Thomas Vander Stichele <thomas at apestaart dot org> +- changes for parallel installability + * Thu Nov 28 2002 Christian Schaller <Uraeus@linuxrising.org> - Put in libgstpng plugin - rm the libgstmedia-info stuff until thomas think they are ready diff --git a/gst/cdxaparse/Makefile.am b/gst/cdxaparse/Makefile.am index 43d82004..02fca6b5 100644 --- a/gst/cdxaparse/Makefile.am +++ b/gst/cdxaparse/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = \ libgstcdxaparse.la diff --git a/gst/chart/Makefile.am b/gst/chart/Makefile.am index bb2cfe50..90a1d085 100644 --- a/gst/chart/Makefile.am +++ b/gst/chart/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstchart.la diff --git a/gst/deinterlace/Makefile.am b/gst/deinterlace/Makefile.am index 3ff1a5f2..2f64005b 100644 --- a/gst/deinterlace/Makefile.am +++ b/gst/deinterlace/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstdeinterlace.la diff --git a/gst/festival/Makefile.am b/gst/festival/Makefile.am index 1adf4ee7..e22ea029 100644 --- a/gst/festival/Makefile.am +++ b/gst/festival/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstfestival.la diff --git a/gst/filter/Makefile.am b/gst/filter/Makefile.am index 60e4a012..77e7ff59 100644 --- a/gst/filter/Makefile.am +++ b/gst/filter/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstfilter.la diff --git a/gst/flx/Makefile.am b/gst/flx/Makefile.am index 917fb018..7b64b425 100644 --- a/gst/flx/Makefile.am +++ b/gst/flx/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstflxdec.la diff --git a/gst/mixmatrix/Makefile.am b/gst/mixmatrix/Makefile.am index 81dac076..e858ae8a 100755 --- a/gst/mixmatrix/Makefile.am +++ b/gst/mixmatrix/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libmixmatrix.la diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am index 47c72e4d..b5b4f755 100644 --- a/gst/modplug/Makefile.am +++ b/gst/modplug/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS=libmodplug . -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmodplug.la diff --git a/gst/mpeg1sys/Makefile.am b/gst/mpeg1sys/Makefile.am index ce4ecfef..87bc8550 100644 --- a/gst/mpeg1sys/Makefile.am +++ b/gst/mpeg1sys/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmpeg1systemencode.la diff --git a/gst/mpeg1videoparse/Makefile.am b/gst/mpeg1videoparse/Makefile.am index eb718f44..dbe0b4bc 100644 --- a/gst/mpeg1videoparse/Makefile.am +++ b/gst/mpeg1videoparse/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmp1videoparse.la diff --git a/gst/mpeg2sub/Makefile.am b/gst/mpeg2sub/Makefile.am index 255a8ffa..5bf0e4ae 100644 --- a/gst/mpeg2sub/Makefile.am +++ b/gst/mpeg2sub/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmpeg2subt.la diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index c2e9649f..06b3f91d 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -1,6 +1,6 @@ #FIXME clean me up a bit -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c diff --git a/gst/passthrough/Makefile.am b/gst/passthrough/Makefile.am index af24e9dc..4d7581e0 100644 --- a/gst/passthrough/Makefile.am +++ b/gst/passthrough/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstpassthrough.la diff --git a/gst/playondemand/Makefile.am b/gst/playondemand/Makefile.am index cb00b403..af06bfdd 100644 --- a/gst/playondemand/Makefile.am +++ b/gst/playondemand/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstplayondemand.la diff --git a/gst/qtdemux/Makefile.am b/gst/qtdemux/Makefile.am index 9e682edc..e4339741 100644 --- a/gst/qtdemux/Makefile.am +++ b/gst/qtdemux/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstqtdemux.la diff --git a/gst/rtjpeg/Makefile.am b/gst/rtjpeg/Makefile.am index 535a6709..740e27d6 100644 --- a/gst/rtjpeg/Makefile.am +++ b/gst/rtjpeg/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstrtjpeg.la diff --git a/gst/smooth/Makefile.am b/gst/smooth/Makefile.am index 5654e09a..933debda 100644 --- a/gst/smooth/Makefile.am +++ b/gst/smooth/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmooth.la diff --git a/gst/smoothwave/Makefile.am b/gst/smoothwave/Makefile.am index c6a67abc..e70825e3 100644 --- a/gst/smoothwave/Makefile.am +++ b/gst/smoothwave/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmoothwave.la diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am index 91a6d127..3aef3a85 100644 --- a/gst/smpte/Makefile.am +++ b/gst/smpte/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmpte.la diff --git a/gst/spectrum/Makefile.am b/gst/spectrum/Makefile.am index acc29f09..0d3a2034 100644 --- a/gst/spectrum/Makefile.am +++ b/gst/spectrum/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstspectrum.la diff --git a/gst/speed/Makefile.am b/gst/speed/Makefile.am index 7ab9f2cb..eee61a78 100644 --- a/gst/speed/Makefile.am +++ b/gst/speed/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstspeed.la diff --git a/gst/stereo/Makefile.am b/gst/stereo/Makefile.am index 486ac716..1023b85d 100644 --- a/gst/stereo/Makefile.am +++ b/gst/stereo/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgststereo.la diff --git a/gst/videocrop/Makefile.am b/gst/videocrop/Makefile.am index f881428b..9c648969 100644 --- a/gst/videocrop/Makefile.am +++ b/gst/videocrop/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstvideocrop.la diff --git a/gst/virtualdub/Makefile.am b/gst/virtualdub/Makefile.am index 072727b4..9c4b7d67 100644 --- a/gst/virtualdub/Makefile.am +++ b/gst/virtualdub/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstvirtualdub.la diff --git a/gst/y4m/Makefile.am b/gst/y4m/Makefile.am index 7c2adc7d..c2928cce 100644 --- a/gst/y4m/Makefile.am +++ b/gst/y4m/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgsty4menc.la diff --git a/gstreamer-libs.pc.in b/gstreamer-libs.pc.in index c76947ea..6ff32172 100644 --- a/gstreamer-libs.pc.in +++ b/gstreamer-libs.pc.in @@ -1,11 +1,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/@PACKAGE@-@VERSION@ +includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ Name: GStreamer Media-Specific Libraries Description: Streaming-media framework, media-specific libraries -Requires: gstreamer = @VERSION@ +Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Version: @VERSION@ Libs: Cflags: -I${includedir} diff --git a/gstreamer-play.pc.in b/gstreamer-play.pc.in index 4bc27071..31d2bdbd 100644 --- a/gstreamer-play.pc.in +++ b/gstreamer-play.pc.in @@ -1,12 +1,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/@PACKAGE@-@VERSION@ +includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ Name: GStreamer Play Library Description: Streaming-media framework, play libraries -Requires: gstreamer >= @VERSION@ +Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstplay -lgstcontrol +Libs: -L${libdir} -lgstplay-@GST_MAJORMINOR@ -lgstcontrol-@GST_MAJORMINOR@ Cflags: -I${includedir} diff --git a/sys/cdrom/Makefile.am b/sys/cdrom/Makefile.am index c3d0600d..e5a98a60 100644 --- a/sys/cdrom/Makefile.am +++ b/sys/cdrom/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstcdplayer.la diff --git a/sys/dxr3/Makefile.am b/sys/dxr3/Makefile.am index 3edc8384..05e969a4 100644 --- a/sys/dxr3/Makefile.am +++ b/sys/dxr3/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstdxr3.la diff --git a/sys/qcam/Makefile.am b/sys/qcam/Makefile.am index 7333c2fc..75c99991 100644 --- a/sys/qcam/Makefile.am +++ b/sys/qcam/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstqcam.la diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am index 18fe742a..976e7305 100644 --- a/sys/v4l2/Makefile.am +++ b/sys/v4l2/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = \ libgstv4l2element.la \ diff --git a/sys/vcd/Makefile.am b/sys/vcd/Makefile.am index 24b04214..7770804c 100644 --- a/sys/vcd/Makefile.am +++ b/sys/vcd/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstvcdsrc.la |