Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Oct 2008 08:19:47 GMT
From:      "Eric L. Chen" <d9364104@mail.nchu.edu.tw>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/128141: update net/opal to 3.4.1 to fit GNOME 2.24
Message-ID:  <200810160819.m9G8JlVJ068865@www.freebsd.org>
Resent-Message-ID: <200810160820.m9G8K2sW009714@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         128141
>Category:       ports
>Synopsis:       update net/opal to 3.4.1 to fit GNOME 2.24
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 16 08:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Eric L. Chen
>Release:        7-STABLE/i386
>Organization:
National Chung Hsing University
>Environment:
FreeBSD lihong-nb.local 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #18: Wed Oct 15 16:04:17 CST 2008     root@lihong-nb.local:/usr/obj/usr/src/sys/lihong-nb  i386
>Description:
According to GNOME 2.24 release ( http://library.gnome.org/misc/release-notes/2.24/#rnusers.ekiga ), ekiga should be version 3.0.0 in GNOME 2.24.0.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN opal.orig/Makefile opal/Makefile
--- opal.orig/Makefile	2008-10-16 16:09:46.000000000 +0800
+++ opal/Makefile	2008-10-16 16:10:16.000000000 +0800
@@ -6,45 +6,35 @@
 #
 
 PORTNAME=	opal
-PORTVERSION=	2.2.11
+PORTVERSION=	3.4.1
 CATEGORIES=	net
-MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/sources/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=mi
+MASTER_SITES=   ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=     sources/${PORTNAME}/3.4
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	VoIP abstraction library
 
-OPTIONS=	FFMPEG	"Support H263 audio/video codec"	on \
-		SPEEX	"Use speex installed by audio/speex"	on
+OPTIONS=	SPEEX	"Use speex installed by audio/speex"	on
 
-LIB_DEPENDS=	pt_r:${PORTSDIR}/devel/pwlib
+LIB_DEPENDS=	pt:${PORTSDIR}/devel/pwlib \
+		avcodec:${PORTSDIR}/multimedia/ffmpeg \
+		theora.0:${PORTSDIR}/multimedia/libtheora
 
-# In opal's Makefile the default make's target is optshared
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu` optshared
+ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:262
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ARGS=	-j`${SYSCTL} -n hw.ncpu`
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+CONFIGURE_ENV+=	CPPFLAGS="-I${WRKSRC}/include -I${LOCALBASE}/include"
+CONFIGURE_ARGS+=--enable-debug=no
 
 .include <bsd.port.pre.mk>
 
 # Be sure to compile position-independent objects for the shared libraries
 CFLAGS+=	-fPIC
 
-.if defined(WITHOUT_FFMPEG)
-CONFIGURE_ARGS+=--disable-h263avcodec
-.else
-LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=--enable-h263avcodec=${LOCALBASE}/include/ffmpeg
-.endif
-
 .if defined(WITHOUT_SPEEX)
 CONFIGURE_ARGS+=--enable-localspeex=no
 .else
diff -urN opal.orig/distinfo opal/distinfo
--- opal.orig/distinfo	2008-10-16 16:09:46.000000000 +0800
+++ opal/distinfo	2008-10-16 16:10:16.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (opal-2.2.11.tar.gz) = eb4a9c0c9ea93ec95c876aaeadf83936
-SHA256 (opal-2.2.11.tar.gz) = 0990ead39728f23a1ce39997f41a8484c59809ccec0e770b9bc4f795a85a29c4
-SIZE (opal-2.2.11.tar.gz) = 4165191
+MD5 (opal-3.4.1.tar.gz) = 64b4711dcc29e4557de240d07580e1b8
+SHA256 (opal-3.4.1.tar.gz) = fa8f38f9acf9321700a041f0cd5d6557633feb8eee12576753025088a1338900
+SIZE (opal-3.4.1.tar.gz) = 21237911
diff -urN opal.orig/files/patch-Makefile.in opal/files/patch-Makefile.in
--- opal.orig/files/patch-Makefile.in	2008-10-16 16:09:46.000000000 +0800
+++ opal/files/patch-Makefile.in	2008-10-16 16:10:16.000000000 +0800
@@ -1,13 +1,22 @@
---- Makefile.in.orig	Sat Apr 22 16:06:54 2006
-+++ Makefile.in	Thu Jun 22 09:39:04 2006
-@@ -427,10 +427,6 @@
- SOURCES += $(OPAL_SRCDIR)/lids/vpblid.cxx
- endif
+--- Makefile.in.orig	2008-09-25 20:32:11.000000000 +0800
++++ Makefile.in	2008-09-25 20:34:21.000000000 +0800
+@@ -545,8 +545,8 @@
+ 		done); \
+ 	done)
  
--ifdef HAS_SANGOMA
--SOURCES += $(OPAL_SRCDIR)/lids/sangomalid.cxx
--endif
--
+-	mkdir -p $(DESTDIR)$(libdir)/pkgconfig ; chmod 755 $(DESTDIR)$(libdir)/pkgconfig
+-	$(INSTALL) -m 644 opal.pc $(DESTDIR)$(libdir)/pkgconfig
++	mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig ; chmod 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig
++	$(INSTALL) -m 644 opal.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig
+ #	mkdir -p $(DESTDIR)$(datarootdir)/opal ; chmod 755 $(DESTDIR)$(datarootdir)/opal
  
- ##################
- # Software codecs
+ 	$(MAKE) -C plugins install
+@@ -560,7 +560,7 @@
+ 	do rm -f $(DESTDIR)$(libdir)/$$filename ;\
+ 	done)
+ 	rm -rf $(DESTDIR)$(includedir)/opal
+-	rm -f $(DESTDIR)$(libdir)/pkgconfig/opal.pc
++	rm -f $(DESTDIR)$(PREFIX)/libdata/pkgconfig/opal.pc
+ #	rm -rf $(DESTDIR)$(datarootdir)/opal
+ 
+ 	$(MAKE) -C plugins uninstall
diff -urN opal.orig/files/patch-libspeex opal/files/patch-libspeex
--- opal.orig/files/patch-libspeex	2008-10-16 16:09:46.000000000 +0800
+++ opal/files/patch-libspeex	1970-01-01 08:00:00.000000000 +0800
@@ -1,13 +0,0 @@
---- src/codec/speex/libspeex/kiss_fft.h.orig	Thu Jun 22 09:56:34 2006
-+++ src/codec/speex/libspeex/kiss_fft.h	Thu Jun 22 09:56:53 2006
-@@ -6,10 +6,6 @@
- #include <math.h>
- #include <memory.h>
- 
--#if !(defined(P_MACOSX) || defined(P_FREEBSD))
--#include <malloc.h>   // RMF
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
diff -urN opal.orig/files/patch-opal_inc.mak.in opal/files/patch-opal_inc.mak.in
--- opal.orig/files/patch-opal_inc.mak.in	2008-10-16 16:09:46.000000000 +0800
+++ opal/files/patch-opal_inc.mak.in	1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
---- opal_inc.mak.in.orig	Fri Apr  7 08:12:16 2006
-+++ opal_inc.mak.in	Fri Apr  7 08:13:55 2006
-@@ -103,7 +103,7 @@
- endif
- 
- 
--OPAL_BASE  = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
-+OPAL_BASE  = opal_$(OPAL_SUFFIX)
- OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
- 
- LDFLAGS	    += -L$(OPAL_LIBDIR)
diff -urN opal.orig/pkg-plist opal/pkg-plist
--- opal.orig/pkg-plist	2008-10-16 16:09:46.000000000 +0800
+++ opal/pkg-plist	2008-10-16 16:10:16.000000000 +0800
@@ -1,6 +1,13 @@
+lib/libopal.so.3.4.1
+lib/libopal.so.3.4
+lib/libopal.so.3
+lib/libopal.so
+lib/libopal_s.a
+include/opal/opal.h
 include/opal/asn/gcc.h
 include/opal/asn/h225.h
 include/opal/asn/h235.h
+include/opal/asn/h235_srtp.h
 include/opal/asn/h245.h
 include/opal/asn/h248.h
 include/opal/asn/h4501.h
@@ -18,22 +25,18 @@
 include/opal/asn/mcs.h
 include/opal/asn/t38.h
 include/opal/asn/x880.h
-include/opal/codec/allcodecs.h
+@dirrm include/opal/asn
 include/opal/codec/echocancel.h
+include/opal/codec/g711a1_plc.h
 include/opal/codec/g711codec.h
-include/opal/codec/g726codec.h
-include/opal/codec/g729codec.h
-include/opal/codec/gsmcodec.h
-include/opal/codec/h261codec.h
-include/opal/codec/h263codec.h
-include/opal/codec/ilbccodec.h
-include/opal/codec/lpc10codec.h
-include/opal/codec/mscodecs.h
+include/opal/codec/opalplugin.h
+include/opal/codec/opalpluginmgr.h
 include/opal/codec/opalwavfile.h
 include/opal/codec/rfc2833.h
+include/opal/codec/rfc4175.h
 include/opal/codec/silencedetect.h
-include/opal/codec/speexcodec.h
 include/opal/codec/vidcodec.h
+@dirrm include/opal/codec
 include/opal/h323/channels.h
 include/opal/h323/gkclient.h
 include/opal/h323/gkserver.h
@@ -54,74 +57,107 @@
 include/opal/h323/q931.h
 include/opal/h323/svcctrl.h
 include/opal/h323/transaddr.h
+@dirrm include/opal/h323
+include/opal/h460/h460.h
+include/opal/h460/h4601.h
+include/opal/h460/h46018.h
+include/opal/h460/h46019.h
+include/opal/h460/h4609.h
+include/opal/h460/h460p.h
+include/opal/h460/h460pres.h
+include/opal/h460/h460tm.h
+@dirrm include/opal/h460
+include/opal/iax2/callprocessor.h
 include/opal/iax2/causecode.h
 include/opal/iax2/frame.h
 include/opal/iax2/iax2.h
 include/opal/iax2/iax2con.h
 include/opal/iax2/iax2ep.h
+include/opal/iax2/iax2jitter.h
 include/opal/iax2/iax2medstrm.h
 include/opal/iax2/iedata.h
 include/opal/iax2/ies.h
+include/opal/iax2/overview.h
 include/opal/iax2/processor.h
 include/opal/iax2/receiver.h
+include/opal/iax2/regprocessor.h
 include/opal/iax2/remote.h
 include/opal/iax2/safestrings.h
 include/opal/iax2/sound.h
+include/opal/iax2/specialprocessor.h
 include/opal/iax2/transmit.h
 include/opal/iax2/version.h
-include/opal/lids/QTIoctl.h
-include/opal/lids/alllids.h
-include/opal/lids/ixjDefs.h
-include/opal/lids/ixjidb.h
-include/opal/lids/ixjlid.h
+@dirrm include/opal/iax2
 include/opal/lids/lid.h
 include/opal/lids/lidep.h
-include/opal/lids/sangomalid.h
-include/opal/lids/vblasterlid.h
-include/opal/lids/vpbapi.h
-include/opal/lids/vpblid.h
+include/opal/lids/lidplugin.h
+include/opal/lids/lidpluginmgr.h
+@dirrm include/opal/lids
+include/opal/opal/audiorecord.h
 include/opal/opal/buildopts.h
 include/opal/opal/call.h
 include/opal/opal/connection.h
 include/opal/opal/endpoint.h
 include/opal/opal/guid.h
 include/opal/opal/ivr.h
+include/opal/opal/localep.h
 include/opal/opal/manager.h
 include/opal/opal/mediacmd.h
 include/opal/opal/mediafmt.h
 include/opal/opal/mediastrm.h
+include/opal/opal/mediatype.h
+include/opal/opal/opalmixer.h
 include/opal/opal/opalvxml.h
 include/opal/opal/patch.h
 include/opal/opal/pcss.h
+include/opal/opal/rtpconn.h
+include/opal/opal/rtpep.h
 include/opal/opal/transcoders.h
 include/opal/opal/transports.h
+@dirrm include/opal/opal
 include/opal/rtp/jitter.h
 include/opal/rtp/rtp.h
+include/opal/rtp/srtp.h
+include/opal/rtp/zrtpudp.h
+@dirrm include/opal/rtp
+include/opal/sip/handlers.h
 include/opal/sip/sdp.h
+include/opal/sip/sdpcaps.h
 include/opal/sip/sip.h
 include/opal/sip/sipcon.h
 include/opal/sip/sipep.h
 include/opal/sip/sippdu.h
+@dirrm include/opal/sip
 include/opal/t120/h323t120.h
 include/opal/t120/t120proto.h
 include/opal/t120/x224.h
+@dirrm include/opal/t120
 include/opal/t38/h323t38.h
+include/opal/t38/sipt38.h
 include/opal/t38/t38proto.h
-lib/libopal.so
-lib/libopal_r.so
-lib/libopal_r.so.2
-lib/libopal_r.so.2.2
-lib/libopal_r.so.%%PORTVERSION%%
-%%DATADIR%%/opal_inc.mak
-@dirrm %%DATADIR%%
 @dirrm include/opal/t38
-@dirrm include/opal/t120
-@dirrm include/opal/sip
-@dirrm include/opal/rtp
-@dirrm include/opal/opal
-@dirrm include/opal/lids
-@dirrm include/opal/iax2
-@dirrm include/opal/h323
-@dirrm include/opal/codec
-@dirrm include/opal/asn
+include/opal/zrtp/opalzrtp.h
+include/opal/zrtp/zrtpeventproc.h
+@dirrm include/opal/zrtp
 @dirrm include/opal
+lib/opal-3.4.1/codecs/audio/gsm0610_audio_pwplugin.so
+lib/opal-3.4.1/codecs/audio/speex_audio_pwplugin.so
+lib/opal-3.4.1/codecs/audio/ilbc_audio_pwplugin.so
+lib/opal-3.4.1/codecs/audio/lpc10_audio_pwplugin.so
+lib/opal-3.4.1/codecs/audio/g726_audio_pwplugin.so
+lib/opal-3.4.1/codecs/audio/ima_adpcm_audio_pwplugin.so
+lib/opal-3.4.1/codecs/audio/gsmamrcodec_pwplugin.so
+@dirrm lib/opal-3.4.1/codecs/audio
+lib/opal-3.4.1/codecs/video/h261-vic_video_pwplugin.so
+lib/opal-3.4.1/codecs/video/h263-ffmpeg_video_pwplugin.so
+lib/opal-3.4.1/codecs/video/h264_video_pwplugin_helper
+lib/opal-3.4.1/codecs/video/h264_video_pwplugin.so
+lib/opal-3.4.1/codecs/video/h263-1998_video_pwplugin.so
+lib/opal-3.4.1/codecs/video/mpeg4-ffmpeg_video_pwplugin.so
+lib/opal-3.4.1/codecs/video/theora_video_pwplugin.so
+@dirrm lib/opal-3.4.1/codecs/video
+@dirrm lib/opal-3.4.1/codecs
+lib/opal-3.4.1/lid/vpb_lid_pwplugin.so
+@dirrm lib/opal-3.4.1/lid
+@dirrm lib/opal-3.4.1
+libdata/pkgconfig/opal.pc


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810160819.m9G8JlVJ068865>