Tue Feb 3 08:44:15 2009 UTC ()
Let to link libx264.la with ${LDFLAGS}, not only ${PTHREAD_LDFLAGS} and
${PTHREAD_LIBS}, same as original .so target.
At least, need to link with -lm (using pow(3))

Bump PKGREVISION.


(obache)
diff -r1.17 -r1.18 pkgsrc/multimedia/x264-devel/Makefile
diff -r1.15 -r1.16 pkgsrc/multimedia/x264-devel/distinfo
diff -r1.9 -r1.10 pkgsrc/multimedia/x264-devel/patches/patch-ab
cvs diff -r1.17 -r1.18 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2009/01/20 22:33:38 1.17
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2009/02/03 08:44:15 1.18
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.17 2009/01/20 22:33:38 sketch Exp $ 1# $NetBSD: Makefile,v 1.18 2009/02/03 08:44:15 obache Exp $
2 2
3SNAPSHOT_DATE= 20081217 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= 1
7CATEGORIES= multimedia 8CATEGORIES= multimedia
8MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 9MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
9EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
10 11
11MAINTAINER= joerg@NetBSD.org 12MAINTAINER= joerg@NetBSD.org
12HOMEPAGE= http://www.videolan.org/developers/x264.html 13HOMEPAGE= http://www.videolan.org/developers/x264.html
13COMMENT= GPL licensed H.264 encoder 14COMMENT= GPL licensed H.264 encoder
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
18 19
19.if exists(/usr/include/stdlib.h) && ${OPSYS} != Linux # XXX should be fine 20.if exists(/usr/include/stdlib.h) && ${OPSYS} != Linux # XXX should be fine
cvs diff -r1.15 -r1.16 pkgsrc/multimedia/x264-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/distinfo 2008/12/18 16:19:07 1.15
+++ pkgsrc/multimedia/x264-devel/Attic/distinfo 2009/02/03 08:44:15 1.16
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.15 2008/12/18 16:19:07 bjs Exp $ 1$NetBSD: distinfo,v 1.16 2009/02/03 08:44:15 obache Exp $
2 2
3SHA1 (x264-snapshot-20081217-2245.tar.bz2) = 81f51f72f8ba78e478f829d5cfe41fb6afe846b0 3SHA1 (x264-snapshot-20081217-2245.tar.bz2) = 81f51f72f8ba78e478f829d5cfe41fb6afe846b0
4RMD160 (x264-snapshot-20081217-2245.tar.bz2) = 20b8504c62189ed654a066d81433a91c0e0a97e3 4RMD160 (x264-snapshot-20081217-2245.tar.bz2) = 20b8504c62189ed654a066d81433a91c0e0a97e3
5Size (x264-snapshot-20081217-2245.tar.bz2) = 2336751 bytes 5Size (x264-snapshot-20081217-2245.tar.bz2) = 2336751 bytes
6SHA1 (patch-aa) = 0ff1c2c0942a08dc1d0e35923490ca039cd16d12 6SHA1 (patch-aa) = 0ff1c2c0942a08dc1d0e35923490ca039cd16d12
7SHA1 (patch-ab) = bdba36c3a2d7a7baaf26f75e6c4ac7a0d15cb3aa 7SHA1 (patch-ab) = 37884e2bc562ec63c941c5932c663b14ff2e7c53
8SHA1 (patch-ac) = a8259f4b21daa19a11547a6af470bbb2376e7049 8SHA1 (patch-ac) = a8259f4b21daa19a11547a6af470bbb2376e7049
9SHA1 (patch-ad) = f43841b2a10a999647b83faa6e845724b0e93847 9SHA1 (patch-ad) = f43841b2a10a999647b83faa6e845724b0e93847
10SHA1 (patch-ae) = bd9b4eb54e0d6f465eea9976d4337bc6650fd5aa 10SHA1 (patch-ae) = bd9b4eb54e0d6f465eea9976d4337bc6650fd5aa
11SHA1 (patch-af) = b006c53478e03ffc7e799ff293878438c8682fd3 11SHA1 (patch-af) = b006c53478e03ffc7e799ff293878438c8682fd3
12SHA1 (patch-ag) = c616a8c0cae024d223aec4adb6564fb2a302d36e 12SHA1 (patch-ag) = c616a8c0cae024d223aec4adb6564fb2a302d36e
13SHA1 (patch-ah) = f6f4c384cb84b517b771e720e8f789e2070d6a4f 13SHA1 (patch-ah) = f6f4c384cb84b517b771e720e8f789e2070d6a4f
14SHA1 (patch-ai) = 5c796c6591f6c3614be769e0276a2c4f77479bae 14SHA1 (patch-ai) = 5c796c6591f6c3614be769e0276a2c4f77479bae
15SHA1 (patch-aj) = 06eeceeb04aefef3a433a2e5934b60a32fd9c116 15SHA1 (patch-aj) = 06eeceeb04aefef3a433a2e5934b60a32fd9c116
16SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14 16SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
17SHA1 (patch-al) = f2c5d0e8b38870e48105239b61999a06b8dbf5ce 17SHA1 (patch-al) = f2c5d0e8b38870e48105239b61999a06b8dbf5ce
18SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1 18SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab 2008/12/18 16:19:07 1.9
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab 2009/02/03 08:44:15 1.10
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.9 2008/12/18 16:19:07 bjs Exp $ 1$NetBSD: patch-ab,v 1.10 2009/02/03 08:44:15 obache Exp $
2 2
3--- Makefile.orig 2008-12-12 16:45:07.000000000 -0500 3--- Makefile.orig 2008-12-17 21:45:13.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -40,9 +40,9 @@ endif 5@@ -40,9 +40,9 @@ endif
6 ifdef ARCH_X86 6 ifdef ARCH_X86
7 ASFLAGS += -Icommon/x86/ 7 ASFLAGS += -Icommon/x86/
8 SRCS += common/x86/mc-c.c common/x86/predict-c.c 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 $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm 11 $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
12-checkasm: tools/checkasm-a.o 12-checkasm: tools/checkasm-a.o
13+checkasm: tools/checkasm-a.lo 13+checkasm: tools/checkasm-a.lo
14 endif 14 endif
15 endif 15 endif
16  16
@@ -42,27 +42,27 @@ $NetBSD: patch-ab,v 1.9 2008/12/18 16:19 @@ -42,27 +42,27 @@ $NetBSD: patch-ab,v 1.9 2008/12/18 16:19
42 .PHONY: all default fprofiled clean distclean install uninstall dox test testclean 42 .PHONY: all default fprofiled clean distclean install uninstall dox test testclean
43  43
44 default: $(DEP) x264$(EXE) 44 default: $(DEP) x264$(EXE)
45  45
46-libx264.a: .depend $(OBJS) $(OBJASM) 46-libx264.a: .depend $(OBJS) $(OBJASM)
47- ar rc libx264.a $(OBJS) $(OBJASM) 47- ar rc libx264.a $(OBJS) $(OBJASM)
48- ranlib libx264.a 48- ranlib libx264.a
49+%.lo: %.c 49+%.lo: %.c
50+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $< 50+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
51+ 51+
52+libx264.la: .depend $(OBJS) $(OBJASM) 52+libx264.la: .depend $(OBJS) $(OBJASM)
53+ ${LIBTOOL} --mode=link \ 53+ ${LIBTOOL} --mode=link \
54+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \ 54+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
55+ $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 55+ $(OBJS) $(OBJASM) ${LDFLAGS}
56  56
57 $(SONAME): .depend $(OBJS) $(OBJASM) 57 $(SONAME): .depend $(OBJS) $(OBJASM)
58 $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS) 58 $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
59  59
60-x264$(EXE): $(OBJCLI) libx264.a  60-x264$(EXE): $(OBJCLI) libx264.a
61- $(CC) -o $@ $+ $(LDFLAGS) 61- $(CC) -o $@ $+ $(LDFLAGS)
62+x264$(EXE): $(OBJCLI) libx264.la  62+x264$(EXE): $(OBJCLI) libx264.la
63+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS) 63+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
64  64
65-checkasm: tools/checkasm.o libx264.a 65-checkasm: tools/checkasm.o libx264.a
66- $(CC) -o $@ $+ $(LDFLAGS) 66- $(CC) -o $@ $+ $(LDFLAGS)
67+checkasm: tools/checkasm.lo libx264.la 67+checkasm: tools/checkasm.lo libx264.la
68+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS) 68+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)