pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Dont use PIC on i386 as it breaks in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/288137b2b5ef
branches:  trunk
changeset: 398754:288137b2b5ef
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Mon Sep 07 20:05:30 2009 +0000

description:
Dont use PIC on i386 as it breaks inline asm.

Closes PR pkg/41964.

diffstat:

 multimedia/ffmpeg/distinfo                |   4 ++--
 multimedia/ffmpeg/patches/patch-configure |  16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diffs (52 lines):

diff -r 273cf8941034 -r 288137b2b5ef multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Mon Sep 07 19:02:13 2009 +0000
+++ b/multimedia/ffmpeg/distinfo        Mon Sep 07 20:05:30 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2009/08/30 11:01:58 jmmv Exp $
+$NetBSD: distinfo,v 1.28 2009/09/07 20:05:30 ahoka Exp $
 
 SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
 Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
 SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
 SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f
-SHA1 (patch-configure) = 50b4b112d465502a313edb44f530ba6fbadcbfa0
+SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0
diff -r 273cf8941034 -r 288137b2b5ef multimedia/ffmpeg/patches/patch-configure
--- a/multimedia/ffmpeg/patches/patch-configure Mon Sep 07 19:02:13 2009 +0000
+++ b/multimedia/ffmpeg/patches/patch-configure Mon Sep 07 20:05:30 2009 +0000
@@ -1,17 +1,19 @@
-$NetBSD: patch-configure,v 1.7 2009/08/30 11:01:58 jmmv Exp $
+$NetBSD: patch-configure,v 1.8 2009/09/07 20:05:30 ahoka Exp $
 
---- configure.orig     2009-06-10 21:50:53.000000000 +0100
+--- configure.orig     2009-06-10 22:50:53.000000000 +0200
 +++ configure
-@@ -1619,6 +1619,8 @@ case $target_os in
+@@ -1619,6 +1619,10 @@ case $target_os in
          add_cflags -D__EXTENSIONS__
          ;;
      netbsd)
-+        LIBOBJFLAGS='$(PIC)'
-+        SHFLAGS='-shared'
++      if test $subarch != "x86_32"; then
++          LIBOBJFLAGS='$(PIC)'
++          SHFLAGS='-shared'
++      fi
          oss_demuxer_extralibs="-lossaudio"
          oss_muxer_extralibs="-lossaudio"
          ;;
-@@ -1632,6 +1634,8 @@ case $target_os in
+@@ -1632,6 +1636,8 @@ case $target_os in
      freebsd)
          disable need_memalign
          ;;
@@ -20,7 +22,7 @@
      bsd/os)
          osextralibs="-lpoll -lgnugetopt"
          strip="strip -d"
-@@ -1996,10 +2000,13 @@ enabled vis && add_cflags -mcpu=ultraspa
+@@ -1996,10 +2002,13 @@ enabled vis && add_cflags -mcpu=ultraspa
  
  # ---
  # big/little-endian test



Home | Main Index | Thread Index | Old Index