summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorobache <obache>2009-02-03 08:44:15 +0000
committerobache <obache>2009-02-03 08:44:15 +0000
commitfba7f686e3bda1f206f92dc18d7f83b6c4ef0bef (patch)
treeff7065c1270094ff4a5523a379eefaf0432acac6 /multimedia
parentb59460a8a8372bbb04646e7fc270244f598f1abe (diff)
downloadpkgsrc-fba7f686e3bda1f206f92dc18d7f83b6c4ef0bef.tar.gz
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.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/x264-devel/Makefile3
-rw-r--r--multimedia/x264-devel/distinfo4
-rw-r--r--multimedia/x264-devel/patches/patch-ab6
3 files changed, 7 insertions, 6 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 7a442c5039c..4bcfcca26ab 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2009/01/20 22:33:38 sketch Exp $
+# $NetBSD: Makefile,v 1.18 2009/02/03 08:44:15 obache Exp $
SNAPSHOT_DATE= 20081217
DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245
PKGNAME= x264-devel-${SNAPSHOT_DATE}
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index fe9b582b769..88913301fa0 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2008/12/18 16:19:07 bjs Exp $
+$NetBSD: distinfo,v 1.16 2009/02/03 08:44:15 obache Exp $
SHA1 (x264-snapshot-20081217-2245.tar.bz2) = 81f51f72f8ba78e478f829d5cfe41fb6afe846b0
RMD160 (x264-snapshot-20081217-2245.tar.bz2) = 20b8504c62189ed654a066d81433a91c0e0a97e3
Size (x264-snapshot-20081217-2245.tar.bz2) = 2336751 bytes
SHA1 (patch-aa) = 0ff1c2c0942a08dc1d0e35923490ca039cd16d12
-SHA1 (patch-ab) = bdba36c3a2d7a7baaf26f75e6c4ac7a0d15cb3aa
+SHA1 (patch-ab) = 37884e2bc562ec63c941c5932c663b14ff2e7c53
SHA1 (patch-ac) = a8259f4b21daa19a11547a6af470bbb2376e7049
SHA1 (patch-ad) = f43841b2a10a999647b83faa6e845724b0e93847
SHA1 (patch-ae) = bd9b4eb54e0d6f465eea9976d4337bc6650fd5aa
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index baa59484c24..c3eab0d026d 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2008/12/18 16:19:07 bjs Exp $
+$NetBSD: patch-ab,v 1.10 2009/02/03 08:44:15 obache Exp $
---- Makefile.orig 2008-12-12 16:45:07.000000000 -0500
+--- Makefile.orig 2008-12-17 21:45:13.000000000 +0000
+++ Makefile
@@ -40,9 +40,9 @@ endif
ifdef ARCH_X86
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.9 2008/12/18 16:19:07 bjs Exp $
+libx264.la: .depend $(OBJS) $(OBJASM)
+ ${LIBTOOL} --mode=link \
+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
-+ $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
++ $(OBJS) $(OBJASM) ${LDFLAGS}
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)