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
1diff --git a/debian/changelog b/debian/changelog
2index fde762f..dfcd457 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+intel-mediasdk (22.5.4-1ubuntu1) noble; urgency=medium
7+
8+ * debian/patches/fix-missing-includes.patch: Add missing header
9+ includes. (LP: #2062948).
10+
11+ -- Zixing Liu <zixing.liu@canonical.com> Fri, 19 Apr 2024 21:28:56 -0600
12+
13 intel-mediasdk (22.5.4-1) unstable; urgency=medium
14
15 * New upstream release.
16diff --git a/debian/control b/debian/control
17index 37bc200..304a70f 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,7 +1,8 @@
21 Source: intel-mediasdk
22 Section: libs
23 Priority: optional
24-Maintainer: Timo Aaltonen <tjaalton@debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Timo Aaltonen <tjaalton@debian.org>
27 Build-Depends: debhelper-compat (= 12),
28 cmake,
29 libdrm-dev,
30diff --git a/debian/patches/fix-missing-includes.patch b/debian/patches/fix-missing-includes.patch
31new file mode 100644
32index 0000000..6e83ecd
33--- /dev/null
34+++ b/debian/patches/fix-missing-includes.patch
35@@ -0,0 +1,18 @@
36+Description: Add missing header includes
37+Author: Zixing Liu <zixing.liu@canonical.com>
38+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1037699
39+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2062948
40+Forwarded: no
41+Last-Update: 2024-04-19
42+---
43+--- intel-mediasdk-22.5.4.orig/api/mfx_dispatch/linux/mfxparser.cpp
44++++ intel-mediasdk-22.5.4/api/mfx_dispatch/linux/mfxparser.cpp
45+@@ -22,7 +22,7 @@
46+ #include <stdio.h>
47+ #include <stdlib.h>
48+ #include <string.h>
49+-
50++#include <cstdint>
51+ #include <list>
52+
53+ #include "mfxloader.h"
54diff --git a/debian/patches/series b/debian/patches/series
55index a82d1b4..77fdfd9 100644
56--- a/debian/patches/series
57+++ b/debian/patches/series
58@@ -1 +1,2 @@
59 #placeholder
60+fix-missing-includes.patch

Subscribers

People subscribed via source and target branches

to all changes: