[svn] r5912 - trunk/rpms/mplayer

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-10-11 21:12:45 +0200 (Thu, 11 Oct 2007)
New Revision: 5912

Added:
   trunk/rpms/mplayer/mplayer-1.0rc1-h264-static.patch
Modified:
   trunk/rpms/mplayer/mplayer.spec
Log:
Updates

Added: trunk/rpms/mplayer/mplayer-1.0rc1-h264-static.patch
===================================================================
--- trunk/rpms/mplayer/mplayer-1.0rc1-h264-static.patch	                        (rev 0)
+++ trunk/rpms/mplayer/mplayer-1.0rc1-h264-static.patch	2007-10-11 19:12:45 UTC (rev 5912)
@@ -0,0 +1,11 @@
+--- libavcodec/h264.c.orig	2007-10-11 17:46:14.713555664 +0200
++++ libavcodec/h264.c	2007-10-11 17:46:29.111366864 +0200
+@@ -6034,7 +6034,7 @@
+     return ctx + 4 * cat;
+ }
+ 
+-static const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
++const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
+     0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+     3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,

Modified: trunk/rpms/mplayer/mplayer.spec
===================================================================
--- trunk/rpms/mplayer/mplayer.spec	2007-10-11 15:40:10 UTC (rev 5911)
+++ trunk/rpms/mplayer/mplayer.spec	2007-10-11 19:12:45 UTC (rev 5912)
@@ -30,20 +30,24 @@
 %{?rh9:%define _without_fribidi 1}
 %{?rh9:%define _without_nas 1}
 %{?rh9:%define _without_theora 1}
+%{?rh9:%define _without_x264 1}
 %{?rh9:%define _without_xvmc 1}
 
 %{?rh8:%define _without_alsa 1}
 %{?rh8:%define _without_fribidi 1}
 %{?rh8:%define _without_nas 1}
 %{?rh8:%define _without_theora 1}
+%{?rh8:%define _without_x264 1}
 %{?rh8:%define _without_xvmc 1}
 
 %{?rh7:%define _without_alsa 1}
+%{?rh7:%define _without_faac 1}
 %{?rh7:%define _without_fribidi 1}
 %{?rh7:%define _without_freedesktop 1}
 %{?rh7:%define _without_nas 1}
 %{?rh7:%define _without_theora 1}
 %{?rh7:%define _without_gcccheck 1}
+%{?rh7:%define _without_x264 1}
 %{?rh7:%define _without_xvmc 1}
 
 %{?el2:%define _without_alsa 1}
@@ -54,6 +58,7 @@
 %{?el2:%define _without_freedesktop 1}
 %{?el2:%define _without_nas 1}
 %{?el2:%define _without_theora 1}
+%{?el2:%define _without_x264 1}
 %{?el2:%define _without_xvmc 1}
 
 %{?yd3:%define _without_alsa 1}
@@ -95,6 +100,7 @@
 # Fixes to 1.0rc1 which won't be needed anymore with 1.0rc2
 Patch50: MPlayer-1.0rc1-dct64_amd.patch
 Patch51: asmrules_fix_20061231.diff
+Patch100: mplayer-1.0rc1-h264-static.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mplayer-fonts
 BuildRequires: gtk2-devel, SDL-devel
@@ -182,6 +188,7 @@
 %patch10 -p1 -b .fribidi
 %patch50 -p1 -b .dct64_amd
 %patch51 -p0 -b .asmrules_fix
+%patch100 -p0 -b .h264_static
 
 # Overwrite some of the details of the provided system menu entry
 %{__perl} -pi -e 's|^Exec=gmplayer$|Exec=gmplayer %f|g;