mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-30 19:18:31 +00:00
Opening the 0.11 branch
This commit is contained in:
parent
0292e86b9b
commit
20f568ae94
5 changed files with 11 additions and 11 deletions
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 605cd9a65ed61505f24b840d3fe8e252be72b151
|
||||
Subproject commit 50b34abb468b6572a92f6700552f6f541c655be8
|
|
@ -3,7 +3,7 @@ AC_PREREQ(2.52)
|
|||
dnl initialize autoconf
|
||||
dnl when going to/from release please set the nano (fourth number) right !
|
||||
dnl releases only do Wall, cvs and prerelease does Werror too
|
||||
AC_INIT(GStreamer Editing Services, 0.10.1.1,
|
||||
AC_INIT(GStreamer Editing Services, 0.11.0.1,
|
||||
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
|
||||
gstreamer-editing-services)
|
||||
|
||||
|
@ -38,7 +38,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
|
|||
dnl our libraries and install dirs use major.minor as a version
|
||||
GST_MAJORMINOR=$GST_EDITING_SERVICES_VERSION_MAJOR.$GST_EDITING_SERVICES_VERSION_MINOR
|
||||
dnl we override it here if we need to for the release candidate of new series
|
||||
GST_MAJORMINOR=0.10
|
||||
GST_MAJORMINOR=0.11
|
||||
AC_SUBST(GST_MAJORMINOR)
|
||||
|
||||
dnl FIXME: this macro doesn't actually work;
|
||||
|
@ -50,8 +50,8 @@ AC_LIBTOOL_WIN32_DLL
|
|||
AM_PROG_LIBTOOL
|
||||
|
||||
dnl *** required versions of GStreamer stuff ***
|
||||
GST_REQ=0.10.34
|
||||
GSTPB_REQ=0.10.34
|
||||
GST_REQ=0.11.0
|
||||
GSTPB_REQ=0.11.0
|
||||
|
||||
dnl *** autotools stuff ****
|
||||
|
||||
|
|
|
@ -136,8 +136,8 @@ GES-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libges-@GST_MAJORMINOR@.la
|
|||
$(gir_cincludes) \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.10` \
|
||||
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.11` \
|
||||
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.11` \
|
||||
--library=libges-@GST_MAJORMINOR@.la \
|
||||
--include=Gst-@GST_MAJORMINOR@ \
|
||||
--include=GstPbutils-@GST_MAJORMINOR@ \
|
||||
|
@ -165,8 +165,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|||
--includedir=$(srcdir) \
|
||||
--includedir=$(srcdir)/../video \
|
||||
--includedir=$(builddir) \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.10` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.11` \
|
||||
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.11` \
|
||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||
|
||||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
%define majorminor @GST_MAJORMINOR@
|
||||
%define gstreamer gstreamer
|
||||
|
||||
%define gst_minver 0.10.0
|
||||
%define gst_minver 0.11.0
|
||||
|
||||
Name: %{gstreamer}-editing-services
|
||||
Version: @VERSION@
|
||||
|
|
2
tools/.gitignore
vendored
2
tools/.gitignore
vendored
|
@ -1,2 +1,2 @@
|
|||
ges-launch
|
||||
ges-launch-0.10
|
||||
ges-launch-0.11
|
||||
|
|
Loading…
Reference in a new issue