diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | debian.upstream/Makefile.am | 35 | ||||
| -rw-r--r-- | debian.upstream/README.Debian | 7 | ||||
| -rw-r--r-- | debian.upstream/changelog.in | 5 | ||||
| -rw-r--r-- | debian.upstream/compat | 1 | ||||
| -rw-r--r-- | debian.upstream/control.in | 102 | ||||
| -rw-r--r-- | debian.upstream/copyright | 44 | ||||
| -rw-r--r-- | debian.upstream/libva-dev.install | 3 | ||||
| -rw-r--r-- | debian.upstream/libva-drm.install.in | 1 | ||||
| -rw-r--r-- | debian.upstream/libva-egl.install.in | 1 | ||||
| -rw-r--r-- | debian.upstream/libva-glx.install.in | 1 | ||||
| -rw-r--r-- | debian.upstream/libva-wayland.install.in | 1 | ||||
| -rw-r--r-- | debian.upstream/libva-x11.install.in | 1 | ||||
| -rw-r--r-- | debian.upstream/libva.install.in | 1 | ||||
| -rwxr-xr-x | debian.upstream/rules | 14 |
17 files changed, 1 insertions, 255 deletions
@@ -22,14 +22,6 @@ config.log config.status config.sub configure -debian.upstream/changelog -debian.upstream/control -debian.upstream/libva-drm*.install -debian.upstream/libva-egl*.install -debian.upstream/libva-glx*.install -debian.upstream/libva-wayland*.install -debian.upstream/libva-x11*.install -debian.upstream/libva[0-9]*.install depcomp install-sh libtool diff --git a/Makefile.am b/Makefile.am index be1ce9e..2eced8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,24 +24,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AUTOMAKE_OPTIONS = foreign -SUBDIRS = va dummy_drv_video pkgconfig debian.upstream doc +SUBDIRS = va dummy_drv_video pkgconfig doc # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = \ aclocal.m4 compile config.guess config.sub \ configure depcomp install-sh ltmain.sh \ Makefile.in missing - -DEB_BUILDDIR = debian.build - -deb: - @[ -d debian ] || ln -s debian.upstream debian - dpkg-buildpackage -rfakeroot -uc -us - -deb.upstream: dist - -mkdir -p $(DEB_BUILDDIR) - cd $(DEB_BUILDDIR) && \ - rm -rf $(PACKAGE)-$(VERSION) && \ - tar zxvf ../$(PACKAGE)-$(VERSION).tar.gz && \ - cd $(PACKAGE)-$(VERSION) && \ - $(MAKE) deb -f Makefile.am diff --git a/configure.ac b/configure.ac index abdf2fa..540bdce 100644 --- a/configure.ac +++ b/configure.ac @@ -305,21 +305,6 @@ AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC], AC_OUTPUT([ Makefile - debian.upstream/Makefile - debian.upstream/changelog - debian.upstream/control - debian.upstream/libva$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva.install.in - debian.upstream/libva-drm$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-drm.install.in - debian.upstream/libva-egl$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-egl.install.in - debian.upstream/libva-glx$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-glx.install.in - debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-wayland.install.in - debian.upstream/libva-x11-$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-x11.install.in doc/Makefile dummy_drv_video/Makefile pkgconfig/Makefile diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am deleted file mode 100644 index f568f9d..0000000 --- a/debian.upstream/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -DEBIANFILES = \ - README.Debian \ - changelog.in \ - compat \ - control.in \ - copyright \ - libva-dev.install \ - libva-drm.install.in \ - libva-egl.install.in \ - libva-glx.install.in \ - libva-wayland.install.in \ - libva-x11.install.in \ - libva.install.in \ - rules \ - $(NULL) - -DEBIANGENFILES = \ - changelog \ - control \ - libva$(LIBVA_MAJOR_VERSION).install \ - libva-drm$(LIBVA_MAJOR_VERSION).install \ - libva-egl$(LIBVA_MAJOR_VERSION).install \ - libva-glx$(LIBVA_MAJOR_VERSION).install \ - libva-wayland$(LIBVA_MAJOR_VERSION).install \ - libva-x11-$(LIBVA_MAJOR_VERSION).install \ - $(NULL) - -EXTRA_DIST = $(DEBIANFILES) - -DISTCLEANFILES = $(DEBIANGENFILES) - -dist_noinst_DATA = $(DEBIANGENFILES) - -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in diff --git a/debian.upstream/README.Debian b/debian.upstream/README.Debian deleted file mode 100644 index d10d702..0000000 --- a/debian.upstream/README.Debian +++ /dev/null @@ -1,7 +0,0 @@ -libva for Debian ----------------- - -This library implements the Video Acceleration (VA) API for Linux. -It will load a hardware dependendent video acceleration driver. - - -- Waldo Bastian <waldo.bastian@intel.com> Mon, 18 Jun 2007 21:35:31 -0700 diff --git a/debian.upstream/changelog.in b/debian.upstream/changelog.in deleted file mode 100644 index f5482c4..0000000 --- a/debian.upstream/changelog.in +++ /dev/null @@ -1,5 +0,0 @@ -libva (@PACKAGE_VERSION@-1) unstable; urgency=low - - * Autogenerated package, see NEWS file for ChangeLog. - - -- Gwenole Beauchesne <gwenole.beauchesne@intel.com> @TODAY@ diff --git a/debian.upstream/compat b/debian.upstream/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian.upstream/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian.upstream/control.in b/debian.upstream/control.in deleted file mode 100644 index 0260d7e..0000000 --- a/debian.upstream/control.in +++ /dev/null @@ -1,102 +0,0 @@ -Source: libva -Priority: extra -Maintainer: Gwenole Beauchesne <gwenole.beauchesne@intel.com> -Build-Depends: automake, - autotools-dev, - cdbs, - debhelper (>= 5), - libdrm-dev (>= @LIBDRM_VERSION@), -@USE_X11_TRUE@ libx11-dev, libxext-dev, libxfixes-dev, -@USE_GLX_TRUE@ libgl-dev, -@USE_WAYLAND_TRUE@ libwayland-dev (>= @WAYLAND_API_VERSION@), - libtool, - pkg-config -Standards-Version: 3.7.2 -Section: libs - -Package: libva-dev -Section: libdevel -Architecture: any -Depends: libdrm-dev (>= @LIBDRM_VERSION@), -@USE_DRM_TRUE@ libva-drm@LIBVA_MAJOR_VERSION@, -@USE_X11_TRUE@ libva-x11-@LIBVA_MAJOR_VERSION@ (= ${binary:Version}), libx11-dev, -@USE_GLX_TRUE@ libva-glx@LIBVA_MAJOR_VERSION@ (= ${binary:Version}), libgl-dev, -@USE_EGL_TRUE@ libva-egl@LIBVA_MAJOR_VERSION@ (= ${binary:Version}), -@USE_WAYLAND_TRUE@ libva-wayland@LIBVA_MAJOR_VERSION@ (= ${binary:Version}), libwayland-dev (>= @WAYLAND_API_VERSION@), - libva@LIBVA_MAJOR_VERSION@ (= ${binary:Version}), - pkg-config -Description: Video Acceleration (VA) API for Linux -- development files - The libva library implements the Video Acceleration (VA) API for Linux. - The library loads a hardware dependendent driver. - . - This package provides the development environment for libva. - -Package: libva@LIBVA_MAJOR_VERSION@ -Section: libs -Architecture: any -Depends: ${shlibs:Depends} -Description: Video Acceleration (VA) API for Linux -- Core runtime - The libva library implements the Video Acceleration (VA) API for Linux. - The library loads a hardware dependendent driver. - . - This package contains the Core runtime library. - -@USE_DRM_TRUE@Package: libva-drm@LIBVA_MAJOR_VERSION@ -@USE_DRM_TRUE@Section: libs -@USE_DRM_TRUE@Architecture: any -@USE_DRM_TRUE@Depends: ${shlibs:Depends} -@USE_DRM_TRUE@Description: Video Acceleration (VA) API for Linux -- DRM runtime -@USE_DRM_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux. -@USE_DRM_TRUE@ The library loads a hardware dependendent driver. -@USE_DRM_TRUE@ . -@USE_DRM_TRUE@ This package contains the VA/DRM runtime library. - -@USE_X11_TRUE@Package: libva-x11-@LIBVA_MAJOR_VERSION@ -@USE_X11_TRUE@Section: libs -@USE_X11_TRUE@Architecture: any -@USE_X11_TRUE@Depends: ${shlibs:Depends} -@USE_X11_TRUE@Description: Video Acceleration (VA) API for Linux -- X11 runtime -@USE_X11_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux. -@USE_X11_TRUE@ The library loads a hardware dependendent driver. -@USE_X11_TRUE@ . -@USE_X11_TRUE@ This package contains the VA/X11 runtime library. - -@USE_GLX_TRUE@Package: libva-glx@LIBVA_MAJOR_VERSION@ -@USE_GLX_TRUE@Section: libs -@USE_GLX_TRUE@Architecture: any -@USE_GLX_TRUE@Depends: ${shlibs:Depends} -@USE_GLX_TRUE@Description: Video Acceleration (VA) API for Linux -- GLX runtime -@USE_GLX_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux. -@USE_GLX_TRUE@ The library loads a hardware dependendent driver. -@USE_GLX_TRUE@ . -@USE_GLX_TRUE@ This package contains the VA/GLX runtime library. - -@USE_EGL_TRUE@Package: libva-egl@LIBVA_MAJOR_VERSION@ -@USE_EGL_TRUE@Section: libs -@USE_EGL_TRUE@Architecture: any -@USE_EGL_TRUE@Depends: ${shlibs:Depends} -@USE_EGL_TRUE@Description: Video Acceleration (VA) API for Linux -- EGL runtime -@USE_EGL_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux. -@USE_EGL_TRUE@ The library loads a hardware dependendent driver. -@USE_EGL_TRUE@ . -@USE_EGL_TRUE@ This package contains the VA/EGL runtime library. - -@USE_WAYLAND_TRUE@Package: libva-wayland@LIBVA_MAJOR_VERSION@ -@USE_WAYLAND_TRUE@Section: libs -@USE_WAYLAND_TRUE@Architecture: any -@USE_WAYLAND_TRUE@Depends: ${shlibs:Depends} -@USE_WAYLAND_TRUE@Description: Video Acceleration (VA) API for Linux -- Wayland runtime -@USE_WAYLAND_TRUE@ The libva library implements the Video Acceleration (VA) API for Linux. -@USE_WAYLAND_TRUE@ The library loads a hardware dependendent driver. -@USE_WAYLAND_TRUE@ . -@USE_WAYLAND_TRUE@ This package contains the VA/Wayland runtime library. - -Package: libva@LIBVA_MAJOR_VERSION@-dbg -Section: libdevel -Architecture: any -Depends: libva@LIBVA_MAJOR_VERSION@ (= ${Source-Version}) -Description: Video Acceleration (VA) API for Linux -- runtime - The libva library implements the Video Acceleration (VA) API for Linux. - The library loads a hardware dependendent driver. - . - This package contains the debug info files. diff --git a/debian.upstream/copyright b/debian.upstream/copyright deleted file mode 100644 index 38b60ef..0000000 --- a/debian.upstream/copyright +++ /dev/null @@ -1,44 +0,0 @@ -This package was debianized by Waldo Bastian <waldo.bastian@intel.com> on -Mon, 18 Jun 2007 21:35:31 -0700. - -It was downloaded from <url://example.com> - -Upstream Author(s): - - Waldo Bastian <waldo.bastian@intel.com> - Jonathan Bian <jonathan.bian@intel.com> - -Copyright: - - (C) Copyright IBM Corporation 2004 - Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. - Copyright 2000 VA Linux Systems, Inc. - Copyright 2007 Intel Corportation - -License: - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sub license, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial portions - of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR - ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -The Debian packaging is (C) 2007, Intel Corporation and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff --git a/debian.upstream/libva-dev.install b/debian.upstream/libva-dev.install deleted file mode 100644 index 2611cdb..0000000 --- a/debian.upstream/libva-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/include/va/va*.h -debian/tmp/usr/lib/libva*.so -debian/tmp/usr/lib/pkgconfig/libva*.pc diff --git a/debian.upstream/libva-drm.install.in b/debian.upstream/libva-drm.install.in deleted file mode 100644 index 7a9b5f2..0000000 --- a/debian.upstream/libva-drm.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libva-drm.so.* diff --git a/debian.upstream/libva-egl.install.in b/debian.upstream/libva-egl.install.in deleted file mode 100644 index 5554b69..0000000 --- a/debian.upstream/libva-egl.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libva-egl.so.* diff --git a/debian.upstream/libva-glx.install.in b/debian.upstream/libva-glx.install.in deleted file mode 100644 index 2d33032..0000000 --- a/debian.upstream/libva-glx.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libva-glx.so.* diff --git a/debian.upstream/libva-wayland.install.in b/debian.upstream/libva-wayland.install.in deleted file mode 100644 index 2563fea..0000000 --- a/debian.upstream/libva-wayland.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libva-wayland.so.* diff --git a/debian.upstream/libva-x11.install.in b/debian.upstream/libva-x11.install.in deleted file mode 100644 index 461d7bd..0000000 --- a/debian.upstream/libva-x11.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libva-x11.so.* diff --git a/debian.upstream/libva.install.in b/debian.upstream/libva.install.in deleted file mode 100644 index bad195c..0000000 --- a/debian.upstream/libva.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libva.so.* diff --git a/debian.upstream/rules b/debian.upstream/rules deleted file mode 100755 index 40b76be..0000000 --- a/debian.upstream/rules +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/utils.mk - -# Allow SMP build -ifeq ($(DEBIAN_BUILD_NCPUS),) - DEBIAN_BUILD_NCPUS = $(shell /usr/bin/getconf _NPROCESSORS_ONLN) -endif -ifneq ($(DEBIAN_BUILD_NCPUS),) - EXTRA_MAKE_FLAGS += -j$(DEBIAN_BUILD_NCPUS) -endif -MAKE += $(EXTRA_MAKE_FLAGS) |