Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (78055afc039b9142d5966fa594dde24205457fd4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (78055afc039b9142d5966fa594dde24205457fd4)
  • Date: Sun, 15 Jul 2012 00:13:11 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

video-libs/libfame/BUILD | 5 ++
video-libs/libfame/HISTORY | 6 +++
video-libs/libfame/PRE_BUILD | 10 +++++
video-libs/libfame/libfame-0.9.1-fstrict-aliasing.patch | 32
++++++++++++++++
video-libs/libfame/libfame-0.9.1-underquoted.patch | 12 ++++++
video-libs/libfame/libfame-0.9.1-x86_64.patch | 15 +++++++
6 files changed, 80 insertions(+)

New commits:
commit 78055afc039b9142d5966fa594dde24205457fd4
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

libfame: fix build

* PRE_BUILD: added to apply patches and run autoreconf
* BUILD: added to pass sse and mmx flags
* libfame-0.9.1-fstrict-aliasing.patch, libfame-0.9.1-underquoted.patch,
libfame-0.9.1-x86_64.patch: added, from RPMforge. Fixes build.

diff --git a/video-libs/libfame/BUILD b/video-libs/libfame/BUILD
new file mode 100755
index 0000000..01c03c5
--- /dev/null
+++ b/video-libs/libfame/BUILD
@@ -0,0 +1,5 @@
+if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 || ${SMGL_COMPAT_ARCHS[1]} == ia32
]]; then
+ OPTS="--enable-sse --enable-mmx $OPTS"
+fi &&
+
+default_build
diff --git a/video-libs/libfame/HISTORY b/video-libs/libfame/HISTORY
index 78da8e6..81850a3 100644
--- a/video-libs/libfame/HISTORY
+++ b/video-libs/libfame/HISTORY
@@ -1,2 +1,8 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added to apply patches and run autoreconf
+ * BUILD: added to pass sse and mmx flags
+ * libfame-0.9.1-fstrict-aliasing.patch,
libfame-0.9.1-underquoted.patch, libfame-0.9.1-x86_64.patch:
+ added, from RPMforge. Fixes build.
+
2007-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, HISTORY: created spell
diff --git a/video-libs/libfame/PRE_BUILD b/video-libs/libfame/PRE_BUILD
new file mode 100755
index 0000000..78a63f9
--- /dev/null
+++ b/video-libs/libfame/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/libfame-0.9.1-fstrict-aliasing.patch &&
+patch -p1 < $SPELL_DIRECTORY/libfame-0.9.1-underquoted.patch &&
+patch -p1 < $SPELL_DIRECTORY/libfame-0.9.1-x86_64.patch &&
+
+# Needed for autoreconf
+touch NEWS ChangeLog
+autoreconf -f -i
diff --git a/video-libs/libfame/libfame-0.9.1-fstrict-aliasing.patch
b/video-libs/libfame/libfame-0.9.1-fstrict-aliasing.patch
new file mode 100644
index 0000000..f9ddcda
--- /dev/null
+++ b/video-libs/libfame/libfame-0.9.1-fstrict-aliasing.patch
@@ -0,0 +1,32 @@
+diff -Naupr libfame-0.9.1.orig/configure.in libfame-0.9.1/configure.in
+--- libfame-0.9.1.orig/configure.in 2004-02-11 14:12:24.000000000 +0100
++++ libfame-0.9.1/configure.in 2004-10-25 11:49:01.654265064 +0200
+@@ -97,26 +97,9 @@ dnl See if we need to pass -lm for the m
+ AC_CHECK_LIB(m, sqrt, LIBS="$LIBS -lm")
+
+ dnl Optimize
++dnl enable -fstrict-aliasing unconditionally
+ if test x$ac_cv_prog_gcc = xyes; then
+- CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops
-ffast-math"
+-
+-dnl -fstrict-aliasing doesn't seem to be supported by gcc < 2.95
+- gcc_major_version=`$CC --version | \
+- sed -e 's,[[^0-9.]],,g' -e
's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- gcc_minor_version=`$CC --version | \
+- sed -e 's,[[^0-9.]],,g' -e
's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- gcc_micro_version=`$CC --version | \
+- sed -e 's,[[^0-9.]],,g' -e
's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+- dnl ok, I must admit I don't know how to do or/and ;)
+- if test $gcc_major_version -eq 2; then
+- if test $gcc_minor_version -gt 94; then
+- CFLAGS="$CFLAGS -fstrict-aliasing"
+- fi
+- fi
+- if test $gcc_major_version -gt 2; then
+- CFLAGS="$CFLAGS -fstrict-aliasing"
+- fi
++ CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops
-ffast-math -fstrict-aliasing"
+ fi
+
+ dnl Check for debugging support
diff --git a/video-libs/libfame/libfame-0.9.1-underquoted.patch
b/video-libs/libfame/libfame-0.9.1-underquoted.patch
new file mode 100644
index 0000000..62f0d4b
--- /dev/null
+++ b/video-libs/libfame/libfame-0.9.1-underquoted.patch
@@ -0,0 +1,12 @@
+diff -Naupr libfame-0.9.1.orig/libfame.m4.in libfame-0.9.1/libfame.m4.in
+--- libfame-0.9.1.orig/libfame.m4.in 2001-11-20 12:56:37.000000000 +0100
++++ libfame-0.9.1/libfame.m4.in 2006-09-18 20:38:20.000000000 +0200
+@@ -3,7 +3,7 @@ dnl Test for libfame, and define LIBFAME
+ dnl Vivien Chappelier 12/11/00
+ dnl stolen from ORBit autoconf
+ dnl
+-AC_DEFUN(AM_PATH_LIBFAME,
++AC_DEFUN([AM_PATH_LIBFAME],
+ [dnl
+ dnl Get the cflags and libraries from the libfame-config script
+ dnl
diff --git a/video-libs/libfame/libfame-0.9.1-x86_64.patch
b/video-libs/libfame/libfame-0.9.1-x86_64.patch
new file mode 100644
index 0000000..0abe4be
--- /dev/null
+++ b/video-libs/libfame/libfame-0.9.1-x86_64.patch
@@ -0,0 +1,15 @@
+diff -Naupr libfame-0.9.1.orig/src/fame_malloc.c
libfame-0.9.1/src/fame_malloc.c
+--- libfame-0.9.1.orig/src/fame_malloc.c 2003-06-20 14:40:30.000000000
+0200
++++ libfame-0.9.1/src/fame_malloc.c 2005-09-30 11:08:48.000000000 +0200
+@@ -36,9 +36,9 @@ void* fame_malloc(size_t size)
+ */
+
+ ptr = (unsigned char*) malloc(size+ALIGN);
+- aligned = (unsigned char*) (((unsigned int)ptr & (~(ALIGN-1))) + ALIGN );
++ aligned = (unsigned char*) (((unsigned long)ptr &(~(ALIGN-1))) + ALIGN );
+ padding = aligned - 1;
+- *padding = (ALIGN-1) - ((unsigned int)ptr & (ALIGN-1));
++ *padding = (ALIGN-1) - ((unsigned long)ptr & (ALIGN-1));
+
+ return ((void*)aligned);
+ }



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (78055afc039b9142d5966fa594dde24205457fd4), Sukneet Basuta, 07/15/2012

Archive powered by MHonArc 2.6.24.

Top of Page