diff options
Diffstat (limited to 'multimedia/mythtv-frontend/files/patch-configure')
| -rw-r--r-- | multimedia/mythtv-frontend/files/patch-configure | 54 |
1 files changed, 40 insertions, 14 deletions
diff --git a/multimedia/mythtv-frontend/files/patch-configure b/multimedia/mythtv-frontend/files/patch-configure index 476f2b1a6362..40981fe8fcd8 100644 --- a/multimedia/mythtv-frontend/files/patch-configure +++ b/multimedia/mythtv-frontend/files/patch-configure @@ -1,31 +1,49 @@ ---- configure.orig 2010-03-30 00:09:16.000000000 +0200 -+++ configure 2010-04-06 19:10:20.000000000 +0200 -@@ -666,21 +666,21 @@ +--- configure.orig 2010-11-08 18:40:43.000000000 +0100 ++++ configure 2010-11-11 19:23:31.000000000 +0100 +@@ -691,21 +691,21 @@ log check_cc "$@" cat > $TMPC log_file $TMPC -- check_cmd $cc $CPPFLAGS $CFLAGS $OPTFLAGS "$@" -c -o $TMPO $TMPC -+ check_cmd $cc $CPPFLAGS $CFLAGS $OPTFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC +- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC ++ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC } check_cpp(){ log check_cpp "$@" cat > $TMPC log_file $TMPC -- check_cmd $cc $CPPFLAGS $CFLAGS $OPTFLAGS "$@" -E -o $TMPO $TMPC -+ check_cmd $cc $CPPFLAGS $CFLAGS $OPTFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC +- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC ++ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC } check_cxx(){ log check_cxx "$@" cat > $TMPCXX log_file $TMPCXX -- check_cmd $cxx $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX -+ check_cmd $cxx $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX +- check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX ++ check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX } check_as(){ -@@ -2841,7 +2841,6 @@ +@@ -1865,7 +1865,7 @@ + + # machine + arch_default=$(uname -m) +-cpu="generic" ++cpu="i686" + processor=`uname -p 2>/dev/null` + processor_flags="" + tune="generic" +@@ -2826,7 +2826,7 @@ + i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|k8-sse3|opteron-sse3|athlon64-sse3|core2|amdfam10|barcelona|atom) + cpuflags="-march=$cpu" + enable cmov +- enable fast_cmov ++ disable fast_cmov + ;; + # targets that do support conditional mov but on which it's slow + pentium4|pentium4m|prescott|nocona) +@@ -3026,7 +3026,6 @@ enable malloc_aligned # Workaround compile errors from missing u_int/uint def CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` @@ -33,12 +51,20 @@ enable backend ;; bsd/os) -@@ -4581,6 +4580,8 @@ +@@ -4742,6 +4741,8 @@ # directories, it cannot be modified. - QMAKE_LIBDIR_QT -= $libdir - LATE_LIBS += -L$libdir + QMAKE_LIBDIR_QT-=${sysroot}${libdir} + LATE_LIBS+=-L${sysroot}${libdir} +CONFIG_INCLUDEPATH= +FREETYPE_CFLAGS -= -I/usr/local/include EOF - diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1 + #echo "endif # FFMPEG_CONFIG_MAK" >> config.mak +@@ -4778,6 +4779,7 @@ + BINDIR=\$(INSTALL_ROOT)$bindir + DATADIR=\$(INSTALL_ROOT)$datadir + MANDIR=\$(INSTALL_ROOT)$mandir ++CFLAGS+=-I/usr/local/include + endif # FFMPEG_CONFIG_MAK + EOF + |