[pkgsrc/trunk]: pkgsrc/multimedia/vlc2 fix bitfield extraction (wrong operato...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/634d930647b1
branches:  trunk
changeset: 609857:634d930647b1
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Oct 11 15:29:39 2012 +0000

description:
fix bitfield extraction (wrong operator precedence)

diffstat:

 multimedia/vlc2/distinfo         |   3 ++-
 multimedia/vlc2/patches/patch-ba |  25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 9a521e2b66f6 -r 634d930647b1 multimedia/vlc2/distinfo
--- a/multimedia/vlc2/distinfo  Thu Oct 11 15:13:49 2012 +0000
+++ b/multimedia/vlc2/distinfo  Thu Oct 11 15:29:39 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2012/08/31 21:00:39 drochner Exp $
+$NetBSD: distinfo,v 1.10 2012/10/11 15:29:39 drochner Exp $
 
 SHA1 (vlc-2.0.3.tar.xz) = 9f161d997eae613bc6431bcb2459e1aefad8d529
 RMD160 (vlc-2.0.3.tar.xz) = 7d4498c21676a9221ef0b632cb454584c9986e16
@@ -17,6 +17,7 @@
 SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
 SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
 SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6
+SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23
 SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a
 SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
 SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
diff -r 9a521e2b66f6 -r 634d930647b1 multimedia/vlc2/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc2/patches/patch-ba  Thu Oct 11 15:29:39 2012 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ba,v 1.1 2012/10/11 15:29:39 drochner Exp $
+
+partly fixed by upstream commit 59997ad65b64e43f418464c37373b9b57cf1f5f9
+(it is really a bug, not just killing a warning)
+
+--- modules/demux/mp4/libmp4.c.orig    2012-04-27 17:14:57.000000000 +0000
++++ modules/demux/mp4/libmp4.c
+@@ -1267,7 +1267,7 @@ static int MP4_ReadBox_dvc1( stream_t *p
+     p_dvc1 = p_box->data.p_dvc1;
+ 
+     MP4_GET1BYTE( p_dvc1->i_profile_level ); /* profile is on 4bits, level 3bits */
+-    if( p_dvc1->i_profile_level & 0xf0 >> 4 != 0x06 )
++    if( (p_dvc1->i_profile_level & 0xf0) >> 4 != 0x06 )
+     {
+         msg_Warn( p_stream, "unsupported VC-1 profile, please report" );
+         MP4_READBOX_EXIT( 0 );
+@@ -1286,7 +1286,7 @@ static int MP4_ReadBox_dvc1( stream_t *p
+ #ifdef MP4_VERBOSE
+     msg_Dbg( p_stream,
+              "read box: \"dvc1\" profile=0x%x level=0x%x",
+-             p_dvc1->i_profile_level & 0xf0 >> 4, p_dvc1->i_profile_level & 0xe > 1 );
++             (p_dvc1->i_profile_level & 0xf0) >> 4, (p_dvc1->i_profile_level & 0xe) >> 1 );
+ #endif
+ 
+     MP4_READBOX_EXIT( 1 );