diff --git a/.gitignore b/.gitignore index e69de29..edc1c14 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/libva-1.0.8-mod.tar.bz2 diff --git a/101_dont_install_test_programs.patch b/101_dont_install_test_programs.patch new file mode 100644 index 0000000..624ba52 --- /dev/null +++ b/101_dont_install_test_programs.patch @@ -0,0 +1,58 @@ +commit 16864159654cb6c77b3db36dd218e4103e3bd0c2 +Author: Gwenole Beauchesne +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 + diff --git a/libva.spec b/libva.spec new file mode 100644 index 0000000..5552f70 --- /dev/null +++ b/libva.spec @@ -0,0 +1,111 @@ +Name: libva +Version: 1.0.8 +Release: 1%{?dist} +Summary: Video Acceleration (VA) API for Linux +Group: System Environment/Libraries +License: MIT +URL: http://freedesktop.org/wiki/Software/vaapi +# Tarball is modified to remove the i965 driver, which legal considers +# potentially problematic from a patent POV. Procedure to generate the +# modified tarball: +# 1. extract +# 2. remove all i965 references in configure.ac and Makefile.am +# 3. autoreconf -i +# 4. rm -rf i965_drv_video +# 5. re-tar +# original tarball at URL: http://cgit.freedesktop.org/libva/snapshot/libva-%{version}.tar.bz2 +Source0: libva-%{version}-mod.tar.bz2 +# From sds: don't install test programs +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 +BuildRequires: mesa-libGL-devel +# owns the %{_libdir}/dri directory +Requires: mesa-dri-drivers + +%description +Libva is a library providing the VA API video acceleration API. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package utils +Summary: Tools for %{name} (including vainfo) +Group: Development/Libraries + +%description utils +The %{name}-utils package contains tools that are provided as part +of %{name}, including the vainfo tool for determining what (if any) +%{name} support is available on a system. + +%prep +%setup -q -n %{name}-%{version}-mod +%patch0 -p1 -b .testprogs + +%build +autoreconf -i +%configure --disable-static --enable-glx +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" +find %{buildroot} -regex ".*\.la$" | xargs rm -f -- + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libva*.so.* +# Keep these specific: if any new real drivers start showing up +# in libva, we need to know about it so they can be patent-audited +%{_libdir}/dri/dummy_drv_video.so + +%files devel +%defattr(-,root,root,-) +%{_includedir}/va +%{_libdir}/libva*.so +%{_libdir}/pkgconfig/libva*.pc + +%files utils +%defattr(-,root,root,-) +%{_bindir}/vainfo + +%changelog +* Tue Jan 25 2011 Adam Williamson - 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 - 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 - 0.31.1-3.sds4 +- drop obsoletes and provides of itself (hangover from freeworld) + +* Tue Nov 23 2010 Adam Williamson - 0.31.1-2.sds4 +- fix the tarball to actually remove the i965 code (duh) + +* Thu Oct 7 2010 Adam Williamson - 0.31.1-1.sds4 +- initial package (based on package from elsewhere by myself and Nic + Chauvet with i965 driver removed) diff --git a/sources b/sources index e69de29..df72f2a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1ab805214a3d79c97f2e87a489b629b0 libva-1.0.8-mod.tar.bz2