sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (b0225402b3507586fd3de3e91d0f92c3241ce0d2)
- From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (b0225402b3507586fd3de3e91d0f92c3241ce0d2)
- Date: Sun, 19 Nov 2006 10:12:10 -0600
GIT changes to master grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:
video/kino/DEPENDS | 8 ++++----
video/kino/HISTORY | 4 ++++
video/kino/PREPARE | 1 -
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit b0225402b3507586fd3de3e91d0f92c3241ce0d2
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>
kino: disable ffmpeg support, bug #13204
diff --git a/video/kino/DEPENDS b/video/kino/DEPENDS
index 3256d4e..161e8ca 100755
--- a/video/kino/DEPENDS
+++ b/video/kino/DEPENDS
@@ -5,8 +5,8 @@ depends libiec61883 &&
depends libsamplerate &&
depends xml-parser-expat &&
-if [ "$KINO_FFMPEG" == "y" ]; then
- depends ffmpeg-svn '--with-avcodec'
-else
+#if [ "$KINO_FFMPEG" == "y" ]; then
+# depends ffmpeg-svn '--with-avcodec'
+#else
depends libdv
-fi
+#fi
diff --git a/video/kino/HISTORY b/video/kino/HISTORY
index 24a9391..792ae91 100644
--- a/video/kino/HISTORY
+++ b/video/kino/HISTORY
@@ -1,3 +1,7 @@
+2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PREPARE, DEPENDS: removed ffmpeg option as it's not working anymore,
+ bug #13204
+
2006-10-31 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 0.9.3
diff --git a/video/kino/PREPARE b/video/kino/PREPARE
deleted file mode 100755
index ada50f2..0000000
--- a/video/kino/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query KINO_FFMPEG "Use ffmpeg instead of libdv for video coding?" n
- [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (b0225402b3507586fd3de3e91d0f92c3241ce0d2), Arwed v. Merkatz, 11/19/2006
Archive powered by MHonArc 2.6.24.