summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv>2009-08-30 11:01:58 +0000
committerjmmv <jmmv>2009-08-30 11:01:58 +0000
commit7ab65160a62572405bd5d71da0b4eed2365da212 (patch)
tree2c90d976729c8c5a0b1823aaaa493a3156e1ea02
parent936eb7c1baa6afe708b9e3b4fa657e2dc2e7abd7 (diff)
downloadpkgsrc-7ab65160a62572405bd5d71da0b4eed2365da212.tar.gz
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.
-rw-r--r--multimedia/ffmpeg/Makefile4
-rw-r--r--multimedia/ffmpeg/distinfo4
-rw-r--r--multimedia/ffmpeg/patches/patch-configure17
3 files changed, 17 insertions, 8 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index da6c5df1e90..aeaab74a13a 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -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
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index e43d795c5f9..120a93c85a0 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -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 --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure
index b2e505e52d7..799b2455cb0 100644
--- a/multimedia/ffmpeg/patches/patch-configure
+++ b/multimedia/ffmpeg/patches/patch-configure
@@ -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 @@ $NetBSD: patch-configure,v 1.6 2009/06/14 11:27:01 ahoka Exp $
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