From d00e4481613bbf241d8137dd7daaff62a3c49112 Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Tue, 25 Sep 2001 16:22:32 +0000 Subject: o update to 0.60.20010920 o sanitize MASTER_SITES o bump lib version since incompatible with previous one o trim/update DESCR; update WWW tag PR: 30747 Submitted by: MAINTAINER --- multimedia/avifile/Makefile | 80 +++++++--------------- multimedia/avifile/distinfo | 2 +- .../avifile/files/patch-Makefile-libwin32Makefile | 10 --- multimedia/avifile/files/patch-aa | 9 --- multimedia/avifile/files/patch-ab | 10 --- multimedia/avifile/files/patch-configure.in | 13 ++++ multimedia/avifile/files/patch-libavireadCache.h | 10 +++ .../avifile/files/patch-libavplayaviplay.cpp | 10 +++ .../avifile/files/patch-libvideorenderer.cpp | 10 +++ multimedia/avifile/files/patch-videocodecMakefile | 10 --- multimedia/avifile/pkg-descr | 38 +--------- multimedia/avifile/pkg-plist | 78 +++++++++++++-------- 12 files changed, 122 insertions(+), 158 deletions(-) delete mode 100644 multimedia/avifile/files/patch-Makefile-libwin32Makefile delete mode 100644 multimedia/avifile/files/patch-aa delete mode 100644 multimedia/avifile/files/patch-ab create mode 100644 multimedia/avifile/files/patch-configure.in create mode 100644 multimedia/avifile/files/patch-libavireadCache.h create mode 100644 multimedia/avifile/files/patch-libavplayaviplay.cpp create mode 100644 multimedia/avifile/files/patch-libvideorenderer.cpp delete mode 100644 multimedia/avifile/files/patch-videocodecMakefile (limited to 'multimedia/avifile') diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index a42e734923a3..4cd178a25065 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -6,17 +6,19 @@ # PORTNAME= avifile -PORTVERSION= 0.60.20010429 -PORTREVISION= 1 +PORTVERSION= 0.60.20010920 CATEGORIES= graphics -MASTER_SITES= http://ernie.eit.uni-kl.de/avifile/ \ - http://divx.euro.ru/ \ - http://www.toon.eu.org/divx/ -DISTFILES= avifile-${PORTVERSION}.tar.gz \ +MASTER_SITES= http://ernie.eit.uni-kl.de/avifile/ +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= holger@eit.uni-kl.de +BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl12 +.if !defined(WITHOUT_VORBIS) +LIB_DEPENDS+= ogg.2:${PORTSDIR}/audio/libogg \ + vorbis.0:${PORTSDIR}/audio/libvorbis +.endif RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT} ONLY_FOR_ARCHS= i386 @@ -25,36 +27,40 @@ USE_XLIB= yes USE_GMAKE= yes INSTALLS_SHLIB= yes WRKSRC= ${WRKDIR}/${PORTNAME}-0.6 -LDCONFIG_DIRS= %%PREFIX%%/lib/avifile +USE_AUTOCONF= yes USE_AUTOMAKE= yes USE_LIBTOOL= yes LIBTOOLFILES= acinclude.m4 CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-win32-path=${LOCALBASE}/lib/win32 \ - --enable-release --with-gnu-ld - -PLIST_SUB= LIB_VERSION="${LIB_VERSION}" + --enable-release --with-gnu-ld --enable-x86opt -FMT= /usr/bin/fmt +PLIST_SUB= LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}" +.if defined(WITHOUT_VORBIS) +PLIST_SUB+= VORBIS="@comment " +.else +PLIST_SUB+= VORBIS="" +.endif #CODEC_PORT= ${PORTSDIR}/graphics/win32-codecs CODEC_PORT= ${.CURDIR}/../win32-codecs CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE -LIB_VERSION= 0 -# Adhoc fix. First part. -# qt is there but configure is not finding it -# Therefore, it is avoiding this directories -# At least, on lioux's homesystem with qt 2.2.3 -EXTRA_BUILD_DIR= player samples/misc samples/qtrecompress - +LIB_VERSION= 3 +VERSION= 0.6 SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config DIFF?= /usr/bin/diff +FMT?= /usr/bin/fmt .include +.if !defined(WITHOUT_VORBIS) +pre-everything:: + @${ECHO_MSG} "You can disable vorbis support by defining WITHOUT_VORBIS." +.endif + pre-extract: @if [ -f ${LOCALBASE}/lib/libpth.so ]; then \ ${ECHO_MSG} "Error: This packet does not compile when the \ @@ -70,45 +76,7 @@ post-configure: 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ ${WRKSRC}/libtool -post-build: -.for dir in ${EXTRA_BUILD_DIR} - (cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}) -.endfor - post-install: @${FMT} < ${PKGMESSAGE} - @${INSTALL_DATA} ${WRKSRC}/lib/libaviplay.la ${PREFIX}/lib - @${INSTALL_DATA} ${WRKSRC}/plugins/libaudiodec/libaudiodec.la ${PREFIX}/lib/avifile - @${INSTALL_DATA} ${WRKSRC}/plugins/libmp3lame_audioenc/libmp3lame_audioenc.la ${PREFIX}/lib/avifile - @${INSTALL_DATA} ${WRKSRC}/plugins/libmpeg_audiodec/libmpeg_audiodec.la ${PREFIX}/lib/avifile - @${INSTALL_DATA} ${WRKSRC}/plugins/libwin32/libwin32.la ${PREFIX}/lib/avifile -# @${LN} -sf libaviplay.so.${LIB_VERSION} ${PREFIX}/lib/libaviplay.so -# Adhoc fix. Second part. -# Install the missed applications. -.if exists(${PREFIX}/bin/aviplay) - ${DIFF} ${WRKSRC}/player/.libs/aviplay ${PREFIX}/bin > /dev/null || \ - ${INSTALL_PROGRAM} ${WRKSRC}/player/.libs/aviplay \ - ${PREFIX}/bin -.else - ${INSTALL_PROGRAM} ${WRKSRC}/player/.libs/aviplay ${PREFIX}/bin -.endif -.if exists(${PREFIX}/bin/benchmark) - ${DIFF} ${WRKSRC}/samples/misc/.libs/benchmark \ - ${PREFIX}/bin > /dev/null || \ - ${INSTALL_PROGRAM} \ - ${WRKSRC}/samples/misc/.libs/benchmark \ - ${PREFIX}/bin -.else - ${INSTALL_PROGRAM} ${WRKSRC}/samples/misc/.libs/benchmark \ - ${PREFIX}/bin -.endif -.if exists(${PREFIX}/bin/qtrecompress) - ${DIFF} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress \ - ${PREFIX}/bin > /dev/null || \ - ${INSTALL_PROGRAM} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress ${PREFIX}/bin -.else - ${INSTALL_PROGRAM} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress \ - ${PREFIX}/bin -.endif .include diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo index b55f9ab6c2a2..094503a7f83c 100644 --- a/multimedia/avifile/distinfo +++ b/multimedia/avifile/distinfo @@ -1 +1 @@ -MD5 (avifile-0.60.20010429.tar.gz) = e5b563661420b82f5fc834b3e8b57202 +MD5 (avifile-0.60.20010920.tar.gz) = 7c1c6bfd7f4871cf2e290bc891fdbddf diff --git a/multimedia/avifile/files/patch-Makefile-libwin32Makefile b/multimedia/avifile/files/patch-Makefile-libwin32Makefile deleted file mode 100644 index b4a50e254f77..000000000000 --- a/multimedia/avifile/files/patch-Makefile-libwin32Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/libwin32/Makefile.am.orig Wed Jun 6 00:03:19 2001 -+++ plugins/libwin32/Makefile.am Wed Jun 6 00:03:37 2001 -@@ -12,6 +12,6 @@ - - libwin32_la_LDFLAGS = -module -version-info 0:0:0 - --CPPFLAGS = @CPPFLAGS@ -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow -+CPPFLAGS = -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow @CPPFLAGS@ - - LIBS = @AVILIBDEPLIB@ diff --git a/multimedia/avifile/files/patch-aa b/multimedia/avifile/files/patch-aa deleted file mode 100644 index 8ec08f839b93..000000000000 --- a/multimedia/avifile/files/patch-aa +++ /dev/null @@ -1,9 +0,0 @@ ---- player/mywidget.h.orig Wed Apr 18 22:06:31 2001 -+++ player/mywidget.h Wed Apr 18 22:06:41 2001 -@@ -7,7 +7,7 @@ - #include - - #ifdef USE_SDL --#include -+#include - #endif diff --git a/multimedia/avifile/files/patch-ab b/multimedia/avifile/files/patch-ab deleted file mode 100644 index ad26321f3929..000000000000 --- a/multimedia/avifile/files/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/aviread/Cache.cpp.orig Sun Apr 29 20:25:10 2001 -+++ lib/aviread/Cache.cpp Sun Apr 29 20:25:19 2001 -@@ -3,7 +3,6 @@ - #include - #include - #include --#include - - #include - #include diff --git a/multimedia/avifile/files/patch-configure.in b/multimedia/avifile/files/patch-configure.in new file mode 100644 index 000000000000..b8a7758306b0 --- /dev/null +++ b/multimedia/avifile/files/patch-configure.in @@ -0,0 +1,13 @@ +--- configure.in.orig Tue Sep 18 12:27:14 2001 ++++ configure.in Mon Sep 24 13:56:59 2001 +@@ -92,8 +92,8 @@ + dnl some defaults + USE_I386=0 + USE_VIDCAP=0 +- DEFAULTQTLIB="-lqt" +- DEFAULTQTMTLIB="qt-mt" ++ DEFAULTQTLIB="-lqt2" ++ DEFAULTQTMTLIB="qt2-mt" + EXTRAINCLUDEPATH= + pthread_cflags="-D_REENTRANT" + pthread_lib="-lpthread" diff --git a/multimedia/avifile/files/patch-libavireadCache.h b/multimedia/avifile/files/patch-libavireadCache.h new file mode 100644 index 000000000000..312b77abf0b4 --- /dev/null +++ b/multimedia/avifile/files/patch-libavireadCache.h @@ -0,0 +1,10 @@ +--- lib/aviread/Cache.h.orig Tue Aug 28 22:02:19 2001 ++++ lib/aviread/Cache.h Tue Aug 28 22:02:22 2001 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + // Isn't this bug in NetBSD configuration - it should not have HAVE_LSEEK64 + #ifdef __NetBSD__ diff --git a/multimedia/avifile/files/patch-libavplayaviplay.cpp b/multimedia/avifile/files/patch-libavplayaviplay.cpp new file mode 100644 index 000000000000..dbba1034ef71 --- /dev/null +++ b/multimedia/avifile/files/patch-libavplayaviplay.cpp @@ -0,0 +1,10 @@ +--- lib/aviplay/aviplay.cpp.orig Tue Aug 28 21:53:40 2001 ++++ lib/aviplay/aviplay.cpp Tue Aug 28 21:53:43 2001 +@@ -25,6 +25,7 @@ + #include "cpuinfo.h" + #include "utils.h" + #include "version.h" ++#include + + //#include + #include diff --git a/multimedia/avifile/files/patch-libvideorenderer.cpp b/multimedia/avifile/files/patch-libvideorenderer.cpp new file mode 100644 index 000000000000..e864722f7190 --- /dev/null +++ b/multimedia/avifile/files/patch-libvideorenderer.cpp @@ -0,0 +1,10 @@ +--- lib/video/renderer.cpp.orig Tue Aug 28 22:53:20 2001 ++++ lib/video/renderer.cpp Tue Aug 28 22:53:30 2001 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #ifndef WITHOUT_X + diff --git a/multimedia/avifile/files/patch-videocodecMakefile b/multimedia/avifile/files/patch-videocodecMakefile deleted file mode 100644 index 6d5d8b0e5d06..000000000000 --- a/multimedia/avifile/files/patch-videocodecMakefile +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/libwin32/videocodec/Makefile.am.orig Mon Jun 4 20:47:34 2001 -+++ plugins/libwin32/videocodec/Makefile.am Mon Jun 4 20:47:52 2001 -@@ -5,6 +5,6 @@ - libvideocodec_la_SOURCES=DS_VideoDecoder.cpp VideoEncoder.cpp \ - VideoDecoder.cpp Module.cpp VideoCodec.cpp - --CPPFLAGS = @CPPFLAGS@ -I../loader -I../DirectShow -+CPPFLAGS = -I../loader -I../DirectShow @CPPFLAGS@ - - LIBS= diff --git a/multimedia/avifile/pkg-descr b/multimedia/avifile/pkg-descr index b583b05810be..f57446f845c2 100644 --- a/multimedia/avifile/pkg-descr +++ b/multimedia/avifile/pkg-descr @@ -1,38 +1,6 @@ An AVI player and converter built around the Windows binary codecs. -Does not use Wine. It supports the following codecs: +Does not use Wine. It supports a lot of common modern codecs; +these have actually been separated into the port graphics/win32-codecs. -Video: -- Win32 VfW DLLs: - Indeo Video 3.2, 4.1 - Microsoft MPEG-4 v1 & v2 beta - Microsoft MPEG-4 v3 ( also known as DivX ;-) ) - Cinepak Video - ATI VCR-2 - I263 -- Win32 DirectShow filters, decompression-only support: - Microsoft MPEG-4 v3 ( this decoder is slower than VfW one, - but offers wider range of picture control features ) - Windows Media Video 7 - Indeo Video 5.0 - Motion JPEG ( using Morgan Multimedia shareware codec ) -- Open-source plugins: - Motion JPEG ( using libjpeg, very slow ) - -Audio: -- Win32 ACM DLLs, decompression-only support: - Windows Media Audio ( also known as DivX ;-) Audio ) - MS ADPCM - Intel Music Codec -- Open-source plugins, decompression-only support: - PCM - AC3 - IMA ADPCM - MPEG Layer-1,2,3 ( compression into MP3 is also supported ) - MSN Audio - GSM 6.1 Audio -- Win32 DirectShow filters, untested decompression-only support: - Voxware Metasound - ACELP.net - -WWW: http://divx.euro.ru/ +WWW: http://avifile.sourceforge.net/ diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist index ab6786c7c69b..3966aca157b0 100644 --- a/multimedia/avifile/pkg-plist +++ b/multimedia/avifile/pkg-plist @@ -1,10 +1,11 @@ +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 -include/avifile/avifmt.h include/avifile/aviplay.h -include/avifile/com.h include/avifile/config.h include/avifile/configfile.h include/avifile/cpuinfo.h @@ -12,42 +13,65 @@ include/avifile/creators.h include/avifile/default.h include/avifile/except.h include/avifile/formats.h +include/avifile/fourcc.h include/avifile/image.h include/avifile/infotypes.h include/avifile/mmx.h include/avifile/playerwidget.h include/avifile/plugin.h -include/avifile/registry.h include/avifile/renderer.h +include/avifile/subtitle.h +include/avifile/utils.h include/avifile/version.h include/avifile/videodecoder.h include/avifile/videoencoder.h @dirrm include/avifile bin/avifile-config bin/aviplay -bin/benchmark -bin/qtrecompress -share/avifile/about.ppm -share/avifile/mute.ppm -share/avifile/open.ppm -share/avifile/pause.ppm -share/avifile/play.ppm -share/avifile/stop.ppm -share/avifile/test.png -@dirrm share/avifile -lib/avifile/libaudiodec.so -lib/avifile/libaudiodec.so.0 -lib/avifile/libaudiodec.la -lib/avifile/libmp3lame_audioenc.so -lib/avifile/libmp3lame_audioenc.so.0 -lib/avifile/libmp3lame_audioenc.la -lib/avifile/libmpeg_audiodec.so -lib/avifile/libmpeg_audiodec.so.0 -lib/avifile/libmpeg_audiodec.la -lib/avifile/libwin32.so -lib/avifile/libwin32.so.0 -lib/avifile/libwin32.la -@dirrm lib/avifile +bin/avibench +bin/avicat +bin/avitype +bin/avimake +bin/avirecompress +lib/libaviplay-%%VERSION%%.so.%%LIB_VERSION%% lib/libaviplay.la lib/libaviplay.so -lib/libaviplay.so.%%LIB_VERSION%% +lib/libmmxnow-0.1.so.1 +lib/libmmxnow.la +lib/libmmxnow.so +lib/libmmxnow.a +lib/avifile%%VERSION%%/libac3pass-%%VERSION%%.so.%%LIB_VERSION%% +lib/avifile%%VERSION%%/libac3pass.la +lib/avifile%%VERSION%%/libac3pass.so +lib/avifile%%VERSION%%/libaudiodec-%%VERSION%%.so.%%LIB_VERSION%% +lib/avifile%%VERSION%%/libaudiodec.la +lib/avifile%%VERSION%%/libaudiodec.so +lib/avifile%%VERSION%%/libffmpeg-%%VERSION%%.so.%%LIB_VERSION%% +lib/avifile%%VERSION%%/libffmpeg.la +lib/avifile%%VERSION%%/libffmpeg.so +lib/avifile%%VERSION%%/libmjpeg-%%VERSION%%.so.%%LIB_VERSION%% +lib/avifile%%VERSION%%/libmjpeg.la +lib/avifile%%VERSION%%/libmjpeg.so +lib/avifile%%VERSION%%/libmp3lamebin_audioenc-%%VERSION%%.so.%%LIB_VERSION%% +lib/avifile%%VERSION%%/libmp3lamebin_audioenc.la +lib/avifile%%VERSION%%/libmp3lamebin_audioenc.so +lib/avifile%%VERSION%%/libmpeg_audiodec-%%VERSION%%.so.%%LIB_VERSION%% +lib/avifile%%VERSION%%/libmpeg_audiodec.la +lib/avifile%%VERSION%%/libmpeg_audiodec.so +%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio-%%VERSION%%.so.%%LIB_VERSION%% +%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio.la +%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio.so +lib/avifile%%VERSION%%/libwin32-%%VERSION%%.so.%%LIB_VERSION%% +lib/avifile%%VERSION%%/libwin32.la +lib/avifile%%VERSION%%/libwin32.so +@dirrm lib/avifile%%VERSION%% +share/avifile%%VERSION%%/about.ppm +share/avifile%%VERSION%%/mute.ppm +share/avifile%%VERSION%%/open.ppm +share/avifile%%VERSION%%/opena.ppm +share/avifile%%VERSION%%/opens.ppm +share/avifile%%VERSION%%/pause.ppm +share/avifile%%VERSION%%/play.ppm +share/avifile%%VERSION%%/stop.ppm +share/avifile%%VERSION%%/test.png +@dirrm share/avifile%%VERSION%% -- cgit v1.2.3