pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel Make this build on SunOS.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5105d6e95586
branches: trunk
changeset: 602733:5105d6e95586
user: hans <hans%pkgsrc.org@localhost>
date: Thu Apr 19 12:34:43 2012 +0000
description:
Make this build on SunOS.
diffstat:
devel/opal/distinfo | 5 +-
devel/opal/patches/patch-plugins_video_H.263-1998_h263pframe.cxx | 34 ++++++++++
devel/opal/patches/patch-plugins_video_H.264_Makefile.in | 17 +++++
devel/opal/patches/patch-plugins_video_H.264_gpl_Makefile.in | 16 ++++
devel/ptlib/distinfo | 4 +-
devel/ptlib/patches/patch-include_ptclib_pldap.h | 17 +++++
devel/ptlib/patches/patch-src_ptclib_pldap.cxx | 18 +++++
7 files changed, 109 insertions(+), 2 deletions(-)
diffs (163 lines):
diff -r 159cf28ed094 -r 5105d6e95586 devel/opal/distinfo
--- a/devel/opal/distinfo Thu Apr 19 12:03:18 2012 +0000
+++ b/devel/opal/distinfo Thu Apr 19 12:34:43 2012 +0000
@@ -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-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 -r 159cf28ed094 -r 5105d6e95586 devel/opal/patches/patch-plugins_video_H.263-1998_h263pframe.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opal/patches/patch-plugins_video_H.263-1998_h263pframe.cxx Thu Apr 19 12:34:43 2012 +0000
@@ -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 -r 159cf28ed094 -r 5105d6e95586 devel/opal/patches/patch-plugins_video_H.264_Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opal/patches/patch-plugins_video_H.264_Makefile.in Thu Apr 19 12:34:43 2012 +0000
@@ -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 -r 159cf28ed094 -r 5105d6e95586 devel/opal/patches/patch-plugins_video_H.264_gpl_Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opal/patches/patch-plugins_video_H.264_gpl_Makefile.in Thu Apr 19 12:34:43 2012 +0000
@@ -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)
diff -r 159cf28ed094 -r 5105d6e95586 devel/ptlib/distinfo
--- a/devel/ptlib/distinfo Thu Apr 19 12:03:18 2012 +0000
+++ b/devel/ptlib/distinfo Thu Apr 19 12:34:43 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/12/04 21:59:36 marino Exp $
+$NetBSD: distinfo,v 1.12 2012/04/19 12:34:43 hans Exp $
SHA1 (ptlib-2.6.5.tar.bz2) = 919487aee09d5a1ea5c4f0abdc01bc49d9dcb596
RMD160 (ptlib-2.6.5.tar.bz2) = ab2f8897b64ab7b1eb9fecc35470ce09af42bcf2
@@ -8,11 +8,13 @@
SHA1 (patch-configure) = 3af145c86d6a7060cb197228ae8046edbde437d4
SHA1 (patch-configure.ac) = 0813261dd595f2980bf691ad6fc69b27a527f803
SHA1 (patch-include_ptbuildopts.h.in) = 93559a280ec01e3eaa8396cd83bce7cf4ac275c5
+SHA1 (patch-include_ptclib_pldap.h) = 0a6d27519797174883de7c1c5dfe47b6f187d491
SHA1 (patch-make_unix.mak) = 03a436317afc6f77e574bf712b1926327bf00f6e
SHA1 (patch-plugins_sound_esd_sound_esd.h) = 6caff0b4890fe3b137e5dd7ceb1013abe1f7fec8
SHA1 (patch-plugins_sound_oss_sound_oss.cxx) = d00476fb46a0bf2474e8963a8fe9f1765d393d04
SHA1 (patch-plugins_sound_oss_sound_oss.h) = 7661d3d2f270680f293ddd4bb58cac8f6f021862
SHA1 (patch-plugins_vidinput_bsd_vidinput_bsd.h) = 33ee2ced0dd8a1e0e567f8700bba92431193dc10
+SHA1 (patch-src_ptclib_pldap.cxx) = 8c0f8b4326327abfac88f99dfa6edf5b7e250fbf
SHA1 (patch-unix-config.cxx) = bf263b858d4b964786360c702bd634aa989a8751
SHA1 (patch-unix-ossaix.cxx) = 5e473ffb524811c4da35fe8cb2f5f77b4807de5c
SHA1 (patch-unix-osutil.cxx) = 33482828d543fda07fd4070f05295e5536a89e64
diff -r 159cf28ed094 -r 5105d6e95586 devel/ptlib/patches/patch-include_ptclib_pldap.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ptlib/patches/patch-include_ptclib_pldap.h Thu Apr 19 12:34:43 2012 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_ptclib_pldap.h,v 1.1 2012/04/19 12:34:43 hans Exp $
+
+--- include/ptclib/pldap.h.orig 2009-09-21 02:25:53.000000000 +0200
++++ include/ptclib/pldap.h 2012-04-18 20:29:59.394305646 +0200
+@@ -103,12 +103,7 @@ class PLDAPSession : public PObject
+ AuthSimple,
+ AuthSASL,
+ AuthKerberos,
+-#ifdef SOLARIS
+- NumAuthenticationMethod1,
+- NumAuthenticationMethod2
+-#else
+ NumAuthenticationMethod
+-#endif
+ };
+
+ /**Bind to the remote LDAP server.
diff -r 159cf28ed094 -r 5105d6e95586 devel/ptlib/patches/patch-src_ptclib_pldap.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ptlib/patches/patch-src_ptclib_pldap.cxx Thu Apr 19 12:34:43 2012 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_ptclib_pldap.cxx,v 1.1 2012/04/19 12:34:43 hans Exp $
+
+--- src/ptclib/pldap.cxx.orig 2009-09-21 02:25:24.000000000 +0200
++++ src/ptclib/pldap.cxx 2012-04-18 20:29:09.841685925 +0200
+@@ -132,13 +132,8 @@ PBoolean PLDAPSession::Bind(const PStrin
+ else
+ whoPtr = who;
+
+-#ifdef SOLARIS
+- static const int AuthMethodCode[NumAuthenticationMethod2] = {
+- LDAP_AUTH_SIMPLE, LDAP_AUTH_SASL, LDAP_AUTH_KRBV41_30, LDAP_AUTH_KRBV42_30
+-#else
+ static const int AuthMethodCode[NumAuthenticationMethod] = {
+ LDAP_AUTH_SIMPLE, LDAP_AUTH_SASL, LDAP_AUTH_KRBV4
+-#endif
+ };
+ errorNumber = ldap_bind_s(ldapContext, whoPtr, passwd, AuthMethodCode[authMethod]);
+ return errorNumber == LDAP_SUCCESS;
Home |
Main Index |
Thread Index |
Old Index