Commit 37fcf400 authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

ffmpeg: Update versioning

parent e438f20c
...@@ -36,10 +36,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])], ...@@ -36,10 +36,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
AC_SUBST(AM_DEFAULT_VERBOSITY)]) AC_SUBST(AM_DEFAULT_VERBOSITY)])
dnl our libraries and install dirs use major.minor as a version dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR 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 dnl we override it here if we need to for the release candidate of new series
GST_MAJORMINOR=0.11 GST_API_VERSION=1.0
AC_SUBST(GST_MAJORMINOR) AC_SUBST(GST_API_VERSION)
AG_GST_LIBTOOL_PREPARE AG_GST_LIBTOOL_PREPARE
...@@ -116,10 +116,10 @@ dnl *** checks for dependancy libraries *** ...@@ -116,10 +116,10 @@ dnl *** checks for dependancy libraries ***
dnl checks for gstreamer dnl checks for gstreamer
dnl uninstalled is selected preferentially -- see pkg-config(1) dnl uninstalled is selected preferentially -- see pkg-config(1)
AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ])
AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ])
AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GST_REQ])
AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR) AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR)
......
...@@ -3,7 +3,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj ...@@ -3,7 +3,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
# The name of the module, e.g. 'glib'. # The name of the module, e.g. 'glib'.
#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@ #DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
MODULE=gst-ffmpeg MODULE=gst-ffmpeg
DOC_MODULE=$(MODULE)-plugins DOC_MODULE=$(MODULE)-plugins
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo> <bookinfo>
<title>GStreamer FFMPeg &GST_MAJORMINOR; Plugins Reference Manual</title> <title>GStreamer FFMPeg &GST_API_VERSION; Plugins Reference Manual</title>
<releaseinfo> <releaseinfo>
for GStreamer FFMPeg Plugins &GST_MAJORMINOR; (&GST_VERSION;) for GStreamer FFMPeg Plugins &GST_API_VERSION; (&GST_VERSION;)
The latest version of this documentation can be found on-line at The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-ffmpeg-plugins/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-ffmpeg-plugins/html/</ulink>. <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-ffmpeg-plugins/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-ffmpeg-plugins/html/</ulink>.
</releaseinfo> </releaseinfo>
......
<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@"> <!ENTITY GST_API_VERSION "@GST_API_VERSION@">
<!ENTITY GST_VERSION "@VERSION@"> <!ENTITY GST_VERSION "@VERSION@">
...@@ -23,8 +23,8 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \ ...@@ -23,8 +23,8 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_PLUGINS_BASE_LIBS) \ libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \ -lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
-lgstpbutils-$(GST_MAJORMINOR) $(GST_BASE_LIBS) \ -lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
$(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS) $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS)
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static
......
...@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstpostproc.la ...@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstpostproc.la
libgstpostproc_la_SOURCES = gstpostproc.c libgstpostproc_la_SOURCES = gstpostproc.c
libgstpostproc_la_CFLAGS = $(POSTPROC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) libgstpostproc_la_CFLAGS = $(POSTPROC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \ libgstpostproc_la_LIBADD = -lgstvideo-@GST_API_VERSION@ \
$(POSTPROC_LIBS) \ $(POSTPROC_LIBS) \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS)
......
...@@ -5,7 +5,7 @@ libgstffmpegscale_la_SOURCES = gstffmpegscale.c ...@@ -5,7 +5,7 @@ libgstffmpegscale_la_SOURCES = gstffmpegscale.c
libgstffmpegscale_la_CFLAGS = $(SWSCALE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \ libgstffmpegscale_la_CFLAGS = $(SWSCALE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
$(ORC_CFLAGS) $(ORC_CFLAGS)
libgstffmpegscale_la_LIBADD = $(SWSCALE_LIBS) \ libgstffmpegscale_la_LIBADD = $(SWSCALE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz $(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz
libgstffmpegscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) libgstffmpegscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
libgstffmpegscale_la_LIBTOOLFLAGS = --tag=disable-static libgstffmpegscale_la_LIBTOOLFLAGS = --tag=disable-static
......
%define majorminor @GST_MAJORMINOR@ %define majorminor @GST_API_VERSION@
%define gstreamer gstreamer %define gstreamer gstreamer
%define gst_minver 0.10.0 %define gst_minver 0.10.0
%define gst_majorminor 0.10 %define gst_majorminor 0.10
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment