[SM-Commit] GIT changes to master grimoire by Robin Cook (95a432d53798d97c81c67d7719396bb8904f0d4c)

Robin Cook scm at sourcemage.org
Wed Aug 17 19:51:42 EDT 2011


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 video-libs/dirac/HISTORY      |    3 +++
 video-libs/dirac/PRE_BUILD    |    4 +++-
 video-libs/dirac/Werror.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 95a432d53798d97c81c67d7719396bb8904f0d4c
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    dirac: added patch to remove -Werror

diff --git a/video-libs/dirac/HISTORY b/video-libs/dirac/HISTORY
index 86f96e6..a5e6152 100644
--- a/video-libs/dirac/HISTORY
+++ b/video-libs/dirac/HISTORY
@@ -1,3 +1,6 @@
+2011-08-17 Robin Cook <rcook at wyrms.net>
+	* PRE_BUILD: added patch to remove -Werror
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/video-libs/dirac/PRE_BUILD b/video-libs/dirac/PRE_BUILD
index cc198a7..8248ee6 100755
--- a/video-libs/dirac/PRE_BUILD
+++ b/video-libs/dirac/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build      &&
 cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.5.diff
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.5.diff  &&
+
+patch -p1 < $SCRIPT_DIRECTORY/Werror.patch
diff --git a/video-libs/dirac/Werror.patch b/video-libs/dirac/Werror.patch
new file mode 100644
index 0000000..8df1400
--- /dev/null
+++ b/video-libs/dirac/Werror.patch
@@ -0,0 +1,42 @@
+diff -ur dirac-1.0.2/configure dirac-mod/configure
+--- dirac-1.0.2/configure	2009-02-10 19:43:40.000000000 -0600
++++ dirac-mod/configure	2011-08-11 19:02:20.545001160 -0500
+@@ -19910,7 +19910,7 @@
+     else
+ 	:
+     fi
+-		TRY_CFLAGS="$OPT_CFLAGS -Werror"
++		TRY_CFLAGS="$OPT_CFLAGS"
+ 		{ $as_echo "$as_me:$LINENO: checking if $CXX supports $TRY_CFLAGS $CXXFLAGS flags" >&5
+ $as_echo_n "checking if $CXX supports $TRY_CFLAGS $CXXFLAGS flags... " >&6; }
+ 	SAVE_CXXFLAGS="$CXXFLAGS"
+@@ -20211,7 +20211,7 @@
+ 			CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[0-9]*//g'`
+ 			CXXFLAGS="-DDIRAC_DEBUG -g -O0 $CXXFLAGS"
+ 		    # report only errors and warnings as errors
+-		    CXXFLAGS="$CXXFLAGS -w1 -Werror -wr964 -wr963"
++		    CXXFLAGS="$CXXFLAGS -w1 -wr964 -wr963"
+ 		    ;;
+ 	    cl*|CL*)
+ 		    # -Od turn off optimisation, -Z7 turn on debugging info
+diff -ur dirac-1.0.2/configure.ac dirac-mod/configure.ac
+--- dirac-1.0.2/configure.ac	2009-02-09 18:16:37.000000000 -0600
++++ dirac-mod/configure.ac	2011-08-11 19:02:50.493000929 -0500
+@@ -183,7 +183,7 @@
+ 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+ 		TRY_CFLAGS="$OPT_CFLAGS -Wall"
+ 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+-		TRY_CFLAGS="$OPT_CFLAGS -Werror"
++		TRY_CFLAGS="$OPT_CFLAGS"
+ 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+ 		TRY_CFLAGS="$OPT_CFLAGS -W"
+ 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+@@ -219,7 +219,7 @@
+ 			CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[[0-9]]*//g'`
+ 			CXXFLAGS="-DDIRAC_DEBUG -g -O0 $CXXFLAGS"
+ 		    # report only errors and warnings as errors
+-		    CXXFLAGS="$CXXFLAGS -w1 -Werror -wr964 -wr963" 
++		    CXXFLAGS="$CXXFLAGS -w1 -wr964 -wr963" 
+ 		    ;;
+ 	    cl*|CL*)
+ 		    # -Od turn off optimisation, -Z7 turn on debugging info


More information about the SM-Commit mailing list