Mon Sep 7 20:05:30 2009 UTC ()
Dont use PIC on i386 as it breaks inline asm.

Closes PR pkg/41964.


(ahoka)
diff -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg/distinfo
diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg/patches/patch-configure
cvs diff -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/distinfo 2009/08/30 11:01:58 1.27
+++ pkgsrc/multimedia/ffmpeg/Attic/distinfo 2009/09/07 20:05:30 1.28
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.27 2009/08/30 11:01:58 jmmv Exp $ 1$NetBSD: distinfo,v 1.28 2009/09/07 20:05:30 ahoka Exp $
2 2
3SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219 3SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
4RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a 4RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
5Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes 5Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
6SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1 6SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
7SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f 7SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f
8SHA1 (patch-configure) = 50b4b112d465502a313edb44f530ba6fbadcbfa0 8SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/patches/Attic/patch-configure 2009/08/30 11:01:58 1.7
+++ pkgsrc/multimedia/ffmpeg/patches/Attic/patch-configure 2009/09/07 20:05:30 1.8
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1$NetBSD: patch-configure,v 1.7 2009/08/30 11:01:58 jmmv Exp $ 1$NetBSD: patch-configure,v 1.8 2009/09/07 20:05:30 ahoka Exp $
2 2
3--- configure.orig 2009-06-10 21:50:53.000000000 +0100 3--- configure.orig 2009-06-10 22:50:53.000000000 +0200
4+++ configure 4+++ configure
5@@ -1619,6 +1619,8 @@ case $target_os in 5@@ -1619,6 +1619,10 @@ case $target_os in
6 add_cflags -D__EXTENSIONS__ 6 add_cflags -D__EXTENSIONS__
7 ;; 7 ;;
8 netbsd) 8 netbsd)
9+ LIBOBJFLAGS='$(PIC)' 9+ if test $subarch != "x86_32"; then
10+ SHFLAGS='-shared' 10+ LIBOBJFLAGS='$(PIC)'
 11+ SHFLAGS='-shared'
 12+ fi
11 oss_demuxer_extralibs="-lossaudio" 13 oss_demuxer_extralibs="-lossaudio"
12 oss_muxer_extralibs="-lossaudio" 14 oss_muxer_extralibs="-lossaudio"
13 ;; 15 ;;
14@@ -1632,6 +1634,8 @@ case $target_os in 16@@ -1632,6 +1636,8 @@ case $target_os in
15 freebsd) 17 freebsd)
16 disable need_memalign 18 disable need_memalign
17 ;; 19 ;;
18+ dragonfly) 20+ dragonfly)
19+ ;; 21+ ;;
20 bsd/os) 22 bsd/os)
21 osextralibs="-lpoll -lgnugetopt" 23 osextralibs="-lpoll -lgnugetopt"
22 strip="strip -d" 24 strip="strip -d"
23@@ -1996,10 +2000,13 @@ enabled vis && add_cflags -mcpu=ultraspa 25@@ -1996,10 +2002,13 @@ enabled vis && add_cflags -mcpu=ultraspa
24  26
25 # --- 27 # ---
26 # big/little-endian test 28 # big/little-endian test
27-check_cc <<EOF || die "endian test failed" 29-check_cc <<EOF || die "endian test failed"
28-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; 30-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
29+check_exec <<EOF || enable bigendian 31+check_exec <<EOF || enable bigendian
30+int main() 32+int main()
31+{ 33+{
32+ long one = 1; 34+ long one = 1;
33+ return !(*((char *)(&one))); 35+ return !(*((char *)(&one)));
34+} 36+}
35 EOF 37 EOF
36-od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian 38-od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian