Date: Fri, 28 Mar 2003 23:03:03 +0100 (CET) From: Michael Nottebrock <lofi@lofi.dyndns.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Max Khon <fjoe@FreeBSD.org> Subject: ports/50410: maintainer update: graphics/xvid (supersedes ports/50389) Message-ID: <200303282203.h2SM33mo021984@lofi.dyndns.org> Resent-Message-ID: <200303282210.h2SMA6iZ042848@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 50410
>Category: ports
>Synopsis: maintainer update: graphics/xvid (supersedes ports/50389)
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 28 14:10:06 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Michael Nottebrock
>Release: FreeBSD 5.0-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD lofi.dyndns.org 5.0-RELEASE-p6 FreeBSD 5.0-RELEASE-p6 #0: Sat Mar 22 00:54:37 CET 2003 lofi@lofi.dyndns.org:/usr/obj/usr/src/sys/LOFI i386
>Description:
Update port to latest release. Changes:
- Lots of reinplacements and patches removed.
- Install the static lib, too
- Byebye divx4.h
- <COMMITER ALERT> Change CATEGORIES from graphics to multimedia </COMMITTER ALERT>
Reminded by: "Thomas E. Zander" <riggi-in-au@gmx.net>
Changes from previous PR:
- Use ${LN} -sf instead of ${LN} -s in post-install
Submitted by: Max Khon <fjoe@freebsd.org>
>How-To-Repeat:
>Fix:
diff -urN graphics/xvid/Makefile multimedia/xvid/Makefile
--- graphics/xvid/Makefile Fri Feb 21 13:15:34 2003
+++ multimedia/xvid/Makefile Fri Mar 28 22:56:14 2003
@@ -2,62 +2,28 @@
# Date created: 04 April 2002
# Whom: Michael Nottebrock <michaelnottebrock@gmx.net> et al
#
-# $FreeBSD: ports/graphics/xvid/Makefile,v 1.10 2003/02/21 12:15:34 knu Exp $
+# $FreeBSD: ports/graphics/xvid/Makefile,v 1.8 2003/01/20 12:07:09 edwin Exp $
#
PORTNAME= xvid
-PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTVERSION= 0.9.1
PORTEPOCH= 1
-CATEGORIES= graphics
+CATEGORIES= multimedia
MASTER_SITES= http://files.xvid.org/downloads/
-DISTNAME= xvidcore-${PORTVERSION}
+DISTNAME= ${PORTNAME}core-${PORTVERSION}
MAINTAINER= michaelnottebrock@gmx.net
COMMENT= An opensource MPEG-4 codec, based on OpenDivx
BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
-ONLY_FOR_ARCHS= i386 sparc64
-USE_AUTOCONF_VER= 253
-USE_PERL5_BUILD=yes
+HAS_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_REINPLACE= yes
-CONFIGURE_WRKSRC= ${WRKDIR}
WRKSRC= ${WRKDIR}/${DISTNAME}/build/generic
-# XXX - compatility header installed for mplayer-devel port's benefit
-EXTRA_HEADER_FILES= divx4.h
+post-install:
+ @ ${LN} -sf libxvidcore.so ${PREFIX}/lib/libxvidcore.so.0
-# trick to detect existence of stdint.h
-# amongst other things
-pre-configure:
-.for file in configure.in config.h.in
- @ ${CP} ${FILESDIR}/${file} ${WRKDIR}
-.endfor
-
-post-patch:
-.for file in Makefile.linuxx86 Makefile.sparc
- ${REINPLACE_CMD} -e 's|-lc||' ${WRKSRC}/$(file)
-.endfor
-
-do-install:
- @ ${INSTALL_DATA} ${WRKSRC}/libxvidcore.so ${PREFIX}/lib/libxvidcore.so.0
- @ ${LN} -s libxvidcore.so.0 ${PREFIX}/lib/libxvidcore.so
- @ ${INSTALL_DATA} ${WRKSRC}/../../src/xvid.h ${PREFIX}/include
-# XXX - compatility header installed for mplayer's benefit
-.for header in ${EXTRA_HEADER_FILES}
- @ ${INSTALL_DATA} ${WRKSRC}/../../src/${header} ${PREFIX}/include
-.endfor
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH:L} == i386
-MAKEFILE= Makefile.linuxx86
-.elif ${ARCH:L} == sparc64
-MAKEFILE= Makefile.sparc
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN graphics/xvid/distinfo multimedia/xvid/distinfo
--- graphics/xvid/distinfo Fri Jan 10 21:23:38 2003
+++ multimedia/xvid/distinfo Fri Feb 21 18:24:58 2003
@@ -1 +1 @@
-MD5 (xvidcore-0.9.0.tar.gz) = 8d0cd15a9d935ec46d3b67eddf188c4a
+MD5 (xvidcore-0.9.1.tar.gz) = d4b4cb185f074082e17b36c24b277276
diff -urN graphics/xvid/files/config.h.in multimedia/xvid/files/config.h.in
--- graphics/xvid/files/config.h.in Fri Jan 10 21:23:38 2003
+++ multimedia/xvid/files/config.h.in Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-/* Define as 1 if you have sys/endian.h. */
-#undef HAVE_SYS_ENDIAN_H
-
-/* Define as 1 if you have sys/param.h. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define as 1 if you have stdint.h. */
-#undef HAVE_STDINT_H
-
-/* Define as 1 if you have inttypes.h. */
-#undef HAVE_INTTYPES_H
-
-/* Define size of uintptr_t type. */
-#undef SIZEOF_UINTPTR_T
diff -urN graphics/xvid/files/configure.in multimedia/xvid/files/configure.in
--- graphics/xvid/files/configure.in Fri Jan 10 21:23:38 2003
+++ multimedia/xvid/files/configure.in Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-dnl Process this file with autoconf to produce a configure header
-AC_INIT(config.h.in)
-
-dnl Check for and header files
-AC_CHECK_HEADERS(sys/endian.h sys/param.h stdint.h inttypes.h)
-
-dnl Check size of pointer for cache size
-AC_CHECK_SIZEOF(uintptr_t)
-
-AC_CONFIG_HEADER([config.h])
-
-AC_OUTPUT(config.h)
diff -urN graphics/xvid/files/patch-src:portab.h multimedia/xvid/files/patch-src:portab.h
--- graphics/xvid/files/patch-src:portab.h Fri Jan 10 21:23:38 2003
+++ multimedia/xvid/files/patch-src:portab.h Thu Jan 1 01:00:00 1970
@@ -1,58 +0,0 @@
---- ../../src/portab.h.orig Sat Nov 23 22:50:14 2002
-+++ ../../src/portab.h Fri Jan 3 14:40:18 2003
-@@ -83,6 +83,14 @@
- * Types used in XviD sources
- ****************************************************************************/
-
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
-+
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000 && defined(HAVE_SYS_ENDIAN_H)
-+#include <sys/endian.h>
-+#endif
-+
- /*----------------------------------------------------------------------------
- | Standard Unix include file (sorry, we put all unix into "linux" case)
- *---------------------------------------------------------------------------*/
-@@ -90,8 +98,15 @@
- #if defined(LINUX) || defined(BEOS) || defined(FREEBSD)
-
- /* All (u)int(size)_t types are defined here */
--# include <inttypes.h>
-
-+#include "../../config.h"
-+
-+#if defined(HAVE_STDINT_H)
-+#include <stdint.h>
-+#elif defined(HAVE_INTTYPES_H)
-+#include <inttypes.h>
-+#endif
-+
- /*----------------------------------------------------------------------------
- | msvc (lacks such a header file)
- *---------------------------------------------------------------------------*/
-@@ -139,6 +154,9 @@
- #elif defined(ARCH_IA64)
- # define CACHE_LINE 32
- # define ptr_t uint64_t
-+#elif defined(__FreeBSD__)
-+# define CACHE_LINE (SIZEOF_UINTPTR_T * 4)
-+# define ptr_t uintptr_t
- #else
- # error Architecture not supported.
- #endif
-@@ -341,6 +359,13 @@
- {
- return 0;
- }
-+
-+/*----------------------------------------------------------------------------
-+ | FreeBSD specific macros/functions
-+ *---------------------------------------------------------------------------*/
-+# elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 && defined(HAVE_SYS_ENDIAN_H)
-+# define BSWAP(a) (be32toh(x))
-+# error Missing EMMS() definition for this architecture.
-
- /*----------------------------------------------------------------------------
- | XviD + gcc unsupported Architecture
diff -urN graphics/xvid/pkg-plist multimedia/xvid/pkg-plist
--- graphics/xvid/pkg-plist Fri Jan 10 21:23:38 2003
+++ multimedia/xvid/pkg-plist Fri Feb 21 18:58:11 2003
@@ -1,4 +1,4 @@
-include/divx4.h
include/xvid.h
+lib/libxvidcore.a
lib/libxvidcore.so
lib/libxvidcore.so.0
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303282203.h2SM33mo021984>