Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (156bebb4688cc4e3d29d99f0835fa4cdb9589906)
  • Date: Thu, 13 Mar 2008 22:43:35 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

e-17/enna/DEPENDS | 9 +++++++--
e-17/enna/HISTORY | 5 +++++
libs/lightmediascanner/DEPENDS | 4 ++++
libs/lightmediascanner/DETAILS | 13 +++++++++++++
libs/lightmediascanner/DOWNLOAD | 10 +++++++---
libs/lightmediascanner/HISTORY | 5 +++++
libs/lightmediascanner/PREPARE | 6 ++++++
libs/lightmediascanner/PRE_BUILD | 7 +++++++
8 files changed, 54 insertions(+), 5 deletions(-)

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

enna: Optionally depends on lightmediascanner, depends on sqlite, no
longer explicitly requires curl

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

lightmediascanner: Add git checkout option, default to using it (for
enna, only app we have which uses it)

diff --git a/e-17/enna/DEPENDS b/e-17/enna/DEPENDS
index 1fa4587..d6f32db 100755
--- a/e-17/enna/DEPENDS
+++ b/e-17/enna/DEPENDS
@@ -1,4 +1,3 @@
-depends curl &&
depends CVS &&
depends dbus &&
depends e-emotion &&
@@ -8,4 +7,10 @@ depends edje &&
depends eet &&
depends evas &&
depends libmusicbrainz &&
-depends libxml2
+depends libxml2 &&
+depends sqlite &&
+
+optional_depends 'lightmediascanner' \
+ '' \
+ '' \
+ 'for background media indexing'
diff --git a/e-17/enna/HISTORY b/e-17/enna/HISTORY
index 3351e9b..0d957d5 100644
--- a/e-17/enna/HISTORY
+++ b/e-17/enna/HISTORY
@@ -1,3 +1,8 @@
+2008-03-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on lightmediascanner for media indexing
+ Depends on sqlite
+ No longer explicitly requires curl
+
2008-01-23 Eric Sandall <sandalle AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, PRE_BUILD: Created

diff --git a/libs/lightmediascanner/DEPENDS b/libs/lightmediascanner/DEPENDS
index adc952a..77ab1cd 100755
--- a/libs/lightmediascanner/DEPENDS
+++ b/libs/lightmediascanner/DEPENDS
@@ -1,6 +1,10 @@
depends pkgconfig &&
depends sqlite &&

+if [[ "$LIGHTMEDIASCANNER_SCM" == "y" ]]; then
+ depends git
+fi &&
+
optional_depends 'jpeg' \
'--enable-jpeg' \
'--disable-jpeg' \
diff --git a/libs/lightmediascanner/DETAILS b/libs/lightmediascanner/DETAILS
index a94b020..313c55c 100755
--- a/libs/lightmediascanner/DETAILS
+++ b/libs/lightmediascanner/DETAILS
@@ -1,9 +1,22 @@
SPELL=lightmediascanner
+if [[ "$LIGHTMEDIASCANNER_SCM" == "y" ]]; then
+ if [[ "$LIGHTMEDIASCANNER_SCM_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ FORCE_DOWNLOAD="on"
+ SOURCE_URL[0]=git://staff.get-e.org/users/barbieri/$SPELL:$SPELL-git
+ SOURCE_IGNORE=volatile
+else
VERSION=0.1.0.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://garage.maemo.org/frs/download.php/2837/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+fi
LICENSE[0]=GPL
KEYWORDS="libs"
WEB_SITE=http://lms.garage.maemo.org/
diff --git a/libs/lightmediascanner/DOWNLOAD b/libs/lightmediascanner/DOWNLOAD
index 5964ef1..bb1b809 100755
--- a/libs/lightmediascanner/DOWNLOAD
+++ b/libs/lightmediascanner/DOWNLOAD
@@ -2,7 +2,11 @@ if [[ -e ${SOURCE_CACHE}/${SOURCE} ]] ; then
message "${MESSAGE_COLOR}Found source file" \
"${FILE_COLOR}${SOURCE}${DEFAULT_COLOR}"
else
- message "${MESSAGE_COLOR}Downloading source file" \
- "${FILE_COLOR}${SOURCE}${DEFAULT_COLOR}" &&
- wget --no-check-certificate ${SOURCE_URL} -O ${SOURCE_CACHE}/${SOURCE}
+ if [[ "$LIGHTMEDIASCANNER_SCM" == "y" ]]; then
+ default_sorcery_download
+ else
+ message "${MESSAGE_COLOR}Downloading source file" \
+ "${FILE_COLOR}${SOURCE}${DEFAULT_COLOR}" &&
+ wget --no-check-certificate ${SOURCE_URL} -O ${SOURCE_CACHE}/${SOURCE}
+ fi
fi
diff --git a/libs/lightmediascanner/HISTORY b/libs/lightmediascanner/HISTORY
index c87807f..58a92f3 100644
--- a/libs/lightmediascanner/HISTORY
+++ b/libs/lightmediascanner/HISTORY
@@ -1,3 +1,8 @@
+2008-03-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PREPARE, DETAILS, PRE_BUILD: Query and configure SCM checkout via
git
+ * DOWNLOAD: Support git downloading via default_sorcery_download
+ * DEPENDS: Depend on git if we want to checkout via SCM
+
2008-03-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DOWNLOAD, CONFIGURE, DEPENDS, BUILD: Created

diff --git a/libs/lightmediascanner/PREPARE b/libs/lightmediascanner/PREPARE
new file mode 100755
index 0000000..149245a
--- /dev/null
+++ b/libs/lightmediascanner/PREPARE
@@ -0,0 +1,6 @@
+config_query LIGHTMEDIASCANNER_SCM 'Checkout latest development version?'
y &&
+
+if [[ "$LIGHTMEDIASCANNER_SCM" == "y" ]]; then
+ config_query LIGHTMEDIASCANNER_SCM_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/libs/lightmediascanner/PRE_BUILD
b/libs/lightmediascanner/PRE_BUILD
new file mode 100755
index 0000000..26c21fc
--- /dev/null
+++ b/libs/lightmediascanner/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+if [[ "$LIGHTMEDIASCANNER_SCM" == "y" ]]
+then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE="on" ./autogen.sh
+fi



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (156bebb4688cc4e3d29d99f0835fa4cdb9589906), Eric Sandall, 03/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page