diff options
Diffstat (limited to 'multimedia/mythtv/files/patch-configure')
| -rw-r--r-- | multimedia/mythtv/files/patch-configure | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure index ec18184b8f97..bf2acae42795 100644 --- a/multimedia/mythtv/files/patch-configure +++ b/multimedia/mythtv/files/patch-configure @@ -1,31 +1,39 @@ ---- configure.orig 2012-10-02 12:30:24.000000000 +0200 -+++ configure 2012-10-03 19:27:16.773415414 +0200 -@@ -731,21 +731,21 @@ +--- configure.orig 2013-09-18 20:06:08.000000000 +0000 ++++ configure 2013-10-18 11:11:10.000000000 +0000 +@@ -846,28 +846,28 @@ log check_cc "$@" cat > $TMPC log_file $TMPC -- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC -+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC +- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPC ++ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $CC_C $(cc_o $TMPO) $TMPC } check_cxx(){ log check_cxx "$@" cat > $TMPCPP log_file $TMPCPP -- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" -c -o $TMPO $TMPCPP -+ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCPP +- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP ++ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP + } + + check_ecxx(){ + log check_cxx "$@" + cat > $TMPCPP + log_file $TMPCPP +- check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP ++ check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP } check_cpp(){ log check_cpp "$@" cat > $TMPC log_file $TMPC -- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC -+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC +- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC ++ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $(cc_e $TMPO) $TMPC } - check_as(){ -@@ -2152,7 +2152,7 @@ + as_o(){ +@@ -2539,7 +2539,7 @@ # machine arch_default=$(uname -m) @@ -34,8 +42,8 @@ processor=`uname -p 2>/dev/null` processor_flags="" tune="generic" -@@ -3185,7 +3185,7 @@ - i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|amdfam10|barcelona|atom) +@@ -3931,7 +3931,7 @@ + i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*) cpuflags="-march=$cpu" enable cmov - enable fast_cmov @@ -43,7 +51,7 @@ ;; # targets that do support conditional mov but on which it's slow pentium4|pentium4m|prescott|nocona) -@@ -3401,7 +3401,6 @@ +@@ -4102,7 +4102,6 @@ append CCONFIG "freebsd" # Workaround compile errors from missing u_int/uint def CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` @@ -51,16 +59,15 @@ enable backend ;; bsd/os) -@@ -5427,6 +5426,8 @@ +@@ -6383,6 +6382,7 @@ QMAKE_LIBDIR_QT-=${sysroot}${libdir} QMAKE_LIBDIR-=${sysroot}${libdir} LATE_LIBS+=-L${sysroot}${libdir} -+CONFIG_INCLUDEPATH= +FREETYPE_CFLAGS-= -I/usr/local/include EOF #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK -@@ -5477,7 +5478,7 @@ +@@ -6435,7 +6435,7 @@ BINDIR=\$(INSTALL_ROOT)$bindir DATADIR=\$(INSTALL_ROOT)$datadir MANDIR=\$(INSTALL_ROOT)$mandir |