cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major update to opal-3.10.3.

Browse Source
This commit is contained in:
ajacoutot 2011-10-26 16:59:34 +00:00
parent a730dfbf59
commit c5ef1efb1a
18 changed files with 200 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
net/opal/Makefile
View File

@ -1,17 +1,12 @@
# $OpenBSD: Makefile,v 1.17 2011/06/16 08:07:20 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2011/10/26 16:59:34 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= Open Phone Abstraction Library
V= 3.6.8
DISTNAME= opal-${V}
DISTNAME= opal-3.10.3
REVISION= 3
SUBST_VARS+= V
SHARED_LIBS= opal 1.0 # .2.2.11
SHARED_LIBS= opal 2.0 # 3.10.3
EXTRACT_SUFX= .tar.bz2
@ -27,28 +22,25 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += c celt0 crypto gsm m ogg pt pthread spandsp speex speexdsp
WANTLIB += stdc++ theora tiff x264
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opalvoip/}
WANTLIB += SDL c crypto expat lber ldap ldap_r m ogg sasl2
WANTLIB += ssl speex speexdsp x264 theora gsm pt pthread stdc++
LIB_DEPENDS= audio/speex \
multimedia/libtheora \
audio/gsm \
devel/ptlib \
multimedia/x264
LIB_DEPENDS= devel/ptlib>=2.10.3 \
audio/celt \
telephony/spandsp
# dlopen(3) libavcodec.so; shows as Extra: in check-lib-depends but
# this is ok, we want to be sure we track ABI changes
WANTLIB+= avcodec
LIB_DEPENDS+= graphics/ffmpeg>=20110306
ALL_TARGET= opt
OPAL_FILE= libopal.so
ALL_TARGET= default_target
MAKE_ENV= CC=${CC} CPLUS=${CXX} VERBOSE=1
MAKE_FLAGS= OPAL_FILE=${OPAL_FILE} \
RELEASE_LIB_FILENAME_SHARED_PAT=${OPAL_FILE}.${LIBopal_VERSION}
MAKE_FLAGS= RELEASE_LIB_NAME=libopal.so.${LIBopal_VERSION} \
RELEASE_LIB_FILENAME_SHARED_PAT=libopal.so.${LIBopal_VERSION}
USE_GMAKE= Yes
NO_REGRESS= Yes
@ -56,11 +48,16 @@ NO_REGRESS= Yes
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/plugins
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -pthread" \
ac_cv_path_SWIG=${LOCALBASE}/bin/swig
CONFIGURE_ARGS= --disable-localspeex \
--disable-localgsm \
--enable-plugins
--enable-ixj \
--disable-ruby \
--disable-sbc \
--enable-plugins \
--with-plugin-installdir=opal
# XXX
# ekiga:/usr/local/lib/opal-3.6.6/lid/vpb_lid_pwplugin.so:
@ -68,9 +65,11 @@ CONFIGURE_ARGS= --disable-localspeex \
# <...>
CONFIGURE_ARGS+= --disable-vpb
.ifndef DEBUG
CONFIGURE_ENV+= DEBUG_BUILD="no"
.endif
pre-configure:
# use perl(1) instead of SUBST_CMD to prevent breaking the configure script
perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" \
-e 's,SUBDIRS\+=\",SUBDIRS=\"\$${SUBDIRS},g' \
${WRKSRC}/plugins/configure
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/opal

10
net/opal/distinfo
View File

@ -1,5 +1,5 @@
MD5 (opal-3.6.8.tar.bz2) = pfTdwSxao03JQH/h2q8PRQ==
RMD160 (opal-3.6.8.tar.bz2) = OhaT3nXP4ebWwfb0Y1y3RH1Douk=
SHA1 (opal-3.6.8.tar.bz2) = xDgmvD4nPfBI9Hp3xK/7NmFPK34=
SHA256 (opal-3.6.8.tar.bz2) = jL+rsz5cVWP9r6zxrd5TbHhjjW0CD65JalLhnivmqQw=
SIZE (opal-3.6.8.tar.bz2) = 6837993
MD5 (opal-3.10.3.tar.bz2) = +w7VLo3VarXH0amtJJnLog==
RMD160 (opal-3.10.3.tar.bz2) = CKIxklECkv6cFl+ByuJTrE4VPF0=
SHA1 (opal-3.10.3.tar.bz2) = AKyPtbXiMxVYByMmDCMPCLgMbJ8=
SHA256 (opal-3.10.3.tar.bz2) = 9AoKOsNcXYlVtWglOo2eyWxfLDnn0twAd1xi3+5yAy0=
SIZE (opal-3.10.3.tar.bz2) = 9804124

15
net/opal/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-Makefile_in,v 1.4 2011/10/26 16:59:34 ajacoutot Exp $
--- Makefile.in.orig Fri Oct 14 09:00:11 2011
+++ Makefile.in Wed Oct 26 12:16:01 2011
@@ -671,11 +671,9 @@ install:
fi )
( if test -e $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) ; then \
$(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir) ; \
- ln -snf $(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(LIB_FILENAME_SHARED) ; \
fi )
( if test -e $(OPAL_LIBDIR)/$(DEBUG_LIB_FILENAME_SHARED_PAT) ; then \
$(INSTALL) -m 755 $(OPAL_LIBDIR)/$(DEBUG_LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir) ; \
- ln -snf $(DEBUG_LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(DEBUG_LIB_FILENAME_SHARED) ; \
fi )
mkdir -p $(DESTDIR)$(libdir)/pkgconfig ; chmod 755 $(DESTDIR)$(libdir)/pkgconfig
$(INSTALL) -m 644 opal.pc $(DESTDIR)$(libdir)/pkgconfig

33
net/opal/patches/patch-configure
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-configure,v 1.3 2010/05/31 06:31:39 ajacoutot Exp $
--- configure.orig Thu May 27 08:53:06 2010
+++ configure Mon May 31 07:28:46 2010
@@ -4471,7 +4471,7 @@ fi
$OpenBSD: patch-configure,v 1.4 2011/10/26 16:59:34 ajacoutot Exp $
--- configure.orig Fri Oct 14 09:00:11 2011
+++ configure Tue Oct 25 12:26:05 2011
@@ -4620,7 +4620,7 @@ fi
WFLAGS=
if test "x$ac_cv_c_compiler_gnu" = xyes; then
if test ${GXX_MAJOR} -lt 4 ; then
- WFLAGS="-Wall -Wextra -Wstrict-aliasing=2 -Wfloat-equal -Wno-comment -Wno-unused"
+ WFLAGS="-Wall -Wfloat-equal -Wno-comment -Wno-unused"
else
WFLAGS="-Wall -Wextra -Winit-self -Wstrict-aliasing=2 -Wfloat-equal -Wno-comment -Wno-missing-field-initializers -Wno-unused"
@@ -5106,7 +5106,7 @@ STDCCFLAGS="$STDCCFLAGS -D__MACOSX__"
- WFLAGS="-Wall -Wextra -Wstrict-aliasing -Wfloat-equal -Wno-comment -Wno-unused"
+ WFLAGS="-Wall -Wfloat-equal -Wno-comment -Wno-unused"
if test ${GXX_MAJOR} -ge 4 ; then
WFLAGS="$WFLAGS -Winit-self -Wno-missing-field-initializers"
fi
@@ -5680,7 +5680,7 @@ STDCCFLAGS="$STDCCFLAGS -D__MACOSX__"
@ -19,14 +19,3 @@ $OpenBSD: patch-configure,v 1.3 2010/05/31 06:31:39 ajacoutot Exp $
HAVE_RANLIB=yes
;;
@@ -5216,6 +5216,10 @@ fi
solaris*)
opal_release_flags="-O3 -DSOLARIS"
opal_debug_flags="-g -D_DEBUG -DSOLARIS"
+ ;;
+ openbsd*)
+ opal_release_flags=""
+ opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
;;
*)
opal_release_flags="-Os"

15
net/opal/patches/patch-include_opal_pres_ent_h Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-include_opal_pres_ent_h,v 1.1 2011/10/26 16:59:34 ajacoutot Exp $
Fix build with gcc3.
--- include/opal/pres_ent.h.orig Fri Oct 14 09:00:02 2011
+++ include/opal/pres_ent.h Sat Oct 22 12:10:42 2011
@@ -660,7 +660,7 @@ class OpalPresentityCommand {
public: virtual void Process(OpalPresentity & presentity) { dynamic_cast<entity &>(presentity).func(*this); } \
}; \
static PFactory<OpalPresentityCommand>::Worker<entity##_##command> \
- s_##entity##_##command(PDefaultPFactoryKey(entity::Class())+typeid(command).name())
+ s_entity##_##command(PDefaultPFactoryKey(#entity)+typeid(command).name())
/** Command for subscribing to the status of another presentity.

12
net/opal/patches/patch-plugins_audio_GSM0610_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_audio_GSM0610_Makefile_in,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/audio/GSM0610/Makefile.in.orig Wed Sep 23 00:23:13 2009
+++ plugins/audio/GSM0610/Makefile.in Wed Sep 23 00:24:07 2009
@@ -163,7 +163,7 @@ ifeq (solaris,$(findstring solaris,$(target_os)))
$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
else
- $(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)
+ $(Q_LD)$(CC) $(LDSO) -o $@ $(LDFLAGS) $^ $(EXTRALIBS)
endif

12
net/opal/patches/patch-plugins_audio_SILK_SILK_SDK_Makefile Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-plugins_audio_SILK_SILK_SDK_Makefile,v 1.1 2011/10/26 16:59:34 ajacoutot Exp $
--- plugins/audio/SILK/SILK_SDK/Makefile.orig Fri Oct 14 08:59:53 2011
+++ plugins/audio/SILK/SILK_SDK/Makefile Wed Oct 26 11:45:32 2011
@@ -16,7 +16,7 @@ LIBPREFIX = lib
LIBSUFFIX = .a
OBJSUFFIX = .o
-CC = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
+CC ?= $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
AR = $(TOOLCHAIN_PREFIX)ar
RANLIB = $(TOOLCHAIN_PREFIX)ranlib
CP = $(TOOLCHAIN_PREFIX)cp

189
net/opal/patches/patch-plugins_configure
View File

@ -1,163 +1,48 @@
$OpenBSD: patch-plugins_configure,v 1.4 2011/04/01 06:52:47 jakemsr Exp $
--- plugins/configure.orig Wed May 26 23:52:49 2010
+++ plugins/configure Thu Mar 31 19:18:03 2011
@@ -2830,6 +2830,10 @@ fi
opal_release_flags="-O3 -DSOLARIS"
opal_debug_flags="-g -D_DEBUG -DSOLARIS"
;;
+ openbsd*)
+ opal_release_flags=""
+ opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
+ ;;
*)
opal_release_flags="-Os"
opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
@@ -5347,7 +5351,7 @@ $as_echo "#define PLUGIN_CODEC_DLL_EXPORTS 1" >>confde
$OpenBSD: patch-plugins_configure,v 1.5 2011/10/26 16:59:34 ajacoutot Exp $
--- plugins/configure.orig Fri Oct 14 09:00:00 2011
+++ plugins/configure Mon Oct 24 18:35:23 2011
@@ -6479,7 +6479,7 @@ $as_echo "#define PLUGIN_CODEC_DLL_EXPORTS 1" >>confde
*)
STDCCFLAGS="$STDCCFLAGS -fPIC"
CFLAGS="$CFLAGS -fPIC"
- LDSO='-shared -Wl,-soname,$(SONAME)'
+ LDSO='-shared -fPIC -Wl,-soname,$(SONAME)'
PLUGINEXT=so
for ac_header in sys/time.h sys/file.h netinet/in.h
do :
@@ -6521,9 +6525,9 @@ $as_echo "$as_me: libavcodec stack align hack disabled
HAVE_H264_DECODER=yes
;;
* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for h263p_encoder in -lavcodec" >&5
-$as_echo_n "checking for h263p_encoder in -lavcodec... " >&6; }
-if test "${ac_cv_lib_avcodec_h263p_encoder+set}" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ff_h263p_encoder in -lavcodec" >&5
+$as_echo_n "checking for ff_h263p_encoder in -lavcodec... " >&6; }
+if test "${ac_cv_lib_avcodec_ff_h263p_encoder+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -6537,35 +6541,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char h263p_encoder ();
+char ff_h263p_encoder ();
int
main ()
{
-return h263p_encoder ();
+return ff_h263p_encoder ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_avcodec_h263p_encoder=yes
+ ac_cv_lib_avcodec_ff_h263p_encoder=yes
else
- ac_cv_lib_avcodec_h263p_encoder=no
+ ac_cv_lib_avcodec_ff_h263p_encoder=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_h263p_encoder" >&5
-$as_echo "$ac_cv_lib_avcodec_h263p_encoder" >&6; }
-if test "x$ac_cv_lib_avcodec_h263p_encoder" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_ff_h263p_encoder" >&5
+$as_echo "$ac_cv_lib_avcodec_ff_h263p_encoder" >&6; }
+if test "x$ac_cv_lib_avcodec_ff_h263p_encoder" = x""yes; then :
HAVE_H263P=yes
else
HAVE_H263P=no
fi
@@ -6973,7 +6973,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpeg4_encoder in -lavcodec" >&5
-$as_echo_n "checking for mpeg4_encoder in -lavcodec... " >&6; }
-if test "${ac_cv_lib_avcodec_mpeg4_encoder+set}" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ff_mpeg4_encoder in -lavcodec" >&5
+$as_echo_n "checking for ff_mpeg4_encoder in -lavcodec... " >&6; }
+if test "${ac_cv_lib_avcodec_ff_mpeg4_encoder+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -6579,35 +6583,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char mpeg4_encoder ();
+char ff_mpeg4_encoder ();
int
main ()
{
-return mpeg4_encoder ();
+return ff_mpeg4_encoder ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_avcodec_mpeg4_encoder=yes
+ ac_cv_lib_avcodec_ff_mpeg4_encoder=yes
else
- ac_cv_lib_avcodec_mpeg4_encoder=no
+ ac_cv_lib_avcodec_ff_mpeg4_encoder=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_mpeg4_encoder" >&5
-$as_echo "$ac_cv_lib_avcodec_mpeg4_encoder" >&6; }
-if test "x$ac_cv_lib_avcodec_mpeg4_encoder" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_ff_mpeg4_encoder" >&5
+$as_echo "$ac_cv_lib_avcodec_ff_mpeg4_encoder" >&6; }
+if test "x$ac_cv_lib_avcodec_ff_mpeg4_encoder" = x""yes; then :
HAVE_MPEG4=yes
else
HAVE_MPEG4=no
fi
- #include <gsm/gsm.h>
+ #include <gsm.h>
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for h264_decoder in -lavcodec" >&5
-$as_echo_n "checking for h264_decoder in -lavcodec... " >&6; }
-if test "${ac_cv_lib_avcodec_h264_decoder+set}" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ff_h264_decoder in -lavcodec" >&5
+$as_echo_n "checking for ff_h264_decoder in -lavcodec... " >&6; }
+if test "${ac_cv_lib_avcodec_ff_h264_decoder+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -6621,27 +6625,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char h264_decoder ();
+char ff_h264_decoder ();
int
main ()
{
-return h264_decoder ();
+return ff_h264_decoder ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_avcodec_h264_decoder=yes
+ ac_cv_lib_avcodec_ff_h264_decoder=yes
else
- ac_cv_lib_avcodec_h264_decoder=no
+ ac_cv_lib_avcodec_ff_h264_decoder=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_h264_decoder" >&5
-$as_echo "$ac_cv_lib_avcodec_h264_decoder" >&6; }
-if test "x$ac_cv_lib_avcodec_h264_decoder" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_ff_h264_decoder" >&5
+$as_echo "$ac_cv_lib_avcodec_ff_h264_decoder" >&6; }
+if test "x$ac_cv_lib_avcodec_ff_h264_decoder" = x""yes; then :
HAVE_H264_DECODER=yes
else
HAVE_H264_DECODER=no
@@ -6999,7 +6999,7 @@ fi
$as_echo "$opal_gsm" >&6; }
if test "x${opal_gsm}" = "xyes" ; then
- GSM_CFLAGS="-I/usr/include/gsm -I/usr/local/include/gsm"
+ GSM_CFLAGS="-I!!LOCALBASE!!/include"
GSM_LIBS="-lgsm"
fi
@@ -7080,7 +7080,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <gsm/gsm.h>
+ #include <gsm.h>
int
main ()
@@ -7106,7 +7106,7 @@ fi
$as_echo "$opal_gsm" >&6; }
if test "x${opal_gsm}" = "xyes" ; then
- GSM_CFLAGS="-I/usr/include/gsm -I/usr/local/include/gsm"
+ GSM_CFLAGS="-I!!LOCALBASE!!/include"
GSM_LIBS="-lgsm"
fi

15
net/opal/patches/patch-plugins_video_H_261-vic_vic_config_h
View File

@ -1,11 +1,14 @@
$OpenBSD: patch-plugins_video_H_261-vic_vic_config_h,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/video/H.261-vic/vic/config.h.orig Mon Nov 3 18:04:53 2008
+++ plugins/video/H.261-vic/vic/config.h Mon Nov 3 18:05:07 2008
@@ -71,6 +71,7 @@ typedef unsigned char BYTE;
$OpenBSD: patch-plugins_video_H_261-vic_vic_config_h,v 1.2 2011/10/26 16:59:34 ajacoutot Exp $
--- plugins/video/H.261-vic/vic/config.h.orig Fri Oct 14 08:59:58 2011
+++ plugins/video/H.261-vic/vic/config.h Wed Oct 26 11:10:13 2011
@@ -70,6 +70,10 @@ typedef unsigned int u_int;
typedef unsigned char BYTE;
typedef unsigned long u_long;
#ifndef _WIN32
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#endif
+
#ifndef _WIN32
#include <netinet/in.h>
#endif

16
net/opal/patches/patch-plugins_video_H_263-1998_Makefile_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins_video_H_263-1998_Makefile_in,v 1.1 2011/04/02 06:15:11 ajacoutot Exp $
C++ code needs to define __STDC_CONSTANT_MACROS to pull in parts of
stdint.h (needed by graphics/ffmpeg).
--- plugins/video/H.263-1998/Makefile.in.orig Thu Mar 31 23:45:08 2011
+++ plugins/video/H.263-1998/Makefile.in Thu Mar 31 23:45:30 2011
@@ -56,7 +56,7 @@ ifdef TRACE_FILE
CFLAGS += -DTRACE_FILE=1
endif
-EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR)
+EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) -D__STDC_CONSTANT_MACROS
vpath %.cxx $(COMMONDIR)
vpath %.o $(OBJDIR)

16
net/opal/patches/patch-plugins_video_H_264_Makefile_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins_video_H_264_Makefile_in,v 1.1 2011/04/02 06:15:11 ajacoutot Exp $
C++ code needs to define __STDC_CONSTANT_MACROS to pull in parts of
stdint.h (needed by graphics/ffmpeg).
--- plugins/video/H.264/Makefile.in.orig Thu Mar 31 23:43:27 2011
+++ plugins/video/H.264/Makefile.in Thu Mar 31 23:43:56 2011
@@ -94,7 +94,7 @@ STDCCFLAGS =@STDCCFLAGS@
LDFLAGS =@LDFLAGS@
LIBAVCODEC_CFLAGS=@LIBAVCODEC_CFLAGS@
-EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"$(VC_PLUGIN_DIR)"' -DLICENCE_MPL
+EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"$(VC_PLUGIN_DIR)"' -DLICENCE_MPL -D__STDC_CONSTANT_MACROS
vpath %.cxx $(SHAREDDIR)
vpath %.cxx $(COMMONDIR)

11
net/opal/patches/patch-plugins_video_H_264_h264pipe_unix_cxx
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-plugins_video_H_264_h264pipe_unix_cxx,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/video/H.264/h264pipe_unix.cxx.orig Fri Nov 14 04:05:39 2008
+++ plugins/video/H.264/h264pipe_unix.cxx Fri Nov 14 04:06:11 2008
@@ -32,6 +32,7 @@
#include "rtpframe.h"
#include "h264pipe_unix.h"
#include <string.h>
+#include <unistd.h>
#define HAVE_MKFIFO 1
#define GPL_PROCESS_FILENAME "h264_video_pwplugin_helper"

11
net/opal/patches/patch-plugins_video_H_264_shared_h264frame_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-plugins_video_H_264_shared_h264frame_h,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/video/H.264/shared/h264frame.h.orig Tue Jul 7 11:16:56 2009
+++ plugins/video/H.264/shared/h264frame.h Tue Jul 7 11:17:41 2009
@@ -118,6 +118,7 @@ const static struct h264_resolution {
#ifndef LICENCE_MPL
extern "C"
{
+#include <inttypes.h>
#ifdef _MSC_VER
#include "x264/x264.h"
#else

16
net/opal/patches/patch-plugins_video_H_264_shared_x264wrap_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-plugins_video_H_264_shared_x264wrap_h,v 1.1 2011/10/26 16:59:34 ajacoutot Exp $
x264wrap.h:112: error: 'size_t' has not been declared
--- plugins/video/H.264/shared/x264wrap.h.orig Fri Oct 14 08:59:56 2011
+++ plugins/video/H.264/shared/x264wrap.h Wed Oct 26 11:09:45 2011
@@ -34,6 +34,9 @@
#include "../common/platform.h"
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#endif
#if X264_LICENSED || GPL_HELPER_APP
#define _INTTYPES_H_ // ../common/platform.h is equivalent to this

16
net/opal/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins_video_MPEG4-ffmpeg_Makefile_in,v 1.1 2011/04/02 06:15:11 ajacoutot Exp $
C++ code needs to define __STDC_CONSTANT_MACROS to pull in parts of
stdint.h (needed by graphics/ffmpeg).
--- plugins/video/MPEG4-ffmpeg/Makefile.in.orig Thu Mar 31 23:49:44 2011
+++ plugins/video/MPEG4-ffmpeg/Makefile.in Thu Mar 31 23:50:23 2011
@@ -76,7 +76,7 @@ LIBAVCODEC_SOURCE_DIR = @LIBAVCODEC_SOURCE_DIR@
# Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
# Also add libavutil, so ffmpeg headers can #include "log.h".
-EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR)
+EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) -D__STDC_CONSTANT_MACROS
ifneq (,$(LIBAVCODEC_SOURCE_DIR))
EXTRACCFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil

12
net/opal/patches/patch-plugins_video_THEORA_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_video_THEORA_Makefile_in,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/video/THEORA/Makefile.in.orig Mon Nov 3 18:23:44 2008
+++ plugins/video/THEORA/Makefile.in Mon Nov 3 18:24:02 2008
@@ -34,7 +34,7 @@ COMMONDIR=../common
PLUGINDIR=../..
CC =@CC@
-CFLAGS =@CFLAGS@
+CFLAGS =@CFLAGS@ @THEORA_CFLAGS@
CXX =@CXX@
LDSO =@LDSO@
PLUGINEXT =@PLUGINEXT@

54
net/opal/patches/patch-plugins_video_common_dyna_cxx
View File

@ -1,46 +1,36 @@
$OpenBSD: patch-plugins_video_common_dyna_cxx,v 1.1 2011/04/01 06:52:47 jakemsr Exp $
--- plugins/video/common/dyna.cxx.orig Thu Mar 31 19:00:39 2011
+++ plugins/video/common/dyna.cxx Thu Mar 31 19:11:01 2011
@@ -236,36 +236,36 @@ bool FFMPEGLibrary::Load(int ver)
}
$OpenBSD: patch-plugins_video_common_dyna_cxx,v 1.2 2011/10/26 16:59:34 ajacoutot Exp $
--- plugins/video/common/dyna.cxx.orig Fri Oct 14 08:59:57 2011
+++ plugins/video/common/dyna.cxx Sat Oct 22 12:14:04 2011
@@ -281,26 +281,26 @@ bool FFMPEGLibrary::Load()
return false;
if (_codec==CODEC_ID_H264) {
- if (!libAvcodec.GetFunction("h264_decoder", (DynaLink::Function &)Favcodec_h264_decoder)) {
+ if (!libAvcodec.GetFunction("ff_h264_decoder", (DynaLink::Function &)Favcodec_h264_decoder)) {
TRACE (1, _codecString << "\tDYNA\tFailed to load h264_decoder");
if (m_codec==CODEC_ID_H264) {
- if (!m_libAvcodec.GetFunction("h264_decoder", (DynaLink::Function &)Favcodec_h264_decoder))
+ if (!m_libAvcodec.GetFunction("ff_h264_decoder", (DynaLink::Function &)Favcodec_h264_decoder))
return false;
}
}
if (_codec==CODEC_ID_H263P) {
- if (!libAvcodec.GetFunction("h263_encoder", (DynaLink::Function &)Favcodec_h263_encoder)) {
+ if (!libAvcodec.GetFunction("ff_h263_encoder", (DynaLink::Function &)Favcodec_h263_encoder)) {
TRACE (1, _codecString << "\tDYNA\tFailed to load h263_encoder" );
if (m_codec==CODEC_ID_H263P) {
- if (!m_libAvcodec.GetFunction("h263_encoder", (DynaLink::Function &)Favcodec_h263_encoder))
+ if (!m_libAvcodec.GetFunction("ff_h263_encoder", (DynaLink::Function &)Favcodec_h263_encoder))
return false;
}
- if (!libAvcodec.GetFunction("h263p_encoder", (DynaLink::Function &)Favcodec_h263p_encoder)) {
+ if (!libAvcodec.GetFunction("ff_h263p_encoder", (DynaLink::Function &)Favcodec_h263p_encoder)) {
TRACE (1, _codecString << "\tDYNA\tFailed to load h263p_encoder" );
- if (!m_libAvcodec.GetFunction("h263p_encoder", (DynaLink::Function &)Favcodec_h263p_encoder))
+ if (!m_libAvcodec.GetFunction("ff_h263p_encoder", (DynaLink::Function &)Favcodec_h263p_encoder))
return false;
}
- if (!libAvcodec.GetFunction("h263_decoder", (DynaLink::Function &)Favcodec_h263_decoder)) {
+ if (!libAvcodec.GetFunction("ff_h263_decoder", (DynaLink::Function &)Favcodec_h263_decoder)) {
TRACE (1, _codecString << "\tDYNA\tFailed to load h263_decoder" );
- if (!m_libAvcodec.GetFunction("h263_decoder", (DynaLink::Function &)Favcodec_h263_decoder))
+ if (!m_libAvcodec.GetFunction("ff_h263_decoder", (DynaLink::Function &)Favcodec_h263_decoder))
return false;
}
}
if (_codec==CODEC_ID_MPEG4) {
- if (!libAvcodec.GetFunction("mpeg4_encoder", (DynaLink::Function &)mpeg4_encoder)) {
+ if (!libAvcodec.GetFunction("ff_mpeg4_encoder", (DynaLink::Function &)mpeg4_encoder)) {
TRACE (1, _codecString << "\tDYNA\tFailed to load mpeg4_encoder");
if (m_codec==CODEC_ID_MPEG4) {
- if (!m_libAvcodec.GetFunction("mpeg4_encoder", (DynaLink::Function &)mpeg4_encoder))
+ if (!m_libAvcodec.GetFunction("ff_mpeg4_encoder", (DynaLink::Function &)mpeg4_encoder))
return false;
}
- if (!libAvcodec.GetFunction("mpeg4_decoder", (DynaLink::Function &)mpeg4_decoder)) {
+ if (!libAvcodec.GetFunction("ff_mpeg4_decoder", (DynaLink::Function &)mpeg4_decoder)) {
TRACE (1, _codecString << "\tDYNA\tFailed to load mpeg4_decoder");
- if (!m_libAvcodec.GetFunction("mpeg4_decoder", (DynaLink::Function &)mpeg4_decoder))
+ if (!m_libAvcodec.GetFunction("ff_mpeg4_decoder", (DynaLink::Function &)mpeg4_decoder))
return false;
}
}

55
net/opal/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2010/09/01 14:40:23 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2011/10/26 16:59:34 ajacoutot Exp $
include/opal/
include/opal/asn/
include/opal/asn/gcc.h
@ -30,6 +30,7 @@ include/opal/codec/opalplugin.h
include/opal/codec/opalpluginmgr.h
include/opal/codec/opalwavfile.h
include/opal/codec/ratectl.h
include/opal/codec/rfc2435.h
include/opal/codec/rfc2833.h
include/opal/codec/rfc4175.h
include/opal/codec/silencedetect.h
@ -71,7 +72,6 @@ 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
@ -92,16 +92,17 @@ include/opal/im/rfc4103.h
include/opal/im/sipim.h
include/opal/im/t140.h
include/opal/lids/
include/opal/lids/capi_ep.h
include/opal/lids/lid.h
include/opal/lids/lidep.h
include/opal/lids/lidplugin.h
include/opal/lids/lidpluginmgr.h
include/opal/opal/
include/opal/opal.h
include/opal/opal/audiorecord.h
include/opal/opal/buildopts.h
include/opal/opal/call.h
include/opal/opal/connection.h
include/opal/opal/console_mgr.h
include/opal/opal/endpoint.h
include/opal/opal/guid.h
include/opal/opal/ivr.h
@ -115,12 +116,16 @@ include/opal/opal/opalmixer.h
include/opal/opal/opalvxml.h
include/opal/opal/patch.h
include/opal/opal/pcss.h
include/opal/opal/pres_ent.h
include/opal/opal/recording.h
include/opal/opal/rtpconn.h
include/opal/opal/rtpep.h
include/opal/opal/transcoders.h
include/opal/opal/transports.h
include/opal/rtp/
include/opal/rtp/jitter.h
include/opal/rtp/metrics.h
include/opal/rtp/pcapfile.h
include/opal/rtp/rtp.h
include/opal/rtp/srtp.h
include/opal/rtp/zrtpudp.h
@ -131,6 +136,7 @@ include/opal/sip/sip.h
include/opal/sip/sipcon.h
include/opal/sip/sipep.h
include/opal/sip/sippdu.h
include/opal/sip/sippres.h
include/opal/t120/
include/opal/t120/h323t120.h
include/opal/t120/t120proto.h
@ -142,27 +148,32 @@ include/opal/t38/t38proto.h
include/opal/zrtp/
include/opal/zrtp/opalzrtp.h
include/opal/zrtp/zrtpeventproc.h
lib/libopal.so
@lib lib/libopal.so.${LIBopal_VERSION}
lib/libopal_s.a
lib/opal-${V}/
lib/opal-${V}/codecs/
lib/opal-${V}/codecs/audio/
lib/opal-${V}/codecs/audio/g722_audio_pwplugin.so
lib/opal-${V}/codecs/audio/g726_audio_pwplugin.so
lib/opal-${V}/codecs/audio/gsm0610_audio_pwplugin.so
lib/opal-${V}/codecs/audio/gsmamrcodec_pwplugin.so
lib/opal-${V}/codecs/audio/ilbc_audio_pwplugin.so
lib/opal-${V}/codecs/audio/ima_adpcm_audio_pwplugin.so
lib/opal-${V}/codecs/audio/lpc10_audio_pwplugin.so
lib/opal-${V}/codecs/audio/speex_audio_pwplugin.so
lib/opal-${V}/codecs/video/
lib/opal-${V}/codecs/video/h261-vic_video_pwplugin.so
lib/opal-${V}/codecs/video/h263-1998_video_pwplugin.so
lib/opal-${V}/codecs/video/h264_video_pwplugin.so
@bin lib/opal-${V}/codecs/video/h264_video_pwplugin_helper
lib/opal-${V}/codecs/video/mpeg4-ffmpeg_video_pwplugin.so
lib/opal-${V}/codecs/video/theora_video_pwplugin.so
lib/opal/
lib/opal/codecs/
lib/opal/codecs/audio/
lib/opal/codecs/audio/celt_ptplugin.so
lib/opal/codecs/audio/g7221_ptplugin.so
lib/opal/codecs/audio/g7222_ptplugin.so
lib/opal/codecs/audio/g722_ptplugin.so
lib/opal/codecs/audio/g726_ptplugin.so
lib/opal/codecs/audio/gsm0610_ptplugin.so
lib/opal/codecs/audio/gsmamrcodec_ptplugin.so
lib/opal/codecs/audio/iLBC_ptplugin.so
lib/opal/codecs/audio/ima_adpcm_ptplugin.so
lib/opal/codecs/audio/lpc10_ptplugin.so
lib/opal/codecs/audio/silk_ptplugin.so
lib/opal/codecs/audio/speex_ptplugin.so
lib/opal/codecs/video/
lib/opal/codecs/video/h261_vic_ptplugin.so
lib/opal/codecs/video/h263_ffmpeg_ptplugin.so
@bin lib/opal/codecs/video/h264_video_pwplugin_helper
lib/opal/codecs/video/h264_x264_ptplugin.so
lib/opal/codecs/video/mpeg4_ffmpeg_ptplugin.so
lib/opal/codecs/video/theora_ptplugin.so
lib/opal/fax/
lib/opal/fax/spandsp_ptplugin.so
lib/pkgconfig/opal.pc
share/opal/
share/opal/opal_inc.mak