Date: Mon, 25 Mar 2013 14:05:24 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315226 - in head/multimedia/libmpeg2: . files Message-ID: <201303251405.r2PE5Oqh038653@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Mon Mar 25 14:05:23 2013 New Revision: 315226 URL: http://svnweb.freebsd.org/changeset/ports/315226 Log: - Add dependence on X libraries [1] and make it optional - Convert to new option framework - Convert to USES - Trim Makefile header - pet portlint: rename patch PR: ports/175965 [1] Submitted by: pawel Added: - copied unchanged from r315215, head/multimedia/libmpeg2/files/patch-libmpeg2::idct_alpha.c Directory Properties: head/multimedia/libmpeg2/files/patch-libmpeg2__idct_alpha.c (props changed) Deleted: head/multimedia/libmpeg2/files/patch-libmpeg2::idct_alpha.c Modified: head/multimedia/libmpeg2/Makefile (contents, props changed) Modified: head/multimedia/libmpeg2/Makefile ============================================================================== --- head/multimedia/libmpeg2/Makefile Mon Mar 25 14:01:36 2013 (r315225) +++ head/multimedia/libmpeg2/Makefile Mon Mar 25 14:05:23 2013 (r315226) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libmpeg2 -# Date created: Tue Oct 16 17:14:20 BRST 2001 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# +# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libmpeg2 PORTVERSION= 0.5.1 @@ -12,30 +8,36 @@ CATEGORIES= multimedia MASTER_SITES= http://libmpeg2.sourceforge.net/files/ MAINTAINER= multimedia@FreeBSD.org -COMMENT= A free library for decoding mpeg-2 and mpeg-1 video streams +COMMENT= Free library for decoding mpeg-2 and mpeg-1 video streams +USES= pathfix USE_GNOME= ltverhack USE_AUTOTOOLS= libtool USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ARGS= --enable-shared \ - --with-x +CONFIGURE_ARGS= --enable-shared MAN1= extract_mpeg2.1 mpeg2dec.1 PORTDOCS= libmpeg2.txt README -.ifdef(WITH_SDL) +OPTIONS_DEFINE= DOCS SDL X11 + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSDL} USE_SDL= yes CONFIGURE_ARGS+= --enable-sdl .else CONFIGURE_ARGS+= --disable-sdl .endif -# allow build with more warnings enabled -.if defined(NO_WERROR) -CONFIGURE_ARGS+= --disable-warnings +.if ${PORT_OPTIONS:MX11} +USE_XORG= sm xv +CONFIGURE_ARGS+= --with-x +.else +CONFIGURE_ARGS+= --without-x .endif .include <bsd.port.pre.mk> @@ -46,29 +48,17 @@ CONFIGURE_ARGS+= --disable-warnings CFLAGS:= ${CFLAGS:N-mcpu=*} .endif -pre-everything:: - @${ECHO_MSG} "====>" -.ifndef(WITH_SDL) - @${ECHO_MSG} "====> You can enable SDL support by defining WITH_SDL" -.endif -.ifndef(WITH_MGA) - @${ECHO_MSG} "====> You can enable MGA support by defining WITH_MGA" -.endif - @${ECHO_MSG} "====>" - post-patch: - @${REINPLACE_CMD} -e 's|-O3||;s|<termio.h>|<termios.h>|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-O3||;s|<termio.h>|<termios.h>|' \ + ${WRKSRC}/configure # AMD64 prefers position independent code .if ${ARCH:L} == "amd64" @${REINPLACE_CMD} -e 's|-prefer-non-pic||' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + ${WRKSRC}/configure .endif - @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/libmpeg2/Makefile.in - @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/libmpeg2/convert/Makefile.in + post-install: -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/libmpeg2.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} Copied: head/multimedia/libmpeg2/files/patch-libmpeg2__idct_alpha.c (from r315215, head/multimedia/libmpeg2/files/patch-libmpeg2::idct_alpha.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libmpeg2/files/patch-libmpeg2__idct_alpha.c Mon Mar 25 14:05:23 2013 (r315226, copy of r315215, head/multimedia/libmpeg2/files/patch-libmpeg2::idct_alpha.c) @@ -0,0 +1,17 @@ +--- libmpeg2/idct_alpha.c.orig Wed May 14 13:19:19 2003 ++++ libmpeg2/idct_alpha.c Wed May 14 13:19:32 2003 +@@ -24,6 +24,14 @@ + + #include "config.h" + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ ++#if defined(__FreeBSD__) && __FreeBSD_version < 500000 ++typedef __int32_t int_fast32_t; ++#endif ++ + #ifdef ARCH_ALPHA + + #include <stdlib.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303251405.r2PE5Oqh038653>