summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/opal/distinfo9
-rw-r--r--devel/opal/patches/patch-configure30
-rw-r--r--devel/opal/patches/patch-configure.ac21
-rw-r--r--devel/opal/patches/patch-plugins_configure171
-rw-r--r--devel/opal/patches/patch-plugins_configure.ac17
-rw-r--r--devel/opal/patches/patch-plugins_video_H.263-1998_h263-1993.cxx22
-rw-r--r--devel/opal/patches/patch-plugins_video_MPEG4-ffmpeg_mpeg4.cxx27
-rw-r--r--devel/opal/patches/patch-plugins_video_common_dyna.cxx47
8 files changed, 343 insertions, 1 deletions
diff --git a/devel/opal/distinfo b/devel/opal/distinfo
index b72fb95516c..20b59c44bd5 100644
--- a/devel/opal/distinfo
+++ b/devel/opal/distinfo
@@ -1,5 +1,12 @@
-$NetBSD: distinfo,v 1.8 2009/11/10 16:23:23 wiz Exp $
+$NetBSD: distinfo,v 1.9 2011/12/04 22:06:04 marino Exp $
SHA1 (opal-3.6.6.tar.bz2) = bd5e3907faf96db884a64dacdedb2259aca30cd3
RMD160 (opal-3.6.6.tar.bz2) = b639709f7e28ce607478bddc41d171e0e54bee9f
Size (opal-3.6.6.tar.bz2) = 7062422 bytes
+SHA1 (patch-configure) = 96aa5856f356a9e3a2b133593c63dd2effecc5b7
+SHA1 (patch-configure.ac) = 0ca73eeab0cb4cd8b1da85cf285e1e6edb596820
+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_MPEG4-ffmpeg_mpeg4.cxx) = a7003ebd378042506fe11393af6c32847f399fde
+SHA1 (patch-plugins_video_common_dyna.cxx) = ab265fc028870ec4dc7f73ee87580fd4baa7f947
diff --git a/devel/opal/patches/patch-configure b/devel/opal/patches/patch-configure
new file mode 100644
index 00000000000..1b901056a42
--- /dev/null
+++ b/devel/opal/patches/patch-configure
@@ -0,0 +1,30 @@
+$NetBSD: patch-configure,v 1.1 2011/12/04 22:06:04 marino Exp $
+
+--- configure.orig 2009-09-22 00:58:43.000000000 +0000
++++ configure
+@@ -4650,6 +4650,7 @@ echo "$as_me: WARNING: \"CPU $target_cpu
+ esac
+ case "$target_os" in
+ linux*) OSTYPE=linux; ;;
++ dragonfly* ) OSTYPE=DragonFly; ;;
+ freebsd* ) OSTYPE=FreeBSD; ;;
+ openbsd* ) OSTYPE=OpenBSD; ;;
+ netbsd* ) OSTYPE=NetBSD; ;;
+@@ -4900,7 +4901,7 @@ STDCCFLAGS="$STDCCFLAGS -D__MACOSX__"
+ HAVE_RANLIB=yes
+ ;;
+
+- freebsd*|openbsd*|netbsd*)
++ dragonfly*|freebsd*|openbsd*|netbsd*)
+ SHAREDLIBEXT=so
+ SHARED_CFLAGS="-fPIC"
+
+@@ -7135,7 +7136,7 @@ echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ case "$target_os" in
+- freebsd*|openbsd*|netbsd*|darwin*)
++ dragonfly*|freebsd*|openbsd*|netbsd*|darwin*)
+ { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
+ echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_dlopen+set}" = set; then
diff --git a/devel/opal/patches/patch-configure.ac b/devel/opal/patches/patch-configure.ac
new file mode 100644
index 00000000000..f3d5d3f9795
--- /dev/null
+++ b/devel/opal/patches/patch-configure.ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-configure.ac,v 1.1 2011/12/04 22:06:04 marino Exp $
+
+--- configure.ac.orig 2009-09-22 00:58:43.000000000 +0000
++++ configure.ac
+@@ -178,6 +178,7 @@ case "$target_cpu" in
+ esac
+ case "$target_os" in
+ linux*) OSTYPE=linux; ;;
++ dragonfly* ) OSTYPE=DragonFly; ;;
+ freebsd* ) OSTYPE=FreeBSD; ;;
+ openbsd* ) OSTYPE=OpenBSD; ;;
+ netbsd* ) OSTYPE=NetBSD; ;;
+@@ -231,7 +232,7 @@ STDCCFLAGS="$STDCCFLAGS -D__MACOSX__"
+ HAVE_RANLIB=yes
+ ;;
+
+- freebsd*|openbsd*|netbsd*)
++ dragonfly*|freebsd*|openbsd*|netbsd*)
+ SHAREDLIBEXT=so
+ SHARED_CFLAGS="-fPIC"
+ OPAL_DETERMINE_LIBNAMES(DEBUG)
diff --git a/devel/opal/patches/patch-plugins_configure b/devel/opal/patches/patch-plugins_configure
new file mode 100644
index 00000000000..3d5c5899a90
--- /dev/null
+++ b/devel/opal/patches/patch-plugins_configure
@@ -0,0 +1,171 @@
+$NetBSD: patch-plugins_configure,v 1.1 2011/12/04 22:06:04 marino Exp $
+
+--- plugins/configure.orig 2009-09-22 00:57:56.000000000 +0000
++++ plugins/configure
+@@ -9651,9 +9651,9 @@ echo "$as_me: libavcodec stack align hac
+ HAVE_H264_DECODER=yes
+ ;;
+ * )
+- { echo "$as_me:$LINENO: checking for h263p_encoder in -lavcodec" >&5
+-echo $ECHO_N "checking for h263p_encoder in -lavcodec... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_avcodec_h263p_encoder+set}" = set; then
++ { echo "$as_me:$LINENO: checking for ff_h263p_encoder in -lavcodec" >&5
++echo $ECHO_N "checking for ff_h263p_encoder in -lavcodec... $ECHO_C" >&6; }
++if test "${ac_cv_lib_avcodec_ff_h263p_encoder+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9671,11 +9671,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char h263p_encoder ();
++char ff_h263p_encoder ();
+ int
+ main ()
+ {
+-return h263p_encoder ();
++return ff_h263p_encoder ();
+ ;
+ return 0;
+ }
+@@ -9698,29 +9698,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+- ac_cv_lib_avcodec_h263p_encoder=yes
++ ac_cv_lib_avcodec_ff_h263p_encoder=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- 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_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_h263p_encoder" >&5
+-echo "${ECHO_T}$ac_cv_lib_avcodec_h263p_encoder" >&6; }
+-if test $ac_cv_lib_avcodec_h263p_encoder = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_ff_h263p_encoder" >&5
++echo "${ECHO_T}$ac_cv_lib_avcodec_ff_h263p_encoder" >&6; }
++if test $ac_cv_lib_avcodec_ff_h263p_encoder = yes; then
+ HAVE_H263P=yes
+ else
+ HAVE_H263P=no
+ fi
+
+- { echo "$as_me:$LINENO: checking for mpeg4_encoder in -lavcodec" >&5
+-echo $ECHO_N "checking for mpeg4_encoder in -lavcodec... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_avcodec_mpeg4_encoder+set}" = set; then
++ { echo "$as_me:$LINENO: checking for ff_mpeg4_encoder in -lavcodec" >&5
++echo $ECHO_N "checking for ff_mpeg4_encoder in -lavcodec... $ECHO_C" >&6; }
++if test "${ac_cv_lib_avcodec_ff_mpeg4_encoder+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9738,11 +9738,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char mpeg4_encoder ();
++char ff_mpeg4_encoder ();
+ int
+ main ()
+ {
+-return mpeg4_encoder ();
++return ff_mpeg4_encoder ();
+ ;
+ return 0;
+ }
+@@ -9765,29 +9765,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+- ac_cv_lib_avcodec_mpeg4_encoder=yes
++ ac_cv_lib_avcodec_ff_mpeg4_encoder=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- 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_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_mpeg4_encoder" >&5
+-echo "${ECHO_T}$ac_cv_lib_avcodec_mpeg4_encoder" >&6; }
+-if test $ac_cv_lib_avcodec_mpeg4_encoder = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_ff_mpeg4_encoder" >&5
++echo "${ECHO_T}$ac_cv_lib_avcodec_ff_mpeg4_encoder" >&6; }
++if test $ac_cv_lib_avcodec_ff_mpeg4_encoder = yes; then
+ HAVE_MPEG4=yes
+ else
+ HAVE_MPEG4=no
+ fi
+
+- { echo "$as_me:$LINENO: checking for h264_decoder in -lavcodec" >&5
+-echo $ECHO_N "checking for h264_decoder in -lavcodec... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_avcodec_h264_decoder+set}" = set; then
++ { echo "$as_me:$LINENO: checking for ff_h264_decoder in -lavcodec" >&5
++echo $ECHO_N "checking for ff_h264_decoder in -lavcodec... $ECHO_C" >&6; }
++if test "${ac_cv_lib_avcodec_ff_h264_decoder+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9805,11 +9805,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char h264_decoder ();
++char ff_h264_decoder ();
+ int
+ main ()
+ {
+-return h264_decoder ();
++return ff_h264_decoder ();
+ ;
+ return 0;
+ }
+@@ -9832,21 +9832,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+- ac_cv_lib_avcodec_h264_decoder=yes
++ ac_cv_lib_avcodec_ff_h264_decoder=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- 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_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_h264_decoder" >&5
+-echo "${ECHO_T}$ac_cv_lib_avcodec_h264_decoder" >&6; }
+-if test $ac_cv_lib_avcodec_h264_decoder = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_ff_h264_decoder" >&5
++echo "${ECHO_T}$ac_cv_lib_avcodec_ff_h264_decoder" >&6; }
++if test $ac_cv_lib_avcodec_ff_h264_decoder = yes; then
+ HAVE_H264_DECODER=yes
+ else
+ HAVE_H264_DECODER=no
+@@ -10729,7 +10729,7 @@ echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ case "$target_os" in
+- freebsd*|openbsd*|netbsd*|darwin*)
++ dragonfly*|freebsd*|openbsd*|netbsd*|darwin*)
+ { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
+ echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_dlopen+set}" = set; then
diff --git a/devel/opal/patches/patch-plugins_configure.ac b/devel/opal/patches/patch-plugins_configure.ac
new file mode 100644
index 00000000000..0158b4476e0
--- /dev/null
+++ b/devel/opal/patches/patch-plugins_configure.ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-plugins_configure.ac,v 1.1 2011/12/04 22:06:04 marino Exp $
+
+--- plugins/configure.ac.orig 2009-09-22 00:57:56.000000000 +0000
++++ plugins/configure.ac
+@@ -236,9 +236,9 @@ PKG_CHECK_MODULES([LIBAVCODEC],
+ HAVE_H264_DECODER=yes
+ ;;
+ * )
+- AC_CHECK_LIB(avcodec, h263p_encoder, [HAVE_H263P=yes], [HAVE_H263P=no])
+- AC_CHECK_LIB(avcodec, mpeg4_encoder, [HAVE_MPEG4=yes], [HAVE_MPEG4=no])
+- AC_CHECK_LIB(avcodec, h264_decoder, [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no])
++ AC_CHECK_LIB(avcodec, ff_h263p_encoder, [HAVE_H263P=yes], [HAVE_H263P=no])
++ AC_CHECK_LIB(avcodec, ff_mpeg4_encoder, [HAVE_MPEG4=yes], [HAVE_MPEG4=no])
++ AC_CHECK_LIB(avcodec, ff_h264_decoder, [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no])
+ ;;
+ esac
+ AC_SUBST(HAVE_H263P)
diff --git a/devel/opal/patches/patch-plugins_video_H.263-1998_h263-1993.cxx b/devel/opal/patches/patch-plugins_video_H.263-1998_h263-1993.cxx
new file mode 100644
index 00000000000..e85c970da35
--- /dev/null
+++ b/devel/opal/patches/patch-plugins_video_H.263-1998_h263-1993.cxx
@@ -0,0 +1,22 @@
+$NetBSD: patch-plugins_video_H.263-1998_h263-1993.cxx,v 1.1 2011/12/04 22:06:04 marino Exp $
+
+--- plugins/video/H.263-1998/h263-1998.cxx.orig 2011-12-04 20:11:24.617287000 +0000
++++ plugins/video/H.263-1998/h263-1998.cxx
+@@ -688,7 +688,7 @@ int H263_RFC2190_EncoderContext::EncodeF
+
+ _inputFrame->data[1] = _inputFrame->data[0] + size;
+ _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
+- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
++ _inputFrame->pict_type = (flags && forceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
+
+ currentMb = 0;
+ currentBytes = 0;
+@@ -885,7 +885,7 @@ int H263_RFC2429_EncoderContext::EncodeF
+ _inputFrame->data[0] = _inputFrameBuffer + FF_INPUT_BUFFER_PADDING_SIZE;
+ _inputFrame->data[1] = _inputFrame->data[0] + size;
+ _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
+- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
++ _inputFrame->pict_type = (flags && forceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
+
+ _txH263PFrame->BeginNewFrame();
+ _txH263PFrame->SetTimestamp(srcRTP.GetTimestamp());
diff --git a/devel/opal/patches/patch-plugins_video_MPEG4-ffmpeg_mpeg4.cxx b/devel/opal/patches/patch-plugins_video_MPEG4-ffmpeg_mpeg4.cxx
new file mode 100644
index 00000000000..4513b335c59
--- /dev/null
+++ b/devel/opal/patches/patch-plugins_video_MPEG4-ffmpeg_mpeg4.cxx
@@ -0,0 +1,27 @@
+$NetBSD: patch-plugins_video_MPEG4-ffmpeg_mpeg4.cxx,v 1.1 2011/12/04 22:06:04 marino Exp $
+
+--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig 2009-09-22 00:57:53.000000000 +0000
++++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -828,11 +828,11 @@ int MPEG4EncoderContext::EncodeFrames(co
+ // Should the next frame be an I-Frame?
+ if ((flags & PluginCodec_CoderForceIFrame) || (_frameNum == 0))
+ {
+- _avpicture->pict_type = FF_I_TYPE;
++ _avpicture->pict_type = AV_PICTURE_TYPE_I;
+ }
+ else // No IFrame requested, let avcodec decide what to do
+ {
+- _avpicture->pict_type = 0;
++ _avpicture->pict_type = AV_PICTURE_TYPE_NONE;
+ }
+
+ // Encode a frame
+@@ -1363,7 +1363,7 @@ bool MPEG4DecoderContext::DecoderError(i
+ if (_doError) {
+ int errors = 0;
+ MpegEncContext *s = (MpegEncContext *) _avcontext->priv_data;
+- if (s->error_count && _avcontext->coded_frame->pict_type == FF_I_TYPE) {
++ if (s->error_count && _avcontext->coded_frame->pict_type == AV_PICTURE_TYPE_I) {
+ const uint8_t badflags = AC_ERROR | DC_ERROR | MV_ERROR;
+ for (int i = 0; i < s->mb_num && errors < threshold; ++i) {
+ if (s->error_status_table[s->mb_index2xy[i]] & badflags)
diff --git a/devel/opal/patches/patch-plugins_video_common_dyna.cxx b/devel/opal/patches/patch-plugins_video_common_dyna.cxx
new file mode 100644
index 00000000000..53eb58948ac
--- /dev/null
+++ b/devel/opal/patches/patch-plugins_video_common_dyna.cxx
@@ -0,0 +1,47 @@
+$NetBSD: patch-plugins_video_common_dyna.cxx,v 1.1 2011/12/04 22:06:04 marino Exp $
+
+--- plugins/video/common/dyna.cxx.orig 2009-09-22 00:57:52.000000000 +0000
++++ plugins/video/common/dyna.cxx
+@@ -236,36 +236,36 @@ bool FFMPEGLibrary::Load(int ver)
+ }
+
+ 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");
+ 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" );
+ 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" );
+ 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" );
+ 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");
+ 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");
+ return false;
+ }
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 14:17:09 +0000