Commit 20f568ae authored by Edward Hervey's avatar Edward Hervey
Browse files

Opening the 0.11 branch

parent 0292e86b
common @ 50b34abb
Subproject commit 605cd9a65ed61505f24b840d3fe8e252be72b151 Subproject commit 50b34abb468b6572a92f6700552f6f541c655be8
...@@ -3,7 +3,7 @@ AC_PREREQ(2.52) ...@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
dnl initialize autoconf dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right ! dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too 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, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gstreamer-editing-services) gstreamer-editing-services)
...@@ -38,7 +38,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])], ...@@ -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 dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$GST_EDITING_SERVICES_VERSION_MAJOR.$GST_EDITING_SERVICES_VERSION_MINOR 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 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) AC_SUBST(GST_MAJORMINOR)
dnl FIXME: this macro doesn't actually work; dnl FIXME: this macro doesn't actually work;
...@@ -50,8 +50,8 @@ AC_LIBTOOL_WIN32_DLL ...@@ -50,8 +50,8 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff *** dnl *** required versions of GStreamer stuff ***
GST_REQ=0.10.34 GST_REQ=0.11.0
GSTPB_REQ=0.10.34 GSTPB_REQ=0.11.0
dnl *** autotools stuff **** dnl *** autotools stuff ****
......
...@@ -136,8 +136,8 @@ GES-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libges-@GST_MAJORMINOR@.la ...@@ -136,8 +136,8 @@ GES-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libges-@GST_MAJORMINOR@.la
$(gir_cincludes) \ $(gir_cincludes) \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.11` \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.10` \ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.11` \
--library=libges-@GST_MAJORMINOR@.la \ --library=libges-@GST_MAJORMINOR@.la \
--include=Gst-@GST_MAJORMINOR@ \ --include=Gst-@GST_MAJORMINOR@ \
--include=GstPbutils-@GST_MAJORMINOR@ \ --include=GstPbutils-@GST_MAJORMINOR@ \
...@@ -165,8 +165,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) ...@@ -165,8 +165,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
--includedir=$(srcdir) \ --includedir=$(srcdir) \
--includedir=$(srcdir)/../video \ --includedir=$(srcdir)/../video \
--includedir=$(builddir) \ --includedir=$(builddir) \
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.11` \
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.10` \ --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.11` \
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
......
%define majorminor @GST_MAJORMINOR@ %define majorminor @GST_MAJORMINOR@
%define gstreamer gstreamer %define gstreamer gstreamer
%define gst_minver 0.10.0 %define gst_minver 0.11.0
Name: %{gstreamer}-editing-services Name: %{gstreamer}-editing-services
Version: @VERSION@ Version: @VERSION@
......
ges-launch ges-launch
ges-launch-0.10 ges-launch-0.11
Supports Markdown
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