Author: kwizart Update of /cvs/free/rpms/libva-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19451/devel Modified Files: .cvsignore libva-freeworld.spec sources Added Files: 101_dont_install_test_programs.patch Log Message: Rebase on Freedesktop version 101_dont_install_test_programs.patch: basic/Makefile.am | 2 +- decode/Makefile.am | 2 +- encode/Makefile.am | 2 +- putsurface/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE 101_dont_install_test_programs.patch --- commit 16864159654cb6c77b3db36dd218e4103e3bd0c2 Author: Gwenole Beauchesne <gbeauchesne(a)splitted-desktop.com&gt; Date: Thu Jun 3 09:23:45 2010 +0200 Don't install test programs. diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am index a2519a2..8022a36 100644 --- a/test/basic/Makefile.am +++ b/test/basic/Makefile.am @@ -20,7 +20,7 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ +check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ test_07 test_08 test_09 test_10 test_11 AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am index ea30643..23a086f 100644 --- a/test/decode/Makefile.am +++ b/test/decode/Makefile.am @@ -20,7 +20,7 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -bin_PROGRAMS = mpeg2vldemo +check_PROGRAMS = mpeg2vldemo AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am index 80c882a..98b2bc4 100644 --- a/test/encode/Makefile.am +++ b/test/encode/Makefile.am @@ -20,7 +20,7 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -bin_PROGRAMS = h264encode +check_PROGRAMS = h264encode AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am index fe18388..d06006c 100644 --- a/test/putsurface/Makefile.am +++ b/test/putsurface/Makefile.am @@ -20,7 +20,7 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -bin_PROGRAMS = putsurface +check_PROGRAMS = putsurface AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libva-freeworld/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jul 2010 18:03:13 -0000 1.2 +++ .cvsignore 10 Mar 2011 15:09:52 -0000 1.3 @@ -1 +1 @@ -libva_0.31.1-1+sds4.tar.gz +libva-1.0.10.tar.bz2 Index: libva-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/libva-freeworld/devel/libva-freeworld.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libva-freeworld.spec 10 Mar 2011 15:07:50 -0000 1.2 +++ libva-freeworld.spec 10 Mar 2011 15:09:52 -0000 1.3 @@ -0,0 +1,82 @@ +Name: libva-freeworld +Version: 1.0.10 +Release: 1%{?dist} +Summary: Video Acceleration (VA) API for Linux +Group: System Environment/Libraries +License: MIT +URL: http://freedesktop.org/wiki/Software/vaapi +Source0: http://cgit.freedesktop.org/libva/snapshot/libva-%{version}.tar.bz2 +Patch0: 101_dont_install_test_programs.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool +BuildRequires: libudev-devel +BuildRequires: libXext-devel +BuildRequires: libXfixes-devel +BuildRequires: libdrm-devel >= 2.4.24 +BuildRequires: mesa-libGL-devel +# owns the %{_libdir}/dri directory +Requires: mesa-dri-drivers + +%description +Libva-freeworld is a library providing the VA API video acceleration API. + + +%prep +%setup -q -n libva-%{version} +%patch0 -p1 -b .testprogs + +%build +autoreconf -i +%configure --disable-static --enable-glx --enable-i965-driver +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" +find %{buildroot} -regex ".*\.la$" | xargs rm -f -- +rm -rf %{buildroot}%{_includedir} +rm -rf %{buildroot}%{_libdir}/pkgconfig +rm -rf %{buildroot}%{_bindir} + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING +%exclude %{_libdir}/libva*.so* +%exclude %{_libdir}/dri/dummy_drv_video.so +%{_libdir}/dri/*_drv_video.so + + +%changelog +* Thu Mar 10 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.10-1 +- Switch to additional package using the freedesktop version + +* Mon Feb 21 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.10-1 +- Update to 1.0.10 + +* Tue Jan 25 2011 Adam Williamson <awilliam(a)redhat.com&gt; - 1.0.8-1 +- bump to new version +- fix modded tarball to actually not have i965 dir +- merge with the other spec I seem to have lying around somewhere + +* Wed Nov 24 2010 Adam Williamson <awilliam(a)redhat.com&gt; - 1.0.6-1 +- switch to upstream from sds branch (sds now isn't carrying any very + interesting changes according to gwenole) +- pull in the dont-install-test-programs patch from sds +- split out libva-utils again for multilib purposes +- drop -devel package obsolete/provides itself too + +* Tue Nov 23 2010 Adam Williamson <awilliam(a)redhat.com&gt; - 0.31.1-3.sds4 +- drop obsoletes and provides of itself (hangover from freeworld) + +* Tue Nov 23 2010 Adam Williamson <awilliam(a)redhat.com&gt; - 0.31.1-2.sds4 +- fix the tarball to actually remove the i965 code (duh) + +* Thu Oct 7 2010 Adam Williamson <awilliam(a)redhat.com&gt; - 0.31.1-1.sds4 +- initial package (based on package from elsewhere by myself and Nic + Chauvet with i965 driver removed) Index: sources =================================================================== RCS file: /cvs/free/rpms/libva-freeworld/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jul 2010 18:03:14 -0000 1.2 +++ sources 10 Mar 2011 15:09:52 -0000 1.3 @@ -1 +1 @@ -4610a0d16d19f25cdf98f0fb1ef5902a libva_0.31.1-1+sds4.tar.gz +959de03d47654adab855e10bff614df3 libva-1.0.10.tar.bz2