diff options
| author | drochner <drochner@pkgsrc.org> | 2009-06-03 09:08:31 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2009-06-03 09:08:31 +0000 |
| commit | 6e903e2ca618b39416a6ee7bb658a9b291bec109 (patch) | |
| tree | 777484cb5eb9ba1fb7694b78893021f66e6ba784 /multimedia | |
| parent | 683aedb902da14e182ad0ce178c821846debdc85 (diff) | |
| download | pkgsrc-6e903e2ca618b39416a6ee7bb658a9b291bec109.tar.gz | |
add a patch from upstream git to fix build error on ppc reported
by Erik Bertelsen
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/x264-devel/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/x264-devel/patches/patch-ao | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo index 739dea05517..8468f72ffb2 100644 --- a/multimedia/x264-devel/distinfo +++ b/multimedia/x264-devel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2009/05/25 20:56:38 drochner Exp $ +$NetBSD: distinfo,v 1.18 2009/06/03 09:08:31 drochner Exp $ SHA1 (x264-snapshot-20090326-2245.tar.bz2) = 4d28a02db4586986162368c18e607ca3b10b3453 RMD160 (x264-snapshot-20090326-2245.tar.bz2) = fc6581a33970f012c660489eb2ae48f8ac9c151d @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 0659b7f6ad1195c59c6298bc270b15990b1a8204 SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14 SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1 SHA1 (patch-an) = 69e2a8f6167fd2410c69e4df3e3a071c8c0c835f +SHA1 (patch-ao) = 27866ab362625c090d40fbea423c24852cdd3598 diff --git a/multimedia/x264-devel/patches/patch-ao b/multimedia/x264-devel/patches/patch-ao new file mode 100644 index 00000000000..594b9f4f389 --- /dev/null +++ b/multimedia/x264-devel/patches/patch-ao @@ -0,0 +1,22 @@ +$NetBSD: patch-ao,v 1.1 2009/06/03 09:08:31 drochner Exp $ + +--- common/ppc/pixel.c.orig 2009-03-26 22:45:08.000000000 +0100 ++++ common/ppc/pixel.c +@@ -1905,7 +1905,7 @@ static uint64_t pixel_hadamard_ac_altive + vec_u16_t addabs67 = vec_add( VEC_ABSOLUTE(pix16_d6), VEC_ABSOLUTE(pix16_d7) ); + + vec_u16_t sum4_v = vec_add(vec_add(addabs01, addabs23), vec_add(addabs45, addabs67)); +- vec_ste(vec_sums(vec_sum4s(sum4_v, zero_s32v), zero_s32v), 12, sum4_tab); ++ vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum4_v, zero_s32v), zero_s32v), 12, sum4_tab); + + vec_s16_t tmpi0 = vec_add(pix16_d0, pix16_d4); + vec_s16_t tmpi4 = vec_sub(pix16_d0, pix16_d4); +@@ -1933,7 +1933,7 @@ static uint64_t pixel_hadamard_ac_altive + VEC_ABSOLUTE( vec_sub(pix16_d3, pix16_d7) ) ); + + vec_u16_t sum8_v = vec_add( vec_add(addsum04, addsum15), vec_add(addsum26, addsum37) ); +- vec_ste(vec_sums( vec_sum4s(sum8_v, zero_s32v), zero_s32v), 12, sum8_tab); ++ vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum8_v, zero_s32v), zero_s32v), 12, sum8_tab); + + int sum8 = sum8_tab[3]; + |