diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/avifile/Makefile | 38 | ||||
| -rw-r--r-- | graphics/avifile/distinfo | 2 | ||||
| -rw-r--r-- | graphics/avifile/pkg-plist | 12 |
3 files changed, 35 insertions, 17 deletions
diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile index 66a4eff1607f..4d949f9a9dbe 100644 --- a/graphics/avifile/Makefile +++ b/graphics/avifile/Makefile @@ -6,11 +6,11 @@ # PORTNAME= avifile -PORTVERSION= 0.7.7.20020523 +PORTVERSION= 0.7.11.20020711 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://avifile.sourceforge.net/ -DISTNAME= ${PORTNAME}-${PORTVERSION:C/^(.....).(.*)/\1-\2/} +DISTNAME= ${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/} EXTRACT_SUFX= .tgz MAINTAINER= holger@eit.uni-kl.de @@ -25,7 +25,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:C/^(.{3}).*/\1/}-${PORTVERSION:C/^(.{5}).+$/\1/} +WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:C/^(.{3}).*/\1/}-${PORTVERSION:C/^(.{6}).+$/\1/} USE_LIBTOOL= yes LIBTOOLFILES= acinclude.m4 @@ -34,6 +34,7 @@ CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ 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 PLIST_SUB= LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}" @@ -104,6 +105,9 @@ PLIST_SUB+= QT="@comment " # 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 @@ -168,7 +172,14 @@ packet 'pth' is installed.";\ # 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) @@ -207,21 +218,30 @@ post-patch: @${REINPLACE_CMD} -e 's|-lmp3lame|-L${LOCALBASE}/lib -lmp3lame|' \ ${WRKSRC}/configure # use portname without version to build dir names - @${SED} -E -e 's|^(PACKAGE\s*=\s*avifile).*|\1|' \ - ${WRKSRC}/configure > ${WRKDIR}/configure && \ - ${CP} ${WRKDIR}/configure ${WRKSRC}/configure + @${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 <malloc.h>|#include <stdlib.h>|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 \ + ${XARGS} -n 10 ${REINPLACE_CMD} -E -e \ 's|INSTALL = \@INSTALL\@|INSTALL = ${INSTALL}|; \ + s!-release[[:space:]]+\$$\(LT_RELEASE\)!!; \ 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 <sobomax@FreeBSD.org> @@ -242,7 +262,9 @@ post-install: .if ${ARCH} == "i386" RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} -CONFIGURE_ARGS+= --enable-x86opt --with-win32-path=${LOCALBASE}/lib/win32 +CONFIGURE_ARGS+= --enable-x86opt \ + --enable-win32 \ + --with-win32-path=${LOCALBASE}/lib/win32 PLIST_SUB+= FFMPEG="" WIN32="" .else diff --git a/graphics/avifile/distinfo b/graphics/avifile/distinfo index bba3bcf8ad0b..3abea0aa8c87 100644 --- a/graphics/avifile/distinfo +++ b/graphics/avifile/distinfo @@ -1 +1 @@ -MD5 (avifile-0.7.7-20020523.tgz) = cf77a5a4d1a06454f578cd95a1743d65 +MD5 (avifile-0.7.11-20020711.tgz) = 3e3cd43f2d383a364789bdf672ba10e8 diff --git a/graphics/avifile/pkg-plist b/graphics/avifile/pkg-plist index 47a18bdfca9e..ddaa0fa07f5a 100644 --- a/graphics/avifile/pkg-plist +++ b/graphics/avifile/pkg-plist @@ -12,7 +12,6 @@ include/avifile/audiodecoder.h include/avifile/audioencoder.h include/avifile/avifile.h include/avifile/aviplay.h -include/avifile/avm_map.h include/avifile/avm_output.h include/avifile/avm_stl.h include/avifile/configfile.h @@ -24,16 +23,14 @@ include/avifile/formats.h include/avifile/fourcc.h include/avifile/image.h include/avifile/infotypes.h -%%WIN32%%include/avifile/mmx.h include/avifile/playerwidget.h -include/avifile/plugin.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 -include/mmxnow.h +%%WIN32%%include/mmxnow.h %%AC3_PASS%%lib/avifile/ac3pass.la %%AC3_PASS%%lib/avifile/ac3pass.so lib/avifile/audiodec.la @@ -56,18 +53,17 @@ lib/avifile/mpeg_audiodec.so %%WIN32%%lib/avifile/win32.so %%XVID%%lib/avifile/xvid.la %%XVID%%lib/avifile/xvid.so -lib/libaviplay-0.7.so.0 lib/libaviplay.a lib/libaviplay.la lib/libaviplay.so -%%WIN32%%lib/libmmxnow-0.1.so -%%WIN32%%lib/libmmxnow-0.1.so.0 +lib/libaviplay.so.0 %%WIN32%%lib/libmmxnow.la %%WIN32%%lib/libmmxnow.so -%%QT%%lib/libqavm-0.7.so.0 +%%WIN32%%lib/libmmxnow.so.0 %%QT%%lib/libqavm.a %%QT%%lib/libqavm.la %%QT%%lib/libqavm.so +%%QT%%lib/libqavm.so.0 share/avifile/about.ppm share/avifile/mute.ppm share/avifile/open.ppm |