summaryrefslogtreecommitdiff
path: root/multimedia/x264-devel
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2012-01-16 11:06:05 +0000
committerdrochner <drochner@pkgsrc.org>2012-01-16 11:06:05 +0000
commit8f6ef90ff17f75159959244f51976673011dcd53 (patch)
treecca42d6a1534cde2484a9328681c642ba8bd030b /multimedia/x264-devel
parentbb607c4ace899bb2c1baac3ad77fb44638fca846 (diff)
downloadpkgsrc-8f6ef90ff17f75159959244f51976673011dcd53.tar.gz
revert an upstream change in the "configure" script which might be the
reason for build problems on NetBSD/amd64, as reported by Aran Clauson per PR pkg/45839
Diffstat (limited to 'multimedia/x264-devel')
-rw-r--r--multimedia/x264-devel/distinfo4
-rw-r--r--multimedia/x264-devel/patches/patch-aa10
2 files changed, 9 insertions, 5 deletions
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index c67a494688b..264c7afe3aa 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2012/01/09 17:04:03 drochner Exp $
+$NetBSD: distinfo,v 1.25 2012/01/16 11:06:05 drochner Exp $
SHA1 (x264-snapshot-20111207-2245.tar.bz2) = 33e0e44e636f8a7d2c2de4e7bac855d5db6a3b1e
RMD160 (x264-snapshot-20111207-2245.tar.bz2) = bf429f9279029c3ad99cafe0551e1f5aedf5f92f
Size (x264-snapshot-20111207-2245.tar.bz2) = 532952 bytes
-SHA1 (patch-aa) = eaac52b0dc6fa3f40d9b4f0b8ec53ec2e7b70f29
+SHA1 (patch-aa) = 1e07c79612b5525b76d4428401696566121d86cd
SHA1 (patch-ab) = 2ea835a62f3ac8bebefef056f69c51b11ceb6099
SHA1 (patch-ac) = a1bd65058559ec1704e2b64dade9f5a84066e67a
SHA1 (patch-ak) = 3c8d6650147ad6a0043d705464267a5d947da488
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index 2de7a60a8f6..2246b3cf9b4 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.13 2012/01/09 17:04:03 drochner Exp $
+$NetBSD: patch-aa,v 1.14 2012/01/16 11:06:06 drochner Exp $
--- configure.orig 2011-12-07 21:45:03.000000000 +0000
+++ configure
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.13 2012/01/09 17:04:03 drochner Exp $
if [ "$thread" = "auto" ]; then
thread="no"
case $SYS in
-@@ -872,7 +877,8 @@ fi
+@@ -872,10 +877,11 @@ fi
cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
if [ "$pic" = "yes" ] ; then
@@ -56,4 +56,8 @@ $NetBSD: patch-aa,v 1.13 2012/01/09 17:04:03 drochner Exp $
+ PICFLAG="-prefer-pic"
ASFLAGS="$ASFLAGS -DPIC"
# resolve textrels in the x86 asm
- cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
+- cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
++ cc_check stdio.h "-Wl,-Bsymbolic" && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
+ [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
+ fi
+