mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

[502/906] Update versioning for gstreamer 1.0

Browse source 
Renames GST_MAJORMINOR to GST_API_VERSION in build files
removes -lgstinterfaces from _LDADD flags
This commit is contained in:
Matthew Waters 2012-05-29 17:55:44 +10:00
parent fa18db91ed
commit 6f2acb94c6
5 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/libvisual/Makefile.am
View file

@ -7,7 +7,7 @@ libgstlibvisualgl_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISU
-I$(top_srcdir)/gst-libs/gst/gl -I$(top_srcdir)/gst-libs/gst/gl
libgstlibvisualgl_la_LIBADD = \ 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) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(LIBVISUAL_LIBS)
libgstlibvisualgl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstlibvisualgl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

30
gst-libs/gst/gl/Makefile.am
View file

@ -1,5 +1,5 @@
lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstgl-@GST_API_VERSION@.la
EXTRA_DIST = \ EXTRA_DIST = \
gstglwindow_x11.c \ gstglwindow_x11.c \
@ -8,7 +8,7 @@ EXTRA_DIST = \
gstglwindow_winCE.c \ gstglwindow_winCE.c \
gstglwindow_cocoa.m gstglwindow_cocoa.m
libgstgl_@GST_MAJORMINOR@_la_SOURCES = \ libgstgl_@GST_API_VERSION@_la_SOURCES = \
gstgldisplay.c \ gstgldisplay.c \
gstglbuffer.c \ gstglbuffer.c \
gstglfilter.c \ gstglfilter.c \
@ -17,20 +17,20 @@ libgstgl_@GST_MAJORMINOR@_la_SOURCES = \
gstglshadervariables.c gstglshadervariables.c
if GL_BACKEND_WIN32 if GL_BACKEND_WIN32
libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_win32.c libgstgl_@GST_API_VERSION@_la_SOURCES += gstglwindow_win32.c
endif endif
if GL_BACKEND_COCOA if GL_BACKEND_COCOA
libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_cocoa.m libgstgl_@GST_API_VERSION@_la_SOURCES += gstglwindow_cocoa.m
endif endif
if GL_BACKEND_X11 if GL_BACKEND_X11
libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_x11.c libgstgl_@GST_API_VERSION@_la_SOURCES += gstglwindow_x11.c
endif endif
if GL_BACKEND_X11ES2 if GL_BACKEND_X11ES2
libgstgl_@GST_MAJORMINOR@_la_SOURCES += gstglwindow_x11ES2.c libgstgl_@GST_API_VERSION@_la_SOURCES += gstglwindow_x11ES2.c
endif endif
libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
libgstgl_@GST_MAJORMINOR@include_HEADERS = \ libgstgl_@GST_API_VERSION@include_HEADERS = \
gstglwindow.h \ gstglwindow.h \
gstgldisplay.h \ gstgldisplay.h \
gstglbuffer.h \ gstglbuffer.h \
@ -41,23 +41,23 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \
gstglshadervariables.h \ gstglshadervariables.h \
gstglshader.h gstglshader.h
libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ libgstgl_@GST_API_VERSION@_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstcontroller-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) \ $(GST_BASE_LIBS) $(GST_LIBS) \
$(GL_LIBS) $(GL_LIBS)
libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ libgstgl_@GST_API_VERSION@_la_CFLAGS = \
$(GL_CFLAGS) $(X_CFLAGS) \ $(GL_CFLAGS) $(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_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) \ $(GL_CFLAGS) $(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_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) $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
if GL_BACKEND_COCOA if GL_BACKEND_COCOA
libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=OBJC libgstgl_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=OBJC
else else
libgstgl_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=CC libgstgl_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=CC
endif endif

4
gst/gl/Makefile.am
View file

@ -87,9 +87,9 @@ libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
-I$(top_srcdir)/gst/gl/effects -I$(top_srcdir)/gst/gl/effects
libgstopengl_la_LIBADD = \ 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_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GL_LIBS) \ $(GL_LIBS) \
$(LIBPNG_LIBS) \ $(LIBPNG_LIBS) \
$(JPEG_LIBS) \ $(JPEG_LIBS) \

2
pkgconfig/gstreamer-gl-uninstalled.pc.in
View file

@ -7,7 +7,7 @@ pluginsdir=${pcfiledir}/..
Name: GStreamer OpenGL Plugins Libraries, Uninstalled Name: GStreamer OpenGL Plugins Libraries, Uninstalled
Description: Streaming media framework, OpenGL plugins libraries, uninstalled Description: Streaming media framework, OpenGL plugins libraries, uninstalled
Version: @VERSION@ Version: @VERSION@
Requires: gstreamer-@GST_MAJORMINOR@ Requires: gstreamer-@GST_API_VERSION@
Libs: -L${libdir}/gl Libs: -L${libdir}/gl
Cflags: -I${includedir} -I@srcdir@/.. Cflags: -I${includedir} -I@srcdir@/..

8
pkgconfig/gstreamer-gl.pc.in
View file

@ -1,13 +1,13 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ includedir=@includedir@/gstreamer-@GST_API_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@ pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
Name: GStreamer OpenGL Plugins Libraries Name: GStreamer OpenGL Plugins Libraries
Description: Streaming media framework, 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@ Version: @VERSION@
Libs: -L${libdir} -lgstgl-@GST_MAJORMINOR@ Libs: -L${libdir} -lgstgl-@GST_API_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}