[pkgsrc/trunk]: pkgsrc/devel/opal-devel * Fix libavcodec library name detecti...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/opal-devel * Fix libavcodec library name detecti...
From: jmcneill <jmcneill%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:36:10 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cede5fe4e86
branches:  trunk
changeset: 547222:8cede5fe4e86
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sun Sep 14 13:41:38 2008 +0000

description:
* Fix libavcodec library name detection, so we don't later try to
  dlopen("-lavcodec.51").
* Disable h263ffmpeg plugin as ekiga doesn't use it
* Pass LDFLAGS to plugins at linking time, so they get RPATH
* Use RTLD_NEXT on NetBSD in an attempt to find symbols in NEEDED
  libraries of the one we actually loaded (libavcodec).

diffstat:

 devel/opal-devel/Makefile                                             |   6 ++-
 devel/opal-devel/PLIST                                                |   3 +-
 devel/opal-devel/distinfo                                             |   7 ++-
 devel/opal-devel/patches/patch-plugins_configure                      |  22 ++++++++++
 devel/opal-devel/patches/patch-plugins_video_H_263-1998_Makefile_in   |  13 +++++
 devel/opal-devel/patches/patch-plugins_video_H_264_Makefile_in        |  20 +++++++++
 devel/opal-devel/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in |  13 +++++
 devel/opal-devel/patches/patch-plugins_video_common_dyna_cxx          |  17 +++++++
 8 files changed, 97 insertions(+), 4 deletions(-)

diffs (159 lines):

diff -r 25d49b5ef063 -r 8cede5fe4e86 devel/opal-devel/Makefile
--- a/devel/opal-devel/Makefile Sun Sep 14 13:25:07 2008 +0000
+++ b/devel/opal-devel/Makefile Sun Sep 14 13:41:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/09/14 11:27:51 sborrill Exp $
+# $NetBSD: Makefile,v 1.4 2008/09/14 13:41:38 jmcneill Exp $
 #
 
 DISTNAME=              opal-snapshot-20080912
@@ -18,6 +18,10 @@
 BUILD_TARGET=          opt
 
 CONFIGURE_ARGS+=       --enable-h264
+# ekiga developers say that the ffmpeg-h263 plugin is
+# not used and should be disabled in favour of the
+# h263+ plugin, so do so
+CONFIGURE_ARGS+=       --disable-ffmpeg-h263
 
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
diff -r 25d49b5ef063 -r 8cede5fe4e86 devel/opal-devel/PLIST
--- a/devel/opal-devel/PLIST    Sun Sep 14 13:25:07 2008 +0000
+++ b/devel/opal-devel/PLIST    Sun Sep 14 13:41:38 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/09/14 11:27:51 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/09/14 13:41:38 jmcneill Exp $
 include/opal.h
 include/opal/asn/gcc.h
 include/opal/asn/h225.h
@@ -137,7 +137,6 @@
 lib/${OPALLIBDIR}/codecs/audio/speex_audio_pwplugin.so
 lib/${OPALLIBDIR}/codecs/video/h261-vic_video_pwplugin.so
 lib/${OPALLIBDIR}/codecs/video/h263-1998_video_pwplugin.so
-lib/${OPALLIBDIR}/codecs/video/h263-ffmpeg_video_pwplugin.so
 lib/${OPALLIBDIR}/codecs/video/h264_video_pwplugin.so
 lib/${OPALLIBDIR}/codecs/video/h264_video_pwplugin_helper
 lib/${OPALLIBDIR}/codecs/video/mpeg4-ffmpeg_video_pwplugin.so
diff -r 25d49b5ef063 -r 8cede5fe4e86 devel/opal-devel/distinfo
--- a/devel/opal-devel/distinfo Sun Sep 14 13:25:07 2008 +0000
+++ b/devel/opal-devel/distinfo Sun Sep 14 13:41:38 2008 +0000
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.4 2008/09/13 19:51:42 jmcneill Exp $
+$NetBSD: distinfo,v 1.5 2008/09/14 13:41:38 jmcneill Exp $
 
 SHA1 (opal-snapshot-20080912.tar.gz) = d0c8359a1406ab2da3e354c944a7cefde7858a3a
 RMD160 (opal-snapshot-20080912.tar.gz) = 15e32b8479547e4b9fc7674fd172f5f4dfd4c9a8
 Size (opal-snapshot-20080912.tar.gz) = 22973261 bytes
 SHA1 (patch-configure) = 9c4cf98787f0f6505ba419e101fed5677cb14456
 SHA1 (patch-configure.tmp) = c0601b8974f53d455f3016806c6875afe1cd809f
+SHA1 (patch-plugins_configure) = a41ea74bbec80c12a2361b646810a8e6a5b24588
+SHA1 (patch-plugins_video_H_263-1998_Makefile_in) = 384002e69862d690f02609843f0103c878626ed9
+SHA1 (patch-plugins_video_H_264_Makefile_in) = f31d2554bc84c640936cded8e03e69d6529a2ed0
+SHA1 (patch-plugins_video_MPEG4-ffmpeg_Makefile_in) = 7bae6bfc8c4cce9b7d70cff244176462032ba236
+SHA1 (patch-plugins_video_common_dyna_cxx) = 5a82442434ba455197361e1da27c1b83db6716d8
diff -r 25d49b5ef063 -r 8cede5fe4e86 devel/opal-devel/patches/patch-plugins_configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opal-devel/patches/patch-plugins_configure  Sun Sep 14 13:41:38 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-plugins_configure,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
+
+--- plugins/configure.orig     2008-09-12 17:01:04.000000000 -0400
++++ plugins/configure  2008-09-13 16:44:36.000000000 -0400
+@@ -9145,7 +9145,7 @@
+             { echo "$as_me:$LINENO: result: cannot determine - using defaults" >&5
+ echo "${ECHO_T}cannot determine - using defaults" >&6; }
+           else
+-            LIBAVCODEC_LIB_NAME=`ldd ./conftest | grep libavcodec | awk '{print $1; }'`
++            LIBAVCODEC_LIB_NAME=`objdump -x ./conftest | grep 'NEEDED.*libavcodec' | awk '{print $2; }'`
+             { echo "$as_me:$LINENO: result: $LIBAVCODEC_LIB_NAME" >&5
+ echo "${ECHO_T}$LIBAVCODEC_LIB_NAME" >&6; }
+ 
+@@ -9638,7 +9638,7 @@
+             { echo "$as_me:$LINENO: result: cannot determine - using defaults" >&5
+ echo "${ECHO_T}cannot determine - using defaults" >&6; }
+           else
+-            X264_LIB_NAME=`ldd ./conftest | grep libx264 | awk '{print $1; }'`
++            X264_LIB_NAME=`objdump -x ./conftest | grep 'NEEDED.*libx264' | awk '{print $2; }'`
+             { echo "$as_me:$LINENO: result: $X264_LIB_NAME" >&5
+ echo "${ECHO_T}$X264_LIB_NAME" >&6; }
+ 
diff -r 25d49b5ef063 -r 8cede5fe4e86 devel/opal-devel/patches/patch-plugins_video_H_263-1998_Makefile_in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opal-devel/patches/patch-plugins_video_H_263-1998_Makefile_in       Sun Sep 14 13:41:38 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_video_H_263-1998_Makefile_in,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
+
+--- plugins/video/H.263-1998/Makefile.in.orig  2008-09-14 09:22:08.000000000 -0400
++++ plugins/video/H.263-1998/Makefile.in       2008-09-14 09:22:17.000000000 -0400
+@@ -62,7 +62,7 @@
+ OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
+ 
+ $(PLUGIN): $(OBJECTS)
+-      $(CXX) $(LDSO) $(DL_LIBS) -o $@ $^
++      $(CXX) $(LDSO) $(DL_LIBS) $(LDFLAGS) -o $@ $^
+ 
+ install:
+       mkdir -p $(DESTDIR)$(libdir)/$(VC_PLUGIN_DIR)
diff -r 25d49b5ef063 -r 8cede5fe4e86 devel/opal-devel/patches/patch-plugins_video_H_264_Makefile_in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opal-devel/patches/patch-plugins_video_H_264_Makefile_in    Sun Sep 14 13:41:38 2008 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-plugins_video_H_264_Makefile_in,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
+
+--- plugins/video/H.264/Makefile.in.orig       2008-09-14 09:21:14.000000000 -0400
++++ plugins/video/H.264/Makefile.in    2008-09-14 09:21:26.000000000 -0400
+@@ -122,7 +122,7 @@
+ 
+ $(PLUGIN): $(OBJECTS)
+       @set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir); fi ; )
+-      $(CXX) $(LDSO) $(DL_LIBS) -o $@ $^
++      $(CXX) $(LDSO) $(DL_LIBS) $(LDFLAGS) -o $@ $^
+ 
+ install:
+       @set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir) install; fi ; )
+@@ -138,4 +138,4 @@
+       @set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir) clean; fi ; )
+ 
+ ###########################################
+-                        
+\ No newline at end of file
++                        
diff -r 25d49b5ef063 -r 8cede5fe4e86 devel/opal-devel/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opal-devel/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in     Sun Sep 14 13:41:38 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_video_MPEG4-ffmpeg_Makefile_in,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
+
+--- plugins/video/MPEG4-ffmpeg/Makefile.in.orig        2008-09-14 09:20:27.000000000 -0400
++++ plugins/video/MPEG4-ffmpeg/Makefile.in     2008-09-14 09:20:40.000000000 -0400
+@@ -93,7 +93,7 @@
+ OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
+ 
+ $(PLUGIN): $(OBJECTS)
+-      $(CXX) $(LDSO) $(DL_LIBS) -o $@ $^
++      $(CXX) $(LDSO) $(DL_LIBS) $(LDFLAGS) -o $@ $^
+ 
+ install:
+       mkdir -p $(DESTDIR)$(libdir)/$(VC_PLUGIN_DIR)
diff -r 25d49b5ef063 -r 8cede5fe4e86 devel/opal-devel/patches/patch-plugins_video_common_dyna_cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opal-devel/patches/patch-plugins_video_common_dyna_cxx      Sun Sep 14 13:41:38 2008 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-plugins_video_common_dyna_cxx,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
+
+--- plugins/video/common/dyna.cxx.orig 2008-07-28 17:01:45.000000000 -0400
++++ plugins/video/common/dyna.cxx      2008-09-13 17:27:40.000000000 -0400
+@@ -136,6 +136,12 @@
+   return true;
+ #else
+   void * p = dlsym(_hDLL, (const char *)name);
++# ifdef __NetBSD__
++  if (p == NULL) {
++    (void)dlerror(); /* clear error */
++    p = dlsym(RTLD_NEXT, (const char *)name);
++  }
++# endif /* __NetBSD__ */
+   if (p == NULL)
+     return false;
+   func = (Function &)p;
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics +gst-jpeg
Next by Date: [pkgsrc/trunk]: pkgsrc/www/liferea update to 1.4.19
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics +gst-jpeg
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/liferea update to 1.4.19
Indexes:
Home | Main Index | Thread Index | Old Index