rtsp-server: Update versioning

diff --git a/configure.ac b/configure.ac
index 85c013a..f7be88f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
    AC_SUBST(AM_DEFAULT_VERBOSITY)])
 
 dnl our libraries and install dirs use major.minor as a version
-GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
+dnl GST_API_VERSION=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
 dnl we override it here if we need to for the release candidate of new series
-GST_MAJORMINOR=0.11
-AC_SUBST(GST_MAJORMINOR)
+GST_API_VERSION=1.0
+AC_SUBST(GST_API_VERSION)
 
 AM_PROG_LIBTOOL
 
@@ -58,7 +58,7 @@ dnl set up gettext
 dnl the version check needs to stay here because autopoint greps for it
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
-AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
+AG_GST_GETTEXT([gstreamer-$GST_API_VERSION])
 
 dnl *** check for arguments to configure ***
 
@@ -123,26 +123,26 @@ AG_GST_GLIB_CHECK([$GLIB_REQ])
 
 dnl checks for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], [yes])
+AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], [yes])
 
-GST_TOOLS_DIR=`$PKG_CONFIG --variable=toolsdir gstreamer-$GST_MAJORMINOR`
+GST_TOOLS_DIR=`$PKG_CONFIG --variable=toolsdir gstreamer-$GST_API_VERSION`
 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)
 
-GST_PLUGINS_DIR=`$PKG_CONFIG gstreamer-$GST_MAJORMINOR --variable pluginsdir`
+GST_PLUGINS_DIR=`$PKG_CONFIG gstreamer-$GST_API_VERSION --variable pluginsdir`
 AC_SUBST(GST_PLUGINS_DIR)
 AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR)
 
-AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], [yes])
+AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], [yes])
 
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], [yes])
-GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_MAJORMINOR --variable pluginsdir`
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], [yes])
+GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_API_VERSION --variable pluginsdir`
 AC_SUBST(GSTPB_PLUGINS_DIR)
 AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR)
 
-AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
+AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
 
 dnl FIXME: get rid of this by making sure gstreamer-check brings it in
 dnl check for "check", unit testing library/header
@@ -221,7 +221,7 @@ dnl default vars for all internal objects built on libgstrtspserver
 dnl includes GST_ALL_*
 GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)"
 AC_SUBST([GST_OBJ_CFLAGS])
-GST_OBJ_LIBS="\$(top_builddir)/gst/rtsp-server/libgstrtspserver-$GST_MAJORMINOR.la \$(GST_ALL_LIBS)"
+GST_OBJ_LIBS="\$(top_builddir)/gst/rtsp-server/libgstrtspserver-$GST_API_VERSION.la \$(GST_ALL_LIBS)"
 AC_SUBST([GST_OBJ_LIBS])
 
 dnl this really should only contain flags, not libs - they get added before

diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 574e9e5..38a958e 100644 (file)
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -23,11 +23,11 @@ include $(top_srcdir)/common/upload-doc.mak
 #      BUILDDIR=`pwd` && \
 #      cd $(srcdir)/tmpl && \
 #      ln -sf gstreamer-libs-unused.sgml \
-#              $$BUILDDIR/tmpl/gstreamer-libs-@GST_MAJORMINOR@-unused.sgml
+#              $$BUILDDIR/tmpl/gstreamer-libs-@GST_API_VERSION@-unused.sgml
 #      touch unused-build.stamp
 
-# these rules are added to create parallel docs using GST_MAJORMINOR
-#$(basefiles): gstreamer-libs-@GST_MAJORMINOR@%: gstreamer-libs%
+# these rules are added to create parallel docs using GST_API_VERSION
+#$(basefiles): gstreamer-libs-@GST_API_VERSION@%: gstreamer-libs%
 #      cp $< $@
 
 #CLEANFILES = $(basefiles)
@@ -61,7 +61,7 @@ HFILE_GLOB=$(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB=$(DOC_SOURCE_DIR)/*.c
 
 SCANOBJ_DEPS = \
-       $(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_MAJORMINOR@.la
+       $(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_API_VERSION@.la
 
 # Extra options to supply to gtkdoc-scan.
 SCANOBJ_OPTIONS=--type-init-func="g_type_init();gst_init(&argc,&argv)"

diff --git a/docs/version.entities.in b/docs/version.entities.in
index 79a6898..286989f 100644 (file)
--- a/docs/version.entities.in
+++ b/docs/version.entities.in
@@ -1,2 +1,2 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
 <!ENTITY GST_VERSION "@VERSION@">

diff --git a/gst-rtsp.spec.in b/gst-rtsp.spec.in
index 2c4eebc..12224f8 100644 (file)
--- a/gst-rtsp.spec.in
+++ b/gst-rtsp.spec.in
@@ -1,4 +1,4 @@
-%define         gst_majorminor @GST_MAJORMINOR@
+%define         gst_majorminor @GST_API_VERSION@
 
 Name:           gstreamer-rtsp-server
 Version:        @VERSION@

diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am
index eeac445..991165d 100644 (file)
--- a/gst/rtsp-server/Makefile.am
+++ b/gst/rtsp-server/Makefile.am
@@ -27,52 +27,52 @@ c_sources = \
 noinst_HEADERS = 
 
 lib_LTLIBRARIES = \
-       libgstrtspserver-@GST_MAJORMINOR@.la
+       libgstrtspserver-@GST_API_VERSION@.la
 
-libgstrtspserver_@GST_MAJORMINOR@_la_SOURCES = \
+libgstrtspserver_@GST_API_VERSION@_la_SOURCES = \
     $(c_sources)
 
-libgstrtspserver_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstrtspserver_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrtspserver_@GST_MAJORMINOR@_la_LIBADD = \
+libgstrtspserver_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstrtspserver_@GST_API_VERSION@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstrtspserver_@GST_API_VERSION@_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-    -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ \
-            -lgstsdp-@GST_MAJORMINOR@ \
-            -lgstapp-@GST_MAJORMINOR@ \
+    -lgstrtp-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ \
+            -lgstsdp-@GST_API_VERSION@ \
+            -lgstapp-@GST_API_VERSION@ \
            $(GST_LIBS) $(LIBM)
-libgstrtspserver_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static
+libgstrtspserver_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=disable-static
 
-libgstrtspserver_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/rtsp-server
-libgstrtspserver_@GST_MAJORMINOR@include_HEADERS = $(public_headers)
+libgstrtspserver_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtsp-server
+libgstrtspserver_@GST_API_VERSION@include_HEADERS = $(public_headers)
 
 CLEANFILES =
 
 if HAVE_INTROSPECTION
-BUILT_GIRSOURCES = GstRtspServer-@GST_MAJORMINOR@.gir
+BUILT_GIRSOURCES = GstRtspServer-@GST_API_VERSION@.gir
 
-gir_headers=$(patsubst %,$(srcdir)/%, $(libgstrtspserver_@GST_MAJORMINOR@include_HEADERS))
-gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtspserver_@GST_MAJORMINOR@_la_SOURCES))
+gir_headers=$(patsubst %,$(srcdir)/%, $(libgstrtspserver_@GST_API_VERSION@include_HEADERS))
+gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtspserver_@GST_API_VERSION@_la_SOURCES))
 gir_cincludes=$(patsubst %,--c-include='gst/rtsp-server/%',$(libgstrtspinclude_HEADERS))
 
-GstRtspServer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@GST_MAJORMINOR@.la
+GstRtspServer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@GST_API_VERSION@.la
        $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
                $(INTROSPECTION_SCANNER) -v --namespace GstRtspServer \
-               --nsversion=@GST_MAJORMINOR@ \
+               --nsversion=@GST_API_VERSION@ \
                --strip-prefix=Gst \
                -I$(top_srcdir) \
                -I$(top_builddir) \
                -DIN_GOBJECT_INTROSPECTION=1 \
                --c-include='gst/gst.h' \
-               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
-               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-@GST_MAJORMINOR@` \
-               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-@GST_MAJORMINOR@` \
-               --library=libgstrtspserver-@GST_MAJORMINOR@.la \
-               --include=Gst-@GST_MAJORMINOR@ \
-               --include=GstRtsp-@GST_MAJORMINOR@ \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-@GST_API_VERSION@` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-@GST_API_VERSION@` \
+               --library=libgstrtspserver-@GST_API_VERSION@.la \
+               --include=Gst-@GST_API_VERSION@ \
+               --include=GstRtsp-@GST_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
-               --pkg gstreamer-@GST_MAJORMINOR@ \
-               --pkg gstreamer-rtsp-@GST_MAJORMINOR@ \
-               --pkg-export gstreamer-rtsp-server-@GST_MAJORMINOR@ \
+               --pkg gstreamer-@GST_API_VERSION@ \
+               --pkg gstreamer-rtsp-@GST_API_VERSION@ \
+               --pkg-export gstreamer-rtsp-server-@GST_API_VERSION@ \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)
@@ -91,9 +91,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(INTROSPECTION_COMPILER) \
        --includedir=$(srcdir) \
        --includedir=$(builddir) \
-       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
-       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-@GST_MAJORMINOR@` \
-       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-@GST_MAJORMINOR@` \
+       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-@GST_API_VERSION@` \
+       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-@GST_API_VERSION@` \
        $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 54f82ac..c45755e 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -1,15 +1,15 @@
 pcfiles = \
-       gstreamer-rtsp-server-@GST_MAJORMINOR@.pc
+       gstreamer-rtsp-server-@GST_API_VERSION@.pc
        
 pcfiles_uninstalled = \
-       gstreamer-rtsp-server-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-rtsp-server-@GST_API_VERSION@-uninstalled.pc
 
 all-local: $(pcfiles) $(pcfiles_uninstalled)
 
 ### how to generate pc files
-%-@GST_MAJORMINOR@.pc: %.pc
+%-@GST_API_VERSION@.pc: %.pc
        cp $< $@
-%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
+%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc
        cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in b/pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in
index cd591be..e453805 100644 (file)
--- a/pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in
@@ -7,6 +7,6 @@ includedir=${pcfiledir}/..
 Name: gst-rtsp-server
 Description: GStreamer based RTSP server
 Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-plugins-base-@GST_MAJORMINOR@
-Libs: ${libdir}/libgstrtspserver-@GST_MAJORMINOR@.la
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-plugins-base-@GST_API_VERSION@
+Libs: ${libdir}/libgstrtspserver-@GST_API_VERSION@.la
 Cflags: -I${includedir} -I@srcdir@/..

diff --git a/pkgconfig/gstreamer-rtsp-server.pc.in b/pkgconfig/gstreamer-rtsp-server.pc.in
index 52e33c5..3a1d820 100644 (file)
--- a/pkgconfig/gstreamer-rtsp-server.pc.in
+++ b/pkgconfig/gstreamer-rtsp-server.pc.in
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 
 Name: gst-rtsp-server
 Description: GStreamer based RTSP server
 Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
-Libs: -L${libdir} -lgstrtspserver-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
+Libs: -L${libdir} -lgstrtspserver-@GST_API_VERSION@
 Cflags: -I${includedir}

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a4a47d9..ce9caf3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,5 +5,5 @@ INCLUDES = -I$(top_srcdir) -I$(srcdir)
 AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 AM_LDFLAGS = \
        $(GST_LIBS) \
-       $(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_MAJORMINOR@.la
+       $(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_API_VERSION@.la