Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (a46714a84eb0db9d59516e52528070c42d30c5d8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (a46714a84eb0db9d59516e52528070c42d30c5d8)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (a46714a84eb0db9d59516e52528070c42d30c5d8)
  • Date: Fri, 4 Jan 2013 18:21:11 -0600
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

e-17/eet/CONFLICTS | 1
e-17/eet/HISTORY | 3 ++
e-17/efl/CONFLICTS | 14 +++++------
e-17/efl/DEPENDS | 59
+++++++++++++++++++++++++++++++++++++++++++++++++-
e-17/efl/HISTORY | 9 +++++++
e-17/efl/INSTALL | 2 +
e-17/eina/CONFLICTS | 1
e-17/eina/HISTORY | 3 ++
e-17/embryo/CONFLICTS | 1
e-17/embryo/HISTORY | 3 ++
e-17/eobj/CONFLICTS | 1
e-17/eobj/HISTORY | 3 ++
e-17/ephysics/DEPENDS | 2 -
e-17/ephysics/HISTORY | 3 ++
e-17/evas/CONFLICTS | 1
e-17/evas/HISTORY | 3 ++
16 files changed, 100 insertions(+), 9 deletions(-)

New commits:
commit a46714a84eb0db9d59516e52528070c42d30c5d8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: Conflicts with efl

commit f83c8deb95ae4254a2d7209ef698fc364e7e4b43
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eobj: Conflicts with efl

commit 2b3cda104f5a79692f58281b6618041225b16b8d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

embryo: Conflicts with efl

commit 1ad4890f5d9fe0f54a02a8943c7338bdd53873d6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eina: Conflicts with efl

commit b10c90b229e72f8ffa0b780eb7276b052769980b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eet: Conflicts with efl

commit 16bcb6a61f36d0fa7366d6da9097afd98c502b91
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ephysics: typo efs -> efl

commit 1100cb575c89748a246744116a95baba8538911b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Sort CONFLICTS for easier checking what's missing

commit 3e6303b2e74bb828f5acaa620ae2b83f5389b04e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Spell physics correctly :p

commit 638561fdf5db4af1f9fee166d0ab1ac6553e826a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Optionally depend on giflib and tiff for image loaders.

commit 5f62c8eabe2ad01bd9cb5af2e6d7e0e41c46cbf1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Fails with multiple make jobs, use make_single

commit 8b82fb6dde780c81f097d58041352b754259e8e6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: More optional depends
fontconfig, sdl, pixman, curl tslib, pulseaudio, and util-linux

commit 3d029fa46e7edcac573fd3b6c8a62efebbd77cf6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: bullet is optional, not required

commit 5dfc2514efed678f64428bccd52c1ed80a16feb9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Cleanup formatting

commit 3fb9eee8653459070ba8e08c683b838c33aa8694
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Depends on bullet

configure: Start EPhysics checks
configure: error: pkg-config missing bullet >= 2.80

commit 010ce84dcc5fa4f177429ce8219fc92106ce152e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Depends on valgrind

configure: Start Eina checks
checking for VALGRIND... no
configure: error: Package requirements (valgrind >= 2.4.0) were not met:

diff --git a/e-17/eet/CONFLICTS b/e-17/eet/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/eet/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/eet/HISTORY b/e-17/eet/HISTORY
index 2f51014..040fdfb 100644
--- a/e-17/eet/HISTORY
+++ b/e-17/eet/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with efl
+
2011-11-12 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: added to ask which crypto library to use
* DEPENDS: added depends and modifed crypto depends
diff --git a/e-17/efl/CONFLICTS b/e-17/efl/CONFLICTS
index 06ce2ec..46dd403 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -1,9 +1,9 @@
-conflicts eina &&
-conflicts eet &&
-conflicts embryo &&
-conflicts evas &&
conflicts ecore &&
-conflicts eio &&
-conflicts efreet &&
conflicts edbus &&
-conflicts eobj
+conflicts eet &&
+conflicts efreet &&
+conflicts eina &&
+conflicts eio &&
+conflicts embryo &&
+conflicts eobj &&
+conflicts evas
diff --git a/e-17/efl/DEPENDS b/e-17/efl/DEPENDS
index 859d9d4..a734ede 100755
--- a/e-17/efl/DEPENDS
+++ b/e-17/efl/DEPENDS
@@ -1,10 +1,67 @@
depends fribidi &&
depends libxp &&
depends subversion &&
+depends valgrind &&

optional_depends check "" "" "Use check?" &&

optional_depends doxygen \
"--enable-doc" \
"--disable-doc" \
- "Build documentation?"
+ "Build documentation?" &&
+
+optional_depends bullet \
+ '--enable-physics' \
+ '--disable-physics' \
+ 'for physics effects and support (recommended)' \
+ 'games' &&
+
+optional_depends curl \
+ '--enable-curl' \
+ '--disable-curl' \
+ 'for curl download support (recommended)' &&
+
+optional_depends fontconfig \
+ '--enable-fontconfig' \
+ '--disable-fontconfig' \
+ 'use fontconfig for finding fonts (recommended)?' &&
+
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (recommended)' &&
+
+optional_depends giflib \
+ '--enable-image-loader-gif' \
+ '--disable-image-loader-gif' \
+ 'for GIF image loader (recommended)' &&
+
+optional_depends pixman \
+ '--enable-pixman --enable-pixman-font --enable-pixman-rect
--enable-pixman-line --enable-pixman-poly --enable-pixman-image
--enable-pixman-image-scale-sample' \
+ '--disable-pixman' \
+ 'use pixman for software rendering (not recommended)?' &&
+
+optional_depends pulseaudio \
+ '--enable-pulseaudio' \
+ '--disable-pulseaudio' \
+ 'for PulseAudio sound support' &&
+
+optional_depends sdl \
+ '--enable-sdl' \
+ '--disable-sdl' \
+ 'for SDL rendering' &&
+
+optional_depends tiff \
+ '--enable-image-loader-tiff' \
+ '--disable-image-loader-tiff' \
+ 'for TIFF image loader' &&
+
+optional_depends tslib \
+ '--enable-tslib' \
+ '--disable-tslib' \
+ 'for touchscreen events' &&
+
+optional_depends util-linux \
+ '--enable-mount' \
+ '--disable-mount' \
+ 'for mount (libmount) support (recommended)'
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index 9807fe8..3d1002d 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,3 +1,11 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on valgrind
+ Optionally depends on bullet (in games)
+ Optionally depends on fontconfig, sdl, pixman, curl tslib,
+ pulseaudio, and util-linux
+ Optionally depend on giflib and tiff for image loaders.
+ * INSTALL: Fails with multiple make jobs, use make_single
+
2013-01-01 Ladislav Hagara <hgr AT vabo.cz>
* CONFLICTS: efreet and edbus added

@@ -13,3 +21,4 @@

2012-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD, CONFLICTS: spell created
+
diff --git a/e-17/efl/INSTALL b/e-17/efl/INSTALL
new file mode 100755
index 0000000..9d88c56
--- /dev/null
+++ b/e-17/efl/INSTALL
@@ -0,0 +1,2 @@
+make_single &&
+default_install
diff --git a/e-17/eina/CONFLICTS b/e-17/eina/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/eina/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/eina/HISTORY b/e-17/eina/HISTORY
index 41d52b7..316337f 100644
--- a/e-17/eina/HISTORY
+++ b/e-17/eina/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with efl
+
2011-11-12 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: corrected pthreads switch
* DEPENDS: added optional depends psiconv, doxygen, and valgrind
diff --git a/e-17/embryo/CONFLICTS b/e-17/embryo/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/embryo/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/embryo/HISTORY b/e-17/embryo/HISTORY
index ab47d74..4df0ba1 100644
--- a/e-17/embryo/HISTORY
+++ b/e-17/embryo/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with efl
+
2011-11-12 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added eina

diff --git a/e-17/eobj/CONFLICTS b/e-17/eobj/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/eobj/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/eobj/HISTORY b/e-17/eobj/HISTORY
index 9e8b0b1..bfdd5e6 100644
--- a/e-17/eobj/HISTORY
+++ b/e-17/eobj/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with efl
+
2012-10-14 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added eina and optional check and doxygen

diff --git a/e-17/ephysics/DEPENDS b/e-17/ephysics/DEPENDS
index e96f1ed..59a6316 100755
--- a/e-17/ephysics/DEPENDS
+++ b/e-17/ephysics/DEPENDS
@@ -1,4 +1,4 @@
-depends efs &&
+depends efl &&
depends ecore &&
depends bullet "" "" games &&

diff --git a/e-17/ephysics/HISTORY b/e-17/ephysics/HISTORY
index 5a800a3..07fd5cf 100644
--- a/e-17/ephysics/HISTORY
+++ b/e-17/ephysics/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: typo efs -> efl
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/evas/CONFLICTS b/e-17/evas/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/evas/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index c9bedd8..0985e7d 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with efl
+
2012-10-14 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added eobj as scm depends



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (a46714a84eb0db9d59516e52528070c42d30c5d8), Eric Sandall, 01/04/2013

Archive powered by MHonArc 2.6.24.

Top of Page