From: raster Date: Sat, 17 Mar 2012 04:17:29 +0000 (+0000) Subject: gear up svn for release. one of many steps/things to do. X-Git-Tag: submit/2.0alpha-wayland/20121127.222018~61 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b3e6cb0abb59834028e2bb8e1a1a3ba3e5502f0;p=profile%2Fivi%2Femotion.git gear up svn for release. one of many steps/things to do. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/emotion@69481 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/README b/README index c64cc15..65a0638 100644 --- a/README +++ b/README @@ -1 +1,22 @@ -Emotion 0.0.1 +Emotion 1.0.0 + +****************************************************************************** + + FOR ANY ISSUES PLEASE EMAIL: + enlightenment-devel@lists.sourceforge.net + +****************************************************************************** + +Emotion is a video (and audio) codec playback library that acts as a +front-end to libxine or gstreamer (or something else more generic) +that provides and evas object as a control object and video output +point. It makes using video API's much simpler and easier while it's +at it. + +------------------------------------------------------------------------------ +COMPILING AND INSTALLING: + + ./configure + make +(do this as root unless you are installing in your users directories): + make install diff --git a/configure.ac b/configure.ac index 21305b4..d41d5cc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -m4_define([v_maj], [0]) -m4_define([v_min], [2]) +m4_define([v_maj], [1]) +m4_define([v_min], [0]) m4_define([v_mic], [0]) m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line -dnl m4_undefine([v_rev]) +m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line m4_define([relname], [ver-pre-svn-07]) m4_define([v_rel], [-release relname]) @@ -19,7 +19,7 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([emotion], [v_ver], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([emotion], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.60]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/emotion.pc.in b/emotion.pc.in index 5126c3b..652e20f 100644 --- a/emotion.pc.in +++ b/emotion.pc.in @@ -5,7 +5,6 @@ includedir=@includedir@ Name: emotion Description: Emotion evas based multimedia library -@pkgconfig_requires_private@: @requirement_emotion@ Version: @VERSION@ Libs: -L${libdir} -lemotion Cflags: -I${includedir}/emotion-@VMAJ@ diff --git a/src/lib/Emotion.h b/src/lib/Emotion.h index e7e214f..2a624dc 100644 --- a/src/lib/Emotion.h +++ b/src/lib/Emotion.h @@ -243,6 +243,19 @@ typedef enum _Emotion_Aspect Emotion_Aspect; /**< Aspect ratio option. */ extern "C" { #endif +#define EMOTION_VERSION_MAJOR 1 +#define EMOTION_VERSION_MINOR 0 + + typedef struct _Emotion_Version + { + int major; + int minor; + int micro; + int revision; + } Emotion_Version; + + EAPI extern Emotion_Version *emotion_version; + /* api calls available */ /** diff --git a/src/lib/emotion_main.c b/src/lib/emotion_main.c index 8180947..7fd93e8 100644 --- a/src/lib/emotion_main.c +++ b/src/lib/emotion_main.c @@ -22,6 +22,9 @@ #include "Emotion.h" #include "emotion_private.h" +static Emotion_Version _version = { VMAJ, VMIN, VMIC, VREV }; +EAPI Emotion_Version *emotion_version = &_version; + EAPI int EMOTION_WEBCAM_UPDATE = 0; struct ext_match_s