[SCM] libva/master: debian/patches/: patchset dropped completely

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d94b0089842ea3c5945cf0e3ba8ce1860cf66ca8
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed Jul 3 16:15:44 2013 +0200

    debian/patches/: patchset dropped completely
    
    - 0001-FTBFS_on_GNU-kFreeBSD.patch became useless
    - 0002-Remove_unneeded_dependencies.patch applied upstream

diff --git a/debian/patches/0001-FTBFS_on_GNU-kFreeBSD.patch b/debian/patches/0001-FTBFS_on_GNU-kFreeBSD.patch
deleted file mode 100644
index dc37937..0000000
--- a/debian/patches/0001-FTBFS_on_GNU-kFreeBSD.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Petr Salinger <Petr.Salinger at seznam.cz>
-Date: Wed, 16 Jan 2013 14:15:57 +0100
-Subject: FTBFS_on_GNU-kFreeBSD
-
-Bug-Debian: http://bugs.debian.org/612480
----
- va/va_backend.h     | 3 +++
- va/va_backend_tpi.h | 6 ++++++
- va/va_tpi.c         | 3 +++
- 3 files changed, 12 insertions(+)
-
-diff --git a/va/va_backend.h b/va/va_backend.h
-index a0c408d..41b1214 100644
---- a/va/va_backend.h
-+++ b/va/va_backend.h
-@@ -30,7 +30,10 @@
- #define _VA_BACKEND_H_
- 
- #include <va/va.h>
-+
-+#ifdef __linux__
- #include <linux/videodev2.h>
-+#endif
- 
- typedef struct VADriverContext *VADriverContextP;
- typedef struct VADisplayContext *VADisplayContextP;
-diff --git a/va/va_backend_tpi.h b/va/va_backend_tpi.h
-index 56998de..95cc0bd 100644
---- a/va/va_backend_tpi.h
-+++ b/va/va_backend_tpi.h
-@@ -32,7 +32,9 @@
- #include <va/va.h>
- #include <va/va_backend.h>
- 
-+#ifdef __linux__
- #include <linux/videodev2.h>
-+#endif
- 
- struct VADriverVTableTPI
- {
-@@ -43,6 +45,8 @@ struct VADriverVTableTPI
- 		VASurfaceID *surface		/* out */
- 	);
-     
-+#ifdef __linux__
-+
-         VAStatus (*vaCreateSurfaceFromV4L2Buf) (
- 		VADriverContextP ctx,
-                 int v4l2_fd,         /* file descriptor of V4L2 device */
-@@ -51,6 +55,8 @@ struct VADriverVTableTPI
-                 VASurfaceID *surface	           /* out */
-         );
- 
-+#endif
-+
-         VAStatus (*vaCreateSurfacesForUserPtr)(
- 		VADriverContextP ctx,
-                 int width,
-diff --git a/va/va_tpi.c b/va/va_tpi.c
-index e9169fc..036f6a5 100644
---- a/va/va_tpi.c
-+++ b/va/va_tpi.c
-@@ -66,6 +66,8 @@ VAStatus vaCreateSurfaceFromCIFrame (
-   
- }
- 
-+#ifdef __linux__
-+
- /* Wrap a V4L2 buffer as a VA surface, so that V4L2 camera, VA encode
-  * can share the data without copy
-  * The VA driver should query the camera device from v4l2_fd to see
-@@ -98,6 +100,7 @@ VAStatus vaCreateSurfaceFromV4L2Buf(
-       return VA_STATUS_ERROR_UNIMPLEMENTED;
- }
- 
-+#endif
- 
- /*
-  * The surfaces could be shared and accessed with extern devices
diff --git a/debian/patches/0002-Remove_unneeded_dependencies.patch b/debian/patches/0002-Remove_unneeded_dependencies.patch
deleted file mode 100644
index 9e931cc..0000000
--- a/debian/patches/0002-Remove_unneeded_dependencies.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Andres Mejia <mcitadel at gmail.com>
-Date: Wed, 16 Jan 2013 14:45:31 +0100
-Subject: Remove_unneeded_dependencies
-
-Patch to remove unnecessary dependency
-to libva-x11 for dummy driver.
----
- dummy_drv_video/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am
-index 69364c2..50f8ee9 100644
---- a/dummy_drv_video/Makefile.am
-+++ b/dummy_drv_video/Makefile.am
-@@ -26,8 +26,6 @@ if BUILD_DUMMY_DRIVER
- dummy_drv_video_la_LTLIBRARIES	= dummy_drv_video.la
- dummy_drv_video_ladir		= $(LIBVA_DRIVERS_PATH)
- dummy_drv_video_la_LDFLAGS	= -module -avoid-version -no-undefined -Wl,--no-undefined
--dummy_drv_video_la_LIBADD	= $(top_builddir)/va/libva-x11.la
--dummy_drv_video_la_DEPENDENCIES	= $(top_builddir)/va/libva-x11.la
- dummy_drv_video_la_SOURCES	= dummy_drv_video.c object_heap.c
- noinst_HEADERS			= dummy_drv_video.h object_heap.h
- endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 733ccb9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-FTBFS_on_GNU-kFreeBSD.patch
-0002-Remove_unneeded_dependencies.patch

-- 
libva packaging