libdrm:

- update to 2.4.40
- enable exynos and omap on arm arch.
- add drm/dri check programs as new subpackage
- move udev rule to /lib/udev/rules.d

TODO:
 - put するときに mesa, xorg-x11-drv-nouveau, plymouth のrebuild & 更新が必要
 - とりあえず spec だけ先に commit.

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7124 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libd/libdrm/libdrm-vl.spec

@@ -3,8 +3,8 @@
 Summary: Direct Rendering Manager runtime library
 Summary(ja): Direct Rendering Manager ランタイムライブラリ
 Name: libdrm
-Version: 2.4.33
+Version: 2.4.40
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -12,12 +12,12 @@ URL: http://dri.sourceforge.net
 Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
 Source2: 91-drm-modeset.rules
 Patch3: libdrm-make-dri-perms-okay.patch
-Patch5: libdrm-2.4.25-libkms_against_in_tree_drm.patch
+Patch5: libdrm-2.4.25-check-programs.patch
-Patch10: libdrm-2.4.32-no-pthread-stubs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig automake autoconf libtool
-BuildRequires: libxcb-devel
+BuildRequires: libxcb-devel >= 1.9-2
+BuildRequires: libatomic_ops-devel
 BuildRequires: libpciaccess-devel
 BuildRequires: libudev-devel
 BuildRequires: kernel-headers >= 2.6.27-1
@@ -39,6 +39,14 @@ Requires: kernel-headers >= 2.6.27-7
 %description devel
 Direct Rendering Manager development package
 
+%package -n drm-utils
+Summary: Direct Rendering Manager utilities
+Summary(ja): Direct Rendering Manager ユーティリティ
+Group: Development/Tools
+
+%description -n drm-utils
+Utility programs for the kernel DRM interface.  Will void your warranty.
+
 # compat32
 %package -n compat32-%{name}
 Summary: Direct Rendering Manager runtime library
@@ -62,25 +70,39 @@ Direct Rendering Manager development package
 %prep
 %setup -q
 %patch3 -p1 -b .forceperms
-%patch5 -p1 -b .libkms-build-against-in-tree-drm
+%patch5 -p1 -b .check-program
-%patch10 -p1 -b .no-pthread-stubs
 
 %build
 autoreconf -v --install || exit 1
 %configure \
   --enable-udev \
+%ifarch %{ix86} x86_64 ia64
   --enable-intel \
+%endif
+%ifarch %{arm}
+  --enable-omap-experimental-api \
+  --enable-exynos-experimental-api \
+%endif
   --enable-radeon \
-  --enable-nouveau-experimental-api \
+  --enable-nouveau \
-  --enable-vmwgfx-experimental-api
+  --enable-vmwgfx
-make
+make %{?smp_mflags}
+pushd tests
+make %{?smp_mflags} $(make check-programs)
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+pushd tests
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
+for foo in $(make check-programs) ; do
+ install -m 0755 .libs/$foo $RPM_BUILD_ROOT%{_bindir}
+done
+popd
+ 
+mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/lib/udev/rules.d/
 
 # NOTE: We intentionally don't ship *.la files
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
@@ -102,11 +124,35 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README
 %{_libdir}/libdrm.so.*
+%ifarch %{ix86} x86_64 ia64
 %{_libdir}/libdrm_intel.so.*
+%endif
+%ifarch %{arm}
+%{_libdir}/libdrm_exynos.so.*
+%{_libdir}/libdrm_omap.so.*
+%endif
 %{_libdir}/libdrm_radeon.so.*
 %{_libdir}/libdrm_nouveau.so.*
 %{_libdir}/libkms.so.*
-%{_sysconfdir}/udev/rules.d/91-drm-modeset.rules
+/lib/udev/rules.d/91-drm-modeset.rules
+
+%files -n drm-utils
+%defattr(-,root,root,-)
+%{_bindir}/dristat
+%{_bindir}/drmstat
+%ifarch %{ix86} x86_64 ia64
+%{_bindir}/gem_basic
+%{_bindir}/gem_flink
+%{_bindir}/gem_mmap
+%{_bindir}/gem_readwrite
+%endif
+%{_bindir}/getclient
+%{_bindir}/getstats
+%{_bindir}/getversion
+%{_bindir}/name_from_fd
+%{_bindir}/openclose
+%{_bindir}/setversion
+%{_bindir}/updatedraw
 
 %files devel
 %defattr(-,root,root,-)
@@ -117,31 +163,48 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libdrm/drm_fourcc.h
 %{_includedir}/libdrm/drm_mode.h
 %{_includedir}/libdrm/drm_sarea.h
+%ifarch %{ix86} x86_64 ia64
 %{_includedir}/libdrm/intel_aub.h
 %{_includedir}/libdrm/intel_bufmgr.h
 %{_includedir}/libdrm/intel_debug.h
+%endif
+%ifarch %{arm}
+%{_includedir}/libdrm/exynos_drmif.h
+%{_includedir}/exynos/
+%{_includedir}/libdrm/omap_drmif.h
+%{_includedir}/omap/
+%endif
 %{_includedir}/libdrm/r600_pci_ids.h
 %{_includedir}/libdrm/radeon_bo*.h
 %{_includedir}/libdrm/radeon_cs*.h
 %{_includedir}/libdrm/radeon_surface.h
-%{_includedir}/libdrm/nouveau_drmif.h
+%{_includedir}/libdrm/nouveau.h
 %{_includedir}/libdrm/*_drm.h
-%dir %{_includedir}/nouveau
-%{_includedir}/nouveau/nouveau_*.h
-%{_includedir}/nouveau/nv04_*.h
-%{_includedir}/nouveau/nvc0_pushbuf.h
 %dir %{_includedir}/libkms
 %{_includedir}/libkms/libkms.h
 %{_libdir}/libdrm.so
+%ifarch %{ix86} x86_64 ia64
 %{_libdir}/libdrm_intel.so
+%endif
+%ifarch %{arm}
+%{_libdir}/libdrm_exynos.so
+%{_libdir}/libdrm_omap.so
+%endif
 %{_libdir}/libdrm_radeon.so
 %{_libdir}/libdrm_nouveau.so
 %{_libdir}/libkms.so
 %{_libdir}/pkgconfig/libdrm.pc
+%ifarch %{ix86} x86_64 ia64
 %{_libdir}/pkgconfig/libdrm_intel.pc
+%endif
+%ifarch %{arm}
+%{_libdir}/pkgconfig/libdrm_exynos.pc
+%{_libdir}/pkgconfig/libdrm_omap.pc
+%endif
 %{_libdir}/pkgconfig/libdrm_radeon.pc
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 %{_libdir}/pkgconfig/libkms.pc
+%{_mandir}/man3/drm*.3*
 
 # compat32
 %if %{build_compat32}
@@ -168,6 +231,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Nov 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.40-1
+- update to 2.4.40
+- enable exynos and omap on arm arch.
+- add drm/dri check programs as new subpackage
+- move udev rule to /lib/udev/rules.d
+
 * Mon Jul 09 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.33-2
 - update 91-drm-modeset.rules
   - add /dev/dri/card* rules (again...)