Make this build on SunOS.

4 files changed, 71 insertions, 1 deletions

diff --git a/devel/opal/distinfo b/devel/opal/distinfo
index 20b59c44bd5..a24f7b17cf5 100644
--- a/devel/opal/distinfo
+++ b/devel/opal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/12/04 22:06:04 marino Exp $
+$NetBSD: distinfo,v 1.10 2012/04/19 12:44:06 hans Exp $
 
 SHA1 (opal-3.6.6.tar.bz2) = bd5e3907faf96db884a64dacdedb2259aca30cd3
 RMD160 (opal-3.6.6.tar.bz2) = b639709f7e28ce607478bddc41d171e0e54bee9f
@@ -8,5 +8,8 @@ SHA1 (patch-configure.ac) = 0ca73eeab0cb4cd8b1da85cf285e1e6edb596820
 SHA1 (patch-plugins_configure) = dcddc6200e457e0a2d1434036f5ad029dca5fbcf
 SHA1 (patch-plugins_configure.ac) = 559fd67e0813a56b1ed13a020acb600ac706d81d
 SHA1 (patch-plugins_video_H.263-1998_h263-1993.cxx) = 5119490e7fecaca0a42e9542182a987ea56f99fc
+SHA1 (patch-plugins_video_H.263-1998_h263pframe.cxx) = b006ac9d5f8b5ee3e26180eeba85a76f52ffcaf8
+SHA1 (patch-plugins_video_H.264_Makefile.in) = f8b740cd8aebb5ac0b3c6e89e57ed4d7553e3e9d
+SHA1 (patch-plugins_video_H.264_gpl_Makefile.in) = fdc5c9923a897e5ec8ba5f201844fdf9cd5b1ad4
 SHA1 (patch-plugins_video_MPEG4-ffmpeg_mpeg4.cxx) = a7003ebd378042506fe11393af6c32847f399fde
 SHA1 (patch-plugins_video_common_dyna.cxx) = ab265fc028870ec4dc7f73ee87580fd4baa7f947
diff --git a/devel/opal/patches/patch-plugins_video_H.263-1998_h263pframe.cxx b/devel/opal/patches/patch-plugins_video_H.263-1998_h263pframe.cxx
new file mode 100644
index 00000000000..4594fda6006
--- /dev/null
+++ b/devel/opal/patches/patch-plugins_video_H.263-1998_h263pframe.cxx
@@ -0,0 +1,34 @@
+$NetBSD: patch-plugins_video_H.263-1998_h263pframe.cxx,v 1.1 2012/04/19 12:44:07 hans Exp $
+
+--- plugins/video/H.263-1998/h263pframe.cxx.orig	2009-09-22 02:57:52.000000000 +0200
++++ plugins/video/H.263-1998/h263pframe.cxx	2012-04-18 21:11:57.720726385 +0200
+@@ -325,7 +325,7 @@ uint32_t H263PFrame::parseHeader(uint8_t
+   bool PB  = false;
+   bool CPM = false;
+   bool PEI = false;
+-  bool SS  = false;
++  bool SS_ = false;
+   bool RPS = false;
+   bool PCF = false;
+   bool UMV = false;
+@@ -351,9 +351,9 @@ uint32_t H263PFrame::parseHeader(uint8_t
+                              << " AP: "  << headerBits.GetBits(1) 
+                              << " AIC: " << headerBits.GetBits(1)
+                              << " DF: "  << headerBits.GetBits(1));
+-      SS = headerBits.GetBits(1);
++      SS_ = headerBits.GetBits(1);
+       RPS = headerBits.GetBits(1);
+-      TRACE_UP(4, "H263+\tHeader\tSS: "  << SS
++      TRACE_UP(4, "H263+\tHeader\tSS: "  << SS_
+                           << " RPS: " << RPS
+                           << " ISD: " << headerBits.GetBits(1)
+                           << " AIV: " << headerBits.GetBits(1)
+@@ -414,7 +414,7 @@ uint32_t H263PFrame::parseHeader(uint8_t
+           else
+            TRACE_UP(4, "H263+\tHeader\tUUI: 0" << headerBits.GetBits(1));
+       }
+-      if (SS) {
++      if (SS_) {
+         TRACE_UP(4, "H263+\tHeader\tSSS:" << headerBits.GetBits(2));
+       }
+     }
diff --git a/devel/opal/patches/patch-plugins_video_H.264_Makefile.in b/devel/opal/patches/patch-plugins_video_H.264_Makefile.in
new file mode 100644
index 00000000000..9244bababaf
--- /dev/null
+++ b/devel/opal/patches/patch-plugins_video_H.264_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-plugins_video_H.264_Makefile.in,v 1.1 2012/04/19 12:44:07 hans Exp $
+
+--- plugins/video/H.264/Makefile.in.orig	2009-09-22 02:57:51.000000000 +0200
++++ plugins/video/H.264/Makefile.in	2012-04-18 21:03:01.250268246 +0200
+@@ -129,12 +129,7 @@ OBJECTS = $(addprefix $(OBJDIR)/,$(patsu
+ 
+ $(PLUGIN): $(OBJECTS)
+ 	@set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir); fi ; )
+-ifeq (,$(findstring solaris,$(target_os)))
+ 	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $(DL_LIBS) -o $@ $^
+-else
+-	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $(DL_LIBS) $@ -o $@ $^
+-endif
+-
+ 
+ install:
+ 	@set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir) install; fi ; )
diff --git a/devel/opal/patches/patch-plugins_video_H.264_gpl_Makefile.in b/devel/opal/patches/patch-plugins_video_H.264_gpl_Makefile.in
new file mode 100644
index 00000000000..cb4b119dd7c
--- /dev/null
+++ b/devel/opal/patches/patch-plugins_video_H.264_gpl_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugins_video_H.264_gpl_Makefile.in,v 1.1 2012/04/19 12:44:07 hans Exp $
+
+--- plugins/video/H.264/gpl/Makefile.in.orig	2009-09-22 02:57:50.000000000 +0200
++++ plugins/video/H.264/gpl/Makefile.in	2012-04-18 20:56:15.209450489 +0200
+@@ -142,11 +142,7 @@ $(OBJDIR)/%.o : %.c
+ OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.c,%.o,$(patsubst %.cxx,%.o,$(notdir $(SRCS)))))
+ 
+ $(PLUGIN): $(OBJECTS)
+-ifeq (,$(findstring solaris,$(target_os)))
+ 	$(Q_LD)$(CXX) -o $@ $^ $(LDFLAGS) $(X264_LIBS)
+-else
+-	$(Q_LD)$(CXX) $@ -o $@ $^ $(LDFLAGS) $(X264_LIBS)
+-endif
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(libdir)/$(VC_PLUGIN_DIR)