diff options
| author | sborrill <sborrill@pkgsrc.org> | 2009-07-02 10:15:47 +0000 |
|---|---|---|
| committer | sborrill <sborrill@pkgsrc.org> | 2009-07-02 10:15:47 +0000 |
| commit | ce1dd99934161d0aaa5dbccf7c25300cfbed2959 (patch) | |
| tree | 9324ac09597a24529aa18e80734f962d0e21892e /multimedia/vlc08 | |
| parent | 49f6b8a4697e7a8356fcf8f8335c5467c396be03 (diff) | |
| download | pkgsrc-ce1dd99934161d0aaa5dbccf7c25300cfbed2959.tar.gz | |
Fix problems with latest x264-devel.
N.B. vlc08 still does not compile with this change without re-instating
ffmpeg-20080727nb8
Diffstat (limited to 'multimedia/vlc08')
| -rw-r--r-- | multimedia/vlc08/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/vlc08/patches/patch-x264.c | 33 |
2 files changed, 29 insertions, 8 deletions
diff --git a/multimedia/vlc08/distinfo b/multimedia/vlc08/distinfo index 7925d22dbdc..aab88adc01f 100644 --- a/multimedia/vlc08/distinfo +++ b/multimedia/vlc08/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2009/01/28 17:53:37 sborrill Exp $ +$NetBSD: distinfo,v 1.8 2009/07/02 10:15:47 sborrill Exp $ SHA1 (vlc-0.8.6i.tar.bz2) = 4c6f45dffe3a8309ce201897040dc1f82b9cde99 RMD160 (vlc-0.8.6i.tar.bz2) = a5da4e1e0980594c678c04016491c8a373df4017 @@ -7,4 +7,4 @@ SHA1 (patch-aa) = 497a83bb0f1e2c095a81aa84115e66b56dd47e2c SHA1 (patch-mmstu.c) = ef4bed6fb5871790bb9198dad4961384f3e38d16 SHA1 (patch-mmstu.h) = a11be24360948bcd8ca32bd7d01020e34c0801ad SHA1 (patch-tta.c) = 923852b9aedeb75eed052e532ce5ddf50ab19951 -SHA1 (patch-x264.c) = 97dae5c57365e13171f85f299e52becfb1dc36f9 +SHA1 (patch-x264.c) = 083ab4eeb48e01216cc0c4d62006a50bcd3ae421 diff --git a/multimedia/vlc08/patches/patch-x264.c b/multimedia/vlc08/patches/patch-x264.c index f738e7b9c18..c71957b9723 100644 --- a/multimedia/vlc08/patches/patch-x264.c +++ b/multimedia/vlc08/patches/patch-x264.c @@ -1,10 +1,18 @@ -$NetBSD: patch-x264.c,v 1.1 2009/01/28 17:53:37 sborrill Exp $ +$NetBSD: patch-x264.c,v 1.2 2009/07/02 10:15:47 sborrill Exp $ Fix build with version of x264-devel currently in pkgsrc ---- modules/codec/x264.c.orig 2009-01-28 11:57:28.000000000 +0000 -+++ modules/codec/x264.c 2009-01-28 12:06:20.000000000 +0000 -@@ -889,8 +889,10 @@ +--- modules/codec/x264.c.orig 2008-07-08 21:59:23.000000000 +0100 ++++ modules/codec/x264.c 2009-07-02 10:49:13.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <vlc/sout.h> + #include <vlc/decoder.h> + ++#include <inttypes.h> + #include <x264.h> + + #define SOUT_CFG_PREFIX "sout-x264-" +@@ -889,8 +890,10 @@ #endif #if X264_BUILD >= 0x0013 @@ -15,7 +23,7 @@ Fix build with version of x264-devel currently in pkgsrc var_Get( p_enc, SOUT_CFG_PREFIX "b-bias", &val ); if( val.i_int >= -100 && val.i_int <= 100 ) -@@ -930,7 +932,7 @@ +@@ -930,7 +933,7 @@ p_sys->param.analyse.i_trellis = val.i_int; #endif @@ -24,7 +32,7 @@ Fix build with version of x264-devel currently in pkgsrc var_Get( p_enc, SOUT_CFG_PREFIX "b-rdo", &val ); p_sys->param.analyse.b_bframe_rdo = val.b_bool; #endif -@@ -940,7 +942,7 @@ +@@ -940,7 +943,7 @@ p_sys->param.analyse.b_fast_pskip = val.b_bool; #endif @@ -33,3 +41,16 @@ Fix build with version of x264-devel currently in pkgsrc var_Get( p_enc, SOUT_CFG_PREFIX "bime", &val ); p_sys->param.analyse.b_bidir_me = val.b_bool; #endif +@@ -965,10 +968,12 @@ + if( val.i_int >= 0 && val.i_int <= 32 ) + p_sys->param.analyse.i_luma_deadzone[1] = val.i_int; + ++#if X264_BUILD < 65 + var_Get( p_enc, SOUT_CFG_PREFIX "direct-8x8", &val ); + if( val.i_int >= -1 && val.i_int <= 1 ) + p_sys->param.analyse.i_direct_8x8_inference = val.i_int; + #endif ++#endif + + var_Get( p_enc, SOUT_CFG_PREFIX "asm", &val ); + if( !val.b_bool ) p_sys->param.cpu = 0; |