Thu Dec 18 16:19:08 2008 UTC ()
Update to 20081218 snapshot.  There is no NEWS file or list of changes;
please see the repository for more information.  I'm doing this update
our version is over a year old and some software is starting to require
a newer version.


(bjs)
diff -r1.13 -r1.14 pkgsrc/multimedia/x264-devel/Makefile
diff -r1.6 -r1.7 pkgsrc/multimedia/x264-devel/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/multimedia/x264-devel/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/files/strip_fopt.sh
diff -r1.5 -r1.6 pkgsrc/multimedia/x264-devel/patches/patch-aa
diff -r1.8 -r1.9 pkgsrc/multimedia/x264-devel/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/multimedia/x264-devel/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/patch-af
diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/patch-ag
diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/patch-ah
diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/patch-ai
diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/patch-aj
diff -r0 -r1.1 pkgsrc/multimedia/x264-devel/patches/patch-ak
diff -r0 -r1.1 pkgsrc/multimedia/x264-devel/patches/patch-al
diff -r0 -r1.1 pkgsrc/multimedia/x264-devel/patches/patch-am
cvs diff -r1.13 -r1.14 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2008/11/18 22:08:32 1.13
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2008/12/18 16:19:07 1.14
@@ -1,42 +1,59 @@ @@ -1,42 +1,59 @@
1# $NetBSD: Makefile,v 1.13 2008/11/18 22:08:32 rillig Exp $ 1# $NetBSD: Makefile,v 1.14 2008/12/18 16:19:07 bjs Exp $
2 2
3SNAPSHOT_DATE= 20071218 3SNAPSHOT_DATE= 20081217
4 4
5DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245 5DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245
6PKGNAME= x264-devel-${SNAPSHOT_DATE} 6PKGNAME= x264-devel-${SNAPSHOT_DATE}
7PKGREVISION= 2 
8CATEGORIES= multimedia 7CATEGORIES= multimedia
9MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 8MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
10EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
11 10
12MAINTAINER= joerg@NetBSD.org 11MAINTAINER= joerg@NetBSD.org
13HOMEPAGE= http://www.videolan.org/developers/x264.html 12HOMEPAGE= http://www.videolan.org/developers/x264.html
14COMMENT= GPL licensed H.264 encoder 13COMMENT= GPL licensed H.264 encoder
15 14
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
18.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
19 18
 19.if exists(/usr/include/stdlib.h) && ${OPSYS} != Linux # XXX should be fine
 20CFLAGS+= -DHAVE_STDLIB_H
 21.endif
 22
 23
20.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 24.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
21BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm 25BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm
22.endif 26.endif
23 27
24USE_TOOLS+= gmake 28USE_TOOLS+= gmake
25USE_LIBTOOL= yes 29USE_LIBTOOL= yes
26 30
27HAS_CONFIGURE= yes 31HAS_CONFIGURE= yes
 32CONFIGURE_ARGS+= --enable-pic # uses libtool's -prefer-pic
28CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 33CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
29.if ${INSTALL_UNSTRIPPED:Uno:M[Yy][Ee][Ss]} 34CONFIGURE_ARGS+= --disable-mp4-output # needs GPAC, not in pkgsrc
30CONFIGURE_ARGS+= --enable-debug 
31.endif 
32MAKE_ENV+= SH=${SH:Q} 35MAKE_ENV+= SH=${SH:Q}
33 36
34BUILD_TARGET= default 37BUILD_TARGET= default
 38BUILDLINK_TRANSFORM+= rm:-O4 # XXX does this mean anything to any compiler?
 39REPLACE_SH= strip_fopt.sh
 40
 41.include "../../mk/dlopen.buildlink3.mk"
 42
 43CHECK_BUILTIN.pthread:= yes
 44.include "../../mk/pthread.builtin.mk"
 45CHECK_BUILTIN.pthread:= no
 46
 47.if !empty(USE_BUILTIN.pthread:M[Yy][Ee][Ss])
 48X264_BUILD_THREADS_SUPPORT= yes
 49.else
 50X264_BUILD_THREADS_SUPPORT= ${DLOPEN_REQUIRE_PTHREADS}
 51.endif
 52
 53.include "options.mk"
35 54
36post-extract: 55post-extract:
37 ${SED} -e 's,@SH@,${SH},' ${FILESDIR}/strip_fopt.sh \ 56 ${CP} ${FILESDIR}/strip_fopt.sh ${WRKSRC}/ && \
38 >${WRKSRC}/strip_fopt.sh 
39 ${CHMOD} +x ${WRKSRC}/strip_fopt.sh 57 ${CHMOD} +x ${WRKSRC}/strip_fopt.sh
40 58
41.include "../../mk/pthread.buildlink3.mk" 
42.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/x264-devel/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/buildlink3.mk 2008/03/10 11:59:26 1.6
+++ pkgsrc/multimedia/x264-devel/Attic/buildlink3.mk 2008/12/18 16:19:07 1.7
@@ -1,19 +1,33 @@ @@ -1,19 +1,33 @@
1# $NetBSD: buildlink3.mk,v 1.6 2008/03/10 11:59:26 drochner Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2008/12/18 16:19:07 bjs Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4X264_DEVEL_BUILDLINK3_MK:= ${X264_DEVEL_BUILDLINK3_MK}+ 4X264_DEVEL_BUILDLINK3_MK:= ${X264_DEVEL_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= x264-devel 7BUILDLINK_DEPENDS+= x264-devel
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx264-devel} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx264-devel}
11BUILDLINK_PACKAGES+= x264-devel 11BUILDLINK_PACKAGES+= x264-devel
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x264-devel 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x264-devel
13 13
14.if !empty(X264_DEVEL_BUILDLINK3_MK:M+) 14.if !empty(X264_DEVEL_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20060127 15###
 16### NOTE: When changing BUILDLINK_A[BP]I_DEPENDS.x264-devel, please record
 17### the value of X264_BUILD in x264.h along with the appropriate
 18### dependency specification. Perhaps we should incorporate this
 19### into the version number and/or pkg-config file?
 20###
 21### Prior specification: x264-devel>=20060127 # X264_BUILD 44
 22###
 23BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20081212 # X264_BUILD 65
16BUILDLINK_PKGSRCDIR.x264-devel?= ../../multimedia/x264-devel 24BUILDLINK_PKGSRCDIR.x264-devel?= ../../multimedia/x264-devel
 25pkgbase:= x264-devel
 26. include "../../mk/pkg-build-options.mk"
17.endif # X264_DEVEL_BUILDLINK3_MK 27.endif # X264_DEVEL_BUILDLINK3_MK
18 28
 29.if !empty(PKG_BUILD_OPTIONS.x264-devel:Mthreads)
 30. include "../../mk/pthread.buildlink3.mk"
 31.endif
 32
19BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 33BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.14 -r1.15 pkgsrc/multimedia/x264-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/distinfo 2008/07/30 21:46:04 1.14
+++ pkgsrc/multimedia/x264-devel/Attic/distinfo 2008/12/18 16:19:07 1.15
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: distinfo,v 1.14 2008/07/30 21:46:04 ahoka Exp $ 1$NetBSD: distinfo,v 1.15 2008/12/18 16:19:07 bjs Exp $
2 2
3SHA1 (x264-snapshot-20071218-2245.tar.bz2) = b5bc182070e17a8470618bae776488514b67a96a 3SHA1 (x264-snapshot-20081217-2245.tar.bz2) = 81f51f72f8ba78e478f829d5cfe41fb6afe846b0
4RMD160 (x264-snapshot-20071218-2245.tar.bz2) = 753ab79398bf5bb92b41656ef48ab57dcc63f347 4RMD160 (x264-snapshot-20081217-2245.tar.bz2) = 20b8504c62189ed654a066d81433a91c0e0a97e3
5Size (x264-snapshot-20071218-2245.tar.bz2) = 537622 bytes 5Size (x264-snapshot-20081217-2245.tar.bz2) = 2336751 bytes
6SHA1 (patch-aa) = 78152d98fd8df5719dfc556286dec466c53299ba 6SHA1 (patch-aa) = 0ff1c2c0942a08dc1d0e35923490ca039cd16d12
7SHA1 (patch-ab) = 1c38310140b0497dbc257758564dac9264abad54 7SHA1 (patch-ab) = bdba36c3a2d7a7baaf26f75e6c4ac7a0d15cb3aa
8SHA1 (patch-ac) = c6b1201d8dad1e681a3bf6df6d03da6688328471 8SHA1 (patch-ac) = a8259f4b21daa19a11547a6af470bbb2376e7049
9SHA1 (patch-ad) = 5a4327e917daa0a62363960f8e59ffd8331ec0c1 9SHA1 (patch-ad) = f43841b2a10a999647b83faa6e845724b0e93847
10SHA1 (patch-ae) = 2f1ffc0e59f9dbccf5887d3a7f92f0f4864c2411 10SHA1 (patch-ae) = bd9b4eb54e0d6f465eea9976d4337bc6650fd5aa
11SHA1 (patch-af) = 2c2777b64a4db19b8eedbefc4beb1262f3a42463 11SHA1 (patch-af) = b006c53478e03ffc7e799ff293878438c8682fd3
12SHA1 (patch-ag) = 1c5652d41bfa3f37cb529c91784ecb40a9731c9d 12SHA1 (patch-ag) = c616a8c0cae024d223aec4adb6564fb2a302d36e
13SHA1 (patch-ah) = f2476d6210481d2f35631b2d8f07f52ebc813467 13SHA1 (patch-ah) = f6f4c384cb84b517b771e720e8f789e2070d6a4f
14SHA1 (patch-ai) = e9c4a887a36d3a48e92c50c289a51d7bef83fd68 14SHA1 (patch-ai) = 5c796c6591f6c3614be769e0276a2c4f77479bae
15SHA1 (patch-aj) = d39c117bec412d2809ce02ec4a53c36b94a46ab4 15SHA1 (patch-aj) = 06eeceeb04aefef3a433a2e5934b60a32fd9c116
 16SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
 17SHA1 (patch-al) = f2c5d0e8b38870e48105239b61999a06b8dbf5ce
 18SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/files/Attic/strip_fopt.sh (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/files/Attic/strip_fopt.sh 2008/03/18 15:05:04 1.1
+++ pkgsrc/multimedia/x264-devel/files/Attic/strip_fopt.sh 2008/12/18 16:19:07 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!@SH@ 1#!/bin/sh
2# 2#
3# $NetBSD: strip_fopt.sh,v 1.1 2008/03/18 15:05:04 tron Exp $ 3# $NetBSD: strip_fopt.sh,v 1.2 2008/12/18 16:19:07 bjs Exp $
4# 4#
5# libtool assumes that the compiler can handle the -fPIC flag and the 5# libtool assumes that the compiler can handle the -fPIC flag and the
6# -fno-common. This isn't always true, for example yasm can't handle it. 6# -fno-common. This isn't always true, for example yasm can't handle it.
7command="$1" 7command="$1"
8shift 8shift
9while [ $# -gt 0 ]; do 9while [ $# -gt 0 ]; do
10 case "$1" in 10 case "$1" in
11 -fPIC|-fno-common) 11 -fPIC|-fno-common)
12 ;; 12 ;;
13 -DPIC) 13 -DPIC)
14 command="$command -D__PIC__" 14 command="$command -D__PIC__"
15 ;; 15 ;;
16 *) 16 *)
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/x264-devel/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-aa 2008/04/09 18:33:37 1.5
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-aa 2008/12/18 16:19:07 1.6
@@ -1,45 +1,84 @@ @@ -1,45 +1,84 @@
1$NetBSD: patch-aa,v 1.5 2008/04/09 18:33:37 tron Exp $ 1$NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
2 2
3--- configure.orig 2007-12-18 21:45:04.000000000 +0000 3--- configure.orig 2008-12-12 16:45:07.000000000 -0500
4+++ configure 2008-04-09 19:10:28.000000000 +0100 4+++ configure
5@@ -193,6 +193,10 @@ 5@@ -130,7 +130,7 @@ for opt do
 6 LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
 7 ;;
 8 --enable-pthread)
 9- pthread="auto" # can't skip detection, since it differs by OS
 10+ pthread="yes"
 11 ;;
 12 --disable-pthread)
 13 pthread="no"
 14@@ -150,7 +150,7 @@ for opt do
 15 shared="yes"
 16 ;;
 17 --enable-visualize)
 18- LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
 19+ LDFLAGS="$LDFLAGS -lX11"
 20 CFLAGS="$CFLAGS -DVISUALIZE=1"
 21 vis="yes"
 22 ;;
 23@@ -192,6 +192,10 @@ case $host_os in
6 SYS="FREEBSD" 24 SYS="FREEBSD"
7 LDFLAGS="$LDFLAGS -lm" 25 LDFLAGS="$LDFLAGS -lm"
8 ;; 26 ;;
9+ dragonfly*) 27+ dragonfly*)
10+ SYS="DRAGONFLY" 28+ SYS="DRAGONFLY"
11+ LDFLAGS="$LDFLAGS -lm" 29+ LDFLAGS="$LDFLAGS -lm"
12+ ;; 30+ ;;
13 kfreebsd*-gnu) 31 kfreebsd*-gnu)
14 SYS="FREEBSD" 32 SYS="FREEBSD"
15 CFLAGS="$CFLAGS -DHAVE_MALLOC_H" 33 CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
16@@ -245,14 +249,12 @@ 34@@ -247,7 +251,7 @@ case $host_cpu in
17 ASFLAGS="$ASFLAGS -f macho -DPREFIX" 
18 elif [ "$SYS" = CYGWIN -o "$SYS" = MINGW ]; then 
19 ASFLAGS="$ASFLAGS -f win32 -DPREFIX" 
20- elif [ "$SYS" = NETBSD ]; then 
21- ASFLAGS="$ASFLAGS -f aoutb" 
22 else 
23 ASFLAGS="$ASFLAGS -f elf" 35 ASFLAGS="$ASFLAGS -f elf"
24 fi 36 fi
25 as_check || AS="nasm" 
26 ;; 37 ;;
27- x86_64) 38- x86_64)
28+ x86_64|amd64) 39+ x86_64|amd64)
29 ARCH="X86_64" 40 ARCH="X86_64"
30 AS="yasm" 
31 if [ "$SYS" = MACOSX ];then 41 if [ "$SYS" = MACOSX ];then
32@@ -264,11 +266,11 @@ 42 ASFLAGS="-f macho64 -m amd64 -DPIC -DPREFIX"
 43@@ -258,11 +262,11 @@ case $host_cpu in
33 fi 44 fi
34 ;; 45 ;;
35 powerpc|powerpc64) 46 powerpc|powerpc64)
36- ARCH="PPC" 47- ARCH="PPC"
37 if [ $SYS = MACOSX ] 48 if [ $SYS = MACOSX ]
38 then 49 then
39- ALTIVECFLAGS="$ALTIVECFLAGS -faltivec -fastf -mcpu=G4" 50- ALTIVECFLAGS="$ALTIVECFLAGS -faltivec -fastf -mcpu=G4"
40+ ARCH="POWERPC" 51+ ARCH="POWERPC"
41 else 52 else
42+ ARCH="PPC" 53+ ARCH="PPC"
43 ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec" 54 ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec"
44 fi 55 fi
45 ;; 56 ;;
 57@@ -322,7 +326,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
 58
 59 # autodetect options that weren't forced nor disabled
 60
 61-libpthread=""
 62+libpthread="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
 63 if test "$pthread" = "auto" ; then
 64 pthread="no"
 65 case $SYS in
 66@@ -348,7 +352,7 @@ if test "$pthread" = "auto" ; then
 67 esac
 68 fi
 69 if test "$pthread" = "yes" ; then
 70- CFLAGS="$CFLAGS -DHAVE_PTHREAD"
 71+ CFLAGS="$CFLAGS -DHAVE_PTHREAD $PTHREAD_CFLAGS"
 72 LDFLAGS="$LDFLAGS $libpthread"
 73 fi
 74
 75@@ -378,7 +382,8 @@ if [ "$avis_input" = "yes" ] ; then
 76 fi
 77
 78 if [ "$pic" = "yes" ] ; then
 79- CFLAGS="$CFLAGS -fPIC"
 80+ CFLAGS="$CFLAGS"
 81+ PICFLAG="-prefer-pic"
 82 ASFLAGS="$ASFLAGS -DPIC"
 83 # resolve textrels in the x86 asm
 84 cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab 2008/07/10 13:40:40 1.8
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab 2008/12/18 16:19:07 1.9
@@ -1,106 +1,105 @@ @@ -1,106 +1,105 @@
1$NetBSD: patch-ab,v 1.8 2008/07/10 13:40:40 joerg Exp $ 1$NetBSD: patch-ab,v 1.9 2008/12/18 16:19:07 bjs Exp $
2 2
3--- Makefile.orig 2008-07-10 15:34:13.000000000 +0200 3--- Makefile.orig 2008-12-12 16:45:07.000000000 -0500
4+++ Makefile 4+++ Makefile
5@@ -26,7 +26,7 @@ ASMSRC = common/i386/dct-a.asm common/i 5@@ -40,9 +40,9 @@ endif
6 common/i386/mc-a2.asm common/i386/predict-a.asm \ 6 ifdef ARCH_X86
7 common/i386/pixel-sse2.asm common/i386/quant-a.asm \ 7 ASFLAGS += -Icommon/x86/
8 common/i386/deblock-a.asm 8 SRCS += common/x86/mc-c.c common/x86/predict-c.c
9-OBJASM = $(ASMSRC:%.asm=%.o) 9-OBJASM = $(ASMSRC:%.asm=%.o)
10+OBJASM = $(ASMSRC:%.asm=%.lo) 10+OBJASM = $(ASMSRC:%.asm=%.lo)
11 ASFLAGS += -Icommon/i386/ 11 $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
 12-checkasm: tools/checkasm-a.o
 13+checkasm: tools/checkasm-a.lo
12 endif 14 endif
13 endif 15 endif
14@@ -40,7 +40,7 @@ ASMSRC = common/amd64/dct-a.asm common/ 16
15 common/amd64/mc-a2.asm common/amd64/predict-a.asm \ 17@@ -52,44 +52,49 @@ ALTIVECSRC += common/ppc/mc.c common/ppc
16 common/amd64/pixel-sse2.asm common/amd64/quant-a.asm \ 
17 common/amd64/deblock-a.asm 
18-OBJASM = $(ASMSRC:%.asm=%.o) 
19+OBJASM = $(ASMSRC:%.asm=%.lo) 
20 ASFLAGS += -Icommon/amd64 
21 endif 
22 endif 
23@@ -51,20 +51,20 @@ ALTIVECSRC += common/ppc/mc.c common/ppc 
24 common/ppc/quant.c common/ppc/deblock.c \ 18 common/ppc/quant.c common/ppc/deblock.c \
25 common/ppc/predict.c 19 common/ppc/predict.c
26 SRCS += $(ALTIVECSRC) 20 SRCS += $(ALTIVECSRC)
27-$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS) 21-$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
28+$(ALTIVECSRC:%.c=%.lo): CFLAGS += $(ALTIVECFLAGS) 22+$(ALTIVECSRC:%.c=%.lo): CFLAGS += $(ALTIVECFLAGS)
29 endif 23 endif
30  24
31 # VIS optims 25 # VIS optims
32 ifeq ($(ARCH),UltraSparc) 26 ifeq ($(ARCH),UltraSparc)
33 ASMSRC += common/sparc/pixel.asm 27 ASMSRC += common/sparc/pixel.asm
34-OBJASM = $(ASMSRC:%.asm=%.o) 28-OBJASM = $(ASMSRC:%.asm=%.o)
35+OBJASM = $(ASMSRC:%.asm=%.lo) 29+OBJASM = $(ASMSRC:%.asm=%.lo)
36 endif 30 endif
37  31
38 ifneq ($(HAVE_GETOPT_LONG),1) 32 ifneq ($(HAVE_GETOPT_LONG),1)
39 SRCS += extras/getopt.c 33 SRCS += extras/getopt.c
40 endif 34 endif
41  35
42-OBJS = $(SRCS:%.c=%.o) 36-OBJS = $(SRCS:%.c=%.o)
 37-OBJCLI = $(SRCCLI:%.c=%.o)
43+OBJS = $(SRCS:%.c=%.lo) 38+OBJS = $(SRCS:%.c=%.lo)
44 OBJCLI = $(SRCCLI:%.c=%.o) 39+OBJCLI = $(SRCCLI:%.c=%.lo)
45 DEP = depend 40 DEP = depend
46  41
47@@ -73,15 +73,17 @@ all: default 42 .PHONY: all default fprofiled clean distclean install uninstall dox test testclean
48  43
49 default: $(DEP) x264$(EXE) 44 default: $(DEP) x264$(EXE)
50  45
51-libx264.a: .depend $(OBJS) $(OBJASM) 46-libx264.a: .depend $(OBJS) $(OBJASM)
52- ar rc libx264.a $(OBJS) $(OBJASM) 47- ar rc libx264.a $(OBJS) $(OBJASM)
53- ranlib libx264.a 48- ranlib libx264.a
54+%.lo: %.c 49+%.lo: %.c
55+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} -o $@ $< 50+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
56+ 51+
57+libx264.la: .depend $(OBJS) $(OBJASM) 52+libx264.la: .depend $(OBJS) $(OBJASM)
58+ ${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -rpath ${PREFIX}/lib -version-info 0 53+ ${LIBTOOL} --mode=link \
 54+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
 55+ $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
59  56
60 $(SONAME): .depend $(OBJS) $(OBJASM) 57 $(SONAME): .depend $(OBJS) $(OBJASM)
61 $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS) 58 $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
62  59
63-x264$(EXE): $(OBJCLI) libx264.a  60-x264$(EXE): $(OBJCLI) libx264.a
64- $(CC) -o $@ $+ $(LDFLAGS) 61- $(CC) -o $@ $+ $(LDFLAGS)
65+x264$(EXE): $(OBJCLI) libx264.la  62+x264$(EXE): $(OBJCLI) libx264.la
66+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS) 63+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
67  64
68 libx264gtk.a: muxers.o libx264.a 65-checkasm: tools/checkasm.o libx264.a
69 $(MAKE) -C gtk 66- $(CC) -o $@ $+ $(LDFLAGS)
70@@ -89,10 +91,10 @@ libx264gtk.a: muxers.o libx264.a 67+checkasm: tools/checkasm.lo libx264.la
71 checkasm: tools/checkasm.o libx264.a 68+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
72 $(CC) -o $@ $+ $(LDFLAGS) 
73  69
74-common/amd64/*.o: common/amd64/amd64inc.asm 
75-common/i386/*.o: common/i386/i386inc.asm 
76-%.o: %.asm 70-%.o: %.asm
77- $(AS) $(ASFLAGS) -o $@ $< 71- $(AS) $(ASFLAGS) -o $@ $<
78+common/amd64/*.lo: common/amd64/amd64inc.asm 
79+common/i386/*.lo: common/i386/i386inc.asm 
80+%.lo: %.asm 72+%.lo: %.asm
81+ ${LIBTOOL} --mode=compile --tag=ASM ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $< 73+ ${LIBTOOL} --mode=compile --tag=CC \
 74+ ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
82 # delete local/anonymous symbols, so they don't show up in oprofile 75 # delete local/anonymous symbols, so they don't show up in oprofile
83 -@ strip -x $@ 76- -@ strip -x $@
 77+ -@ strip -x $(@:.lo=.o)
84  78
85@@ -150,15 +152,14 @@ distclean: clean 79 .depend: config.mak
86 $(MAKE) -C gtk distclean 80 rm -f .depend
87  81@@ -144,21 +149,16 @@ distclean: clean
88 install: x264 $(SONAME) 82 rm -f config.mak config.h x264.pc
89- install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) 83 rm -rf test/
90- install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig 84
91+ install -d $(DESTDIR)$(bindir) 85-install: x264$(EXE) $(SONAME)
92+ install -d $(DESTDIR)$(includedir) 86+install: x264$(EXE) libx264.la
93+ install -d $(DESTDIR)$(libdir) 87 install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
94+ install -d $(DESTDIR)$(libdir)/pkgconfig 88 install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
95 install -m 644 x264.h $(DESTDIR)$(includedir) 89 install -m 644 x264.h $(DESTDIR)$(includedir)
96- install -m 644 libx264.a $(DESTDIR)$(libdir) 90- install -m 644 libx264.a $(DESTDIR)$(libdir)
97+ ${LIBTOOL} --mode=install install -m 644 libx264.la $(DESTDIR)$(libdir) 91+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
98 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig 92 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
99- install x264 $(DESTDIR)$(bindir) 93- install x264$(EXE) $(DESTDIR)$(bindir)
100- ranlib $(DESTDIR)$(libdir)/libx264.a 94- ranlib $(DESTDIR)$(libdir)/libx264.a
101- $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so) 95+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264$(EXE) $(DESTDIR)$(bindir)
 96 ifeq ($(SYS),MINGW)
 97 $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
 98-else
 99- $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
102- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) 100- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
103+ ${LIBTOOL} --mode=install install x264 $(DESTDIR)$(bindir) 101 endif
 102- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
104  103
105 install-gtk: libx264gtk.a 104 uninstall:
106 $(MAKE) -C gtk install 105 rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ac 2008/07/10 15:11:53 1.3
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ac 2008/12/18 16:19:07 1.4
@@ -1,13 +1,77 @@ @@ -1,13 +1,77 @@
1$NetBSD: patch-ac,v 1.3 2008/07/10 15:11:53 joerg Exp $ 1$NetBSD: patch-ac,v 1.4 2008/12/18 16:19:07 bjs Exp $
2 2
3--- common/osdep.h.orig 2008-07-10 15:44:08.000000000 +0200 3--- common/cpu.c.orig 2008-11-15 16:45:06.000000000 -0500
4+++ common/osdep.h 4+++ common/cpu.c
5@@ -44,7 +44,7 @@ 5@@ -32,6 +32,10 @@
6 #define X264_VERSION "" // no configure script for msvc 6 #include <sys/types.h>
 7 #include <sys/sysctl.h>
7 #endif 8 #endif
 9+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
 10+#include <sys/param.h>
 11+#include <sys/sysctl.h>
 12+#endif
8  13
9-#ifdef SYS_OPENBSD 14 #include "common.h"
10+#if defined(SYS_OPENBSD) || defined(SYS_SunOS) 15 #include "cpu.h"
11 #define isfinite finite 16@@ -185,17 +189,28 @@ uint32_t x264_cpu_detect( void )
 17
 18 #elif defined( ARCH_PPC )
 19
 20-#ifdef SYS_MACOSX
 21+#if defined(SYS_MACOSX) || defined(SYS_OPENBSD) || defined(SYS_NETBSD)
 22 #include <sys/sysctl.h>
 23+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
 24+#include <machine/cpu.h>
 25+#endif
 26 uint32_t x264_cpu_detect( void )
 27 {
 28 /* Thank you VLC */
 29 uint32_t cpu = 0;
 30- int selectors[2] = { CTL_HW, HW_VECTORUNIT };
 31- int has_altivec = 0;
 32+ int selectors[2];
 33+ int has_altivec = 0, error;
 34 size_t length = sizeof( has_altivec );
 35- int error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
 36
 37+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
 38+ selectors[0] = CTL_MACHDEP;
 39+ selectors[1] = CPU_ALTIVEC;
 40+#else
 41+ selectors[0] = CTL_HW;
 42+ selectors[1] = HW_VECTORUNIT;
 43+#endif
 44+
 45+ error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
 46 if( error == 0 && has_altivec != 0 )
 47 {
 48 cpu |= X264_CPU_ALTIVEC;
 49@@ -285,7 +300,7 @@ int x264_cpu_num_processors( void )
 50 get_system_info( &info );
 51 return info.cpu_count;
 52
 53-#elif defined(SYS_MACOSX) || defined(SYS_FREEBSD)
 54+#elif defined(SYS_MACOSX) || defined(SYS_FREEBSD)
 55 int numberOfCPUs;
 56 size_t length = sizeof( numberOfCPUs );
 57 if( sysctlbyname("hw.ncpu", &numberOfCPUs, &length, NULL, 0) )
 58@@ -294,6 +309,19 @@ int x264_cpu_num_processors( void )
 59 }
 60 return numberOfCPUs;
 61
 62+#elif defined(SYS_OPENBSD) || defined(SYS_NETBSD)
 63+ int mib[2], numberOfCPUs;
 64+ size_t length = sizeof( numberOfCPUs );
 65+
 66+ mib[0] = CTL_HW;
 67+ mib[1] = HW_NCPU;
 68+
 69+ if( sysctl(mib, 2, &numberOfCPUs, &length, NULL, 0) )
 70+ {
 71+ numberOfCPUs = 1;
 72+ }
 73+ return numberOfCPUs;
 74+
 75 #else
 76 return 1;
12 #endif 77 #endif
13 #if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX) 
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ad 2008/07/30 21:03:17 1.1
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ad 2008/12/18 16:19:07 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.1 2008/07/30 21:03:17 ahoka Exp $ 1$NetBSD: patch-ad,v 1.2 2008/12/18 16:19:07 bjs Exp $
2 2
3--- common/ppc/dct.c.orig 2007-12-18 22:45:03.000000000 +0100 3--- common/osdep.h.orig 2008-12-12 16:45:07.000000000 -0500
4+++ common/ppc/dct.c 4+++ common/osdep.h
5@@ -22,7 +22,7 @@ 5@@ -51,7 +51,7 @@
6 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. 6 #define X264_VERSION "" // no configure script for msvc
7 *****************************************************************************/ 
8  
9-#ifdef SYS_LINUX 
10+#if defined(SYS_LINUX) || defined(__NetBSD__) 
11 #include <altivec.h> 
12 #endif 7 #endif
13  8
 9-#if defined(SYS_OPENBSD) || defined(SYS_SunOS)
 10+#if defined(SYS_SunOS)
 11 #define isfinite finite
 12 #endif
 13 #if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX)
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ae 2008/07/30 21:03:17 1.1
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ae 2008/12/18 16:19:07 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ae,v 1.1 2008/07/30 21:03:17 ahoka Exp $ 1$NetBSD: patch-ae,v 1.2 2008/12/18 16:19:07 bjs Exp $
2 2
3--- common/ppc/deblock.c.orig 2007-12-18 22:45:03.000000000 +0100 3--- common/ppc/deblock.c.orig 2008-12-12 16:45:07.000000000 -0500
4+++ common/ppc/deblock.c 4+++ common/ppc/deblock.c
5@@ -21,7 +21,7 @@ 5@@ -18,7 +18,7 @@
6 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. 6 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
7 *****************************************************************************/ 7 *****************************************************************************/
8  8
9-#if defined SYS_LINUX 9-#if defined SYS_LINUX
10+#if defined(SYS_LINUX) || defined(__NetBSD__) 10+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
11 #include <altivec.h> 11 #include <altivec.h>
12 #endif 12 #endif
13  13
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-af 2008/07/30 21:03:17 1.1
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-af 2008/12/18 16:19:07 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-af,v 1.1 2008/07/30 21:03:17 ahoka Exp $ 1$NetBSD: patch-af,v 1.2 2008/12/18 16:19:07 bjs Exp $
2 2
3--- common/ppc/mc.c.orig 2007-12-18 22:45:03.000000000 +0100 3--- common/ppc/mc.c.orig 2008-12-12 16:45:07.000000000 -0500
4+++ common/ppc/mc.c 4+++ common/ppc/mc.c
5@@ -27,7 +27,7 @@ 5@@ -27,7 +27,7 @@
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <stdarg.h> 7 #include <stdarg.h>
8  8
9-#ifdef SYS_LINUX 9-#ifdef SYS_LINUX
10+#if defined(SYS_LINUX) || defined(__NetBSD__) 10+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
11 #include <altivec.h> 11 #include <altivec.h>
12 #endif 12 #endif
13  13
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ag 2008/07/30 21:03:17 1.1
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ag 2008/12/18 16:19:08 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ag,v 1.1 2008/07/30 21:03:17 ahoka Exp $ 1$NetBSD: patch-ag,v 1.2 2008/12/18 16:19:08 bjs Exp $
2 2
3--- common/ppc/pixel.c.orig 2007-12-18 22:45:03.000000000 +0100 3--- common/ppc/pixel.c.orig 2008-12-12 16:45:07.000000000 -0500
4+++ common/ppc/pixel.c 4+++ common/ppc/pixel.c
5@@ -22,7 +22,7 @@ 5@@ -21,7 +21,7 @@
6 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. 6 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
7 *****************************************************************************/ 7 *****************************************************************************/
8  8
9-#ifdef SYS_LINUX 9-#ifdef SYS_LINUX
10+#if defined(SYS_LINUX) || defined(__NetBSD__) 10+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
11 #include <altivec.h> 11 #include <altivec.h>
12 #endif 12 #endif
13  13
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ah 2008/07/30 21:03:17 1.1
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ah 2008/12/18 16:19:08 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ah,v 1.1 2008/07/30 21:03:17 ahoka Exp $ 1$NetBSD: patch-ah,v 1.2 2008/12/18 16:19:08 bjs Exp $
2 2
3--- common/ppc/predict.c.orig 2007-12-18 22:45:03.000000000 +0100 3--- common/ppc/predict.c.orig 2008-12-12 16:45:07.000000000 -0500
4+++ common/ppc/predict.c 4+++ common/ppc/predict.c
5@@ -20,7 +20,7 @@ 5@@ -18,7 +18,7 @@
6 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. 6 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
7 *****************************************************************************/ 7 *****************************************************************************/
8  8
9-#ifdef SYS_LINUX 9-#ifdef SYS_LINUX
10+#if defined(SYS_LINUX) || defined(__NetBSD__) 10+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
11 #include <altivec.h> 11 #include <altivec.h>
12 #endif 12 #endif
13  13
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ai 2008/07/30 21:03:17 1.1
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ai 2008/12/18 16:19:08 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ai,v 1.1 2008/07/30 21:03:17 ahoka Exp $ 1$NetBSD: patch-ai,v 1.2 2008/12/18 16:19:08 bjs Exp $
2 2
3--- common/ppc/quant.c.orig 2007-12-18 22:45:03.000000000 +0100 3--- common/ppc/quant.c.orig 2008-12-12 16:45:07.000000000 -0500
4+++ common/ppc/quant.c 4+++ common/ppc/quant.c
5@@ -18,7 +18,7 @@ 5@@ -18,7 +18,7 @@
6 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. 6 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
7 *****************************************************************************/ 7 *****************************************************************************/
8  8
9-#if defined SYS_LINUX 9-#if defined SYS_LINUX
10+#if defined(SYS_LINUX) || defined(__NetBSD__) 10+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
11 #include <altivec.h> 11 #include <altivec.h>
12 #endif 12 #endif
13  13
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/x264-devel/patches/Attic/patch-aj (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-aj 2008/07/30 21:46:04 1.1
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-aj 2008/12/18 16:19:08 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aj,v 1.1 2008/07/30 21:46:04 ahoka Exp $ 1$NetBSD: patch-aj,v 1.2 2008/12/18 16:19:08 bjs Exp $
2 2
3--- common/cpu.c.orig 2007-12-18 22:45:03.000000000 +0100 3--- common/cpu.c.orig 2008-12-13 06:09:00.000000000 -0500
4+++ common/cpu.c 4+++ common/cpu.c
5@@ -154,7 +154,7 @@ uint32_t x264_cpu_detect( void ) 5@@ -226,7 +226,7 @@ uint32_t x264_cpu_detect( void )
6 return cpu; 6 return cpu;
7 } 7 }
8  8
9-#elif defined( SYS_LINUX ) 9-#elif defined( SYS_LINUX )
10+#elif defined(SYS_LINUX) || defined(__NetBSD__) 10+#elif defined(SYS_LINUX) || defined(SYS_NETBSD)
11 #include <signal.h> 11 #include <signal.h>
12 #include <setjmp.h> 12 #include <setjmp.h>
13 static sigjmp_buf jmpbuf; 13 static sigjmp_buf jmpbuf;
File Added: pkgsrc/multimedia/x264-devel/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.1 2008/12/18 16:19:08 bjs Exp $

--- common/display-x11.c.orig	2008-12-12 16:45:07.000000000 -0500
+++ common/display-x11.c
@@ -22,6 +22,9 @@
 #include <X11/Xutil.h>
 #include <stdio.h>
 #include <string.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 #include "display.h"
File Added: pkgsrc/multimedia/x264-devel/patches/Attic/patch-al
$NetBSD: patch-al,v 1.1 2008/12/18 16:19:08 bjs Exp $

--- common/ppc/dct.c.orig	2008-12-12 16:45:07.000000000 -0500
+++ common/ppc/dct.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef SYS_LINUX
+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
 #include <altivec.h>
 #endif
File Added: pkgsrc/multimedia/x264-devel/patches/Attic/patch-am
$NetBSD: patch-am,v 1.1 2008/12/18 16:19:08 bjs Exp $

--- common/x86/mc-a.asm.orig	2008-12-12 16:45:07.000000000 -0500
+++ common/x86/mc-a.asm
@@ -512,12 +512,12 @@ AVG_CACHELINE_CHECK  8, 32, mmxext
 AVG_CACHELINE_CHECK 12, 32, mmxext
 AVG_CACHELINE_CHECK 16, 32, mmxext
 AVG_CACHELINE_CHECK 20, 32, mmxext
-AVG_CACHELINE_CHECK 16, 64, mmxext
-AVG_CACHELINE_CHECK 20, 64, mmxext
 %endif
 
 AVG_CACHELINE_CHECK  8, 64, mmxext
 AVG_CACHELINE_CHECK 12, 64, mmxext
+AVG_CACHELINE_CHECK 16, 64, mmxext
+AVG_CACHELINE_CHECK 20, 64, mmxext
 AVG_CACHELINE_CHECK 16, 64, sse2
 AVG_CACHELINE_CHECK 20, 64, sse2