From 139567a9a99c29befefd8ecb1d50510418dfca80 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:24:02 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for libvdpau --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From f534391e404f1c32039e6dd064fac31f88dfc947 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:55:03 +0000 Subject: [PATCH 2/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b5a8d0b..0624ccd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libvdpau SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6e1ac93d7ee4bc83059610309295b1fb5f5e7e3d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 14 Dec 2009 22:20:56 +0000 Subject: [PATCH 3/5] - Update to 0.3 --- .cvsignore | 2 +- libvdpau.spec | 41 ++++++++++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index fa71990..39f5aa1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libvdpau-0.2.tar.gz +libvdpau-0.3.tar.bz2 diff --git a/libvdpau.spec b/libvdpau.spec index c65001c..6ba56f3 100644 --- a/libvdpau.spec +++ b/libvdpau.spec @@ -1,14 +1,22 @@ Name: libvdpau -Version: 0.2 +Version: 0.3 Release: 1%{?dist} Summary: Wrapper library for the Video Decode and Presentation API Group: System Environment/Libraries License: MIT URL: http://freedesktop.org/wiki/Software/VDPAU -Source0: http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.gz +Source0: http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool + +%{?!_without_docs: +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: texlive +} + BuildRequires: libX11-devel @@ -17,6 +25,14 @@ VDPAU is the Video Decode and Presentation API for UNIX. It provides an interface to video decode acceleration and presentation hardware present in modern GPUs. +%{?!_without_docs: +%package docs +Summary: Documentation for %{name} +Group: Documentation + +%description docs +The %{name}-docs package contains documentation for %{name}. +} %package devel Summary: Development files for %{name} @@ -32,11 +48,13 @@ developing applications that use %{name}. %prep %setup -q - +autoreconf -vif %build -%configure --disable-static +%configure --disable-static \ + %{?_without_docs:--disable-documentation } + make %{?_smp_mflags} @@ -46,6 +64,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + %clean rm -rf $RPM_BUILD_ROOT @@ -59,7 +78,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/*.so.* -%{_libdir}/libvdpau_trace.so +%dir %{_libdir}/vdpau +%{_libdir}/vdpau/libvdpau_trace.so* + +%{?!_without_docs: +%files docs +%defattr(-,root,root,-) +%doc %{_docdir}/%{name} +} %files devel %defattr(-,root,root,-) @@ -69,6 +95,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 22 2009 Nicolas Chauvet - 0.3-1 +- Update to 0.3 +- Create docs sub-package +- Allow --without docs conditional + * Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2-1 - Update to 0.2 - Disable ExclusiveArch diff --git a/sources b/sources index 38517e8..3794c19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0641a208839eb88fe7c01ee5af83735 libvdpau-0.2.tar.gz +bf714e773ea55ba06d068dee3bc28135 libvdpau-0.3.tar.bz2 From da63c3736a1d541edce5a8c61a0c83f3223cf20d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 14 Mar 2010 00:11:20 +0000 Subject: [PATCH 4/5] - Update to 0.4 --- .cvsignore | 2 +- libvdpau.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 39f5aa1..3c5307d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libvdpau-0.3.tar.bz2 +libvdpau-0.4.tar.gz diff --git a/libvdpau.spec b/libvdpau.spec index 6ba56f3..a2a6a43 100644 --- a/libvdpau.spec +++ b/libvdpau.spec @@ -1,12 +1,12 @@ Name: libvdpau -Version: 0.3 +Version: 0.4 Release: 1%{?dist} Summary: Wrapper library for the Video Decode and Presentation API Group: System Environment/Libraries License: MIT URL: http://freedesktop.org/wiki/Software/VDPAU -Source0: http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.bz2 +Source0: http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -14,10 +14,12 @@ BuildRequires: libtool %{?!_without_docs: BuildRequires: doxygen BuildRequires: graphviz -BuildRequires: texlive +BuildRequires: texlive-latex } BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: xorg-x11-proto-devel %description @@ -95,7 +97,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Nov 22 2009 Nicolas Chauvet - 0.3-1 +* Sat Mar 13 2010 Nicolas Chauvet - 0.4-1 +- Update to 0.4 + +* Sun Nov 22 2009 kwizart < kwizart at gmail.com > - 0.3-1 - Update to 0.3 - Create docs sub-package - Allow --without docs conditional diff --git a/sources b/sources index 3794c19..c1b3bb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf714e773ea55ba06d068dee3bc28135 libvdpau-0.3.tar.bz2 +06da6f81ad37708b33a20ed177a44d81 libvdpau-0.4.tar.gz From ac0ef3e9eaf18149e59d76b6ba8fdab0d920551e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:49:39 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0624ccd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libvdpau -# $Id$ -NAME := libvdpau -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index ceede0a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libvdpau-0_1-0_6_20090902git_fc11:HEAD:libvdpau-0.1-0.6.20090902git.fc11.src.rpm:1252526863