Index: head/cad/netgen/Makefile =================================================================== --- head/cad/netgen/Makefile (revision 426601) +++ head/cad/netgen/Makefile (revision 426602) @@ -1,65 +1,63 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= netgen PORTVERSION= 5.3.1 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:C|\.[[:digit:]]+$||}/ MAINTAINER= stephen@FreeBSD.org COMMENT= Automatic 3D tetrahedral mesh generator LIB_DEPENDS= libTix8.4.3.so:x11-toolkits/tix \ libtogl.so:graphics/togl OCC_BROKEN= Does not compile because of issues with cad/opencascade USE_LDCONFIG= yes -USES= gmake jpeg libtool tk:tea -USE_GL= yes -USE_XORG= xmu xi +USES= gmake jpeg libtool localbase tk:tea +USE_GL= gl glu +USE_XORG= x11 xmu xi MAKE_JOBS_UNSAFE= yes -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/lib/Togl-1.7 +CPPFLAGS+= -isystem ${LOCALBASE}/lib/Togl-1.7 CONFIGURE_ARGS= --enable-jpeglib +INSTALL_TARGET= install-strip FETCH_BEFORE_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} OPTIONS_DEFINE= OCC FFMPEG OCC_DESC= Compile with OpenCascade geometry kernel FFMPEG_DESC= video recording with FFmpeg OPTIONS_DEFAULT= # OCC BROKEN_sparc64= internal gcc error (Bug 23159) OCC_LIB_DEPENDS= libTKernel.so:cad/opencascade OCC_CXXFLAGS= -DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE OCC_CONFIGURE_ON= --enable-occ -FFMPEG_LIB_DEPENDS= libavcodec0.so:multimedia/ffmpeg0 +FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ON= --enable-ffmpeg MACHINE= ${OPSYS:tu} SUB_LIST= PREFIX=${PREFIX} SUB_FILES= pkg-message MAKE_ENV= TK_VER=${TK_VER} TCL_VER=${TCL_VER} \ TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \ TK_INCLUDEDIR="${TK_INCLUDEDIR}" \ MACHINE=${MACHINE} MAKE=${MAKE_CMD} -pre-configure: - @${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ +post-patch: + @${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \ + ${WRKSRC}/ng/ng.tcl \ ${WRKSRC}/ng/ngappinit.cpp - -post-configure: - @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" \ - ${WRKSRC}/configure post-install: # copy some additional headers for build cad/salome-netgenplugin ${MKDIR} ${STAGEDIR}${DATADIR}/include ${SH} ${FILESDIR}/netgen_copy_include_for_salome ${WRKSRC} ${STAGEDIR}${PREFIX} ${LN} ${STAGEDIR}${PREFIX}/lib/libnglib.so ${STAGEDIR}${PREFIX}/lib/libnglib.so.1 .include Index: head/cad/netgen/files/patch-ng_ng.tcl =================================================================== --- head/cad/netgen/files/patch-ng_ng.tcl (revision 426601) +++ head/cad/netgen/files/patch-ng_ng.tcl (nonexistent) @@ -1,11 +0,0 @@ ---- ng/ng.tcl.orig 2014-08-29 09:54:01 UTC -+++ ng/ng.tcl -@@ -32,7 +32,7 @@ if { [lsearch [array names env] NETGENDI - set ngdir $env(NETGENDIR) - } - if { [string length $ngdir] == 0 } { -- set ngdir "." -+ set ngdir "/usr/local/bin" - } - - set nguserdir "" Property changes on: head/cad/netgen/files/patch-ng_ng.tcl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/netgen/files/patch-ng_ngappinit.cpp =================================================================== --- head/cad/netgen/files/patch-ng_ngappinit.cpp (revision 426601) +++ head/cad/netgen/files/patch-ng_ngappinit.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- ng/ngappinit.cpp.orig 2014-08-29 09:54:01 UTC -+++ ng/ngappinit.cpp -@@ -149,7 +149,7 @@ int main(int argc, char ** argv) - if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR"))) - ngdir = getenv ("NETGENDIR"); - else -- ngdir = "."; -+ ngdir = "/usr/local/bin"; - - verbose = parameters.GetDefineFlag ("V"); - Property changes on: head/cad/netgen/files/patch-ng_ngappinit.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/netgen/files/patch-configure =================================================================== --- head/cad/netgen/files/patch-configure (revision 426601) +++ head/cad/netgen/files/patch-configure (revision 426602) @@ -1,167 +1,155 @@ --- configure.orig 2014-10-06 11:04:36 UTC +++ configure @@ -9219,7 +9219,7 @@ $as_echo_n "checking whether the $compil hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no - link_all_deplibs=unknown + link_all_deplibs=no module_cmds= module_expsym_cmds= old_archive_from_new_cmds= @@ -9488,7 +9488,7 @@ _LT_EOF wlarc= else archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' fi ;; @@ -9507,7 +9507,7 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi @@ -9536,7 +9536,7 @@ _LT_EOF if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi @@ -9554,7 +9554,7 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi @@ -10142,7 +10142,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > hardcode_direct_absolute=yes if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-version-script,$lib-ver' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -10920,7 +10920,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; @@ -12015,7 +12015,7 @@ striplib= old_striplib= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -12263,7 +12263,7 @@ hardcode_automatic_CXX=no inherit_rpath_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown +link_all_deplibs_CXX=no old_archive_cmds_CXX=$old_archive_cmds reload_flag_CXX=$reload_flag reload_cmds_CXX=$reload_cmds @@ -12481,7 +12481,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13100,7 +13100,7 @@ fi case `$CC -V 2>&1` in *"Version 7."*) archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= @@ -13108,7 +13108,7 @@ fi ia64*) tmp_idyn=' -i_dynamic';; esac archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' ;; esac archive_cmds_need_lc_CXX=no @@ -13140,7 +13140,7 @@ fi ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-version-script ${wl}$lib-ver -o $lib' ;; esac @@ -13151,7 +13151,7 @@ fi cxx*) # Compaq C++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-version-script $wl$lib-ver' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -13185,7 +13185,7 @@ fi # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script ${wl}$lib-ver' hardcode_libdir_flag_spec_CXX='-R$libdir' whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes @@ -13258,7 +13258,7 @@ fi archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script,$lib-ver -o $lib' export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi @@ -14766,7 +14766,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; -@@ -15534,9 +15534,9 @@ fi - ffmpegon=false - # Check whether --enable-ffmpeg was given. - if test "${enable_ffmpeg+set}" = set; then : -- enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS" -+ enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I/usr/local/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS" - -- FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2" -+ FFMPEG_LIBS="-L/usr/local/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2" - - if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi - Index: head/cad/netgen/files/patch-ng_ngpkg.cpp =================================================================== --- head/cad/netgen/files/patch-ng_ngpkg.cpp (nonexistent) +++ head/cad/netgen/files/patch-ng_ngpkg.cpp (revision 426602) @@ -0,0 +1,93 @@ +--- ng/ngpkg.cpp.orig 2014-08-29 09:54:01 UTC ++++ ng/ngpkg.cpp +@@ -2266,7 +2266,7 @@ namespace netgen + static int gopsize = DEFAULT_GOP_SIZE; + static int bframes = DEFAULT_B_FRAMES; + static int MPGbufsize = DEFAULT_MPG_BUFSIZE; +- static CodecID codec_id = CODEC_ID_MPEG1VIDEO; ++ static AVCodecID codec_id = AV_CODEC_ID_MPEG1VIDEO; + static FILE *MPGfile; + static buffer_t buff; + static struct SwsContext *img_convert_ctx; +@@ -2338,7 +2338,7 @@ namespace netgen + context->time_base = s; + context->gop_size = gopsize; + context->max_b_frames = bframes; +- context->pix_fmt = PIX_FMT_YUV420P; ++ context->pix_fmt = AV_PIX_FMT_YUV420P; + context->flags |= CODEC_FLAG_PSNR; + + // if( avcodec_open( context, codec ) < 0 ) { +@@ -2351,7 +2351,7 @@ namespace netgen + return TCL_ERROR; + } + +- YUVpicture = avcodec_alloc_frame(); ++ YUVpicture = av_frame_alloc(); + + YUVpicture->data[0] = buff.YUV; + YUVpicture->data[1] = buff.YUV + PIXsize; +@@ -2360,7 +2360,7 @@ namespace netgen + YUVpicture->linesize[1] = nx / 2; + YUVpicture->linesize[2] = nx / 2; + +- RGBpicture = avcodec_alloc_frame(); ++ RGBpicture = av_frame_alloc(); + + RGBpicture->data[0] = buff.RGB; + RGBpicture->data[1] = buff.RGB; +@@ -2405,8 +2405,8 @@ namespace netgen + // Convert to YUV: + //---------------- + if( img_convert_ctx == NULL ) +- img_convert_ctx = sws_getContext( nx, ny, PIX_FMT_RGB24, +- nx, ny, PIX_FMT_YUV420P, ++ img_convert_ctx = sws_getContext( nx, ny, AV_PIX_FMT_RGB24, ++ nx, ny, AV_PIX_FMT_YUV420P, + SWS_BICUBIC, NULL, NULL, NULL ); + + if( img_convert_ctx == NULL ) { +@@ -2420,8 +2420,15 @@ namespace netgen + + // Encode frame: + //-------------- +- bytes = avcodec_encode_video( context, buff.MPG, +- MPGbufsize, YUVpicture ); ++ AVPacket pkt; ++ av_init_packet( &pkt ); ++ pkt.data = buff.MPG; ++ pkt.size = MPGbufsize; ++ ++ int got_packet = 0; ++ int ret = avcodec_encode_video2( context, &pkt, YUVpicture, ++ &got_packet ); ++ bytes = ret ? ret : pkt.size; + count_frames++; + print_info( count_frames, context, bytes ); + fwrite( buff.MPG, 1, bytes, MPGfile ); +@@ -2442,8 +2449,15 @@ namespace netgen + + // Get the delayed frames, if any: + //-------------------------------- ++ AVPacket pkt; ++ av_init_packet( &pkt ); ++ pkt.data = buff.MPG; ++ pkt.size = MPGbufsize; ++ ++ int got_packet = 0; + for( ; bytes; ) { +- bytes = avcodec_encode_video( context, buff.MPG, MPGbufsize, NULL ); ++ int ret = avcodec_encode_video2( context, &pkt, NULL, &got_packet ); ++ bytes = ret ? ret : pkt.size; + count_frames++; + print_info( count_frames, context, bytes ); + fwrite( buff.MPG, 1, bytes, MPGfile ); +@@ -2451,7 +2465,7 @@ namespace netgen + + // Add sequence end code: + //----------------------- +- if( codec_id == CODEC_ID_MPEG1VIDEO ) { ++ if( codec_id == AV_CODEC_ID_MPEG1VIDEO ) { + buff.MPG[0] = 0x00; + buff.MPG[1] = 0x00; + buff.MPG[2] = 0x01; Property changes on: head/cad/netgen/files/patch-ng_ngpkg.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property