diff options
author | adam <adam@pkgsrc.org> | 2012-11-28 16:29:53 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2012-11-28 16:29:53 +0000 |
commit | 2c5c78127f5296a6103ffdae0750ff6622e03c6b (patch) | |
tree | 6e7cc9bde8b466682e0634259412eeb78e625b2e /multimedia/x264-devel | |
parent | 02bba417ab173313154c718c570fc9ba3ebe5fe7 (diff) | |
download | pkgsrc-2c5c78127f5296a6103ffdae0750ff6622e03c6b.tar.gz |
Updated to snapshot 20121127
Diffstat (limited to 'multimedia/x264-devel')
-rw-r--r-- | multimedia/x264-devel/Makefile | 4 | ||||
-rw-r--r-- | multimedia/x264-devel/distinfo | 12 | ||||
-rw-r--r-- | multimedia/x264-devel/patches/patch-aa | 16 | ||||
-rw-r--r-- | multimedia/x264-devel/patches/patch-ac | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index 0d096f8272d..44e4a725d4c 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.38 2012/11/09 07:42:20 tron Exp $ +# $NetBSD: Makefile,v 1.39 2012/11/28 16:29:53 adam Exp $ -SNAPSHOT_DATE= 20121107 +SNAPSHOT_DATE= 20121127 DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245 PKGNAME= x264-devel-${SNAPSHOT_DATE} diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo index 8feab61742c..c5aa17efa1a 100644 --- a/multimedia/x264-devel/distinfo +++ b/multimedia/x264-devel/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.27 2012/11/08 20:28:09 adam Exp $ +$NetBSD: distinfo,v 1.28 2012/11/28 16:29:53 adam Exp $ -SHA1 (x264-snapshot-20121107-2245.tar.bz2) = 9b881d79f1dd8399451e17ac5e410280514ed1c4 -RMD160 (x264-snapshot-20121107-2245.tar.bz2) = 634a564002c84c6ab80ca1c419d0c1c503806e71 -Size (x264-snapshot-20121107-2245.tar.bz2) = 555368 bytes -SHA1 (patch-aa) = f4505ef68e208d05d763e67625c172a85402db31 +SHA1 (x264-snapshot-20121127-2245.tar.bz2) = 6642af8d8a2ccbf566b36b49922fc8bfd12120dd +RMD160 (x264-snapshot-20121127-2245.tar.bz2) = df9b0a63c54362b2f8a51546736681011141af48 +Size (x264-snapshot-20121127-2245.tar.bz2) = 556104 bytes +SHA1 (patch-aa) = bf070b45b4868abdb08c4b9849937c970e6b1311 SHA1 (patch-ab) = 796b817a9ad056fea3ccb87c051701653c78f913 -SHA1 (patch-ac) = 8e39fe0d61f31bd4624e8b2f4cc6a795cbea4e77 +SHA1 (patch-ac) = 42aaa1f91cd87923442d23ff222e1b37ed43948b SHA1 (patch-ak) = bb73c847d6f7be5cee2eee1d77060b5633e5dfc2 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6 diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa index d4c9549831c..b3ba34eaae5 100644 --- a/multimedia/x264-devel/patches/patch-aa +++ b/multimedia/x264-devel/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.15 2012/11/08 19:55:56 adam Exp $ +$NetBSD: patch-aa,v 1.16 2012/11/28 16:29:53 adam Exp $ ---- configure.orig 2012-11-07 21:45:03.000000000 +0000 +--- configure.orig 2012-11-27 21:45:03.000000000 +0000 +++ configure -@@ -465,6 +465,10 @@ case $host_os in +@@ -466,6 +466,10 @@ case $host_os in SYS="FREEBSD" - LDFLAGS="$LDFLAGS -lm" + libm="-lm" ;; + dragonfly*) + SYS="DRAGONFLY" @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.15 2012/11/08 19:55:56 adam Exp $ kfreebsd*-gnu) SYS="FREEBSD" define HAVE_MALLOC_H -@@ -564,7 +568,7 @@ case $host_cpu in +@@ -567,7 +571,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf" fi ;; @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.15 2012/11/08 19:55:56 adam Exp $ ARCH="X86_64" AS="yasm" [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" -@@ -584,13 +588,14 @@ case $host_cpu in +@@ -587,13 +591,14 @@ case $host_cpu in fi ;; powerpc|powerpc64) @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.15 2012/11/08 19:55:56 adam Exp $ CFLAGS="$CFLAGS -maltivec -mabi=altivec" define HAVE_ALTIVEC_H fi -@@ -736,7 +741,7 @@ fi +@@ -739,7 +744,7 @@ fi # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32" @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.15 2012/11/08 19:55:56 adam Exp $ if [ "$thread" = "auto" ]; then thread="no" case $SYS in -@@ -919,10 +924,11 @@ fi +@@ -922,10 +927,11 @@ fi cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT if [ "$pic" = "yes" ] ; then diff --git a/multimedia/x264-devel/patches/patch-ac b/multimedia/x264-devel/patches/patch-ac index b18b688792b..ee4660f65ca 100644 --- a/multimedia/x264-devel/patches/patch-ac +++ b/multimedia/x264-devel/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.8 2012/11/08 19:55:56 adam Exp $ +$NetBSD: patch-ac,v 1.9 2012/11/28 16:29:53 adam Exp $ --- common/cpu.c.orig 2012-11-07 21:45:03.000000000 +0000 +++ common/cpu.c @@ -27,7 +27,7 @@ $NetBSD: patch-ac,v 1.8 2012/11/08 19:55:56 adam Exp $ int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC }; #else int selectors[2] = { CTL_HW, HW_VECTORUNIT }; -@@ -424,7 +424,7 @@ int x264_cpu_num_processors( void ) +@@ -427,7 +427,7 @@ int x264_cpu_num_processors( void ) #elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD int ncpu; size_t length = sizeof( ncpu ); |