[SCM] vdpau-video/master: Redo patching. Only proper check for enabling GLX extensions needed to be changed. Also use dh-autoreconf to perform autoreconf during build.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sun Jan 30 23:18:39 UTC 2011
The following commit has been merged in the master branch:
commit 0c3240b79c18228e1197e075662ee25b2434b16d
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun Jan 30 15:52:08 2011 -0500
Redo patching. Only proper check for enabling GLX extensions needed to be changed.
Also use dh-autoreconf to perform autoreconf during build.
diff --git a/debian/control b/debian/control
index 9e9684a..d872ec4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
Uploaders: Andres Mejia <mcitadel at gmail.com>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50),
+ dh-autoreconf,
quilt (>= 0.46-7),
pkg-config,
libva-dev (>= 1.0.4),
diff --git a/debian/patches/Makefile.in.patch b/debian/patches/Makefile.in.patch
deleted file mode 100644
index b3af718..0000000
--- a/debian/patches/Makefile.in.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Reverts some change that occurs when building package.
-==========================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -313,9 +313,9 @@
- exit 1;; \
- esac; \
- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
- $(am__cd) $(top_srcdir) && \
-- $(AUTOMAKE) --gnu src/Makefile
-+ $(AUTOMAKE) --foreign src/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
diff --git a/debian/patches/autoreconf_-vif.patch b/debian/patches/autoreconf_-vif.patch
deleted file mode 100644
index c7b898c..0000000
--- a/debian/patches/autoreconf_-vif.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Patch with modifications after running autoreconf -vif
-==========================================================================
---- a/configure
-+++ b/configure
-@@ -12341,6 +12341,9 @@
- /* end confdefs.h. */
-
- #include <va/va_version.h>
-+ #ifndef VA_SDS_VERSION
-+ # error "Not using SDS library"
-+ #endif
- #if VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 29
- # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_SDS_VERSION_0_29)
- # error "VA API version >= 0.29.0-sds$LIBVA_SDS_VERSION_0_29 is required"
-@@ -12388,20 +12391,18 @@
- ${VA_MICRO_VERSION:-0} "*" 100 + \
- ${VA_SDS_VERSION:-0}`
- VA_DRIVER_INIT_FUNC="__vaDriverInit_${VA_MAJOR_VERSION}_${VA_MINOR_VERSION}"
--if test $va_full_version_int -ge 00310005; then
-- VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_${VA_MICRO_VERSION}_sds${VA_SDS_VERSION}"
--else
-- VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_sds"
--fi
- if test "$ac_cv_libva_sds_extensions" = "yes"; then
-+ if test $va_full_version_int -ge 00310005; then
-+ VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_${VA_MICRO_VERSION}_sds${VA_SDS_VERSION}"
-+ else
-+ VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_sds"
-+ fi
-+fi
-
- cat >>confdefs.h <<_ACEOF
- #define VA_DRIVER_INIT_FUNC $VA_DRIVER_INIT_FUNC
- _ACEOF
-
--else
-- as_fn_error $? "Your VA API SDK does not include SDS extensions" "$LINENO" 5
--fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VA API (GLX extensions)" >&5
- $as_echo_n "checking for VA API (GLX extensions)... " >&6; }
-@@ -12415,15 +12416,8 @@
- /* end confdefs.h. */
-
- #include <va/va_version.h>
-- #if VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 30
-- # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_GLX_SDS_VERSION_0_30)
-- # error "VA API version >= 0.30.0-sds$LIBVA_GLX_SDS_VERSION_0_30 is required"
-- # endif
-- #elif VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 31
-- # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_GLX_SDS_VERSION_0_31)
-- # error "VA API version >= 0.31.0-sds$LIBVA_GLX_SDS_VERSION_0_31 is required"
-- # endif
-- #else
-+ #include <va/va_glx.h>
-+ #if !(VA_MAJOR_VERSION == 0 && (VA_MINOR_VERSION == 30 || VA_MINOR_VERSION == 31))
- # error "This version of VA API is not supported for OpenGL rendering"
- #endif
-
diff --git a/debian/patches/glx-check.patch b/debian/patches/glx-check.patch
new file mode 100644
index 0000000..fb16d89
--- /dev/null
+++ b/debian/patches/glx-check.patch
@@ -0,0 +1,34 @@
+Description: Better check to see whether attempt to enable GLX extensions should
+ be made.
+Forwarded: no
+Last-Update: 2011-01-30
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -194,25 +194,9 @@
+ dnl Check for OpenGL rendering extensions to VA-API
+ AC_CACHE_CHECK([for VA-API (GLX extensions)],
+ ac_cv_libva_glx_extensions, [
+- saved_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS"
+- AC_TRY_COMPILE([
+- #include <va/va_version.h>
+- #if VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 30
+- # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_GLX_SDS_VERSION_0_30)
+- # error "VA-API version >= 0.30.0-sds$LIBVA_GLX_SDS_VERSION_0_30 is required"
+- # endif
+- #elif VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 31
+- # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_GLX_SDS_VERSION_0_31)
+- # error "VA-API version >= 0.31.0-sds$LIBVA_GLX_SDS_VERSION_0_31 is required"
+- # endif
+- #else
+- # error "This version of VA-API is not supported for OpenGL rendering"
+- #endif
+- ], [],
++ AC_CHECK_HEADERS([va/va_glx.h],
+ [ac_cv_libva_glx_extensions="yes"],
+ [ac_cv_libva_glx_extensions="no" USE_GLX=0])
+- CFLAGS="$saved_CFLAGS"
+ ])
+
+ dnl Check for VA-API drivers path
diff --git a/debian/patches/libva_glx_detection.patch b/debian/patches/libva_glx_detection.patch
deleted file mode 100644
index daca4a7..0000000
--- a/debian/patches/libva_glx_detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-libva >= 1.0.4 has GLX extensions
-==========================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -198,15 +198,8 @@
- CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS"
- AC_TRY_COMPILE([
- #include <va/va_version.h>
-- #if VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 30
-- # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_GLX_SDS_VERSION_0_30)
-- # error "VA API version >= 0.30.0-sds$LIBVA_GLX_SDS_VERSION_0_30 is required"
-- # endif
-- #elif VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 31
-- # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_GLX_SDS_VERSION_0_31)
-- # error "VA API version >= 0.31.0-sds$LIBVA_GLX_SDS_VERSION_0_31 is required"
-- # endif
-- #else
-+ #include <va/va_glx.h>
-+ #if !(VA_MAJOR_VERSION == 0 && (VA_MINOR_VERSION == 30 || VA_MINOR_VERSION == 31))
- # error "This version of VA API is not supported for OpenGL rendering"
- #endif
- ], [],
diff --git a/debian/patches/libva_sds_detection.patch b/debian/patches/libva_sds_detection.patch
deleted file mode 100644
index f765669..0000000
--- a/debian/patches/libva_sds_detection.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Don't need to check for SDS version of libva, as of libva >= 1.0.4.
-==========================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -147,6 +147,9 @@
- CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS"
- AC_TRY_COMPILE([
- #include <va/va_version.h>
-+ #ifndef VA_SDS_VERSION
-+ # error "Not using SDS library"
-+ #endif
- #if VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 29
- # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_SDS_VERSION_0_29)
- # error "VA API version >= 0.29.0-sds$LIBVA_SDS_VERSION_0_29 is required"
-@@ -179,16 +182,14 @@
- ${VA_MICRO_VERSION:-0} "*" 100 + \
- ${VA_SDS_VERSION:-0}`
- VA_DRIVER_INIT_FUNC="__vaDriverInit_${VA_MAJOR_VERSION}_${VA_MINOR_VERSION}"
--if test $va_full_version_int -ge 00310005; then
-- VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_${VA_MICRO_VERSION}_sds${VA_SDS_VERSION}"
--else
-- VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_sds"
--fi
- if test "$ac_cv_libva_sds_extensions" = "yes"; then
-- AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC], [Define driver entry-point])
--else
-- AC_MSG_ERROR([Your VA API SDK does not include SDS extensions])
-+ if test $va_full_version_int -ge 00310005; then
-+ VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_${VA_MICRO_VERSION}_sds${VA_SDS_VERSION}"
-+ else
-+ VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_sds"
-+ fi
- fi
-+AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC], [Define driver entry-point])
-
- dnl Check for OpenGL rendering extensions to VA API
- AC_CACHE_CHECK([for VA API (GLX extensions)],
diff --git a/debian/patches/series b/debian/patches/series
index fcd5a0c..e50203e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-libva_sds_detection.patch
-libva_glx_detection.patch
-autoreconf_-vif.patch
-Makefile.in.patch
+glx-check.patch
diff --git a/debian/rules b/debian/rules
index 630bc53..e8bd94c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh --with quilt $@
+ dh --with quilt,autoreconf $@
override_dh_auto_configure:
dh_testdir
--
vdpau-video packaging
More information about the pkg-multimedia-commits
mailing list