Add auto-generated Debian packaging.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

23 files changed, 139 insertions, 195 deletions

diff --git a/Makefile.am b/Makefile.am
index b6a84de..331394b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,4 +22,24 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = va dummy_drv_video pkgconfig test
+SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream
+
+# 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 0f2448a..c218d94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,9 @@ m4_define([libva_lt_revision],
 m4_define([libva_lt_age],
           [m4_eval(libva_binary_age - libva_interface_age)])
 
+# libdrm minimun version requirement
+m4_define([libdrm_version], [2.4])
+
 AC_PREREQ(2.57)
 AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva)
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -142,7 +145,11 @@ AC_SYS_LARGEFILE
 PKG_CHECK_MODULES([X11], [x11])
 PKG_CHECK_MODULES([XEXT],[xext])
 PKG_CHECK_MODULES([XFIXES], [xfixes])
-PKG_CHECK_MODULES([DRM], [libdrm])
+
+# Check for recent enough DRM
+LIBDRM_VERSION=libdrm_version
+PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
+AC_SUBST(LIBDRM_VERSION)
 
 if test x$enable_dummy_backend = xyes; then
     PKG_CHECK_MODULES([UDEV], [libudev], [libudev=yes], [libudev=no])
@@ -188,6 +195,7 @@ AC_SUBST([libvabackendlib])
 
 AC_OUTPUT([
 	Makefile
+	debian.upstream/Makefile
 	va/Makefile
 	va/va_version.h
 	va/x11/Makefile
diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am
new file mode 100644
index 0000000..56dc98a
--- /dev/null
+++ b/debian.upstream/Makefile.am
@@ -0,0 +1,32 @@
+DEBIANFILES = \
+	README.Debian				\
+	changelog.in				\
+	compat					\
+	control.in				\
+	copyright				\
+	libva-dev.dirs				\
+	libva-dev.install			\
+	libva1.dirs				\
+	libva1.install				\
+	rules					\
+	$(NULL)
+
+DEBIANGENFILES =				\
+	changelog				\
+	control					\
+	$(NULL)
+
+EXTRA_DIST = $(DEBIANFILES)
+
+dist_noinst_DATA = $(DEBIANGENFILES)
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in $(DEBIANGENFILES)
+
+$(DEBIANGENFILES): %: %.in Makefile
+	-sed \
+	  -e 's|\@DATE\@|'"`LC_ALL=C date +'%a, %d %b %Y %X %z'`"'|' \
+	  -e 's|\@LIBDRM_VERSION\@|$(LIBDRM_VERSION)|' \
+	  -e 's|\@LIBVA_PACKAGE_VERSION\@|$(LIBVA_PACKAGE_VERSION)|' \
+	  -e 's|\@PACKAGE_VERSION\@|$(PACKAGE_VERSION)|' \
+	  $< > $@
diff --git a/debian/README.Debian b/debian.upstream/README.Debian
index d10d702..d10d702 100644
--- a/debian/README.Debian
+++ b/debian.upstream/README.Debian
diff --git a/debian.upstream/changelog.in b/debian.upstream/changelog.in
new file mode 100644
index 0000000..397b5eb
--- /dev/null
+++ b/debian.upstream/changelog.in
@@ -0,0 +1,5 @@
+libva (@PACKAGE_VERSION@-1) unstable; urgency=low
+
+  * Autogenerated package, see NEWS file for ChangeLog.
+
+ -- Gwenole Beauchesne <gwenole.beauchesne@intel.com>  @DATE@
diff --git a/debian/compat b/debian.upstream/compat
index 7ed6ff8..7ed6ff8 100644
--- a/debian/compat
+++ b/debian.upstream/compat
diff --git a/debian.upstream/control.in b/debian.upstream/control.in
new file mode 100644
index 0000000..f8291c5
--- /dev/null
+++ b/debian.upstream/control.in
@@ -0,0 +1,52 @@
+Source: libva
+Priority: extra
+Maintainer: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+Build-Depends: automake,
+               autotools-dev,
+               cdbs,
+               debhelper (>= 5),
+               libdrm-dev (>= @LIBDRM_VERSION@),
+               libgl-dev,
+               libtool,
+               libxext-dev,
+               libxfixes-dev,
+               pkg-config,
+               x11proto-xext-dev
+Standards-Version: 3.7.2
+Section: libs
+
+Package: libva-dev
+Section: libdevel
+Architecture: any
+Depends: libva1 (= ${binary:Version}),
+         libdrm-dev (>= @LIBDRM_VERSION@),
+         libgl-dev,
+         pkg-config
+Conflicts: libva-0.29-dev
+Replaces: libva-0.29-dev
+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: libva1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libva-0.29-0
+Replaces: libva-0.29-0
+Provides: libva-0.29-0
+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.
+
+Package: libva1-dbg
+Section: libdevel
+Architecture: any
+Depends: libva1 (= ${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 files.
diff --git a/debian/copyright b/debian.upstream/copyright
index 38b60ef..38b60ef 100644
--- a/debian/copyright
+++ b/debian.upstream/copyright
diff --git a/debian/libva-dev.dirs b/debian.upstream/libva-dev.dirs
index 4418816..4418816 100644
--- a/debian/libva-dev.dirs
+++ b/debian.upstream/libva-dev.dirs
diff --git a/debian.upstream/libva-dev.install b/debian.upstream/libva-dev.install
new file mode 100644
index 0000000..2611cdb
--- /dev/null
+++ b/debian.upstream/libva-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/va/va*.h
+debian/tmp/usr/lib/libva*.so
+debian/tmp/usr/lib/pkgconfig/libva*.pc
diff --git a/debian/libva1.dirs b/debian.upstream/libva1.dirs
index 6845771..6845771 100644
--- a/debian/libva1.dirs
+++ b/debian.upstream/libva1.dirs
diff --git a/debian.upstream/libva1.install b/debian.upstream/libva1.install
new file mode 100644
index 0000000..ddfd8ed
--- /dev/null
+++ b/debian.upstream/libva1.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libva.so.*
+debian/tmp/usr/lib/libva-*.so.*
diff --git a/debian.upstream/rules b/debian.upstream/rules
new file mode 100755
index 0000000..27b2639
--- /dev/null
+++ b/debian.upstream/rules
@@ -0,0 +1,15 @@
+#!/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/simple-patchsys.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)
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 1f60620..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,27 +0,0 @@
-libva (0.24-1) unstable; urgency=low
-
-  * Updated to v0.24
-  * Display attributes added
-  * H264 parameter fixes
-  * Swapped vaGetConfigAttributes and vaQueryConfigAttributes
-
- -- Waldo Bastian <waldo.bastian@intel.com>  Thu, 20 Sep 2007 15:08:04 -0700
-
-  * Updated to v0.22
-  * VAImage and VASubpicture added
-
- -- Waldo Bastian <waldo.bastian@intel.com>  Fri, 07 Sep 2007 04:32:28 -0700
-
-  * Updated to v0.20
-  * Clean up & exporting DRI interface
-
- -- Waldo Bastian <waldo.bastian@intel.com>  Thu, 09 Aug 2007 11:49:43 -0700
-
-  * Add VA_INVALID_SURFACE
-
- -- Waldo Bastian <waldo.bastian@intel.com>  Wed, 11 Jul 2007 17:24:10 -0700
-
-  * Initial release of libva
-
- -- Waldo Bastian <waldo.bastian@intel.com>  Mon, 18 Jun 2007 21:35:31 -0700
-
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 7ad39bc..0000000
--- a/debian/control
+++ /dev/null
@@ -1,36 +0,0 @@
-Source: libva
-Priority: extra
-Maintainer: Waldo Bastian <waldo.bastian@intel.com>
-Build-Depends: debhelper (>= 5),
-               autotools-dev,
-               libdrm-dev (>= 2.3.0),
-               mesa-common-dev,
-               x11proto-gl-dev,
-               x11proto-xext-dev,
-               libxext-dev,
-               pkg-config
-Standards-Version: 3.7.2
-Section: libs
-
-Package: libva-dev
-Section: libdevel
-Architecture: any
-Depends: libva1 (= ${binary:Version}),
-         libdrm-dev (>= 2.3.0),
-         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: libva1
-Section: libs
-Architecture: any
-Depends: libx11-6,
-         libxext6, 
-         libdrm2 (>= 2.3.0)
-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.
-
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e69de29..0000000
--- a/debian/docs
+++ /dev/null
diff --git a/debian/files b/debian/files
deleted file mode 100644
index bbaff89..0000000
--- a/debian/files
+++ /dev/null
@@ -1,2 +0,0 @@
-libva-dev_0.24-1_i386.deb libdevel extra
-libva1_0.24-1_i386.deb libs extra
diff --git a/debian/libva-dev.install b/debian/libva-dev.install
deleted file mode 100644
index d86b3bf..0000000
--- a/debian/libva-dev.install
+++ /dev/null
@@ -1,8 +0,0 @@
-debian/tmp/usr/include/va.h
-debian/tmp/usr/include/va_x11.h
-debian/tmp/usr/include/va_backend.h
-debian/tmp/usr/include/va_dri.h
-debian/tmp/usr/X11R6/lib/modules/dri/dummy_drv_video.*
-debian/tmp/usr/lib/libva.la
-debian/tmp/usr/lib/libva.so
-debian/tmp/usr/lib/pkgconfig/libva.pc
diff --git a/debian/libva-dev.substvars b/debian/libva-dev.substvars
deleted file mode 100644
index 17c2baa..0000000
--- a/debian/libva-dev.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.6-1)
diff --git a/debian/libva1.install b/debian/libva1.install
deleted file mode 100644
index 499e94b..0000000
--- a/debian/libva1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libva.so.*
-debian/tmp/usr/bin/vainfo
diff --git a/debian/libva1.substvars b/debian/libva1.substvars
deleted file mode 100644
index 9e3d1d8..0000000
--- a/debian/libva1.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.6-1), libx11-6, libxext6
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 60fbc95..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install