From 5417f66ca9803c2626446837f23b02053fbfc71f Mon Sep 17 00:00:00 2001 From: zuntum Date: Thu, 26 Jul 2001 15:20:49 +0000 Subject: Update avifile-devel to 0.6.20010726 Thanks for Zdenek Kabelac for playing with avifile on my NetBSD box and making it compile after recent changes in the avifile code! Now audio/video should be in sync again. Several new tools are available: avicat, avimake, avitype. You need to build avifile-devel with WITH_QT=YES if you want to build those. aviplay still does not work, please use pkgsrc/graphics/apla instead. apla has been switched to use avifile-devel (it required avifile in the past). Changes: 2001/07/22 * TrueType Font Rendering (using Xft extension - with the help of Lukas Hejtmanek) * smarter DirectRendering mode - should work all the time with necessary conversions 2001/07/21 * very extensive cleanup of conversion modes of images * cleaned some hacks in Win32 VideoDecoder class * added some hack for correct playing of several not very used codecs like huffyuv, asv1, asv2, vcr2 * large speedup of C-version routines for conversion RGB 24b->16b 2001/07/18 * fixed bug in Subviewer reader * fixed two memory leaks discovered by mprotector * added support for few more codecs 2001/07/17 * lots of code cleanup * started to cleanup some types - transformation to uint32... * some fixies in DirectShow code * fixed several MAJOR bugs in qtrecompressor - now it even works - though it's still rather a toy application and I would not advice to use it for any serious thing yet * ffmpeg 0.4.4 * autoconf2.50 compatible - anyone dissagree ??? 2001/07/14 * another speedup of resumpling code - should be now very efficient * -ljpeg for avimake 2001/07/11 * added libmp3lamebin plugin which as able to load libmp3lame at runtime 2001/07/10 * 4 times faster resampling - using just interger arithmetic * scanning WIN32_PATH, /usr/lib/win32, /usr/local/lib/win32 paths for dll 2001/07/09 * able to use ffmpeg library - version 0.4.3 is now in avifile CVS - original CVS seems to be now the tree of the mplayer. for now we could use it to play OpenDivX - it could also play DivX :-) * minor redesing of videodecoder API - now we have Start/StopInternal * cleaned mjpeg_plugin * started to clean DirectShow directory to make it C-compilable (so it could be used by mplayer and others...) * also made quite a few cleanups in other places * fixed WIN32_PATH support * added AVIPLUGIN_PATH shell variable * fixed AVIPLAY_MUTE_VIDEO, AVIPLAY_MUTE_AUDIO * few fixes for debian 2001/06/28 * another change in constants in scheduler * interface change! - GetHeader(void* header, size_t n) 2001/06/26 * Locker.h and VideoDPMS.h are now public * fixed few problems in frame elimination in video decoder class 2001/06/23 * complete rewrite of players' thread - is it now FreeBSD safe ?? - also we are no longer using avi_usleep for audio synchronization and instead we use timed condition which has adwantage that we have immediate hangup when thread is sleeping * added NextFrame aviplay method - usable with 'Return' key in aviplayer * implemented initial 'hacked' support for better priority handling - if you set uid.gid to root.root together with 'suid' bit, that video thread will use -10 priority for better timing - however BIG WARNING is here - you are using closed-source windows binary dll codecs - during their execution aviplayer is using user uid & gid - however you never know what could happen! * for this reason it looks like the best is to lower the priority if audio & video decoding threads so video thread gets its needed CPU when necessery. 2001/06/21 * complex GUI update for configuration of aviplayer (some of buttons now even works in runtime so you don't have to restart player - ok I know - still not perfect...) * resampling is now more usable as it could do far more things then just pure 44kHz resampling - so why not making it fully usable - its even nice feature * version-info - library has now number 0.0.6 (level 0 version 0.6) * another streaming bug fixed - so we play more asf stream over the net 2001/06/20 * fixed & tuned resampling to remove clics for unsigned char audio stream (but some check for the overflow would help us too) * extended stream info added (check movie property) 2001/06/18 * some deadlocks in audio renderer - SDL_LockAudio now works somehow better but it is still not usable * no longer processing keyboard events which belongs to other applications * fixed resampling - that was really stupid bug and not that easy to fix but the result is very good 2001/06/18 * minor updates in network asf - it just works - but it's still crashing a lot * staying compatible with qt2.X * added hack for NVidia cards - autodetected by looking for NVIDIA-GLX extension - could be forced on by setting export AVIPLAY_NVIDIA_ENABLE=1 or off with this shell command executed before aviplayer gets started export AVIPLAY_NVIDIA_DISABLE=1 --- graphics/avifile-devel/Makefile | 11 +++++------ graphics/avifile-devel/distinfo | 9 +++------ graphics/avifile-devel/patches/patch-aa | 10 ---------- graphics/avifile-devel/patches/patch-ab | 12 ------------ graphics/avifile-devel/patches/patch-ac | 12 ------------ graphics/avifile-devel/pkg/PLIST | 16 ++++++++++++++-- 6 files changed, 22 insertions(+), 48 deletions(-) delete mode 100644 graphics/avifile-devel/patches/patch-aa delete mode 100644 graphics/avifile-devel/patches/patch-ab delete mode 100644 graphics/avifile-devel/patches/patch-ac (limited to 'graphics/avifile-devel') diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile index cfe08f7e048..b755b807624 100644 --- a/graphics/avifile-devel/Makefile +++ b/graphics/avifile-devel/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:54 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/07/26 15:20:49 zuntum Exp $ # -DISTNAME= avifile-0.6.20010618 +DISTNAME= avifile-0.6.20010726 CATEGORIES= graphics -MASTER_SITES= http://flis.utech.lublin.pl/~zuntum/distfiles/ \ - http://zuntum.net/distfiles/ +MASTER_SITES= http://flis.utech.lublin.pl/~zuntum/distfiles/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= zuntum@netbsd.org @@ -34,11 +33,11 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= YES -CXXFLAGS+= -L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include +CXXFLAGS+= -L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include -I${X11PREFIX}/include CONFIGURE_ARGS+= --with-win32-path=${LOCALBASE}/lib/win32 -CONFIGURE_ARGS+= --enable-release CONFIGURE_ARGS+= --disable-dpms +CONFIGURE_ARGS+= --disable-ffmpeg .if defined (WITH_QT) && ${WITH_QT} == YES .include "../../x11/qt2-designer/buildlink.mk" diff --git a/graphics/avifile-devel/distinfo b/graphics/avifile-devel/distinfo index d69ec565740..a4bcf7e3e7f 100644 --- a/graphics/avifile-devel/distinfo +++ b/graphics/avifile-devel/distinfo @@ -1,7 +1,4 @@ -$NetBSD: distinfo,v 1.5 2001/06/26 17:33:34 zuntum Exp $ +$NetBSD: distinfo,v 1.6 2001/07/26 15:20:49 zuntum Exp $ -SHA1 (avifile-0.6.20010618.tar.bz2) = 7bd6f699ca0f72a48559e8b490322bd2670191e1 -Size (avifile-0.6.20010618.tar.bz2) = 788276 bytes -SHA1 (patch-aa) = 462e2f0ca34d5a50ec87f9424b2ec9c84d3b8f6a -SHA1 (patch-ab) = 65c1318ce1798d0e6c25fc0b61dd02be932a74d8 -SHA1 (patch-ac) = ef62129e30cfed2a8494160d18146e4f536ce0fd +SHA1 (avifile-0.6.20010726.tar.bz2) = 64a05a1623ff0989ca05ec3ef490baeaf5a70306 +Size (avifile-0.6.20010726.tar.bz2) = 1024840 bytes diff --git a/graphics/avifile-devel/patches/patch-aa b/graphics/avifile-devel/patches/patch-aa deleted file mode 100644 index ec01c8bf985..00000000000 --- a/graphics/avifile-devel/patches/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2001/06/25 14:09:46 zuntum Exp $ - ---- lib/common/Makefile.am.orig Thu Jun 7 22:36:21 2001 -+++ lib/common/Makefile.am -@@ -13,4 +13,4 @@ - ldt_keeper.cpp \ - mmx.cpp - --CXXFLAGS = -g -O2 -+CXXFLAGS+= -g -O2 -I${X11BASE}/include diff --git a/graphics/avifile-devel/patches/patch-ab b/graphics/avifile-devel/patches/patch-ab deleted file mode 100644 index 77ecb060ef6..00000000000 --- a/graphics/avifile-devel/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/06/25 14:09:46 zuntum Exp $ - ---- plugins/libwin32/loader/afl.c.orig Mon May 7 16:53:12 2001 -+++ plugins/libwin32/loader/afl.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - #include - #include diff --git a/graphics/avifile-devel/patches/patch-ac b/graphics/avifile-devel/patches/patch-ac deleted file mode 100644 index ffda21d0a6c..00000000000 --- a/graphics/avifile-devel/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/06/25 14:09:46 zuntum Exp $ - ---- plugins/libwin32/loader/ext.c.orig Sat Jan 27 19:52:10 2001 -+++ plugins/libwin32/loader/ext.c -@@ -5,6 +5,7 @@ - * - * - ********************************************************/ -+#include - #include - #ifdef HAVE_MALLOC_H - #include diff --git a/graphics/avifile-devel/pkg/PLIST b/graphics/avifile-devel/pkg/PLIST index e3c65fcfb68..e3ed6d5204d 100644 --- a/graphics/avifile-devel/pkg/PLIST +++ b/graphics/avifile-devel/pkg/PLIST @@ -1,9 +1,15 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/06/16 11:48:04 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/07/26 15:20:51 zuntum Exp $ +${QT}bin/avicat bin/avifile-config +${QT}bin/avimake ${QT}bin/aviplay +${QT}bin/avitype ${QT}bin/benchmark ${QT}bin/qtrecompress +include/avifile/Locker.h include/avifile/ReadHandlers.h +include/avifile/StreamInfo.h +include/avifile/VideoDPMS.h include/avifile/audiodecoder.h include/avifile/audioencoder.h include/avifile/avifile.h @@ -25,6 +31,7 @@ include/avifile/playerwidget.h include/avifile/plugin.h include/avifile/registry.h include/avifile/renderer.h +include/avifile/utils.h include/avifile/version.h include/avifile/videodecoder.h include/avifile/videoencoder.h @@ -33,6 +40,11 @@ lib/avifile/libaudiodec.la lib/avifile/libaudiodec.so lib/avifile/libaudiodec.so.0 lib/avifile/libaudiodec.so.0.0 +${QT}lib/avifile/libmjpeg.a +${QT}lib/avifile/libmjpeg.la +${QT}lib/avifile/libmjpeg.so +${QT}lib/avifile/libmjpeg.so.0 +${QT}lib/avifile/libmjpeg.so.0.0 lib/avifile/libmp3lame_audioenc.a lib/avifile/libmp3lame_audioenc.la lib/avifile/libmp3lame_audioenc.so @@ -52,7 +64,7 @@ lib/libaviplay.a lib/libaviplay.la lib/libaviplay.so lib/libaviplay.so.0 -lib/libaviplay.so.0.0 +lib/libaviplay.so.0.6 share/avifile/about.ppm share/avifile/mute.ppm share/avifile/open.ppm -- cgit v1.2.3