Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (efbb6524ec907c25bc665a5c163e38f723876ac8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (efbb6524ec907c25bc665a5c163e38f723876ac8)
  • Date: Tue, 19 Sep 2006 15:53:20 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

kde-core/kdemultimedia/HISTORY | 5 +++++
kde-core/kdemultimedia/PRE_BUILD | 4 ++++
kde-core/kdemultimedia/akode_fix.diff | 28 ++++++++++++++++++++++++++++
3 files changed, 37 insertions(+)

New commits:
commit efbb6524ec907c25bc665a5c163e38f723876ac8
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kdemultimedia: Fix patch for configure's akode option, bug #13126.

diff --git a/kde-core/kdemultimedia/HISTORY b/kde-core/kdemultimedia/HISTORY
index d3177c1..7d29496 100644
--- a/kde-core/kdemultimedia/HISTORY
+++ b/kde-core/kdemultimedia/HISTORY
@@ -1,4 +1,9 @@
2006-09-19 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Added. Apply patch to fix configure script's akode
+ option, fixes bug #13126.
+ * akode_fix.diff: Added.
+
+2006-09-19 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Changed jack to JACK-DRIVER.

2006-09-10 Anton Brondz <dinolinux AT sourcemage.org>
diff --git a/kde-core/kdemultimedia/PRE_BUILD
b/kde-core/kdemultimedia/PRE_BUILD
new file mode 100755
index 0000000..d62dd55
--- /dev/null
+++ b/kde-core/kdemultimedia/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SCRIPT_DIRECTORY/akode_fix.diff"
diff --git a/kde-core/kdemultimedia/akode_fix.diff
b/kde-core/kdemultimedia/akode_fix.diff
new file mode 100644
index 0000000..82d9ce0
--- /dev/null
+++ b/kde-core/kdemultimedia/akode_fix.diff
@@ -0,0 +1,28 @@
+--- configure 2006-07-24 18:15:49.000000000 +0300
++++ configure.new 2006-09-19 22:50:53.000000000 +0300
+@@ -36607,6 +36607,12 @@
+ LIBS="$kde_save_LIBS"
+
+
++ if test "x$with_akode" != xcheck && test "x$have_akode" != xyes; then
++ { { echo "$as_me:$LINENO: error: --with-akode was given, but test for
aKode failed" >&5
++echo "$as_me: error: --with-akode was given, but test for aKode failed"
>&2;}
++ { (exit 1); exit 1; }; }
++ fi
++fi
+
+
+ if test x$have_akode_mpeg = xyes; then
+@@ -36650,12 +36656,6 @@
+
+
+
+- if test "x$with_akode" != xcheck && test "x$have_akode" != xyes; then
+- { { echo "$as_me:$LINENO: error: --with-akode was given, but test for
aKode failed" >&5
+-echo "$as_me: error: --with-akode was given, but test for aKode failed"
>&2;}
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+
+ artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
+ # Extract the first word of "artsc-config", so it can be a program name
with args.



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (efbb6524ec907c25bc665a5c163e38f723876ac8), Juuso Alasuutari, 09/19/2006

Archive powered by MHonArc 2.6.24.

Top of Page