diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -5,10 +5,10 @@ libQt5OpenGL.so.5 libQt5Widgets.so.5 libSDL2-2.0.so.0 -libavcodec.so.57 -libavformat.so.57 -libavresample.so.3 -libavutil.so.55 +libavcodec.so.58 +libavformat.so.58 +libavresample.so.4 +libavutil.so.56 libc.so.6 libdl.so.2 libepoxy.so.0 @@ -17,6 +17,6 @@ libpng16.so.16 libpthread.so.0 libstdc++.so.6 -libswscale.so.4 +libswscale.so.5 libz.so.1 libzip.so.5 diff --git a/files/Qt5.11_fix.patch b/files/Qt5.11_fix.patch new file mode 100644 --- /dev/null +++ b/files/Qt5.11_fix.patch @@ -0,0 +1,35 @@ +From a2b8c4ae807ae92103e14961fd34377b28cbe219 Mon Sep 17 00:00:00 2001 +From: Vicki Pfau +Date: Fri, 25 May 2018 18:04:16 -0700 +Subject: [PATCH] Qt: Fix build with Qt 5.11 + +--- + src/platform/qt/LoadSaveState.cpp | 1 + + src/platform/qt/Window.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/platform/qt/LoadSaveState.cpp b/src/platform/qt/LoadSaveState.cpp +index a381c3d22..41ddb842e 100644 +--- a/src/platform/qt/LoadSaveState.cpp ++++ b/src/platform/qt/LoadSaveState.cpp +@@ -10,6 +10,7 @@ + #include "GamepadButtonEvent.h" + #include "VFileDevice.h" + ++#include + #include + #include + #include +diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h +index c009c7ffa..8ee63907d 100644 +--- a/src/platform/qt/Window.h ++++ b/src/platform/qt/Window.h +@@ -6,6 +6,7 @@ + #ifndef QGBA_WINDOW + #define QGBA_WINDOW + ++#include + #include + #include + #include + diff --git a/files/fix-build-with-Qt-5.10.patch b/files/fix-build-with-Qt-5.10.patch deleted file mode 100644 --- a/files/fix-build-with-Qt-5.10.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8dc8d51c8f807d252b4374dc27318720e39bd745 Mon Sep 17 00:00:00 2001 -From: ilovezfs -Date: Mon, 11 Dec 2017 00:39:32 -0800 -Subject: [PATCH] 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(-) - -diff --git a/src/platform/qt/MemoryModel.cpp b/src/platform/qt/MemoryModel.cpp -index 92fb2aa98..e2ad0700a 100644 ---- a/src/platform/qt/MemoryModel.cpp -+++ b/src/platform/qt/MemoryModel.cpp -@@ -99,7 +99,7 @@ void MemoryModel::setRegion(uint32_t base, uint32_t size, const QString& name, i - 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 --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,25 +1,25 @@ name : mgba -version : 0.6.1 -release : 27 +version : 0.6.3 +release : 28 source : - - https://github.com/mgba-emu/mgba/archive/0.6.1.zip : 1a8d429b323c032bc8d38e3c70c5371d0fa861933b9479cefc3f04ddc1a17fbb + - https://github.com/mgba-emu/mgba/archive/0.6.3.tar.gz : 35c8906c01206adae714fee9c2bc39698c514a4adb32c9c4a5a3fa58b2d10f9a license : MPL-2.0 component : games.emulator -summary : Game Boy Advance emulator written in C. +summary : Game Boy Advance emulator written in C description: mGBA is a new Game Boy Advance emulator written in C. builddeps : + - pkgconfig(MagickWand) + - pkgconfig(Qt5Multimedia) - pkgconfig(epoxy) - - pkgconfig(gl) - pkgconfig(libavcodec) - pkgconfig(libpng) - pkgconfig(libzip) - - pkgconfig(MagickWand) - - pkgconfig(Qt5Multimedia) - pkgconfig(sdl2) - bzip2-devel - desktop-file-utils setup : | - %patch -p1 < $pkgfiles/fix-build-with-Qt-5.10.patch + %patch -p1 < $pkgfiles/Qt5.11_fix.patch + sed -i 's/wand\/MagickWand.h/ImageMagick-7\/MagickWand\/MagickWand.h/g' src/feature/imagemagick/imagemagick-gif-encoder.h %cmake -DBUILD_QT=ON -DUSE_EPOXY=ON build : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -7,20 +7,23 @@ MPL-2.0 games.emulator - Game Boy Advance emulator written in C. + Game Boy Advance emulator written in C mGBA is a new Game Boy Advance emulator written in C. https://solus-project.com/sources/README.Solus mgba - Game Boy Advance emulator written in C. + Game Boy Advance emulator written in C mGBA is a new Game Boy Advance emulator written in C. games.emulator - /usr/bin - /usr/lib64/lib*.so.* + /usr/bin/mgba + /usr/bin/mgba-qt + /usr/lib64/libmgba.so.0.6 + /usr/lib64/libmgba.so.0.6.1 /usr/share/applications/mgba-qt.desktop - /usr/share/doc + /usr/share/doc/mGBA/CHANGES + /usr/share/doc/mGBA/README.md /usr/share/icons/hicolor/128x128/apps/mgba.png /usr/share/icons/hicolor/16x16/apps/mgba.png /usr/share/icons/hicolor/24x24/apps/mgba.png @@ -30,8 +33,39 @@ /usr/share/icons/hicolor/512x512/apps/mgba.png /usr/share/icons/hicolor/64x64/apps/mgba.png /usr/share/icons/hicolor/96x96/apps/mgba.png - /usr/share/man - /usr/share/mgba + /usr/share/man/man6/mgba-qt.6 + /usr/share/man/man6/mgba.6 + /usr/share/mgba/nointro.dat + /usr/share/mgba/shaders/agb001.shader/agb001.fs + /usr/share/mgba/shaders/agb001.shader/manifest.ini + /usr/share/mgba/shaders/ags001.shader/ags001-light.fs + /usr/share/mgba/shaders/ags001.shader/ags001.fs + /usr/share/mgba/shaders/ags001.shader/manifest.ini + /usr/share/mgba/shaders/fish.shader/fish.fs + /usr/share/mgba/shaders/fish.shader/manifest.ini + /usr/share/mgba/shaders/gba-color.shader/gba-color.fs + /usr/share/mgba/shaders/gba-color.shader/manifest.ini + /usr/share/mgba/shaders/lcd.shader/lcd.fs + /usr/share/mgba/shaders/lcd.shader/manifest.ini + /usr/share/mgba/shaders/motion_blur.shader/manifest.ini + /usr/share/mgba/shaders/motion_blur.shader/motion_blur.fs + /usr/share/mgba/shaders/pixelate.shader/manifest.ini + /usr/share/mgba/shaders/scanlines.shader/manifest.ini + /usr/share/mgba/shaders/scanlines.shader/scanlines.fs + /usr/share/mgba/shaders/soften.shader/manifest.ini + /usr/share/mgba/shaders/soften.shader/soften.fs + /usr/share/mgba/shaders/vba_pixelate.shader/manifest.ini + /usr/share/mgba/shaders/vba_pixelate.shader/vba_pixelate.fs + /usr/share/mgba/shaders/vignette.shader/manifest.ini + /usr/share/mgba/shaders/vignette.shader/vignette.fs + /usr/share/mgba/shaders/wiiu.shader/manifest.ini + /usr/share/mgba/shaders/wiiu.shader/wiiu.fs + /usr/share/mgba/shaders/xbr-lv2.shader/manifest.ini + /usr/share/mgba/shaders/xbr-lv2.shader/xbr.fs + /usr/share/mgba/shaders/xbr-lv2.shader/xbr.vs + /usr/share/mgba/shaders/xbr-lv3.shader/manifest.ini + /usr/share/mgba/shaders/xbr-lv3.shader/xbr.fs + /usr/share/mgba/shaders/xbr-lv3.shader/xbr.vs @@ -40,19 +74,19 @@ mGBA is a new Game Boy Advance emulator written in C. programming.devel - mgba + mgba - /usr/include/ + /usr/include/mgba/flags.h - - 2018-05-07 - 0.6.1 + + 2018-08-10 + 0.6.3 Packaging update Pierre-Yves pyu@riseup.net \ No newline at end of file