Subject: [blfs-support] Amarok-1.4.10 jumbo patch + small fix SDL-1.2.24
Hi, if I apply this patch to amarok 1.4.10 it compiles out the box
(lot's of warnings but it works).
It's a combination of various patches found around the net:
amarok-1.4.10-gcc44.patch
amarok-1.4.10-covermanager-fix.patch
amarok-1.4.10-wikipedia.patch
amarok-1.4.10-gcc-4.6.patch
amarok-1.4.10-osd.patch

some fiddling with ruby rbconfig, some libraries weren't found on my
system (see acinclude.m4 part in the diff file)
apply the patch and with this ./configure it works (at least form me :-) ).
./configure --prefix=$(kde-config --prefix) \
--sysconfdir=/etc/kde \
--disable-debug \
--without-daap \
--disable-dependency-tracking
--with-extra-includes=/usr/local/qt3/include/tqt

and I must apply this patch to SDL-1.2.24 because of sdl-config giving
a -rpath what it should not do (according to people from debian):
------------
diff -uar SDL-1.2.14/configure.in SDL-1.2.14a/configure.in
--- SDL-1.2.14/configure.in 2009-10-17 19:35:03.000000000 +0200
+++ SDL-1.2.14a/configure.in 2012-02-18 10:07:01.024566209 +0100
@@ -2845,9 +2845,6 @@
# Set runtime shared library paths as needed

if test "x$enable_rpath" = "xyes"; then
- if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH =
linux -o $ARCH = netbsd; then
- SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
- fi
if test $ARCH = solaris; then
SDL_RLD_FLAGS="-R\${libdir}"
fi
diff -uar SDL-1.2.14/src/video/mmx.h SDL-1.2.14a/src/video/mmx.h
--- SDL-1.2.14/src/video/mmx.h 2009-10-13 01:07:15.000000000 +0200
+++ SDL-1.2.14a/src/video/mmx.h 2012-02-18 10:06:44.325567120 +0100
@@ -291,7 +291,7 @@
printf(#mem "=0x%08x%08x) => ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ (#op " %%" #reg ", %0" \
- : "=X" (mem) \
+ : "=m" (mem) \
: /* nothing */ ); \
mmx_trace = (mem); \
printf(#mem "=0x%08x%08x\n", \
EOF
cat mmx.diff|patch -p0
./autogen.sh
./configure --prefix=/usr
-----------------------
--
http://linuxfromscratch.org/mailman/listinfo/blfs-support
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
(C)2011 mailinglist-archive.com