[502/906] Update versioning for gstreamer 1.0

Renames GST_MAJORMINOR to GST_API_VERSION in build files
removes -lgstinterfaces from _LDADD flags

diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am
index 9868083103f464ed6b16eb4a16b843c4430d507a..1eba9af2f564308c6d96f3da4b1da3adbc65caff 100644 (file)
--- a/ext/libvisual/Makefile.am
+++ b/ext/libvisual/Makefile.am
@@ -7,7 +7,7 @@ libgstlibvisualgl_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISU
        -I$(top_srcdir)/gst-libs/gst/gl
 
 libgstlibvisualgl_la_LIBADD = \
-       $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \
+       $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
        $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(LIBVISUAL_LIBS)
 
 libgstlibvisualgl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index 2ef7afcd4a0cebcde90ce0e49b8b3690d6033857..64f054895c81ae7b3f65adcb710b2ae4d51ec8a6 100644 (file)
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstgl-@GST_API_VERSION@.la
 
 EXTRA_DIST = \
        gstglwindow_x11.c \
@@ -8,7 +8,7 @@ EXTRA_DIST = \
        gstglwindow_winCE.c \
        gstglwindow_cocoa.m
 
-libgstgl_@GST_MAJORMINOR@_la_SOURCES = \
+libgstgl_@GST_API_VERSION@_la_SOURCES = \
        gstgldisplay.c \
        gstglbuffer.c \
        gstglfilter.c \
@@ -17,20 +17,20 @@ libgstgl_@GST_MAJORMINOR@_la_SOURCES = \
         gstglshadervariables.c
 
 if GL_BACKEND_WIN32
-libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_win32.c
+libgstgl_@GST_API_VERSION@_la_SOURCES += gstglwindow_win32.c
 endif
 if GL_BACKEND_COCOA
-libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_cocoa.m
+libgstgl_@GST_API_VERSION@_la_SOURCES += gstglwindow_cocoa.m
 endif
 if GL_BACKEND_X11
-libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_x11.c
+libgstgl_@GST_API_VERSION@_la_SOURCES += gstglwindow_x11.c
 endif
 if GL_BACKEND_X11ES2
-libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_x11ES2.c
+libgstgl_@GST_API_VERSION@_la_SOURCES += gstglwindow_x11ES2.c
 endif
 
-libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl
-libgstgl_@GST_MAJORMINOR@include_HEADERS = \
+libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
+libgstgl_@GST_API_VERSION@include_HEADERS = \
        gstglwindow.h \
        gstgldisplay.h \
        gstglbuffer.h \
@@ -41,23 +41,23 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \
         gstglshadervariables.h \
        gstglshader.h
 
-libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstcontroller-$(GST_MAJORMINOR) \
+libgstgl_@GST_API_VERSION@_la_LIBADD = \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) \
        $(GL_LIBS)
 
-libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstgl_@GST_API_VERSION@_la_CFLAGS = \
        $(GL_CFLAGS) $(X_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstgl_@GST_MAJORMINOR@_la_OBJCFLAGS = \
+libgstgl_@GST_API_VERSION@_la_OBJCFLAGS = \
        $(GL_CFLAGS) $(X_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 
-libgstgl_@GST_MAJORMINOR@_la_LDFLAGS = \
+libgstgl_@GST_API_VERSION@_la_LDFLAGS = \
        $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 if GL_BACKEND_COCOA
-libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=OBJC
+libgstgl_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=OBJC
 else
-libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=CC
+libgstgl_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=CC
 endif

diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am
index 76bcf372f84b49fea84a7bdcfd834079ea9c92fa..60f06a00e5287dc02d4073b139981ac4d2143843 100644 (file)
--- a/gst/gl/Makefile.am
+++ b/gst/gl/Makefile.am
@@ -87,9 +87,9 @@ libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
        -I$(top_srcdir)/gst/gl/effects
 
 libgstopengl_la_LIBADD = \
-       $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \
+       $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
        $(GST_BASE_LIBS) \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GL_LIBS) \
        $(LIBPNG_LIBS) \
         $(JPEG_LIBS) \

diff --git a/pkgconfig/gstreamer-gl-uninstalled.pc.in b/pkgconfig/gstreamer-gl-uninstalled.pc.in
index a7b1b413c89dcfc4f105cfbbcd03252b03882341..382bb3278df95ceb269c81b98e102ed9315247ba 100644 (file)
--- a/pkgconfig/gstreamer-gl-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-gl-uninstalled.pc.in
@@ -7,7 +7,7 @@ pluginsdir=${pcfiledir}/..
 Name: GStreamer OpenGL Plugins Libraries, Uninstalled
 Description: Streaming media framework, OpenGL plugins libraries, uninstalled
 Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@
 
 Libs: -L${libdir}/gl
 Cflags: -I${includedir} -I@srcdir@/..

diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in
index 432b73ebbe332d20d1a20d652a706c360395c4a4..c640e754731cfa9e299a7f14658c60c8feb920b5 100644 (file)
--- a/pkgconfig/gstreamer-gl.pc.in
+++ b/pkgconfig/gstreamer-gl.pc.in
@@ -1,13 +1,13 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
-pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
+pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer OpenGL Plugins Libraries
 Description: Streaming media framework, OpenGL plugins libraries
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lgstgl-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstgl-@GST_API_VERSION@
 Cflags: -I${includedir}