Date: Tue, 10 Dec 2002 21:47:30 +0100 (CET) From: Michael Nottebrock <lofi@lofi.dyndns.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org, andy@fud.org.nz, mistry.7@osu.edu Subject: ports/46173: maintainer update: graphics/xvid to 0.9.0 (supersedes ports/46076) Message-ID: <200212102047.gBAKlUdt095254@lofi.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 46173 >Category: ports >Synopsis: maintainer update: graphics/xvid to 0.9.0 (supersedes ports/46076) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Dec 10 12:50:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Michael Nottebrock >Release: FreeBSD 4.7-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD lofi.dyndns.org 4.7-RELEASE-p1 FreeBSD 4.7-RELEASE-p1 #0: Fri Nov 1 19:50:41 CET 2002 lofi@lofi.dyndns.org:/usr/obj/usr/src/sys/LOFI i386 >Description: Update xvid to version 0.9.0 Changes since last PR: - Make the port build little endian. Maintainer stupidity spotted by: Andrew Thompson <andy@fud.org.nz> >How-To-Repeat: >Fix: diff -urN xvid.orig/Makefile xvid/Makefile --- xvid.orig/Makefile Sun Nov 3 08:27:39 2002 +++ xvid/Makefile Tue Dec 10 21:26:25 2002 @@ -6,44 +6,29 @@ # PORTNAME= xvid -PORTVERSION= 0.20020412 -PORTREVISION= 1 +PORTVERSION= 0.9.0 +PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= http://www.xvid.org/snapshots/ -DISTNAME= xvid_snapshot_${PORTVERSION:S/^0.//} +MASTER_SITES= http://cvs.xvid.org/downloads/xvidcore-0.9.0/ +DISTNAME= xvidcore-${PORTVERSION} MAINTAINER= michaelnottebrock@gmx.net BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm +MAKE_ARGS= CFLAGS+="-DARCH_X86 -DLINUX" +MAKEFILE= Makefile.linuxx86 ONLY_FOR_ARCHS= i386 USE_AUTOCONF= yes USE_GMAKE= yes -USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_WRKSRC= ${WRKDIR} -WRKSRC= ${WRKDIR}/xvid_20020412/xvidcore/build/generic +WRKSRC= ${WRKDIR}/${DISTNAME}/build/generic # XXX - compatility header installed for mplayer-devel port's benefit EXTRA_HEADER_FILES= divx4.h -pre-everything:: -.if !defined(WITH_OPTIMIZED_CFLAGS) - @ ${ECHO_MSG} "You can enable additional compilation optimizations" - @ ${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS" -.endif - -post-patch: - @ ${FIND} ${WRKDIR} -type f | \ - ${XARGS} -n 10 -x ${REINPLACE_CMD} -e \ - 's|<malloc.h>|<stdlib.h>|' -.ifndef(WITH_OPTIMIZED_CFLAGS) - @ ${REINPLACE_CMD} -E -e 's|(CFLAGS \+=).*|\1 ${CFLAGS}|' ${WRKSRC}/Makefile -.else - @ ${REINPLACE_CMD} -E -e 's|(CFLAGS \+=.*)|\1 ${CFLAGS}|' ${WRKSRC}/Makefile -.endif - # trick to detect existence of stdint.h pre-configure: .for file in configure.in config.h.in @@ -52,13 +37,11 @@ do-install: @ ${INSTALL_DATA} ${WRKSRC}/libxvidcore.so ${PREFIX}/lib/libxvidcore.so.0 - @ ${INSTALL_DATA} ${WRKSRC}/libcore.a ${PREFIX}/lib/libcore.a @ ${LN} -s libxvidcore.so.0 ${PREFIX}/lib/libxvidcore.so @ ${INSTALL_DATA} ${WRKSRC}/../../src/xvid.h ${PREFIX}/include -# XXX - compatility header installed for mplayer-devel port's benefit - @ ${MKDIR} ${PREFIX}/include/xvid +# XXX - compatility header installed for mplayer's benefit .for header in ${EXTRA_HEADER_FILES} - @ ${INSTALL_DATA} ${WRKSRC}/../../src/${header} ${PREFIX}/include/xvid + @ ${INSTALL_DATA} ${WRKSRC}/../../src/${header} ${PREFIX}/include .endfor .include <bsd.port.mk> diff -urN xvid.orig/distinfo xvid/distinfo --- xvid.orig/distinfo Thu May 23 06:57:22 2002 +++ xvid/distinfo Sat Dec 7 21:11:14 2002 @@ -1 +1 @@ -MD5 (xvid_snapshot_20020412.tar.gz) = 05643ca7a870bba08631d7ef4127dbb8 +MD5 (xvidcore-0.9.0.tar.gz) = 8d0cd15a9d935ec46d3b67eddf188c4a diff -urN xvid.orig/files/patch-Makefile xvid/files/patch-Makefile --- xvid.orig/files/patch-Makefile Tue Apr 9 01:38:02 2002 +++ xvid/files/patch-Makefile Thu Jan 1 01:00:00 1970 @@ -1,19 +0,0 @@ ---- Makefile.orig Sat Apr 6 16:29:59 2002 -+++ Makefile Sat Apr 6 16:31:10 2002 -@@ -14,7 +14,6 @@ - - include Makefile.inc - --CC = gcc - #CC=icc - #CC = /opt/experimental/bin/gcc # that's where SuSE installs gcc3 - -@@ -33,7 +32,7 @@ - # CFLAGS += -march=pentium -mcpu=pentium - # CFLAGS += -march=pentiumpro -mcpu=pentiumpro - -- CFLAGS += -Wall -O3 -funroll-loops -ffast-math -march=pentiumpro -mcpu=pentiumpro -+ CFLAGS += -Wall -O3 -funroll-loops -ffast-math - CFLAGS += -fstrict-aliasing -fomit-frame-pointer - endif - diff -urN xvid.orig/files/patch-src:portab.h xvid/files/patch-src:portab.h --- xvid.orig/files/patch-src:portab.h Thu May 23 06:57:24 2002 +++ xvid/files/patch-src:portab.h Sat Dec 7 19:35:36 2002 @@ -1,16 +1,19 @@ ---- ../../src/portab.h.orig Thu May 23 04:52:08 2002 -+++ ../../src/portab.h Thu May 23 04:54:41 2002 -@@ -88,7 +88,13 @@ +--- ../../src/portab.h.orig Wed Dec 4 03:42:01 2002 ++++ ../../src/portab.h Wed Dec 4 03:44:07 2002 +@@ -90,8 +90,15 @@ + #if defined(LINUX) || defined(BEOS) || defined(FREEBSD) - #if defined(LINUX) + /* All (u)int(size)_t types are defined here */ +-# include <inttypes.h> -+#include "../../../config.h" ++#include "../../config.h" + +#if defined(HAVE_STDINT_H) - #include <stdint.h> ++#include <stdint.h> +#elif defined(HAVE_INTTYPES_H) +#include <inttypes.h> +#endif - - #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ - type name##_storage[(sizex)*(sizey)+(alignment)-1]; \ ++ + /*---------------------------------------------------------------------------- + | msvc (lacks such a header file) + *---------------------------------------------------------------------------*/ diff -urN xvid.orig/pkg-plist xvid/pkg-plist --- xvid.orig/pkg-plist Wed Jul 24 21:15:26 2002 +++ xvid/pkg-plist Sat Dec 7 22:09:48 2002 @@ -1,6 +1,4 @@ +include/divx4.h include/xvid.h -include/xvid/divx4.h -lib/libcore.a lib/libxvidcore.so lib/libxvidcore.so.0 -@dirrm include/xvid >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212102047.gBAKlUdt095254>