[SCM] intel-vaapi-driver/master: Remove patch, applied upstream

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Jun 16 08:38:48 UTC 2014


The following commit has been merged in the master branch:
commit 8ed26fa9795abd36c011c868eb95fdc10a2d99ca
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jun 16 10:38:11 2014 +0200

    Remove patch, applied upstream

diff --git a/debian/patches/0002-Define_i965_proc_picture_in_header.patch b/debian/patches/0002-Define_i965_proc_picture_in_header.patch
deleted file mode 100644
index ea9653d..0000000
--- a/debian/patches/0002-Define_i965_proc_picture_in_header.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Define i965_proc_picture in header
-Author: Sebastian Ramacher <sramacher at debian.org>
-Forwarded: http://lists.freedesktop.org/archives/libva/2014-May/002269.html
-Bug-Debian: https://bugs.debian.org/748555
-Last-Update: 2014-05-31
-
-diff --git a/src/gen75_picture_process.c b/src/gen75_picture_process.c
-index 3c4fc0b..54967a9 100644
---- a/src/gen75_picture_process.c
-+++ b/src/gen75_picture_process.c
-@@ -38,12 +38,6 @@
- #include "i965_post_processing.h"
- #include "gen75_picture_process.h"
- 
--extern void
--i965_proc_picture(VADriverContextP ctx, 
--                  VAProfile profile, 
--                  union codec_state *codec_state,
--                  struct hw_context *hw_context);
--
- extern struct hw_context *
- i965_proc_context_init(VADriverContextP ctx,
-                        struct object_config *obj_config);
-diff --git a/src/i965_post_processing.h b/src/i965_post_processing.h
-index fd4cbcf..1599026 100755
---- a/src/i965_post_processing.h
-+++ b/src/i965_post_processing.h
-@@ -575,6 +575,11 @@ i965_post_processing_terminate(VADriverContextP ctx);
- bool
- i965_post_processing_init(VADriverContextP ctx);
- 
-+VAStatus
-+i965_proc_picture(VADriverContextP ctx,
-+                  VAProfile profile,
-+                  union codec_state *codec_state,
-+                  struct hw_context *hw_context);
- 
- extern void
- gen8_post_processing_context_init(VADriverContextP ctx,
--- 
-2.0.0.rc4
-
diff --git a/debian/patches/series b/debian/patches/series
index 0e30a6b..f1f963d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Fix_FTBFS_on_kFreeBSD.patch
-0002-Define_i965_proc_picture_in_header.patch

-- 
intel-vaapi-driver packaging



More information about the pkg-multimedia-commits mailing list