[pkgsrc/trunk]: pkgsrc/multimedia/xvidcore Fixes merge issues of patch-ab int...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9bc959222c65
branches:  trunk
changeset: 575781:9bc959222c65
user:      obache <obache%pkgsrc.org@localhost>
date:      Fri May 21 13:06:19 2010 +0000

description:
Fixes merge issues of patch-ab introduced when updated to 1.2.2.

Adding "-Wl,-readd_only_relocs -Wl,warning" for Darwin-ppc is not required anymore
because already have "-Wl,read_only_relocs,suppress".

This issue rise multiple definition of -readd_only_relocs linker flags,
and result in failed to link reported as PR#41641.

diffstat:

 multimedia/xvidcore/distinfo         |   4 ++--
 multimedia/xvidcore/patches/patch-ab |  13 +++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diffs (42 lines):

diff -r 979f1ccda1d8 -r 9bc959222c65 multimedia/xvidcore/distinfo
--- a/multimedia/xvidcore/distinfo      Fri May 21 11:55:11 2010 +0000
+++ b/multimedia/xvidcore/distinfo      Fri May 21 13:06:19 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2009/06/02 17:10:53 drochner Exp $
+$NetBSD: distinfo,v 1.23 2010/05/21 13:06:19 obache Exp $
 
 SHA1 (xvidcore-1.2.2.tar.bz2) = d03270c803592f7655e7aa4181de587be25ba97f
 RMD160 (xvidcore-1.2.2.tar.bz2) = 5fbbc99a02d9eab7f2394220cec2c872957ff26f
 Size (xvidcore-1.2.2.tar.bz2) = 643344 bytes
 SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
-SHA1 (patch-ab) = f4ede5caf57cb35cb566d73672a4228e42d666e9
+SHA1 (patch-ab) = 870ae0eee0f1eafd87c9e5693b593642a564a3c9
 SHA1 (patch-ac) = 4318ab70e07444078cf0436b101f88bc4ae80aab
diff -r 979f1ccda1d8 -r 9bc959222c65 multimedia/xvidcore/patches/patch-ab
--- a/multimedia/xvidcore/patches/patch-ab      Fri May 21 11:55:11 2010 +0000
+++ b/multimedia/xvidcore/patches/patch-ab      Fri May 21 13:06:19 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2009/06/02 17:10:53 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2010/05/21 13:06:19 obache Exp $
 
---- configure.orig     2009-05-28 19:13:31.000000000 +0200
+--- configure.orig     2009-05-28 17:13:31.000000000 +0000
 +++ configure
 @@ -3802,7 +3802,7 @@ SHARED_EXTENSION=""
  STATIC_EXTENSION=""
@@ -20,14 +20,7 @@
        echo "$as_me:$LINENO: result: ok" >&5
  echo "${ECHO_T}ok" >&6
        STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-@@ -3876,13 +3876,13 @@ echo "${ECHO_T}ok" >&6
-          echo "$as_me:$LINENO: result: dylib options" >&5
- echo "${ECHO_T}dylib options" >&6
-          SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
--         SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name 
\$(libdir)/\$(SHARED_LIB)"
-+         SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name 
\$(libdir)/\$(SHARED_LIB) -Wl,-read_only_relocs -Wl,warning"
-       else
-          echo "$as_me:$LINENO: result: module options" >&5
+@@ -3882,7 +3882,7 @@ echo "${ECHO_T}dylib options" >&6
  echo "${ECHO_T}module options" >&6
           PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
           SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"