pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/opal/patches No longer required.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/171e57fbeb51
branches:  trunk
changeset: 548983:171e57fbeb51
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sat Oct 25 18:15:04 2008 +0000

description:
No longer required.

diffstat:

 devel/opal/patches/patch-ac |  33 ---------------------------------
 devel/opal/patches/patch-ad |  12 ------------
 2 files changed, 0 insertions(+), 45 deletions(-)

diffs (53 lines):

diff -r b6cacee6953a -r 171e57fbeb51 devel/opal/patches/patch-ac
--- a/devel/opal/patches/patch-ac       Sat Oct 25 18:14:24 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/09/29 01:28:50 jmcneill Exp $
-
---- plugins/video/common/dyna.cxx.orig 2008-09-28 20:48:56.000000000 -0400
-+++ plugins/video/common/dyna.cxx
-@@ -89,6 +89,7 @@ bool DynaLink::InternalOpen(const char *
- #else
-   WITH_ALIGNED_STACK({  // must be called before using avcodec lib
-     _hDLL = dlopen((const char *)path, RTLD_NOW);
-+    _hDLLutil = dlopen("libavutil.so", RTLD_NOW);
-   });
- #endif /* _WIN32 */
- 
-@@ -119,8 +120,10 @@ void DynaLink::Close()
-     FreeLibrary(_hDLL);
- #else
-     dlclose(_hDLL);
-+    if (_hDLLutil)
-+      dlclose(_hDLLutil);
- #endif /* _WIN32 */
--    _hDLL = NULL;
-+    _hDLL = _hDLLutil = NULL;
-   }
- }
- 
-@@ -143,6 +146,8 @@ bool DynaLink::GetFunction(const char * 
-   return true;
- #else
-   void * p = dlsym(_hDLL, (const char *)name);
-+  if (p == NULL && _hDLLutil != NULL)
-+    p = dlsym(_hDLLutil, (const char *)name);
-   if (p == NULL) {
-     TRACE(1, _codecString << "\tDYNA\tError " << dlerror());
-     return false;
diff -r b6cacee6953a -r 171e57fbeb51 devel/opal/patches/patch-ad
--- a/devel/opal/patches/patch-ad       Sat Oct 25 18:14:24 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/09/29 01:28:50 jmcneill Exp $
-
---- plugins/video/common/dyna.h.orig   2008-09-28 20:48:27.000000000 -0400
-+++ plugins/video/common/dyna.h
-@@ -137,6 +137,7 @@ class DynaLink
-     HINSTANCE _hDLL;
- #else
-     void * _hDLL;
-+    void * _hDLLutil;
- #endif /* _WIN32 */
-     CodecID _codec;
-     char _codecString [32];



Home | Main Index | Thread Index | Old Index