Accepting request 126177 from X11:Drivers:Video

- back to building the HTML documentation (instead of prebuilding
  and then extracting it during the build), but this time without
  requiring texlive, since pdftex apparently isn't used for this
  purpose anyway (libvdpau-nopdftex.patch)

- do not build the documentation but package a prebuilt tar of it
  to avoid huge build cycle

OBS-URL: https://build.opensuse.org/request/show/126177
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvdpau?expand=0&rev=18
This commit is contained in:
Stephan Kulow 2012-06-26 15:46:22 +00:00 committed by Git OBS Bridge
parent aec1507dd5
commit a7e0da1672
3 changed files with 57 additions and 10 deletions

27
libvdpau-nopdftex.patch Normal file
View File

@ -0,0 +1,27 @@
--- configure.ac.old 2012-06-26 14:21:28.000000000 +0200
+++ configure.ac 2012-06-26 14:22:30.000000000 +0200
@@ -48,11 +48,9 @@ AC_ARG_ENABLE(documentation, AS_HELP_STR
if test "x$DOCS" != xno; then
AC_CHECK_TOOL([DOXYGEN], [doxygen], [no])
AC_CHECK_TOOL([DOT], [dot], [no])
- AC_CHECK_TOOL([PDFTEX], [pdftex], [no])
else
DOXYGEN=no
DOT=no
- PDFTEX=no
fi
if test "x$DOCS" = xyes; then
if test "x$DOXYGEN" = xno; then
@@ -61,11 +59,8 @@ if test "x$DOCS" = xyes; then
if test "x$DOT" = xno; then
AC_ERROR([Documentation enabled but dot was not found in your path. Please install graphviz])
fi
- if test "x$PDFTEX" = xno; then
- AC_ERROR([Documentation enabled but pdftex was not found in your path])
- fi
fi
-AM_CONDITIONAL([ENABLE_DOCS], [test "x$DOXYGEN" != xno -a "x$DOT" != xno -a "x$PDFTEX" != xno])
+AM_CONDITIONAL([ENABLE_DOCS], [test "x$DOXYGEN" != xno -a "x$DOT" != xno])
AC_SUBST(DOXYGEN)
# Options

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Jun 26 12:34:44 UTC 2012 - sndirsch@suse.com
- back to building the HTML documentation (instead of prebuilding
and then extracting it during the build), but this time without
requiring texlive, since pdftex apparently isn't used for this
purpose anyway (libvdpau-nopdftex.patch)
-------------------------------------------------------------------
Mon Jun 25 13:23:52 UTC 2012 - coolo@suse.com
- do not build the documentation but package a prebuilt tar of it
to avoid huge build cycle
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 14:47:54 UTC 2011 - sndirsch@suse.com Mon Aug 29 14:47:54 UTC 2011 - sndirsch@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package libvdpau # spec file for package libvdpau
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,22 +16,29 @@
# #
Name: libvdpau Name: libvdpau
Version: 0.4.1 Version: 0.4.1
Release: 15 Release: 0
License: MIT
Summary: VDPAU wrapper and trace libraries Summary: VDPAU wrapper and trace libraries
Url: http://people.freedesktop.org/~aplattner License: MIT
Group: System/Libraries Group: System/Libraries
Url: http://people.freedesktop.org/~aplattner
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
Source1: vdpauinfo-0.0.6.tar.gz Source1: vdpauinfo-0.0.6.tar.gz
Source2: README Source2: README
Source99: baselibs.conf Source99: baselibs.conf
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
Patch: vdpauinfo-missing-lX11.diff Patch: vdpauinfo-missing-lX11.diff
BuildRequires: gcc-c++ pkgconfig xorg-x11-devel Patch1: libvdpau-nopdftex.patch
BuildRequires: doxygen graphviz texlive BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: graphviz
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -42,7 +49,6 @@ implementation library. Currently, this is always libvdpau_nvidia. You can
override the driver name by setting the VDPAU_DRIVER environment variable. override the driver name by setting the VDPAU_DRIVER environment variable.
%package -n libvdpau1 %package -n libvdpau1
License: MIT
Summary: VDPAU wrapper library Summary: VDPAU wrapper library
Group: System/Libraries Group: System/Libraries
Provides: libvdpau = %{version}-%{release} Provides: libvdpau = %{version}-%{release}
@ -56,7 +62,6 @@ implementation library. Currently, this is always libvdpau_nvidia. You can
override the driver name by setting the VDPAU_DRIVER environment variable. override the driver name by setting the VDPAU_DRIVER environment variable.
%package -n libvdpau-devel %package -n libvdpau-devel
License: MIT
Summary: VDPAU wrapper development files Summary: VDPAU wrapper development files
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Requires: libvdpau1 = %{version} Requires: libvdpau1 = %{version}
@ -67,7 +72,6 @@ build applications. At runtime, the shared libraries are needed too and may
be installed using the proprietary nVidia driver packages. be installed using the proprietary nVidia driver packages.
%package -n libvdpau_trace1 %package -n libvdpau_trace1
License: MIT
Summary: VDPAU trace library Summary: VDPAU trace library
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Requires: libvdpau1 = %{version} Requires: libvdpau1 = %{version}
@ -80,11 +84,13 @@ Its usage is documented in the README.
%prep %prep
%setup -q -b1 %setup -q -b1
%patch1 -p0
pushd ../vdpauinfo-* pushd ../vdpauinfo-*
%patch -p0 %patch -p0
popd popd
%build %build
autoreconf -fi
%configure %configure
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}