summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-03-17 04:17:29 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-03-17 04:17:29 +0000
commit63ed6ac02f01b5237f3872c82dbc54cdb3f69e7a (patch)
treedf99a7d35f5f6e1df3d5c194b62a7d91fca7dc93 /legacy/emotion
parentd350177475eee9c19ad41036fe3a9f21a938b1e7 (diff)
gear up svn for release. one of many steps/things to do.
SVN revision: 69481
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/README23
-rw-r--r--legacy/emotion/configure.ac8
-rw-r--r--legacy/emotion/emotion.pc.in1
-rw-r--r--legacy/emotion/src/lib/Emotion.h13
-rw-r--r--legacy/emotion/src/lib/emotion_main.c3
5 files changed, 42 insertions, 6 deletions
diff --git a/legacy/emotion/README b/legacy/emotion/README
index c64cc15dda..65a06385f2 100644
--- a/legacy/emotion/README
+++ b/legacy/emotion/README
@@ -1 +1,22 @@
1Emotion 0.0.1 1Emotion 1.0.0
2
3******************************************************************************
4
5 FOR ANY ISSUES PLEASE EMAIL:
6 enlightenment-devel@lists.sourceforge.net
7
8******************************************************************************
9
10Emotion is a video (and audio) codec playback library that acts as a
11front-end to libxine or gstreamer (or something else more generic)
12that provides and evas object as a control object and video output
13point. It makes using video API's much simpler and easier while it's
14at it.
15
16------------------------------------------------------------------------------
17COMPILING AND INSTALLING:
18
19 ./configure
20 make
21(do this as root unless you are installing in your users directories):
22 make install
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 21305b423a..d41d5cc32f 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -1,12 +1,12 @@
1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [0]) 3m4_define([v_maj], [1])
4m4_define([v_min], [2]) 4m4_define([v_min], [0])
5m4_define([v_mic], [0]) 5m4_define([v_mic], [0])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_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']))]) 7m4_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']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9dnl m4_undefine([v_rev]) 9m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11m4_define([relname], [ver-pre-svn-07]) 11m4_define([relname], [ver-pre-svn-07])
12m4_define([v_rel], [-release relname]) 12m4_define([v_rel], [-release relname])
@@ -19,7 +19,7 @@ m4_define([lt_age], v_min)
19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
20##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 20##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
21 21
22AC_INIT([emotion], [v_ver], [enlightenment-devel@lists.sourceforge.net]) 22AC_INIT([emotion], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net])
23AC_PREREQ([2.60]) 23AC_PREREQ([2.60])
24AC_CONFIG_SRCDIR([configure.ac]) 24AC_CONFIG_SRCDIR([configure.ac])
25AC_CONFIG_MACRO_DIR([m4]) 25AC_CONFIG_MACRO_DIR([m4])
diff --git a/legacy/emotion/emotion.pc.in b/legacy/emotion/emotion.pc.in
index 5126c3b0bc..652e20fbc5 100644
--- a/legacy/emotion/emotion.pc.in
+++ b/legacy/emotion/emotion.pc.in
@@ -5,7 +5,6 @@ includedir=@includedir@
5 5
6Name: emotion 6Name: emotion
7Description: Emotion evas based multimedia library 7Description: Emotion evas based multimedia library
8@pkgconfig_requires_private@: @requirement_emotion@
9Version: @VERSION@ 8Version: @VERSION@
10Libs: -L${libdir} -lemotion 9Libs: -L${libdir} -lemotion
11Cflags: -I${includedir}/emotion-@VMAJ@ 10Cflags: -I${includedir}/emotion-@VMAJ@
diff --git a/legacy/emotion/src/lib/Emotion.h b/legacy/emotion/src/lib/Emotion.h
index e7e214fac0..2a624dc4bc 100644
--- a/legacy/emotion/src/lib/Emotion.h
+++ b/legacy/emotion/src/lib/Emotion.h
@@ -243,6 +243,19 @@ typedef enum _Emotion_Aspect Emotion_Aspect; /**< Aspect ratio option. */
243extern "C" { 243extern "C" {
244#endif 244#endif
245 245
246#define EMOTION_VERSION_MAJOR 1
247#define EMOTION_VERSION_MINOR 0
248
249 typedef struct _Emotion_Version
250 {
251 int major;
252 int minor;
253 int micro;
254 int revision;
255 } Emotion_Version;
256
257 EAPI extern Emotion_Version *emotion_version;
258
246/* api calls available */ 259/* api calls available */
247 260
248/** 261/**
diff --git a/legacy/emotion/src/lib/emotion_main.c b/legacy/emotion/src/lib/emotion_main.c
index 81809474fc..7fd93e8f6c 100644
--- a/legacy/emotion/src/lib/emotion_main.c
+++ b/legacy/emotion/src/lib/emotion_main.c
@@ -22,6 +22,9 @@
22#include "Emotion.h" 22#include "Emotion.h"
23#include "emotion_private.h" 23#include "emotion_private.h"
24 24
25static Emotion_Version _version = { VMAJ, VMIN, VMIC, VREV };
26EAPI Emotion_Version *emotion_version = &_version;
27
25EAPI int EMOTION_WEBCAM_UPDATE = 0; 28EAPI int EMOTION_WEBCAM_UPDATE = 0;
26 29
27struct ext_match_s 30struct ext_match_s