[directfb/f17: 2/2] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/directfb into f17

[Nicolas Chauvet]

commit 97edce745d2e559ad9ae16b30d36b3b92c648c92
Merge: 43e23a3 c6d1c86
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Thu Aug 30 22:50:13 2012 +0200

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/directfb into f17

 DirectFB-1.5.3-add-missing-davinci-files.patch | 1697 ++++++++++++++++++++++++
 DirectFB-1.5.3-gcc-atomics-on-arm.patch        |   64 +
 directfb.spec                                  |   40 +-
 3 files changed, 1786 insertions(+), 15 deletions(-)
---
diff --cc directfb.spec
index fecb287,4529c96..12393bd
--- a/directfb.spec
+++ b/directfb.spec
@@@ -4,7 -4,7 +4,7 @@@
  Summary: Graphics abstraction library for the Linux Framebuffer Device
  Name: directfb
  Version: %{major_ver}%{minor_ver}
- Release: 6%{?dist}
 -Release: 7%{?dist}
++Release: 8%{?dist}
  Group: System Environment/Libraries
  License: LGPLv2+
  URL: http://www.directfb.org/
@@@ -13,10 -13,8 +13,9 @@@ Patch0: http://sources.gentoo.org/cgi-b
  Patch1: DirectFB-1.2.8-tweak.patch
  Patch2: DirectFB-1.5.3-fix_v4l1.patch
  Patch3: DirectFB-1.5.3-lm.patch
- Patch4: DirectFB-1.5.3-vdpau.patch
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- #BuildRequires: libtool
+ Patch4: DirectFB-1.5.3-gcc-atomics-on-arm.patch
+ Patch5: DirectFB-1.5.3-add-missing-davinci-files.patch
++Patch6: DirectFB-1.5.3-vdpau.patch
  
  BuildRequires: libpng-devel
  BuildRequires: zlib-devel
@@@ -73,7 -71,8 +72,9 @@@ Development files for DirectFB
  %patch1 -p1 -b .tweak
  %patch2 -p1 -b .fix_v4l1
  %patch3 -p1 -b .lm
- %patch4 -p1 -b .vdpau
+ %patch4 -p1 -b .arm-atomics
+ %patch5 -p1 -b .davinci
++%patch6 -p1 -b .vdpau
  
  #Disable ppc asm since compilation fails (and it seems better to use glibc)
  sed -i.noppcasm -e 's/want_ppcasm=yes/want_ppcasm=no/'g configure.in configure
@@@ -212,9 -214,12 +216,15 @@@ make chec
  
  
  %changelog
- * Thu Aug 30 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.5.3-6
++* Thu Aug 30 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.5.3-8
 +- Fix vdpau plugin - rhbz#852740
 +
+ * Sat May 19 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.5.3-7
+ - Add ARM atomics patch to fix compilation on ARMv5tel
+ 
+ * Fri Apr 27 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.5.3-6
+ - Backport fix for ARM
+ 
  * Thu Apr 26 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.5.3-5
  - Fix rhbz#781874 - MMX is selectable at runtime