Index: head/graphics/avifile/Makefile =================================================================== --- head/graphics/avifile/Makefile (revision 67371) +++ head/graphics/avifile/Makefile (revision 67372) @@ -1,293 +1,298 @@ # New ports collection makefile for: avifile # Date created: 16 September 2000 # Whom: Holger Lamm # # $FreeBSD$ # PORTNAME= avifile -PORTVERSION= 0.7.11.20020711 +PORTVERSION= 0.7.16.20020913 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= http://avifile.sourceforge.net/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/} EXTRACT_SUFX= .tgz -MAINTAINER= holger@eit.uni-kl.de +MAINTAINER= holger@e-gitt.net BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_SUBMAKE= yes USE_REINPLACE= yes USE_XLIB= yes USE_GMAKE= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:C/^(.{3}).*/\1/}-${PORTVERSION:C/^(.{6}).+$/\1/} USE_LIBTOOL= yes LIBTOOLFILES= acinclude.m4 CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib `${ECHO_CMD} ${PTHREAD_LIBS}`" CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \ - --program-transform-name='' \ --disable-divx4 +CONFIGURE_TARGET= PLIST_SUB= LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}" +MAN1= aviplay.1 + #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= 3 VERSION= 0.7 SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config DIFF?= /usr/bin/diff FMT?= /usr/bin/fmt +.include + +.if ${ARCH} != "i386" +WITHOUT_A52=yes +WITHOUT_XVID=yes +.endif + # compilation optimizations .if !defined(WITHOUT_OPTIMIZED_CFLAGS) CONFIGURE_ARGS+= --enable-release .endif # soundblaster can be passed ac3 instead of letting avifile decode # it .if defined(WITH_AC3_PASSTHROUGH) CONFIGURE_ARGS+= --enable-ac3passthrough PLIST_SUB+= AC3_PASS="" .else CONFIGURE_ARGS+= --disable-ac3passthrough PLIST_SUB+= AC3_PASS="@comment " .endif # liba52 .if !defined(WITHOUT_A52) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 CONFIGURE_ARGS+= --enable-a52 \ --disable-ffmpeg-a52bin \ --with-a52-prefix=${LOCALBASE} PLIST_SUB+= A52="" .else CONFIGURE_ARGS+= --disable-a52 PLIST_SUB+= A52="@comment " .endif # libmad .if !defined(WITHOUT_MAD) LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad PLIST_SUB+= MAD="" .else CONFIGURE_ARGS+= --disable-mad PLIST_SUB+= MAD="@comment " .endif # qt .if !defined(WITHOUT_QT) . if exists(${X11BASE}/include/qt2/qapp.h) USE_QT_VER= 2 . else USE_QT_VER= 3 . endif PLIST_SUB+= QT="" .else CONFIGURE_ARGS+= --without-qt PLIST_SUB+= QT="@comment " .endif # sdl .if !defined(WITHOUT_SDL) LIB_DEPENDS+= SDL-1.1.4:${PORTSDIR}/devel/sdl12 CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} .else CONFIGURE_ARGS+= --without-sdl .endif # libvorbis; thus, libogg .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --with-vorbis-prefix=${LOCALBASE} \ --with-ogg-prefix=${LOCALBASE} PLIST_SUB+= VORBIS="" .else CONFIGURE_ARGS+= --disable-vorbis PLIST_SUB+= VORBIS="@comment " .endif # xvid .if !defined(WITHOUT_XVID) LIB_DEPENDS+= xvidcore.0:${PORTSDIR}/graphics/xvid CONFIGURE_ARGS+= --with-xvid-prefix=${LOCALBASE} PLIST_SUB+= XVID="" .else CONFIGURE_ARGS+= --disable-xvid PLIST_SUB+= XVID="@comment " .endif pre-everything:: .if !defined(WITHOUT_OPTIMIZED_CFLAGS) @${ECHO_MSG} "You can disable compilation optimizations by defining" @${ECHO_MSG} " WITHOUT_OPTIMIZED_CFLAGS." .endif .if !defined(WITH_AC3_PASSTHROUGH) @${ECHO_MSG} "You can enable soundblaster ac3 passthrough support by" @${ECHO_MSG} " defining WITH_AC3_PASSTHROUGH." .endif .if !defined(WITHOUT_A52) @${ECHO_MSG} "You can disable ac3 (liba52) support by defining WITHOUT_A52." .endif .if !defined(WITHOUT_MAD) @${ECHO_MSG} "You can disable mad support by defining WITHOUT_MAD." .endif .if !defined(WITHOUT_QT) @${ECHO_MSG} "You can disable QT supported tools by defining WITHOUT_QT." .endif .if !defined(WITHOUT_SDL) @${ECHO_MSG} "You can disable SDL supported tools by defining WITHOUT_SDL." .endif .if !defined(WITHOUT_VORBIS) @${ECHO_MSG} "You can disable vorbis support by defining WITHOUT_VORBIS." .endif .if !defined(WITHOUT_XVID) @${ECHO_MSG} "You can disable xvid support by defining WITHOUT_XVID." .endif pre-extract: @if [ -f ${LOCALBASE}/lib/libpth.so ]; then \ ${ECHO_MSG} "Error: This packet does not compile when the \ packet 'pth' is installed.";\ ${FALSE};\ fi # insure that ports' liba52 is being used post-extract: .if !defined(WITHOUT_A52) @${RM} -Rf ${WRKSRC}/ffmpeg/libavcodec/liba52 @${MKDIR} ${WRKSRC}/ffmpeg/libavcodec/liba52 @${TOUCH} ${WRKSRC}/ffmpeg/libavcodec/liba52/Makefile.in .endif # grab does not work outside Linux for now @${RM} -f ${WRKSRC}/ffmpeg/libav/grab.c @${TOUCH} ${WRKSRC}/ffmpeg/libav/grab.c post-patch: .if !defined(WITHOUT_A52) @${REINPLACE_CMD} -e 's|-la52|${LIBA52_DEP_LIBS} -la52|' \ ${WRKSRC}/configure +# linux/ioctl.h -> sys/ioctl.h + @${REINPLACE_CMD} -e 's|linux/ioctl.h|sys/ioctl.h|' \ + ${WRKSRC}/drivers/libdha/kernelhelper/dhahelper.h # XXX - fool ffmpeg to use ports' version of liba52, revise this # at EVERY avifile update @${REINPLACE_CMD} -e 's|liba52/liba52.la|${LOCALBASE}/lib/liba52.la|; \ s|SUBDIRS_LIBA52 = liba52|SUBDIRS_LIBA52 =|; \ s|mlib liba52 i386|mlib i386|' \ ${WRKSRC}/ffmpeg/libavcodec/Makefile.in @${REINPLACE_CMD} -e 's|"liba52/a52.h"||' \ ${WRKSRC}/ffmpeg/libavcodec/a52dec.c .endif .if !defined(WITHOUT_MAD) @${REINPLACE_CMD} -e 's|MAD_LDADD = \@MAD_LDADD\@|MAD_LDADD = -L${LOCALBASE}/lib \@MAD_LDADD\@|' \ ${WRKSRC}/plugins/libmad/Makefile.in .endif .if !defined(WITHOUT_QT) . if exists(${X11BASE}/include/qt2/qapp.h) @${REINPLACE_CMD} -e 's|qt-mt|qt2-mt|' ${WRKSRC}/configure . endif @${REINPLACE_CMD} -e 's|QT_CFLAGS = \@QT_CFLAGS\@|QT_CFLAGS = -I${X11BASE}/include \@QT_CFLAGS\@|; \ s|QT_LIBS = \@QT_LIBS\@|QT_LIBS = -L${X11BASE}/lib \@QT_LIBS\@|' \ ${WRKSRC}/libavqt/Makefile.in .endif .if !defined(WITHOUT_XVID) @${REINPLACE_CMD} -e 's|XVID_LIBS = \@XVID_LIBS\@|XVID_LIBS = -L${LOCALBASE}/lib \@XVID_LIBS\@|' \ ${WRKSRC}/plugins/libxvid/Makefile.in .endif @${REINPLACE_CMD} -e 's|__THROW||' \ ${WRKSRC}/plugins/libwin32/loader/dshow/DS_Filter.h @${REINPLACE_CMD} -e 's|-ljpeg|-L${LOCALBASE}/lib -ljpeg|' \ ${WRKSRC}/samples/mjpeg_plugin/Makefile.in # if we have LAME @${REINPLACE_CMD} -e 's|-lmp3lame|-L${LOCALBASE}/lib -lmp3lame|' \ ${WRKSRC}/configure # use portname without version to build dir names @${REINPLACE_CMD} -E -e 's|(PACKAGE[:space:]*=[:space:]*avifile).*|\1|' \ ${WRKSRC}/configure # fix build in -CURRENT @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \ 's|#include |#include |g' # use correct signal type @${REINPLACE_CMD} -e 's|sighandler_t|sig_t|' \ ${WRKSRC}/samples/misc/benchmark.cpp # fix breakage if either auto{conf,make} are installed # do not version library names # fix incorrect behavior of configure script @${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E -e \ 's|INSTALL = \@INSTALL\@|INSTALL = ${INSTALL}|; \ - s!-release[[:space:]]+\$$\(LT_RELEASE\)!!; \ + s!-release[[:space:]]+\$$\([^\)]+\)!!; \ s!ACLOCAL =!ACLOCAL = ${TRUE} || !; \ s!AUTOCONF =!AUTOCONF = ${TRUE} || !; \ s!AUTOHEADER =!AUTOHEADER = ${TRUE} || !; \ s!AUTOMAKE =!AUTOMAKE = ${TRUE} || !' -# XXX - fix simple bugs in version.sh script, revise this -# at EVERY avifile update - @${REINPLACE_CMD} -E -e 's|^(last_cvs_update=).+$$|\1|; \ - s|cp[[:space:]]+-a|cp|' \ - ${WRKSRC}/admin/version.sh post-configure: # Libtool fix code kindly provided by Mr. Maxim Sobolev @${REINPLACE_CMD} -e \ 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ ${WRKSRC}/libtool @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README .endif @${FMT} < ${PKGMESSAGE} - -.include .if ${ARCH} == "i386" RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} CONFIGURE_ARGS+= --enable-x86opt \ --enable-win32 \ --with-win32-path=${LOCALBASE}/lib/win32 PLIST_SUB+= FFMPEG="" WIN32="" .else CONFIGURE_ARGS+= --disable-x86opt --disable-win32 \ --disable-ffmpeg PLIST_SUB+= FFMPEG="@comment " WIN32="@comment " .endif # hack taken from ogle to make it work with liba52 + djbfft .if exists(${LOCALBASE}/lib/liba52.la) LIBA52_DEP_LIBS!= ${GREP} dependency_libs ${LOCALBASE}/lib/liba52.la | ${CUT} -d \' -f 2 .else LIBA52_DEP_LIBS= .endif # if we have LAME .if exists(${LOCALBASE}/lib/libmp3lame.so) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame PLIST_SUB+= NOLAME="@comment " LAME="" .else PLIST_SUB+= NOLAME="" LAME="@comment " .endif .include Property changes on: head/graphics/avifile/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.31 \ No newline at end of property +1.32 \ No newline at end of property Index: head/graphics/avifile/distinfo =================================================================== --- head/graphics/avifile/distinfo (revision 67371) +++ head/graphics/avifile/distinfo (revision 67372) @@ -1 +1 @@ -MD5 (avifile-0.7.11-20020711.tgz) = 3e3cd43f2d383a364789bdf672ba10e8 +MD5 (avifile-0.7.16-20020913.tgz) = c8ea982ee735ccdb995830d18c366f1b Property changes on: head/graphics/avifile/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/graphics/avifile/files/patch-drivers::libdha::mmi.c =================================================================== --- head/graphics/avifile/files/patch-drivers::libdha::mmi.c (nonexistent) +++ head/graphics/avifile/files/patch-drivers::libdha::mmi.c (revision 67372) @@ -0,0 +1,10 @@ +--- drivers/libdha/mmi.c.orig Wed Oct 2 16:00:07 2002 ++++ drivers/libdha/mmi.c Wed Oct 2 16:00:14 2002 +@@ -1,6 +1,7 @@ + /* Memory manager interface */ + #include + #include ++#include + #include /* mlock */ + #include + #include Property changes on: head/graphics/avifile/files/patch-drivers::libdha::mmi.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/graphics/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c =================================================================== --- head/graphics/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c (nonexistent) +++ head/graphics/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c (revision 67372) @@ -0,0 +1,10 @@ +--- drivers/vidix/drivers/radeon_vid.c.orig Wed Oct 2 16:01:05 2002 ++++ drivers/vidix/drivers/radeon_vid.c Wed Oct 2 16:01:15 2002 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include "../../libdha/pci_ids.h" + #include "../../libdha/pci_names.h" Property changes on: head/graphics/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/graphics/avifile/pkg-plist =================================================================== --- head/graphics/avifile/pkg-plist (revision 67371) +++ head/graphics/avifile/pkg-plist (revision 67372) @@ -1,80 +1,97 @@ bin/avibench bin/avicat bin/avifile-config bin/avimake %%QT%%bin/aviplay bin/avitype %%WIN32%%bin/mmxnow-config include/avifile/Locker.h include/avifile/StreamInfo.h include/avifile/VideoDPMS.h include/avifile/audiodecoder.h include/avifile/audioencoder.h include/avifile/avifile.h include/avifile/aviplay.h -include/avifile/avm_output.h include/avifile/avm_stl.h include/avifile/configfile.h include/avifile/cpuinfo.h 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/playerwidget.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 %%WIN32%%include/mmxnow.h %%AC3_PASS%%lib/avifile/ac3pass.la %%AC3_PASS%%lib/avifile/ac3pass.so lib/avifile/audiodec.la lib/avifile/audiodec.so %%FFMPEG%%lib/avifile/ffmpeg.la %%FFMPEG%%lib/avifile/ffmpeg.so %%MAD%%lib/avifile/mad_audiodec.la %%MAD%%lib/avifile/mad_audiodec.so lib/avifile/mjpeg.la lib/avifile/mjpeg.so %%NOLAME%%lib/avifile/mp3lame_audioenc.la %%NOLAME%%lib/avifile/mp3lame_audioenc.so %%LAME%%lib/avifile/mp3lamebin_audioenc.la %%LAME%%lib/avifile/mp3lamebin_audioenc.so lib/avifile/mpeg_audiodec.la lib/avifile/mpeg_audiodec.so +lib/avifile/vidix/libgenfb.la +lib/avifile/vidix/libgenfb.so +lib/avifile/vidix/libmach64.la +lib/avifile/vidix/libmach64.so +lib/avifile/vidix/libmga.la +lib/avifile/vidix/libmga.so +lib/avifile/vidix/libmga_crtc2.la +lib/avifile/vidix/libmga_crtc2.so +lib/avifile/vidix/libnvidia.la +lib/avifile/vidix/libnvidia.so +lib/avifile/vidix/libpm3.la +lib/avifile/vidix/libpm3.so +lib/avifile/vidix/libradeon.la +lib/avifile/vidix/libradeon.so +lib/avifile/vidix/librage128.la +lib/avifile/vidix/librage128.so %%VORBIS%%lib/avifile/vorbis_audio.la %%VORBIS%%lib/avifile/vorbis_audio.so %%WIN32%%lib/avifile/win32.la %%WIN32%%lib/avifile/win32.so %%XVID%%lib/avifile/xvid.la %%XVID%%lib/avifile/xvid.so lib/libaviplay.a lib/libaviplay.la lib/libaviplay.so lib/libaviplay.so.0 %%WIN32%%lib/libmmxnow.la %%WIN32%%lib/libmmxnow.so %%WIN32%%lib/libmmxnow.so.0 %%QT%%lib/libqavm.a %%QT%%lib/libqavm.la %%QT%%lib/libqavm.so %%QT%%lib/libqavm.so.0 +share/aclocal/avifile.m4 share/avifile/about.ppm share/avifile/mute.ppm share/avifile/open.ppm share/avifile/opena.ppm share/avifile/opens.ppm share/avifile/pause.ppm share/avifile/play.ppm share/avifile/stop.ppm share/avifile/test.png %%PORTDOCS%%share/doc/avifile/README %%PORTDOCS%%@dirrm share/doc/avifile @dirrm share/avifile +@dirrm lib/avifile/vidix @dirrm lib/avifile @dirrm include/avifile Property changes on: head/graphics/avifile/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/multimedia/avifile/Makefile =================================================================== --- head/multimedia/avifile/Makefile (revision 67371) +++ head/multimedia/avifile/Makefile (revision 67372) @@ -1,293 +1,298 @@ # New ports collection makefile for: avifile # Date created: 16 September 2000 # Whom: Holger Lamm # # $FreeBSD$ # PORTNAME= avifile -PORTVERSION= 0.7.11.20020711 +PORTVERSION= 0.7.16.20020913 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= http://avifile.sourceforge.net/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/} EXTRACT_SUFX= .tgz -MAINTAINER= holger@eit.uni-kl.de +MAINTAINER= holger@e-gitt.net BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_SUBMAKE= yes USE_REINPLACE= yes USE_XLIB= yes USE_GMAKE= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:C/^(.{3}).*/\1/}-${PORTVERSION:C/^(.{6}).+$/\1/} USE_LIBTOOL= yes LIBTOOLFILES= acinclude.m4 CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib `${ECHO_CMD} ${PTHREAD_LIBS}`" CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \ - --program-transform-name='' \ --disable-divx4 +CONFIGURE_TARGET= PLIST_SUB= LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}" +MAN1= aviplay.1 + #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= 3 VERSION= 0.7 SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config DIFF?= /usr/bin/diff FMT?= /usr/bin/fmt +.include + +.if ${ARCH} != "i386" +WITHOUT_A52=yes +WITHOUT_XVID=yes +.endif + # compilation optimizations .if !defined(WITHOUT_OPTIMIZED_CFLAGS) CONFIGURE_ARGS+= --enable-release .endif # soundblaster can be passed ac3 instead of letting avifile decode # it .if defined(WITH_AC3_PASSTHROUGH) CONFIGURE_ARGS+= --enable-ac3passthrough PLIST_SUB+= AC3_PASS="" .else CONFIGURE_ARGS+= --disable-ac3passthrough PLIST_SUB+= AC3_PASS="@comment " .endif # liba52 .if !defined(WITHOUT_A52) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 CONFIGURE_ARGS+= --enable-a52 \ --disable-ffmpeg-a52bin \ --with-a52-prefix=${LOCALBASE} PLIST_SUB+= A52="" .else CONFIGURE_ARGS+= --disable-a52 PLIST_SUB+= A52="@comment " .endif # libmad .if !defined(WITHOUT_MAD) LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad PLIST_SUB+= MAD="" .else CONFIGURE_ARGS+= --disable-mad PLIST_SUB+= MAD="@comment " .endif # qt .if !defined(WITHOUT_QT) . if exists(${X11BASE}/include/qt2/qapp.h) USE_QT_VER= 2 . else USE_QT_VER= 3 . endif PLIST_SUB+= QT="" .else CONFIGURE_ARGS+= --without-qt PLIST_SUB+= QT="@comment " .endif # sdl .if !defined(WITHOUT_SDL) LIB_DEPENDS+= SDL-1.1.4:${PORTSDIR}/devel/sdl12 CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} .else CONFIGURE_ARGS+= --without-sdl .endif # libvorbis; thus, libogg .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --with-vorbis-prefix=${LOCALBASE} \ --with-ogg-prefix=${LOCALBASE} PLIST_SUB+= VORBIS="" .else CONFIGURE_ARGS+= --disable-vorbis PLIST_SUB+= VORBIS="@comment " .endif # xvid .if !defined(WITHOUT_XVID) LIB_DEPENDS+= xvidcore.0:${PORTSDIR}/graphics/xvid CONFIGURE_ARGS+= --with-xvid-prefix=${LOCALBASE} PLIST_SUB+= XVID="" .else CONFIGURE_ARGS+= --disable-xvid PLIST_SUB+= XVID="@comment " .endif pre-everything:: .if !defined(WITHOUT_OPTIMIZED_CFLAGS) @${ECHO_MSG} "You can disable compilation optimizations by defining" @${ECHO_MSG} " WITHOUT_OPTIMIZED_CFLAGS." .endif .if !defined(WITH_AC3_PASSTHROUGH) @${ECHO_MSG} "You can enable soundblaster ac3 passthrough support by" @${ECHO_MSG} " defining WITH_AC3_PASSTHROUGH." .endif .if !defined(WITHOUT_A52) @${ECHO_MSG} "You can disable ac3 (liba52) support by defining WITHOUT_A52." .endif .if !defined(WITHOUT_MAD) @${ECHO_MSG} "You can disable mad support by defining WITHOUT_MAD." .endif .if !defined(WITHOUT_QT) @${ECHO_MSG} "You can disable QT supported tools by defining WITHOUT_QT." .endif .if !defined(WITHOUT_SDL) @${ECHO_MSG} "You can disable SDL supported tools by defining WITHOUT_SDL." .endif .if !defined(WITHOUT_VORBIS) @${ECHO_MSG} "You can disable vorbis support by defining WITHOUT_VORBIS." .endif .if !defined(WITHOUT_XVID) @${ECHO_MSG} "You can disable xvid support by defining WITHOUT_XVID." .endif pre-extract: @if [ -f ${LOCALBASE}/lib/libpth.so ]; then \ ${ECHO_MSG} "Error: This packet does not compile when the \ packet 'pth' is installed.";\ ${FALSE};\ fi # insure that ports' liba52 is being used post-extract: .if !defined(WITHOUT_A52) @${RM} -Rf ${WRKSRC}/ffmpeg/libavcodec/liba52 @${MKDIR} ${WRKSRC}/ffmpeg/libavcodec/liba52 @${TOUCH} ${WRKSRC}/ffmpeg/libavcodec/liba52/Makefile.in .endif # grab does not work outside Linux for now @${RM} -f ${WRKSRC}/ffmpeg/libav/grab.c @${TOUCH} ${WRKSRC}/ffmpeg/libav/grab.c post-patch: .if !defined(WITHOUT_A52) @${REINPLACE_CMD} -e 's|-la52|${LIBA52_DEP_LIBS} -la52|' \ ${WRKSRC}/configure +# linux/ioctl.h -> sys/ioctl.h + @${REINPLACE_CMD} -e 's|linux/ioctl.h|sys/ioctl.h|' \ + ${WRKSRC}/drivers/libdha/kernelhelper/dhahelper.h # XXX - fool ffmpeg to use ports' version of liba52, revise this # at EVERY avifile update @${REINPLACE_CMD} -e 's|liba52/liba52.la|${LOCALBASE}/lib/liba52.la|; \ s|SUBDIRS_LIBA52 = liba52|SUBDIRS_LIBA52 =|; \ s|mlib liba52 i386|mlib i386|' \ ${WRKSRC}/ffmpeg/libavcodec/Makefile.in @${REINPLACE_CMD} -e 's|"liba52/a52.h"||' \ ${WRKSRC}/ffmpeg/libavcodec/a52dec.c .endif .if !defined(WITHOUT_MAD) @${REINPLACE_CMD} -e 's|MAD_LDADD = \@MAD_LDADD\@|MAD_LDADD = -L${LOCALBASE}/lib \@MAD_LDADD\@|' \ ${WRKSRC}/plugins/libmad/Makefile.in .endif .if !defined(WITHOUT_QT) . if exists(${X11BASE}/include/qt2/qapp.h) @${REINPLACE_CMD} -e 's|qt-mt|qt2-mt|' ${WRKSRC}/configure . endif @${REINPLACE_CMD} -e 's|QT_CFLAGS = \@QT_CFLAGS\@|QT_CFLAGS = -I${X11BASE}/include \@QT_CFLAGS\@|; \ s|QT_LIBS = \@QT_LIBS\@|QT_LIBS = -L${X11BASE}/lib \@QT_LIBS\@|' \ ${WRKSRC}/libavqt/Makefile.in .endif .if !defined(WITHOUT_XVID) @${REINPLACE_CMD} -e 's|XVID_LIBS = \@XVID_LIBS\@|XVID_LIBS = -L${LOCALBASE}/lib \@XVID_LIBS\@|' \ ${WRKSRC}/plugins/libxvid/Makefile.in .endif @${REINPLACE_CMD} -e 's|__THROW||' \ ${WRKSRC}/plugins/libwin32/loader/dshow/DS_Filter.h @${REINPLACE_CMD} -e 's|-ljpeg|-L${LOCALBASE}/lib -ljpeg|' \ ${WRKSRC}/samples/mjpeg_plugin/Makefile.in # if we have LAME @${REINPLACE_CMD} -e 's|-lmp3lame|-L${LOCALBASE}/lib -lmp3lame|' \ ${WRKSRC}/configure # use portname without version to build dir names @${REINPLACE_CMD} -E -e 's|(PACKAGE[:space:]*=[:space:]*avifile).*|\1|' \ ${WRKSRC}/configure # fix build in -CURRENT @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \ 's|#include |#include |g' # use correct signal type @${REINPLACE_CMD} -e 's|sighandler_t|sig_t|' \ ${WRKSRC}/samples/misc/benchmark.cpp # fix breakage if either auto{conf,make} are installed # do not version library names # fix incorrect behavior of configure script @${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E -e \ 's|INSTALL = \@INSTALL\@|INSTALL = ${INSTALL}|; \ - s!-release[[:space:]]+\$$\(LT_RELEASE\)!!; \ + s!-release[[:space:]]+\$$\([^\)]+\)!!; \ s!ACLOCAL =!ACLOCAL = ${TRUE} || !; \ s!AUTOCONF =!AUTOCONF = ${TRUE} || !; \ s!AUTOHEADER =!AUTOHEADER = ${TRUE} || !; \ s!AUTOMAKE =!AUTOMAKE = ${TRUE} || !' -# XXX - fix simple bugs in version.sh script, revise this -# at EVERY avifile update - @${REINPLACE_CMD} -E -e 's|^(last_cvs_update=).+$$|\1|; \ - s|cp[[:space:]]+-a|cp|' \ - ${WRKSRC}/admin/version.sh post-configure: # Libtool fix code kindly provided by Mr. Maxim Sobolev @${REINPLACE_CMD} -e \ 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ ${WRKSRC}/libtool @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README .endif @${FMT} < ${PKGMESSAGE} - -.include .if ${ARCH} == "i386" RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} CONFIGURE_ARGS+= --enable-x86opt \ --enable-win32 \ --with-win32-path=${LOCALBASE}/lib/win32 PLIST_SUB+= FFMPEG="" WIN32="" .else CONFIGURE_ARGS+= --disable-x86opt --disable-win32 \ --disable-ffmpeg PLIST_SUB+= FFMPEG="@comment " WIN32="@comment " .endif # hack taken from ogle to make it work with liba52 + djbfft .if exists(${LOCALBASE}/lib/liba52.la) LIBA52_DEP_LIBS!= ${GREP} dependency_libs ${LOCALBASE}/lib/liba52.la | ${CUT} -d \' -f 2 .else LIBA52_DEP_LIBS= .endif # if we have LAME .if exists(${LOCALBASE}/lib/libmp3lame.so) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame PLIST_SUB+= NOLAME="@comment " LAME="" .else PLIST_SUB+= NOLAME="" LAME="@comment " .endif .include Property changes on: head/multimedia/avifile/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.31 \ No newline at end of property +1.32 \ No newline at end of property Index: head/multimedia/avifile/distinfo =================================================================== --- head/multimedia/avifile/distinfo (revision 67371) +++ head/multimedia/avifile/distinfo (revision 67372) @@ -1 +1 @@ -MD5 (avifile-0.7.11-20020711.tgz) = 3e3cd43f2d383a364789bdf672ba10e8 +MD5 (avifile-0.7.16-20020913.tgz) = c8ea982ee735ccdb995830d18c366f1b Property changes on: head/multimedia/avifile/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/multimedia/avifile/files/patch-drivers::libdha::mmi.c =================================================================== --- head/multimedia/avifile/files/patch-drivers::libdha::mmi.c (nonexistent) +++ head/multimedia/avifile/files/patch-drivers::libdha::mmi.c (revision 67372) @@ -0,0 +1,10 @@ +--- drivers/libdha/mmi.c.orig Wed Oct 2 16:00:07 2002 ++++ drivers/libdha/mmi.c Wed Oct 2 16:00:14 2002 +@@ -1,6 +1,7 @@ + /* Memory manager interface */ + #include + #include ++#include + #include /* mlock */ + #include + #include Property changes on: head/multimedia/avifile/files/patch-drivers::libdha::mmi.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/multimedia/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c =================================================================== --- head/multimedia/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c (nonexistent) +++ head/multimedia/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c (revision 67372) @@ -0,0 +1,10 @@ +--- drivers/vidix/drivers/radeon_vid.c.orig Wed Oct 2 16:01:05 2002 ++++ drivers/vidix/drivers/radeon_vid.c Wed Oct 2 16:01:15 2002 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include "../../libdha/pci_ids.h" + #include "../../libdha/pci_names.h" Property changes on: head/multimedia/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/multimedia/avifile/pkg-plist =================================================================== --- head/multimedia/avifile/pkg-plist (revision 67371) +++ head/multimedia/avifile/pkg-plist (revision 67372) @@ -1,80 +1,97 @@ bin/avibench bin/avicat bin/avifile-config bin/avimake %%QT%%bin/aviplay bin/avitype %%WIN32%%bin/mmxnow-config include/avifile/Locker.h include/avifile/StreamInfo.h include/avifile/VideoDPMS.h include/avifile/audiodecoder.h include/avifile/audioencoder.h include/avifile/avifile.h include/avifile/aviplay.h -include/avifile/avm_output.h include/avifile/avm_stl.h include/avifile/configfile.h include/avifile/cpuinfo.h 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/playerwidget.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 %%WIN32%%include/mmxnow.h %%AC3_PASS%%lib/avifile/ac3pass.la %%AC3_PASS%%lib/avifile/ac3pass.so lib/avifile/audiodec.la lib/avifile/audiodec.so %%FFMPEG%%lib/avifile/ffmpeg.la %%FFMPEG%%lib/avifile/ffmpeg.so %%MAD%%lib/avifile/mad_audiodec.la %%MAD%%lib/avifile/mad_audiodec.so lib/avifile/mjpeg.la lib/avifile/mjpeg.so %%NOLAME%%lib/avifile/mp3lame_audioenc.la %%NOLAME%%lib/avifile/mp3lame_audioenc.so %%LAME%%lib/avifile/mp3lamebin_audioenc.la %%LAME%%lib/avifile/mp3lamebin_audioenc.so lib/avifile/mpeg_audiodec.la lib/avifile/mpeg_audiodec.so +lib/avifile/vidix/libgenfb.la +lib/avifile/vidix/libgenfb.so +lib/avifile/vidix/libmach64.la +lib/avifile/vidix/libmach64.so +lib/avifile/vidix/libmga.la +lib/avifile/vidix/libmga.so +lib/avifile/vidix/libmga_crtc2.la +lib/avifile/vidix/libmga_crtc2.so +lib/avifile/vidix/libnvidia.la +lib/avifile/vidix/libnvidia.so +lib/avifile/vidix/libpm3.la +lib/avifile/vidix/libpm3.so +lib/avifile/vidix/libradeon.la +lib/avifile/vidix/libradeon.so +lib/avifile/vidix/librage128.la +lib/avifile/vidix/librage128.so %%VORBIS%%lib/avifile/vorbis_audio.la %%VORBIS%%lib/avifile/vorbis_audio.so %%WIN32%%lib/avifile/win32.la %%WIN32%%lib/avifile/win32.so %%XVID%%lib/avifile/xvid.la %%XVID%%lib/avifile/xvid.so lib/libaviplay.a lib/libaviplay.la lib/libaviplay.so lib/libaviplay.so.0 %%WIN32%%lib/libmmxnow.la %%WIN32%%lib/libmmxnow.so %%WIN32%%lib/libmmxnow.so.0 %%QT%%lib/libqavm.a %%QT%%lib/libqavm.la %%QT%%lib/libqavm.so %%QT%%lib/libqavm.so.0 +share/aclocal/avifile.m4 share/avifile/about.ppm share/avifile/mute.ppm share/avifile/open.ppm share/avifile/opena.ppm share/avifile/opens.ppm share/avifile/pause.ppm share/avifile/play.ppm share/avifile/stop.ppm share/avifile/test.png %%PORTDOCS%%share/doc/avifile/README %%PORTDOCS%%@dirrm share/doc/avifile @dirrm share/avifile +@dirrm lib/avifile/vidix @dirrm lib/avifile @dirrm include/avifile Property changes on: head/multimedia/avifile/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property