[pkgsrc/pkgsrc-2005Q2]: pkgsrc/audio/liba52 Pullup ticket 693 - requested by ...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1e0e26ad021
branches:  pkgsrc-2005Q2
changeset: 496000:e1e0e26ad021
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Aug 20 14:36:15 2005 +0000

description:
Pullup ticket 693 - requested by Grant Beattie
portability fix for liba52

Revisions pulled up:
- pkgsrc/audio/liba52/Makefile                  1.15
- pkgsrc/audio/liba52/distinfo                  1.7
- pkgsrc/audio/liba52/patches/patch-ab          1.4

   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Fri Jul 29 00:41:52 UTC 2005

   Modified Files:
        pkgsrc/audio/liba52: Makefile distinfo
        pkgsrc/audio/liba52/patches: patch-ab

   Log Message:
   don't assume that all platforms will be able to build a shared library
   out of non-PIC code; do it on NetBSD and Linux/i386 where it is
   known to be OK.

diffstat:

 audio/liba52/Makefile         |  10 +++++++++-
 audio/liba52/distinfo         |   4 ++--
 audio/liba52/patches/patch-ab |  15 +++++++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r 2da5c3018d69 -r e1e0e26ad021 audio/liba52/Makefile
--- a/audio/liba52/Makefile     Fri Aug 19 16:55:18 2005 +0000
+++ b/audio/liba52/Makefile     Sat Aug 20 14:36:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2005/08/20 14:36:15 salo Exp $
 #
 
 DISTNAME=      a52dec-0.7.4
@@ -18,4 +18,12 @@
 CONFIGURE_ARGS+=       --disable-mlib
 CONFIGURE_ARGS+=       --enable-shared
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386"
+.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
+CONFIGURE_ENV+=                LIBA52_CFLAGS=-prefer-non-pic
+.  endif
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r 2da5c3018d69 -r e1e0e26ad021 audio/liba52/distinfo
--- a/audio/liba52/distinfo     Fri Aug 19 16:55:18 2005 +0000
+++ b/audio/liba52/distinfo     Sat Aug 20 14:36:15 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 20:39:47 agc Exp $
+$NetBSD: distinfo,v 1.6.4.1 2005/08/20 14:36:15 salo Exp $
 
 SHA1 (a52dec-0.7.4.tar.gz) = 79b33bd8d89dad7436f85b9154ad35667aa37321
 RMD160 (a52dec-0.7.4.tar.gz) = 5b63b34c5840e7182b733cad41e916a8d4875eb1
 Size (a52dec-0.7.4.tar.gz) = 241507 bytes
 SHA1 (patch-aa) = f31a0e354ab7f1111c03196bf1a11d7caab0f1e9
-SHA1 (patch-ab) = 7673335451c9e58853cd0a543073dac2607114f8
+SHA1 (patch-ab) = 79341f97816b93731bdb5999957e36f36b30e63a
 SHA1 (patch-ac) = d226b58ae1314deaa8c938d39669139bd513be18
 SHA1 (patch-ad) = 680e399e79211fb3f788111d5221c5f8227f23b6
diff -r 2da5c3018d69 -r e1e0e26ad021 audio/liba52/patches/patch-ab
--- a/audio/liba52/patches/patch-ab     Fri Aug 19 16:55:18 2005 +0000
+++ b/audio/liba52/patches/patch-ab     Sat Aug 20 14:36:15 2005 +0000
@@ -1,7 +1,18 @@
-$NetBSD: patch-ab,v 1.3 2002/08/30 23:43:08 wiz Exp $
+$NetBSD: patch-ab,v 1.3.16.1 2005/08/20 14:36:15 salo Exp $
 
---- configure.orig     Sun Jul 28 05:50:42 2002
+--- configure.orig     2002-07-28 13:50:42.000000000 +1000
 +++ configure
+@@ -9639,8 +9639,8 @@ _ACEOF
+ 
+ 
+ 
+-
+-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
++# we set LIBA52_CFLAGS in CONFIGURE_ENV
++# LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
+ 
+ # Check whether --enable-double or --disable-double was given.
+ if test "${enable_double+set}" = set; then
 @@ -9743,6 +9743,11 @@ if test $ac_cv_lib_ossaudio__oss_ioctl =
    LIBAO_LIBS="$LIBAO_LIBS -lossaudio"
  fi