Return to patch-aa CVS log

Up to [cvs.NetBSD.org] / pkgsrc / multimedia / mplayer-share / patches

Annotation of pkgsrc/multimedia/mplayer-share/patches/patch-aa, Revision 1.14

1.13      kristerw    1: $NetBSD$
1.1       jmmv        2:
1.14    ! drochner    3: --- configure.orig     2006-06-11 20:35:47.000000000 +0200
        !             4: +++ configure
        !             5: @@ -493,7 +493,7 @@ for ac_option do
1.1       jmmv        6:      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
                      7:      ;;
                      8:    --with-extralibdir=*)
                      9: -    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
                     10: +    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
                     11:      ;;
                     12:    --enable-runtime-cpudetection)
                     13:      _runtime_cpudetection=yes
1.14    ! drochner   14: @@ -694,11 +694,11 @@ if test "$_skip_cc_check" != yes ; then
1.13      kristerw   15:    esac
                     16:    echores "$cc_version"
                     17:   else
                     18: - for _cc in "$_cc" gcc gcc-3.4 gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
                     19: + for _cc in "$_cc" gcc cc ; do
1.1       jmmv       20:    echocheck "$_cc version"
1.9       drochner   21:    cc_vendor=gnu
1.14    ! drochner   22:    cc_name=`$_cc -v 2>&1 | _tail 1 | cut -d ' ' -f 1`
        !            23: -  cc_version=`$_cc -dumpversion 2>&1`
1.1       jmmv       24: +  cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1`
                     25:    if test "$?" -gt 0; then
                     26:      cc_version="not found"
                     27:    fi
1.14    ! drochner   28: @@ -830,7 +830,7 @@ if x86 || x86_64 ; then
        !            29:    # gather more CPU information
1.9       drochner   30:    pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
                     31:    pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | _head 1`
                     32: -  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
                     33: +  pfamily=`$_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
                     34:    pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
                     35:    pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
1.2       salo       36:
1.14    ! drochner   37: @@ -4136,7 +4136,7 @@ fi
1.12      wiz        38:  if test "$_aa" = yes ; then
                     39:    _def_aa='#define HAVE_AA 1'
                     40:    if cygwin ; then
                     41: -    _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
                     42: +    _ld_aa=`${AALIB_CONFIG} --libs | cut -d " " -f 2,5,6`
                     43:    fi
                     44:    _vosrc="$_vosrc vo_aa.c"
                     45:    _vomodules="aa $_vomodules"