Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (139cf57cab919f3f2145302de8bc1afa9c031116)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (139cf57cab919f3f2145302de8bc1afa9c031116)
  • Date: Sat, 4 Jul 2009 10:00:34 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

dev/null |binary
disk/cdrdao/DETAILS | 8 +++--
disk/cdrdao/HISTORY | 8 +++++
disk/cdrdao/PRE_BUILD | 2 -
disk/cdrdao/cdrdao-1.2.2.tar.bz2.sig | 0
disk/cdrdao/gcc43.patch | 50
-----------------------------------
disk/cdrdao/gcc44.patch | 23 ++++++++++++++++
disk/udev/HISTORY | 3 ++
disk/udev/udev.missing | 1
9 files changed, 40 insertions(+), 55 deletions(-)

New commits:
commit 139cf57cab919f3f2145302de8bc1afa9c031116
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cdrdao: => 1.2.3rc2

commit 1bff22b09d27e6c5d86206e3a9ea3d4b0ab17678
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

udev - do not create /dev/raw1394

diff --git a/disk/cdrdao/DETAILS b/disk/cdrdao/DETAILS
index f3d5ca3..aa636e5 100755
--- a/disk/cdrdao/DETAILS
+++ b/disk/cdrdao/DETAILS
@@ -1,5 +1,5 @@
SPELL=cdrdao
- VERSION=${VERSION:=1.2.2}
+ VERSION=1.2.3rc2
if [ "$CVS" == "y" ]; then
if [ "$CDRDAO_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
@@ -13,9 +13,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-sfcvs
SOURCE_IGNORE=volatile
else
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:f52929a7b050140030b62cf43292c21b3d227d7be3b8931d7c91bf09b4a02220f2f3a7ed9b3940a03c3b313cdf7115edacaf1d7e39cf321cdc7e69db613258d5
+# SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://www.poolshark.org/src/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
fi
WEB_SITE=http://cdrdao.sourceforge.net/index.html
ENTERED=20020201
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index 859cc65..beb26ea 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,11 @@
+2009-07-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.3rc2
+ also fixes bug #15259
+ temporary url
+ * gcc 4.3 patch: removed
+ * gcc44.patch: added
+ * PRE_BUILD: apply new patch
+
2008-06-04 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: only non-cvs branch needs in gcc 4.3 patch

diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
index 477788a..e6d5517 100755
--- a/disk/cdrdao/PRE_BUILD
+++ b/disk/cdrdao/PRE_BUILD
@@ -3,5 +3,5 @@ cd $SOURCE_DIRECTORY &&

if [ "$CVS" != "y" ]
then
- patch -p1 < $SPELL_DIRECTORY/gcc43.patch
+ patch -p1 < $SPELL_DIRECTORY/gcc44.patch
fi
diff --git a/disk/cdrdao/cdrdao-1.2.2.tar.bz2.sig
b/disk/cdrdao/cdrdao-1.2.2.tar.bz2.sig
deleted file mode 100644
index 55bfcd8..0000000
Binary files a/disk/cdrdao/cdrdao-1.2.2.tar.bz2.sig and /dev/null differ
diff --git a/disk/cdrdao/gcc43.patch b/disk/cdrdao/gcc43.patch
deleted file mode 100644
index 3f8e96a..0000000
--- a/disk/cdrdao/gcc43.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- cdrdao-1.2.2.orig/trackdb/FormatConverter.cc 2005-05-10
00:55:28.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/FormatConverter.cc 2008-03-07 11:14:07.000000000
+0000
-@@ -22,6 +22,7 @@
- #include <ao/ao.h>
- #endif
- #include <fstream>
-+#include <cstring>
-
- #include "config.h"
- #include "util.h"
---- cdrdao-1.2.2.orig/trackdb/FormatOgg.cc 2005-04-22 02:01:46.000000000
+0000
-+++ cdrdao-1.2.2/trackdb/FormatOgg.cc 2008-03-07 11:14:07.000000000 +0000
-@@ -18,6 +18,7 @@
- */
-
- #include <stdio.h>
-+#include <cstring>
-
- #include "util.h"
- #include "FormatOgg.h"
---- cdrdao-1.2.2.orig/trackdb/TempFileManager.cc 2005-04-22
02:01:46.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/TempFileManager.cc 2008-03-07 11:14:07.000000000
+0000
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <cstring>
-
- #define DEFAULT_TEMP_PATH "/tmp/"
-
---- cdrdao-1.2.2.orig/xdao/AudioCDProject.cc 2006-09-18 10:42:26.000000000
+0000
-+++ cdrdao-1.2.2/xdao/AudioCDProject.cc 2008-03-07 11:15:26.000000000
+0000
-@@ -18,6 +18,7 @@
- */
-
- #include <assert.h>
-+#include <cstring>
- #include <gtkmm.h>
- #include <libgnome/gnome-i18n.h>
-
---- cdrdao-1.2.2.orig/xdao/TextEdit.cc 2004-02-12 01:13:32.000000000 +0000
-+++ cdrdao-1.2.2/xdao/TextEdit.cc 2008-03-07 11:14:07.000000000 +0000
-@@ -21,6 +21,7 @@
-
- #include <stddef.h>
- #include <ctype.h>
-+#include <cstring>
-
- TextEdit::TextEdit(const char *sample) : Gtk::Entry()
- {
diff --git a/disk/cdrdao/gcc44.patch b/disk/cdrdao/gcc44.patch
new file mode 100644
index 0000000..b748314
--- /dev/null
+++ b/disk/cdrdao/gcc44.patch
@@ -0,0 +1,23 @@
+--- cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~ 2008-02-17
14:05:05.000000000 +0100
++++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc 2009-04-07 09:05:41.000000000
+0200
+@@ -20,6 +20,7 @@
+ #include "TempFileManager.h"
+ #include "log.h"
+
++#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- cdrdao-1.2.3rc2/dao/CdrDriver.cc~ 2009-02-21 11:01:32.000000000 +0100
++++ cdrdao-1.2.3rc2/dao/CdrDriver.cc 2009-04-07 09:07:14.000000000 +0200
+@@ -2114,8 +2114,8 @@
+ ret = 1;
+ }
+ else {
+- if ((caps & CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
+- ret = 1;
++ if ((caps & (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
++ ret = 1;
+ }
+ break;
+
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 88fbeac..053298c 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2009-07-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * udev.missing: don't create raw1394, udev does it now
+
2009-06-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=3
* BUILD: use correct libexecdir, rootlibdir, sbindir
diff --git a/disk/udev/udev.missing b/disk/udev/udev.missing
index 194156d..4a210ed 100644
--- a/disk/udev/udev.missing
+++ b/disk/udev/udev.missing
@@ -30,4 +30,3 @@ nvidia5:c:195:5:0666:root:root
nvidia6:c:195:6:0666:root:root
nvidia7:c:195:7:0666:root:root
nvidiactl:c:195:255:0666:root:root
-raw1394:c:171:0:0660:root:firewire



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (139cf57cab919f3f2145302de8bc1afa9c031116), Treeve Jelbert, 07/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page