Attachment #27175 for bug #46173

View | Details | Raw Unified | Return to bug 46173
Collapse All | Expand All




#

PORTNAME=	xvid
PORTVERSION=	0.9.0
PORTEPOCH=	1
CATEGORIES=	graphics
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}/${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


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's benefit
	@ ${MKDIR} ${PREFIX}/include/xvid
.for header in ${EXTRA_HEADER_FILES}
	@ ${INSTALL_DATA} ${WRKSRC}/../../src/${header} ${PREFIX}/include
.endfor

.include <bsd.port.mk>

Line 1 Link Here

(-)xvid/distinfo (-1 / +1 lines)
1	MD5 (xvid_snapshot_20020412.tar.gz) = 05643ca7a870bba08631d7ef4127dbb8	1	MD5 (xvidcore-0.9.0.tar.gz) = 8d0cd15a9d935ec46d3b67eddf188c4a




--- 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
 




--- ../../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)
 
 /* 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)
  

Lines 1-6 Link Here

(-)xvid/pkg-plist (-3 / +1 lines)
		1	include/divx4.h
1	include/xvid.h	2	include/xvid.h
2	include/xvid/divx4.h
3	lib/libcore.a
4	lib/libxvidcore.so	3	lib/libxvidcore.so
5	lib/libxvidcore.so.0	4	lib/libxvidcore.so.0
6	@dirrm include/xvid

Return to bug 46173

Lines 6-49 Link Here

(-)xvid/Makefile (-26 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= xvid	8	PORTNAME= xvid
9	PORTVERSION= 0.20020412	9	PORTVERSION= 0.9.0
10	PORTREVISION= 1	10	PORTEPOCH= 1
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= http://www.xvid.org/snapshots/	12	MASTER_SITES= http://cvs.xvid.org/downloads/xvidcore-0.9.0/
13	DISTNAME= xvid_snapshot_${PORTVERSION:S/^0.//}	13	DISTNAME= xvidcore-${PORTVERSION}
14		14
15	MAINTAINER= michaelnottebrock@gmx.net	15	MAINTAINER= michaelnottebrock@gmx.net
16		16
17	BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm	17	BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
18		18
		19	MAKE_ARGS= CFLAGS+="-DARCH_X86 -DLINUX"
		20	MAKEFILE= Makefile.linuxx86
19	ONLY_FOR_ARCHS= i386	21	ONLY_FOR_ARCHS= i386
20	USE_AUTOCONF= yes	22	USE_AUTOCONF= yes
21	USE_GMAKE= yes	23	USE_GMAKE= yes
22	USE_REINPLACE= yes
23	INSTALLS_SHLIB= yes	24	INSTALLS_SHLIB= yes
24		25
25	CONFIGURE_WRKSRC= ${WRKDIR}	26	CONFIGURE_WRKSRC= ${WRKDIR}
26	WRKSRC= ${WRKDIR}/xvid_20020412/xvidcore/build/generic	27	WRKSRC= ${WRKDIR}/${DISTNAME}/build/generic
27		28
28	# XXX - compatility header installed for mplayer-devel port's benefit	29	# XXX - compatility header installed for mplayer-devel port's benefit
29	EXTRA_HEADER_FILES= divx4.h	30	EXTRA_HEADER_FILES= divx4.h
30		31
31	pre-everything::
32	.if !defined(WITH_OPTIMIZED_CFLAGS)
33	@ ${ECHO_MSG} "You can enable additional compilation optimizations"
34	@ ${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
35	.endif
36
37	post-patch:
38	@ ${FIND} ${WRKDIR} -type f \| \
39	${XARGS} -n 10 -x ${REINPLACE_CMD} -e \
40	's\|<malloc.h>\|<stdlib.h>\|'
41	.ifndef(WITH_OPTIMIZED_CFLAGS)
42	@ ${REINPLACE_CMD} -E -e 's\|(CFLAGS \+=).*\|\1 ${CFLAGS}\|' ${WRKSRC}/Makefile
43	.else
44	@ ${REINPLACE_CMD} -E -e 's\|(CFLAGS \+=.*)\|\1 ${CFLAGS}\|' ${WRKSRC}/Makefile
45	.endif
46
47	# trick to detect existence of stdint.h	32	# trick to detect existence of stdint.h
48	pre-configure:	33	pre-configure:
49	.for file in configure.in config.h.in	34	.for file in configure.in config.h.in
Lines 52-64 Link Here
52		37
53	do-install:	38	do-install:
54	@ ${INSTALL_DATA} ${WRKSRC}/libxvidcore.so ${PREFIX}/lib/libxvidcore.so.0	39	@ ${INSTALL_DATA} ${WRKSRC}/libxvidcore.so ${PREFIX}/lib/libxvidcore.so.0
55	@ ${INSTALL_DATA} ${WRKSRC}/libcore.a ${PREFIX}/lib/libcore.a
56	@ ${LN} -s libxvidcore.so.0 ${PREFIX}/lib/libxvidcore.so	40	@ ${LN} -s libxvidcore.so.0 ${PREFIX}/lib/libxvidcore.so
57	@ ${INSTALL_DATA} ${WRKSRC}/../../src/xvid.h ${PREFIX}/include	41	@ ${INSTALL_DATA} ${WRKSRC}/../../src/xvid.h ${PREFIX}/include
58	# XXX - compatility header installed for mplayer-devel port's benefit	42	# XXX - compatility header installed for mplayer's benefit
59	@ ${MKDIR} ${PREFIX}/include/xvid
60	.for header in ${EXTRA_HEADER_FILES}	43	.for header in ${EXTRA_HEADER_FILES}
61	@ ${INSTALL_DATA} ${WRKSRC}/../../src/${header} ${PREFIX}/include/xvid	44	@ ${INSTALL_DATA} ${WRKSRC}/../../src/${header} ${PREFIX}/include
62	.endfor	45	.endfor
63		46
64	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-19 Link Here

(-)xvid/files/patch-Makefile (-20 lines)
1	--- Makefile.orig Sat Apr 6 16:29:59 2002
2	+++ Makefile Sat Apr 6 16:31:10 2002
3	@@ -14,7 +14,6 @@
4
5	include Makefile.inc
6
7	-CC = gcc
8	#CC=icc
9	#CC = /opt/experimental/bin/gcc # that's where SuSE installs gcc3
10
11	@@ -33,7 +32,7 @@
12	# CFLAGS += -march=pentium -mcpu=pentium
13	# CFLAGS += -march=pentiumpro -mcpu=pentiumpro
14
15	- CFLAGS += -Wall -O3 -funroll-loops -ffast-math -march=pentiumpro
16	mcpu=pentiumpro
17	+ CFLAGS += -Wall -O3 -funroll-loops -ffast-math
18	CFLAGS += -fstrict-aliasing -fomit-frame-pointer
19	endif
20

Lines 1-16 Link Here

(-)xvid/files/patch-src:portab.h (-9 / +12 lines)
1	--- ../../src/portab.h.orig Thu May 23 04:52:08 2002	1	--- ../../src/portab.h.orig Wed Dec 4 03:42:01 2002
2	+++ ../../src/portab.h Thu May 23 04:54:41 2002	2	+++ ../../src/portab.h Wed Dec 4 03:44:07 2002
3	@@ -88,7 +88,13 @@	3	@@ -90,8 +90,15 @@
		4	#if defined(LINUX) \|\| defined(BEOS) \|\| defined(FREEBSD)
4		5
5	#if defined(LINUX)	6	/* All (u)int(size)_t types are defined here */
		7	-# include <inttypes.h>
6		8
7	+#include "../../../config.h"	9	+#include "../../config.h"
8	+	10	+
9	+#if defined(HAVE_STDINT_H)	11	+#if defined(HAVE_STDINT_H)
10	#include <stdint.h>	12	+#include <stdint.h>
11	+#elif defined(HAVE_INTTYPES_H)	13	+#elif defined(HAVE_INTTYPES_H)
12	+#include <inttypes.h>	14	+#include <inttypes.h>
13	+#endif	15	+#endif
14		16	+
15	#define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \	17	/*----------------------------------------------------------------------------
16	type name##_storage[(sizex)*(sizey)+(alignment)-1]; \	18	\| msvc (lacks such a header file)
		19