Merge ~liushuyu-011/ubuntu/+source/intel-mediasdk:ubuntu/devel into ubuntu/+source/intel-mediasdk:ubuntu/devel

Proposed by Zixing Liu
Status: Needs review
Proposed branch: ~liushuyu-011/ubuntu/+source/intel-mediasdk:ubuntu/devel
Merge into: ubuntu/+source/intel-mediasdk:ubuntu/devel
Diff against target: 60 lines (+28/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/fix-missing-includes.patch (+18/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+464771@code.launchpad.net

Description of the change

This MP fixes FTBFS on amd64 due to missing a header

To post a comment you must log in.
Revision history for this message
Zixing Liu (liushuyu-011) wrote :

Unmerged commits

c6d63b9... by Zixing Liu

changelog for GCC 13 patch

d9c0c08... by Zixing Liu

d/p/fix-missing-includes.patch: add a patch to fix build with GCC 13

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index fde762f..dfcd457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1intel-mediasdk (22.5.4-1ubuntu1) noble; urgency=medium
2
3 * debian/patches/fix-missing-includes.patch: Add missing header
4 includes. (LP: #2062948).
5
6 -- Zixing Liu <zixing.liu@canonical.com> Fri, 19 Apr 2024 21:28:56 -0600
7
1intel-mediasdk (22.5.4-1) unstable; urgency=medium8intel-mediasdk (22.5.4-1) unstable; urgency=medium
29
3 * New upstream release.10 * New upstream release.
diff --git a/debian/control b/debian/control
index 37bc200..304a70f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: intel-mediasdk1Source: intel-mediasdk
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4Maintainer: Timo Aaltonen <tjaalton@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Timo Aaltonen <tjaalton@debian.org>
5Build-Depends: debhelper-compat (= 12),6Build-Depends: debhelper-compat (= 12),
6 cmake,7 cmake,
7 libdrm-dev,8 libdrm-dev,
diff --git a/debian/patches/fix-missing-includes.patch b/debian/patches/fix-missing-includes.patch
8new file mode 1006449new file mode 100644
index 0000000..6e83ecd
--- /dev/null
+++ b/debian/patches/fix-missing-includes.patch
@@ -0,0 +1,18 @@
1Description: Add missing header includes
2Author: Zixing Liu <zixing.liu@canonical.com>
3Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1037699
4Bug-Ubuntu: https://bugs.launchpad.net/bugs/2062948
5Forwarded: no
6Last-Update: 2024-04-19
7---
8--- intel-mediasdk-22.5.4.orig/api/mfx_dispatch/linux/mfxparser.cpp
9+++ intel-mediasdk-22.5.4/api/mfx_dispatch/linux/mfxparser.cpp
10@@ -22,7 +22,7 @@
11 #include <stdio.h>
12 #include <stdlib.h>
13 #include <string.h>
14-
15+#include <cstdint>
16 #include <list>
17
18 #include "mfxloader.h"
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..77fdfd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
1#placeholder1#placeholder
2fix-missing-includes.patch

Subscribers

People subscribed via source and target branches

to all changes: