FreeBSD Bugzilla – Attachment 109987 Details for
Bug 151067
[PATCH] devel/ptlib: fix build in presence of alsa-lib
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ptlib267_1.diff
ptlib267_1.diff (text/plain), 3.13 KB, created by
Alexander V. Chernikov
on 2010-10-05 19:40:36 UTC
(
hide
)
Description:
ptlib267_1.diff
Filename:
MIME Type:
Creator:
Alexander V. Chernikov
Created:
2010-10-05 19:40:36 UTC
Size:
3.13 KB
patch
obsolete
>diff -urN /usr/ports/devel/ptlib26/Makefile ptlib26/Makefile >--- /usr/ports/devel/ptlib26/Makefile 2010-05-15 14:30:58.000000000 +0400 >+++ ptlib26/Makefile 2010-10-05 22:38:28.000000000 +0400 >@@ -6,20 +6,21 @@ > # > > PORTNAME= ptlib >-PORTVERSION= 2.6.5 >-PORTREVISION= 2 >+PORTVERSION= 2.6.7 > CATEGORIES= devel >-MASTER_SITES= ${MASTER_SITE_GNOME} >-MASTER_SITE_SUBDIR= sources/ptlib/2.6 >+MASTER_SITES= SF/opalvoip/v3.6%20Lalande/Final/ > DISTNAME= ptlib-${PORTVERSION} > > MAINTAINER= melifaro@ipfw.ru > COMMENT= A cross platform C++ library, used by OPAL > >+LICENSE=MPL >+ > LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 > >-CONFLICTS= pwlib-1.* ptlib-2.4.* >+CONFLICTS= pwlib-1.* ptlib-2.4.* ptlib-2.8.* > >+USE_BZIP2= yes > USE_BISON= build > USE_GMAKE= yes > GNU_CONFIGURE= yes >@@ -30,8 +31,10 @@ > > CFLAGS+= -I${LOCALBASE}/include > CONFIGURE_ARGS+= --enable-oss --enable-plugins --with-expat-dir="${LOCALBASE}" >+CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" > > OPTIONS= ODBC "Use ODBC" On \ >+ ALSA "Use ALSA (experimental)" Off \ > V4L "Use Video4Linux" Off \ > BSDVIDEO "Enable BSD video support" On \ > SDL "Use SDL" On \ >@@ -57,6 +60,15 @@ > CONFIGURE_ARGS+= --disable-odbc > .endif > >+.if defined(WITH_ALSA) >+CONFIGURE_ARGS+= --enable-alsa >+PLIST_SUB+= ALSA="" >+LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib >+.else >+CONFIGURE_ARGS+= --disable-alsa >+PLIST_SUB+= ALSA="@comment " >+.endif >+ > .if defined(WITH_BSDVIDEO) > CONFIGURE_ARGS+=--enable-bsdvideo > PLIST_SUB+= BSDVIDEO="" >@@ -130,6 +142,7 @@ > > post-patch: > @${REINPLACE_CMD} -e 's|-lpt|-lpt-${PORTVERSION:C/.[0-9]+$//g}|' ${WRKSRC}/ptlib.pc.in >+ @${REINPLACE_CMD} -e 's|-lasound|-lasound -L${LOCALBASE}/lib|' ${WRKSRC}/plugins/sound_alsa/Makefile > .if ${ARCH} == sparc64 && ${OSVERSION} <= 700003 > @${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' ${WRKSRC}/src/ptlib/unix/tlibthrd.cxx > .endif >diff -urN /usr/ports/devel/ptlib26/distinfo ptlib26/distinfo >--- /usr/ports/devel/ptlib26/distinfo 2010-05-15 14:30:58.000000000 +0400 >+++ ptlib26/distinfo 2010-05-30 11:02:11.000000000 +0400 >@@ -1,3 +1,3 @@ >-MD5 (ptlib-2.6.5.tar.gz) = a7381ea6bbd35ee15e21eb1be107d6d5 >-SHA256 (ptlib-2.6.5.tar.gz) = ae8ecf50a39d204910408934f2ab6965310e350c8c3ef4309dca985c761d05fb >-SIZE (ptlib-2.6.5.tar.gz) = 4861936 >+MD5 (ptlib-2.6.7.tar.bz2) = 37279b5cf4aa64890eb9f38b4500ec6f >+SHA256 (ptlib-2.6.7.tar.bz2) = 7dd28225fedd21154d34899b21ee4b6d27c88eb1a9f9931c8e6ced28e8f3b97f >+SIZE (ptlib-2.6.7.tar.bz2) = 3275152 >diff -urN /usr/ports/devel/ptlib26/pkg-plist ptlib26/pkg-plist >--- /usr/ports/devel/ptlib26/pkg-plist 2010-05-15 14:30:58.000000000 +0400 >+++ ptlib26/pkg-plist 2010-05-30 11:52:16.000000000 +0400 >@@ -157,9 +157,10 @@ > include/ptlib/videoio.h > include/ptlib/videoio1394dc.h > lib/libpt-%%PVERSION_MAJOR%%.so >+lib/libpt-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%% > lib/libpt.so > lib/libpt_s.a >-lib/libpt-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%% >+%%ALSA%%lib/ptlib-%%PORTVERSION%%/devices/sound/alsa_pwplugin.so > lib/ptlib-%%PORTVERSION%%/devices/sound/oss_pwplugin.so > %%BSDVIDEO%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/bsdvideo_pwplugin.so > %%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l_pwplugin.so
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 151067
:
109986
| 109987