multimedia/x264-devel/patches/patch-aa

   1 $NetBSD: patch-aa,v 1.10 2010/05/07 09:34:43 drochner Exp $
   2
   3 --- configure.orig      2009-09-20 20:45:09.000000000 +0000
   4 +++ configure
   5 @@ -117,7 +117,7 @@ for opt do
   6              LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
   7              ;;
   8          --enable-pthread)
   9 -            pthread="auto" # can't skip detection, since it differs by OS
  10 +            pthread="yes"
  11              ;;
  12          --disable-pthread)
  13              pthread="no"
  14 @@ -137,7 +137,7 @@ for opt do
  15              shared="yes"
  16              ;;
  17          --enable-visualize)
  18 -            LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
  19 +            LDFLAGS="$LDFLAGS -lX11"
  20              CFLAGS="$CFLAGS -DVISUALIZE=1"
  21              vis="yes"
  22              ;;
  23 @@ -187,6 +187,10 @@ case $host_os in
  24      SYS="FREEBSD"
  25      LDFLAGS="$LDFLAGS -lm"
  26      ;;
  27 +  dragonfly*)
  28 +    SYS="DRAGONFLY"
  29 +    LDFLAGS="$LDFLAGS -lm"
  30 +    ;;
  31    kfreebsd*-gnu)
  32      SYS="FREEBSD"
  33      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
  34 @@ -250,7 +254,7 @@ case $host_cpu in
  35        ASFLAGS="$ASFLAGS -f elf"
  36      fi
  37      ;;
  38 -  x86_64)
  39 +  x86_64|amd64)
  40      ARCH="X86_64"
  41      AS="yasm"
  42      if [ "$SYS" = MACOSX ];then
  43 @@ -264,11 +268,11 @@ case $host_cpu in
  44      fi
  45      ;;
  46    powerpc|powerpc64)
  47 -    ARCH="PPC"
  48      if [ $SYS = MACOSX ]
  49      then
  50 -      ALTIVECFLAGS="$ALTIVECFLAGS -faltivec -fastf -mcpu=G4"
  51 +      ARCH="POWERPC"
  52      else
  53 +      ARCH="PPC"
  54        ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_H"
  55      fi
  56      ;;
  57 @@ -354,7 +358,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
  58
  59  # autodetect options that weren't forced nor disabled
  60
  61 -libpthread=""
  62 +libpthread="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
  63  if test "$pthread" = "auto" ; then
  64      pthread="no"
  65      case $SYS in
  66 @@ -387,7 +391,7 @@ if test "$pthread" = "auto" ; then
  67      esac
  68  fi
  69  if test "$pthread" = "yes" ; then
  70 -    CFLAGS="$CFLAGS -DHAVE_PTHREAD"
  71 +    CFLAGS="$CFLAGS -DHAVE_PTHREAD $PTHREAD_CFLAGS"
  72      LDFLAGS="$LDFLAGS $libpthread"
  73  fi
  74
  75 @@ -424,7 +428,8 @@ if [ "$avis_input" = "yes" ] ; then
  76  fi
  77
  78  if [ "$pic" = "yes" ] ; then
  79 -    CFLAGS="$CFLAGS -fPIC"
  80 +    CFLAGS="$CFLAGS"
  81 +    PICFLAG="-prefer-pic"
  82      ASFLAGS="$ASFLAGS -DPIC"
  83      # resolve textrels in the x86 asm
  84      cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"