diff options
| author | tron <tron> | 2009-01-30 17:24:33 +0000 |
|---|---|---|
| committer | tron <tron> | 2009-01-30 17:24:33 +0000 |
| commit | 9454bb3a1475c5d199b9cc0452e31d78ddd6d652 (patch) | |
| tree | 9966d016fad808d04c8116ec7e385112e6e3bfc9 /multimedia | |
| parent | d4e0062067855c6a2d075d859a555513a601f79f (diff) | |
| download | pkgsrc-9454bb3a1475c5d199b9cc0452e31d78ddd6d652.tar.gz | |
Pullup ticket #2671 - requested by sborrill
vlc08: build fix
Revisions pulled up:
- multimedia/vlc08/distinfo 1.7
- multimedia/vlc08/patches/patch-x264.c 1.1
---
Module Name: pkgsrc
Committed By: sborrill
Date: Wed Jan 28 17:53:37 UTC 2009
Modified Files:
pkgsrc/multimedia/vlc08: distinfo
Added Files:
pkgsrc/multimedia/vlc08/patches: patch-x264.c
Log Message:
Fix build failure in x264.c with the version of x264-devel now in pkgsrc
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc08/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/vlc08/patches/patch-x264.c | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/multimedia/vlc08/distinfo b/multimedia/vlc08/distinfo index be1e52a7c5c..3bf01d3c086 100644 --- a/multimedia/vlc08/distinfo +++ b/multimedia/vlc08/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2008/09/12 14:47:39 sborrill Exp $ +$NetBSD: distinfo,v 1.6.6.1 2009/01/30 17:24:33 tron Exp $ SHA1 (vlc-0.8.6i.tar.bz2) = 4c6f45dffe3a8309ce201897040dc1f82b9cde99 RMD160 (vlc-0.8.6i.tar.bz2) = a5da4e1e0980594c678c04016491c8a373df4017 @@ -7,3 +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 diff --git a/multimedia/vlc08/patches/patch-x264.c b/multimedia/vlc08/patches/patch-x264.c new file mode 100644 index 00000000000..87a4dc9a9d2 --- /dev/null +++ b/multimedia/vlc08/patches/patch-x264.c @@ -0,0 +1,35 @@ +$NetBSD: patch-x264.c,v 1.1.2.2 2009/01/30 17:24:33 tron 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 @@ + #endif + + #if X264_BUILD >= 0x0013 ++#if X264_BUILD < 65 + var_Get( p_enc, SOUT_CFG_PREFIX "b-adapt", &val ); + p_sys->param.b_bframe_adaptive = val.b_bool; ++#endif + + var_Get( p_enc, SOUT_CFG_PREFIX "b-bias", &val ); + if( val.i_int >= -100 && val.i_int <= 100 ) +@@ -930,7 +932,7 @@ + p_sys->param.analyse.i_trellis = val.i_int; + #endif + +-#if X264_BUILD >= 41 ++#if X264_BUILD >= 41 && X264_BUILD < 65 + 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 @@ + p_sys->param.analyse.b_fast_pskip = val.b_bool; + #endif + +-#if X264_BUILD >= 43 ++#if X264_BUILD >= 43 && X264_BUILD < 65 + var_Get( p_enc, SOUT_CFG_PREFIX "bime", &val ); + p_sys->param.analyse.b_bidir_me = val.b_bool; + #endif |