[SCM] intel-vaapi-driver/experimental: Remove no longer needed patches

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Dec 15 19:59:42 UTC 2014


The following commit has been merged in the experimental branch:
commit 8c6dcb3bda6d2f041fc0e3132f1a8bcd92426cc5
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Dec 15 20:14:40 2014 +0100

    Remove no longer needed patches

diff --git a/debian/patches/0002-avoid_segfault_on_unsupported_platforms.patch b/debian/patches/0002-avoid_segfault_on_unsupported_platforms.patch
deleted file mode 100644
index 7b272d0..0000000
--- a/debian/patches/0002-avoid_segfault_on_unsupported_platforms.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Avoid segfailt on unsupported platforms
- Call preinit_hw_codec callback after successful initialization to avoid segment
- fault issue on unsupported platforms.
-Origin: upstream,
- http://cgit.freedesktop.org/vaapi/intel-driver/commit/?h=v1.4-branch&id=eb097b1a39b69af76b5575835255cb4653195c1c
-Last-Update: 2014-11-10
-
-diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
-index ba7c7be..e768537 100644
---- a/src/i965_drv_video.c
-+++ b/src/i965_drv_video.c
-@@ -5669,9 +5669,6 @@ i965_Init(VADriverContextP ctx)
-             break;
-     }
- 
--    if (i965->codec_info->preinit_hw_codec)
--        i965->codec_info->preinit_hw_codec(ctx, i965->codec_info);
--
-     if (i == ARRAY_ELEMS(i965_sub_ops)) {
-         switch (i965->intel.device_id) {
- #undef CHIPSET
-@@ -5697,6 +5694,9 @@ i965_Init(VADriverContextP ctx)
- 
-         i965->current_context_id = VA_INVALID_ID;
- 
-+        if (i965->codec_info && i965->codec_info->preinit_hw_codec)
-+            i965->codec_info->preinit_hw_codec(ctx, i965->codec_info);
-+
-         return VA_STATUS_SUCCESS;
-     } else {
-         i--;
diff --git a/debian/patches/series b/debian/patches/series
index fc1b2b1..f1f963d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Fix_FTBFS_on_kFreeBSD.patch
-0002-avoid_segfault_on_unsupported_platforms.patch

-- 
intel-vaapi-driver packaging



More information about the pkg-multimedia-commits mailing list