Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9244
Modified Files:
opal2.info
Added Files:
opal3.6.0.info opal3.6.0.patch
Log Message:
new version, new libversion, slightly saner build system
--- NEW FILE: opal3.6.0.patch ---
diff -Nurd -x'*~' opal-3.6.0.orig/configure opal-3.6.0/configure
--- opal-3.6.0.orig/configure 2009-02-23 22:25:48.000000000 -0500
+++ opal-3.6.0/configure 2009-03-08 04:42:32.000000000 -0400
@@ -4807,7 +4807,7 @@
- LDSOOPTS="-dynamiclib"
+ LDSOOPTS="-dynamiclib -install_name
\$(libdir)/\$(LIB_FILENAME_SHARED_PAT) -compatibility_version ${OPAL_VERSION}"
# CFLAGS="$CFLAGS -fno-common -dynamic"
# LDSO="-dynamiclib -multiply_defined suppress"
@@ -9408,10 +9408,7 @@
int
main ()
{
-int main(int argc, char *argv[])
- {
crypto_policy_t p;
p.cipher_key_len = SRTP_MASTER_KEY_LEN; return 0;
- }
;
diff -Nurd -x'*~' opal-3.6.0.orig/opal_defs.mak.in opal-3.6.0/opal_defs.mak.in
--- opal-3.6.0.orig/opal_defs.mak.in 2009-02-23 22:25:48.000000000 -0500
+++ opal-3.6.0/opal_defs.mak.in 2009-03-07 18:03:04.000000000 -0500
@@ -141,8 +141,8 @@
LIB_NAME = $(RELEASE_LIB_NAME)
endif
-CXXFLAGS += -I$(OPAL_INCDIR)
-CFLAGS += -I$(OPAL_INCDIR)
+CXXFLAGS := -I$(OPAL_INCDIR) $(CXXFLAGS)
+CFLAGS := -I$(OPAL_INCDIR) $(CFLAGS)
# End of file
diff -Nurd -x'*~' opal-3.6.0.orig/plugins/configure opal-3.6.0/plugins/configure
--- opal-3.6.0.orig/plugins/configure 2009-02-23 22:25:34.000000000 -0500
+++ opal-3.6.0/plugins/configure 2009-03-08 03:47:33.000000000 -0400
@@ -5503,7 +5503,9 @@
darwin*)
CFLAGS="$CFLAGS -fno-common -dynamic"
- LDSO="-dynamiclib -multiply_defined suppress"
+ # Only "correct *_PLUGIN_DIR for local codec" is defined
+ # so stringing all together gives locally-correct value
+ LDSO='-dynamiclib -multiply_defined suppress -install_name
$(libdir)/$(AC_PLUGIN_DIR)$(VC_PLUGIN_DIR)/$(subst ./,,$(PLUGIN))'
STDCCFLAGS="$STDCCFLAGS -fPIC -D__MACOSX__"
case "$target_cpu" in
x86 | i686 | i586 | i486 | i386 ) STDCCFLAGS="${STDCCFLAGS} -m486" ;;
@@ -7111,7 +7113,7 @@
if test "x${opal_gsm}" = "xyes" ; then
GSM_CLFAGS=""
- GSM_LIBS="-lgsm"
+ GSM_LIBS='-lgsm $(LDFLAGS)'
fi
{ echo "$as_me:$LINENO: checking System GSM" >&5
@@ -7275,7 +7277,7 @@
if test "x${opal_gsm}" = "xyes" ; then
GSM_CLFAGS=""
- GSM_LIBS="-lgsm"
+ GSM_LIBS='-lgsm $(LDFLAGS)'
fi
{ echo "$as_me:$LINENO: checking System GSM" >&5
diff -Nurd -x'*~' opal-3.6.0.orig/plugins/video/THEORA/Makefile.in
opal-3.6.0/plugins/video/THEORA/Makefile.in
--- opal-3.6.0.orig/plugins/video/THEORA/Makefile.in 2009-02-23
22:25:33.000000000 -0500
+++ opal-3.6.0/plugins/video/THEORA/Makefile.in 2009-03-07 15:07:53.000000000
-0500
@@ -41,8 +41,9 @@
STDCCFLAGS =...@stdccflags@
LDFLAGS =...@ldflags@
THEORA_LIBS =...@theora_libs@
+THEORA_CFLAGS =...@theora_cflags@
-EXTRACCFLAGS += -I$(COMMONDIR) -I$(PLUGINDIR)
+EXTRACCFLAGS += -I$(COMMONDIR) -I$(PLUGINDIR) $(THEORA_CFLAGS)
vpath %.cxx $(COMMONDIR)
vpath %.o $(OBJDIR)
Index: opal2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/opal2.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- opal2.info 6 Mar 2009 02:46:07 -0000 1.11
+++ opal2.info 8 Mar 2009 17:40:43 -0000 1.12
@@ -1,6 +1,6 @@
Package: opal2
Version: 2.2.11
-Revision: 4
+Revision: 5
Maintainer: The Gnome Core Team <[email protected]>
GCC: 4.0
BuildDependsOnly: true
@@ -8,15 +8,17 @@
cyrus-sasl2-dev (>= 2.1.22-1006),
doxygen,
expat1,
+ fink (>= 0.27.2),
openldap24-dev (>= 2.4.15-1),
openssl098-dev,
- pwlib1 (>= 1.10.10-6),
+ pwlib1 (>= 1.10.10-6),
sdl (>= 1.2.13-1),
- sed,
- fink (>= 0.27.2)
+ sed
<<
# sed : because of the patchscript
Depends: %N-shlibs (= %v-%r)
+Conflicts: opal3.6.0
+Replaces: opal3.6.0
Source: mirror:gnome:sources/opal/2.2/opal-%v.tar.bz2
Source-MD5: b759033c85a1351e00ad1a29e4f50f26
PatchScript: <<
@@ -91,7 +93,7 @@
<<
DocFiles: mpl-1.0.htm
<<
-Description: Open Phone Application Library
+Description: Open Phone Application Library
DescPort: <<
Try to keep at latest version compatible _ according to http://www.ekiga.org/ _
with current version of ekiga, or else go first back for opal2 to the format
--- NEW FILE: opal3.6.0.info ---
Package: opal3.6.0
Version: 3.6.0
Revision: 1
Maintainer: The Gnome Core Team <[email protected]>
GCC: 4.0
BuildDependsOnly: true
BuildDepends: <<
cyrus-sasl2-dev (>= 2.1.22-1006),
doxygen,
expat1,
fink (>= 0.28.0),
gsm (>= 1.0.10-1),
libogg (>= 1.1.3-1),
libsrtp (>= 1.4.2-2),
libtheora0 (>= 1.0.0-1),
openldap24-dev (>= 2.4.15-1),
openssl098-dev,
pkgconfig (>= 0.23),
ptlib2.6.0,
sdl (>= 1.2.13-1),
unixodbc2 (>= 2.2.12-1) | unixodbc2-nox (>= 2.2.12-1)
<<
Depends: %N-shlibs (= %v-%r)
Conflicts: opal2
Replaces: opal2
Source: mirror:gnome:sources/opal/3.6/opal-%v.tar.bz2
Source-MD5: 86896c75a5239fa85766cb4ba93a2118
PatchFile: %n.patch
PatchFile-MD5: 68cae70510745fdfd4c782fffa7aa90c
ConfigureParams: --enable-localspeex --disable-java
InstallScript: <<
make install DESTDIR=%d
<<
DocFiles: ChangeLog* mpl-1.0.htm docs/*
SplitOff: <<
Package: %N-shlibs
Depends: <<
cyrus-sasl2-shlibs (>= 2.1.22-1006),
expat1-shlibs,
libogg-shlibs (>= 1.1.3-1),
libtheora0-shlibs (>= 1.0.0-1),
openldap24-shlibs (>= 2.4.15-1),
openssl098-shlibs,
ptlib2.6.0-shlibs,
sdl-shlibs (>= 1.2.13-1),
unixodbc2-shlibs (>= 2.2.12-1) | unixodbc2-nox-shlibs (>=
2.2.12-1)
<<
Description: Shared libraries for %N
Files: <<
lib/libopal.3.6.0.dylib
lib/opal-%v
<<
Shlibs: <<
%p/lib/libopal.3.6.0.dylib 3.6.0 %n (>= 3.6.0-1)
!%p/lib/opal-%v/codecs/audio/g722_audio_pwplugin.dylib
!%p/lib/opal-%v/codecs/audio/g726_audio_pwplugin.dylib
!%p/lib/opal-%v/codecs/audio/gsm0610_audio_pwplugin.dylib
!%p/lib/opal-%v/codecs/audio/gsmamrcodec_pwplugin.dylib
!%p/lib/opal-%v/codecs/audio/ilbc_audio_pwplugin.dylib
!%p/lib/opal-%v/codecs/audio/ima_adpcm_audio_pwplugin.dylib
!%p/lib/opal-%v/codecs/audio/lpc10_audio_pwplugin.dylib
!%p/lib/opal-%v/codecs/audio/speex_audio_pwplugin.dylib
!%p/lib/opal-%v/codecs/video/h261-vic_video_pwplugin.dylib
!%p/lib/opal-%v/codecs/video/theora_video_pwplugin.dylib
<<
DocFiles: <<
ChangeLog* mpl-1.0.htm docs/*
plugins/audio/GSM0610/README:README.GSM0610
plugins/audio/LPC_10/README:README.LPC_10
plugins/audio/Speex/README:README.Speex
plugins/fax/fax_spandsp/README:README.fax_spands
<<
<<
DescPackaging: <<
Fink's speex is too old right now, so force use of onboard
version for consistent build if fink's speex gets updated.
<<
DescPort: <<
Makefiles never pass LDFLAGS to linker (!). Add it where
needed for -lgsm.
Makefiles never pass CPPFLAGS to compiler or autoconf theora
compiler flags (!). Make sure to pass THEORA_CFLAGS as needed.
Prepend (cf. append) local -I so they come before global ones.
Add -install_name to the codecs so validator doesn't whine
about these runtime-loadable plugins looking like shared libs.
Wonder if they should be extension .so?
Also add -install_name to lib.mak to get a public shared lib
that can be linked against even after build dir is deleted.
Also add -compatibility_version to the half-implemented darwin
support.
Fix nested function (misuse of AC_LANG_PROGRAM) for srtp.h
<<
Description: Open Phone Application Library
License: OSI-Approved
Homepage: http://openh323.sourceforge.net/
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
