sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Robin Cook (6c9b8de7e03f578505113f059daa74ad21a6c7f6)
- From: Robin Cook <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (6c9b8de7e03f578505113f059daa74ad21a6c7f6)
- Date: Tue, 11 Jan 2011 19:14:23 -0600
GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:
disk/cdrdao/BUILD | 18 ++++++++++--------
disk/cdrdao/HISTORY | 4 ++++
disk/cdrdao/PRE_BUILD | 4 +++-
video/mlt/DEPENDS | 2 +-
video/mlt/HISTORY | 3 +++
5 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit 6c9b8de7e03f578505113f059daa74ad21a6c7f6
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
mlt: re-did frei0r entry to fix whatever had gotten wonky
commit eb07e10171ece2069f2ad52cbeb20200423de307
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
cdrdao: added if statments to get CVS version to compile
diff --git a/disk/cdrdao/BUILD b/disk/cdrdao/BUILD
index 83a2ead..0fec124 100755
--- a/disk/cdrdao/BUILD
+++ b/disk/cdrdao/BUILD
@@ -1,11 +1,13 @@
-##### Patch needed for building on x86_64 ######
-ARCH=$(uname -m) &&
-if [ "${ARCH:0:6}" = "x86_64" ]; then
- cd scsilib/RULES &&
- cp i686-linux-cc.rul x86_64-linux-cc.rul &&
- cd $SOURCE_DIRECTORY
-fi &&
-################################################
+if [ "$CVS" == "n" ]; then
+ ##### Patch needed for building on x86_64 ######
+ ARCH=$(uname -m) &&
+ if [ "${ARCH:0:6}" = "x86_64" ]; then
+ cd scsilib/RULES
&&
+ cp i686-linux-cc.rul x86_64-linux-cc.rul
&&
+ cd $SOURCE_DIRECTORY
+ fi
+ ################################################
+fi &&
if [ "$CVS" == "y" ]
then
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index 43265af..950969e 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,7 @@
+2011-01-11 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added if statement for CVS
+ * BUILD: added if statement for CVS
+
2011-01-05 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply the patch
* stat.patch: added, to fix compilation with recent headers
diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
index e0a0900..18d7ab7 100755
--- a/disk/cdrdao/PRE_BUILD
+++ b/disk/cdrdao/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < "$SPELL_DIRECTORY/stat.patch"
+if [ "$CVS" == "n" ]; then
+ patch -p0 < "$SPELL_DIRECTORY/stat.patch"
+fi
diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index 6a5624a..2bc1cf9 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -53,7 +53,7 @@ optional_depends xine-lib \
"Enable Xine Module" &&
optional_depends frei0r-plugins \
- "--enable-frei0r" \
+ "--enable-frei0r" \
"--disable-frei0r" \
"Enable the frei0r module?" &&
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 102a7fb..166c544 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,6 @@
+2011-01-11 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: redid fier0r-plugin optional as was failing
+
2010-12-10 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added frei0r-plugin as optional
- [SM-Commit] GIT changes to master grimoire by Robin Cook (6c9b8de7e03f578505113f059daa74ad21a6c7f6), Robin Cook, 01/11/2011
Archive powered by MHonArc 2.6.24.