Control: tags 884392 + pending
Control: tags 888325 + pending
Control: tags 895496 + patch
Control: tags 895496 + pending
Dear maintainer,
I've prepared an NMU for mgba (versioned as 0.5.2+dfsg1-3.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru mgba-0.5.2+dfsg1/debian/changelog mgba-0.5.2+dfsg1/debian/changelog
--- mgba-0.5.2+dfsg1/debian/changelog 2017-08-17 22:39:12.000000000 +0300
+++ mgba-0.5.2+dfsg1/debian/changelog 2018-05-10 17:53:34.000000000 +0300
@@ -1,3 +1,14 @@
+mgba (0.5.2+dfsg1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with Qt 5.10,
+ thanks to Juhani Numminen. (Closes: #895496)
+ * Fix FTBFS on armel. (Closes: #884392)
+ * Add patch from James Cowgill to fix FTBFS with FFmpeg 4.0.
+ (Closes: #888325)
+
+ -- Adrian Bunk <b...@debian.org> Thu, 10 May 2018 17:53:34 +0300
+
mgba (0.5.2+dfsg1-3) unstable; urgency=medium
* Team upload.
diff -Nru mgba-0.5.2+dfsg1/debian/control mgba-0.5.2+dfsg1/debian/control
--- mgba-0.5.2+dfsg1/debian/control 2017-08-17 22:39:12.000000000 +0300
+++ mgba-0.5.2+dfsg1/debian/control 2018-05-10 17:53:34.000000000 +0300
@@ -11,7 +11,7 @@
libavresample-dev,
libavutil-dev,
libedit-dev,
- libepoxy-dev [armhf],
+ libepoxy-dev [armel armhf],
libmagickwand-dev,
libpng-dev,
libqt5opengl5-dev,
diff -Nru mgba-0.5.2+dfsg1/debian/patches/0001-Qt-Fix-build-with-Qt-5.10.patch mgba-0.5.2+dfsg1/debian/patches/0001-Qt-Fix-build-with-Qt-5.10.patch
--- mgba-0.5.2+dfsg1/debian/patches/0001-Qt-Fix-build-with-Qt-5.10.patch 1970-01-01 02:00:00.000000000 +0200
+++ mgba-0.5.2+dfsg1/debian/patches/0001-Qt-Fix-build-with-Qt-5.10.patch 2018-05-10 17:53:34.000000000 +0300
@@ -0,0 +1,23 @@
+From e31373560535203d826687044290a4994706c2dd Mon Sep 17 00:00:00 2001
+From: ilovezfs <ilove...@icloud.com>
+Date: Mon, 11 Dec 2017 00:39:32 -0800
+Subject: Qt: Fix build with Qt 5.10
+
+Fixes "MemoryModel.cpp:102:15: error: no viable overloaded '='"
+---
+ src/platform/qt/MemoryModel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: mgba-0.5.2+dfsg1/src/platform/qt/MemoryModel.cpp
+===================================================================
+--- mgba-0.5.2+dfsg1.orig/src/platform/qt/MemoryModel.cpp
++++ mgba-0.5.2+dfsg1/src/platform/qt/MemoryModel.cpp
+@@ -94,7 +94,7 @@ void MemoryModel::setRegion(uint32_t bas
+ m_top = 0;
+ m_base = base;
+ m_size = size;
+- m_regionName = name;
++ m_regionName = QStaticText(name);
+ m_regionName.prepare(QTransform(), m_font);
+ m_currentBank = segment;
+ verticalScrollBar()->setRange(0, (size >> 4) + 1 - viewport()->size().height() / m_cellHeight);
diff -Nru mgba-0.5.2+dfsg1/debian/patches/ffmpeg4.0.patch mgba-0.5.2+dfsg1/debian/patches/ffmpeg4.0.patch
--- mgba-0.5.2+dfsg1/debian/patches/ffmpeg4.0.patch 1970-01-01 02:00:00.000000000 +0200
+++ mgba-0.5.2+dfsg1/debian/patches/ffmpeg4.0.patch 2018-05-10 17:53:34.000000000 +0300
@@ -0,0 +1,20 @@
+--- a/src/feature/ffmpeg/ffmpeg-encoder.c
++++ b/src/feature/ffmpeg/ffmpeg-encoder.c
+@@ -229,7 +229,7 @@ bool FFmpegEncoderOpen(struct FFmpegEnco
+ AVDictionary* opts = 0;
+ av_dict_set(&opts, "strict", "-2", 0);
+ if (encoder->context->oformat->flags & AVFMT_GLOBALHEADER) {
+- encoder->audio->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ encoder->audio->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ }
+ avcodec_open2(encoder->audio, acodec, &opts);
+ av_dict_free(&opts);
+@@ -291,7 +291,7 @@ bool FFmpegEncoderOpen(struct FFmpegEnco
+ encoder->video->gop_size = 60;
+ encoder->video->max_b_frames = 3;
+ if (encoder->context->oformat->flags & AVFMT_GLOBALHEADER) {
+- encoder->video->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ encoder->video->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ }
+ if (strcmp(vcodec->name, "libx264") == 0) {
+ // Try to adaptively figure out when you can use a slower encoder
diff -Nru mgba-0.5.2+dfsg1/debian/patches/series mgba-0.5.2+dfsg1/debian/patches/series
--- mgba-0.5.2+dfsg1/debian/patches/series 2017-08-17 22:39:12.000000000 +0300
+++ mgba-0.5.2+dfsg1/debian/patches/series 2018-05-10 17:53:34.000000000 +0300
@@ -1,3 +1,5 @@
01_fix-about-strings.patch
02_fix-GB-saves.patch
gcc7.patch
+0001-Qt-Fix-build-with-Qt-5.10.patch
+ffmpeg4.0.patch
