[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8db5b1a1801c0b6be0625edccebc122ecae0b38c)

Treeve Jelbert scm at sourcemage.org
Tue Oct 14 14:09:47 EDT 2008


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

 database/fbcopy/HISTORY              |    3 +++
 database/fbcopy/PRE_BUILD            |    7 +++++++
 database/fbexport/HISTORY            |    3 +++
 database/fbexport/PRE_BUILD          |   15 +++++++++++----
 xorg-driver/xf86-video-intel/DETAILS |    6 +++---
 xorg-driver/xf86-video-intel/HISTORY |    3 +++
 6 files changed, 30 insertions(+), 7 deletions(-)

New commits:
commit f16662ab437317c771c3835ce75d406a9d5f7f68
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    fbexport - fix gcc-4.3 issues

commit 376f057bc6754196f9fa977c18f344c427535b90
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    missing file

commit bc51cebe7013456f3d7b089dedd586135b9246de
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    fbcopy - fix gcc-4.3 issue

commit 972191e4a0e63b527696854972bb3f35821ea4b8
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "xf86-video-intel-2.4.2"

diff --git a/database/fbcopy/HISTORY b/database/fbcopy/HISTORY
index dd9e904..abbbe31 100755
--- a/database/fbcopy/HISTORY
+++ b/database/fbcopy/HISTORY
@@ -1,3 +1,6 @@
+2008-10-14 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, fix use of gcc-4.3.2
+
 2008-01-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.70
 	  new URL
diff --git a/database/fbcopy/PRE_BUILD b/database/fbcopy/PRE_BUILD
new file mode 100755
index 0000000..648b107
--- /dev/null
+++ b/database/fbcopy/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+# fix problem with gcc-4.3.2
+sed -i -e "/\<limits\>/ a\
+#include <cstring>
+#include <memory>
+" source/ibpp/core/_ibpp.h
diff --git a/database/fbexport/HISTORY b/database/fbexport/HISTORY
index 69f0f55..0754abf 100755
--- a/database/fbexport/HISTORY
+++ b/database/fbexport/HISTORY
@@ -1,3 +1,6 @@
+2008-10-14 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added - fix gcc-4.3 issues
+
 2008-02-17 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.70
 	  new url
diff --git a/database/fbexport/PRE_BUILD b/database/fbexport/PRE_BUILD
index d94dba7..ea0cd92 100755
--- a/database/fbexport/PRE_BUILD
+++ b/database/fbexport/PRE_BUILD
@@ -1,6 +1,13 @@
   default_pre_build                      &&
   cd $SOURCE_DIRECTORY                   &&
-sed -i "s|gds|fbclient|;s|/local||;s|-O3|$CFLAGS|" source/Makefile
-# fix make and gcc-4.1 problems
-#  sedit "s/RowImpl:://" src/ibpp/_internals.h  &&
-#  bzcat $SPELL_DIRECTORY/build.diff.bz2 | patch -p1
+# fix smgl issues
+sed -i "s|gds|fbclient|;s|/local||;s|-O3|$CXXFLAGS|" source/Makefile &&
+
+# fix problem with gcc-4.3.2
+sed -i -e "/\<limits\>/ a\
+#include <cstring>
+#include <memory>
+" source/ibpp/_ibpp.h  &&
+sed -i -e "/\<string\>/ a\
+#include <cstring>
+" source/FBExport.cpp
diff --git a/xorg-driver/xf86-video-intel/DETAILS b/xorg-driver/xf86-video-intel/DETAILS
index 73433d4..47286c3 100755
--- a/xorg-driver/xf86-video-intel/DETAILS
+++ b/xorg-driver/xf86-video-intel/DETAILS
@@ -1,10 +1,10 @@
            SPELL=xf86-video-intel
-         VERSION=2.4.1
-        XORG_VER=X11R7.1
+         VERSION=2.4.2
+      SOURCE_HASH=sha512:90e1a94c7cbb9b831fdb56625d9a6584d17c5637cbbcab32d134111a860516a1ffdc12a438729949db1c497c2a7e23274edc37c56628b84e4fb209985a5ab764
+       XORG_VER=X11R7.1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-     SOURCE_HASH=sha512:37f1a8d6efcc09818b54c2a3180f9d21d06883a40c6b2501d7cdf337f65dc33880325c921c718dfdc2ee7531a894fba9456ad05d37510165defd9ffbc7da5031
       LICENSE[0]=XCL
         WEB_SITE=http://xorg.freedesktop.org/wiki
          ENTERED=20070922
diff --git a/xorg-driver/xf86-video-intel/HISTORY b/xorg-driver/xf86-video-intel/HISTORY
index df69243..5b678bf 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,6 @@
+2008-10-14 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.4.2
+
 2008-08-22 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated spell to 2.4.1
 



More information about the SM-Commit mailing list