pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Fix linkage in NetBSD so that object...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/514a2908285e
branches:  trunk
changeset: 564279:514a2908285e
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Aug 30 11:01:58 2009 +0000

description:
Fix linkage in NetBSD so that object files for shared libraries get the
-fPIC -DPIC flags.  Fixes execution in, at least, NetBSD/macppc.  Bump
PKGREVISION.

diffstat:

 multimedia/ffmpeg/Makefile                |   4 ++--
 multimedia/ffmpeg/distinfo                |   4 ++--
 multimedia/ffmpeg/patches/patch-configure |  17 +++++++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r c82cbb553762 -r 514a2908285e multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Sun Aug 30 10:41:29 2009 +0000
+++ b/multimedia/ffmpeg/Makefile        Sun Aug 30 11:01:58 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2009/08/10 20:37:15 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2009/08/30 11:01:58 jmmv Exp $
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 MAINTAINER=    ahoka%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
diff -r c82cbb553762 -r 514a2908285e multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Sun Aug 30 10:41:29 2009 +0000
+++ b/multimedia/ffmpeg/distinfo        Sun Aug 30 11:01:58 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2009/08/10 20:37:15 drochner Exp $
+$NetBSD: distinfo,v 1.27 2009/08/30 11:01:58 jmmv 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) = c4f5cbe0cecac291547a9fd652f3e6c3c92fde2c
+SHA1 (patch-configure) = 50b4b112d465502a313edb44f530ba6fbadcbfa0
diff -r c82cbb553762 -r 514a2908285e multimedia/ffmpeg/patches/patch-configure
--- a/multimedia/ffmpeg/patches/patch-configure Sun Aug 30 10:41:29 2009 +0000
+++ b/multimedia/ffmpeg/patches/patch-configure Sun Aug 30 11:01:58 2009 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-configure,v 1.6 2009/06/14 11:27:01 ahoka Exp $
+$NetBSD: patch-configure,v 1.7 2009/08/30 11:01:58 jmmv Exp $
 
---- configure.orig     2009-06-10 22:50:53.000000000 +0200
+--- configure.orig     2009-06-10 21:50:53.000000000 +0100
 +++ configure
-@@ -1632,6 +1632,8 @@ case $target_os in
+@@ -1619,6 +1619,8 @@ case $target_os in
+         add_cflags -D__EXTENSIONS__
+         ;;
+     netbsd)
++        LIBOBJFLAGS='$(PIC)'
++        SHFLAGS='-shared'
+         oss_demuxer_extralibs="-lossaudio"
+         oss_muxer_extralibs="-lossaudio"
+         ;;
+@@ -1632,6 +1634,8 @@ case $target_os in
      freebsd)
          disable need_memalign
          ;;
@@ -11,7 +20,7 @@
      bsd/os)
          osextralibs="-lpoll -lgnugetopt"
          strip="strip -d"
-@@ -1996,10 +1998,13 @@ enabled vis && add_cflags -mcpu=ultraspa
+@@ -1996,10 +2000,13 @@ enabled vis && add_cflags -mcpu=ultraspa
  
  # ---
  # big/little-endian test



Home | Main Index | Thread Index | Old Index