* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/
@ 2017-05-23 8:03 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-05-23 8:03 UTC (permalink / raw
To: gentoo-commits
commit: adf8d0f5bfd5ecefe69fcaa92449bd3a5d786a66
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 08:02:52 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 23 08:03:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf8d0f5
games-emulation/mgba: Fixed compilation with imagemagick-7 (bug #610578)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../mgba/files/mgba-0.5.2-imagemagick7.patch | 59 ++++++++++++++++++++++
games-emulation/mgba/mgba-0.5.2.ebuild | 4 ++
2 files changed, 63 insertions(+)
diff --git a/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch b/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch
new file mode 100644
index 00000000000..965e66466e5
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch
@@ -0,0 +1,59 @@
+From 2e3daaedc208824c9b8a54480bd614160cdda9e7 Mon Sep 17 00:00:00 2001
+From: Vicki Pfau <vi@endrift.com>
+Date: Wed, 18 Jan 2017 12:51:05 -0800
+Subject: [PATCH] Feature: Support ImageMagick 7
+
+---
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38120827e..6be159915 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -322,6 +322,7 @@ if(HAVE_UMASK)
+ endif()
+
+ # Feature dependencies
++set(FEATURE_DEFINES)
+ set(FEATURES)
+ if(CMAKE_SYSTEM_NAME MATCHES .*BSD)
+ set(LIBEDIT_LIBRARIES -ledit)
+@@ -431,11 +432,16 @@ if(USE_MAGICK)
+ list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
+ list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
+ string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
++ string(REGEX MATCH "^[0-9]+" MAGICKWAND_VERSION_MAJOR ${MagickWand_VERSION})
+ if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
+ set(MAGICKWAND_DEB_VERSION "5")
++ elseif(${MagickWand_VERSION} EQUAL "6.9.7")
++ set(MAGICKWAND_DEB_VERSION "-6.q16-3")
+ else()
+ set(MAGICKWAND_DEB_VERSION "-6.q16-2")
+ endif()
++ list(APPEND FEATURE_DEFINES MAGICKWAND_VERSION_MAJOR=${MAGICKWAND_VERSION_MAJOR})
++
+ set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libmagickwand${MAGICKWAND_DEB_VERSION}")
+ endif()
+
+@@ -595,7 +601,6 @@ if(USE_DEBUGGERS)
+ list(APPEND FEATURES DEBUGGERS)
+ endif()
+
+-set(FEATURE_DEFINES)
+ foreach(FEATURE IN LISTS FEATURES)
+ list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
+ endforeach()
+diff --git a/src/feature/imagemagick/imagemagick-gif-encoder.h b/src/feature/imagemagick/imagemagick-gif-encoder.h
+index 13505e6db..842cad942 100644
+--- a/src/feature/imagemagick/imagemagick-gif-encoder.h
++++ b/src/feature/imagemagick/imagemagick-gif-encoder.h
+@@ -15,7 +15,11 @@ CXX_GUARD_START
+ #define MAGICKCORE_HDRI_ENABLE 0
+ #define MAGICKCORE_QUANTUM_DEPTH 8
+
++#if MAGICKWAND_VERSION_MAJOR >= 7
++#include <MagickWand/MagickWand.h>
++#else
+ #include <wand/MagickWand.h>
++#endif
+
+ struct ImageMagickGIFEncoder {
+ struct mAVStream d;
diff --git a/games-emulation/mgba/mgba-0.5.2.ebuild b/games-emulation/mgba/mgba-0.5.2.ebuild
index d44cab6ea95..d70be6e1062 100644
--- a/games-emulation/mgba/mgba-0.5.2.ebuild
+++ b/games-emulation/mgba/mgba-0.5.2.ebuild
@@ -33,6 +33,10 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-util/cmake-3.2.2"
+PATCHES=(
+ "${FILESDIR}/${P}-imagemagick7.patch"
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/
@ 2018-07-03 14:10 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2018-07-03 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 288f883b4305bfaee177adb899a78345eb99afde
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 3 14:10:52 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 3 14:10:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288f883b
games-emulation/mgba: Fixed build against qt-5.11
Package-Manager: Portage-2.3.41, Repoman-2.3.9
games-emulation/mgba/files/mgba-0.6.3-qt511.patch | 34 +++++++++++++++++++++++
games-emulation/mgba/mgba-0.6.3.ebuild | 4 +++
2 files changed, 38 insertions(+)
diff --git a/games-emulation/mgba/files/mgba-0.6.3-qt511.patch b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
new file mode 100644
index 00000000000..05368f6e30e
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
@@ -0,0 +1,34 @@
+From a2b8c4ae807ae92103e14961fd34377b28cbe219 Mon Sep 17 00:00:00 2001
+From: Vicki Pfau <vi@endrift.com>
+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 <QAction>
+ #include <QDateTime>
+ #include <QKeyEvent>
+ #include <QPainter>
+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 <QAction>
+ #include <QDateTime>
+ #include <QList>
+ #include <QMainWindow>
diff --git a/games-emulation/mgba/mgba-0.6.3.ebuild b/games-emulation/mgba/mgba-0.6.3.ebuild
index 6674579a2fc..c4859e9bec5 100644
--- a/games-emulation/mgba/mgba-0.6.3.ebuild
+++ b/games-emulation/mgba/mgba-0.6.3.ebuild
@@ -37,6 +37,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-qt511.patch"
+)
+
src_prepare() {
cmake-utils_src_prepare
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/
@ 2020-02-17 10:12 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2020-02-17 10:12 UTC (permalink / raw
To: gentoo-commits
commit: 6dfe840af64340674835fdf4f346812ef51d9bea
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 09:59:26 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 10:12:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfe840a
games-emulation/mgba: Removed old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
games-emulation/mgba/Manifest | 1 -
games-emulation/mgba/files/mgba-0.6.3-qt511.patch | 34 ------
games-emulation/mgba/mgba-0.6.3.ebuild | 122 ----------------------
3 files changed, 157 deletions(-)
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 4907d35f3dd..6375536e59d 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,4 +1,3 @@
-DIST mgba-0.6.3.tar.gz 7442154 BLAKE2B 2b46cf36174ef0a186b1bc71784820e6ddd7754a7cae695a95dcdae96efff58af70dd14faa2f1f6194a23450943d82aed2394f7bf2821ed91bf558eef6ae9c4d SHA512 d646af7869dbcf8df671a75ecfd8c270950c013b826b23b94bacae43a77243786f198725e1b9bf17827d1ffcf6a8eef70091d53ea878bfb2450472485f42f233
DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
DIST mgba-0.8.0.tar.gz 11797469 BLAKE2B ddf1e7fe291c3bab0391a916e2e34b1adc280d6eb40ac730a5b6fe754f947061709103c480658f1fe90f9677a5cc7334200e6b16bc73d22bb178c93e8ef51de8 SHA512 47a267f7998535bbbe1fafb6e2a4d708bdafe9601f7bd50f16f37d79d78a991d49d360a2a571fc6b09ddd21450244a8c0bc37aa08d5e38b4896c25cc6f615bb2
DIST mgba-0.8.1.tar.gz 11893993 BLAKE2B 0b5db35927111a23defaf33ea67b00613c01302940db8bfe6c21aab4ec39bdb089ddbd6238ca7ccd35010724b058f78cee3ca3cbc6d7fbe0047f25a152b208fa SHA512 7873bde6a74e8a1509a3b5bba602da1c747ca1eff72adcf11f7b2572298d94766570fea0b920cb28c8b63a7d8237a15876b9feb9169edbf331b2d72f340734e2
diff --git a/games-emulation/mgba/files/mgba-0.6.3-qt511.patch b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
deleted file mode 100644
index 05368f6e30e..00000000000
--- a/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a2b8c4ae807ae92103e14961fd34377b28cbe219 Mon Sep 17 00:00:00 2001
-From: Vicki Pfau <vi@endrift.com>
-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 <QAction>
- #include <QDateTime>
- #include <QKeyEvent>
- #include <QPainter>
-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 <QAction>
- #include <QDateTime>
- #include <QList>
- #include <QMainWindow>
diff --git a/games-emulation/mgba/mgba-0.6.3.ebuild b/games-emulation/mgba/mgba-0.6.3.ebuild
deleted file mode 100644
index fa5245675b2..00000000000
--- a/games-emulation/mgba/mgba-0.6.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg imagemagick libav opengl qt5 +sdl"
-REQUIRED_USE="|| ( qt5 sdl )
- qt5? ( opengl )"
-
-RDEPEND="
- dev-db/sqlite:3
- media-libs/libpng:0=
- sys-libs/zlib[minizip]
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:= )
- )
- imagemagick? ( media-gfx/imagemagick:= )
- opengl? ( virtual/opengl )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-qt511.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Get rid of any bundled stuff we don't want
- for pkg in libpng lzma sqlite3 zlib ; do
- rm -r src/third-party/${pkg} || die
- done
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=ON
- -DBUILD_GL="$(usex opengl)"
- -DBUILD_PYTHON=OFF
- -DBUILD_QT="$(usex qt5)"
- -DBUILD_SDL="$(usex sdl)"
- -DBUILD_SHARED=ON
- # test suite fails to build (0.6.0)
- -DBUILD_SUITE=OFF
- -DBUILD_TEST=OFF
- -DM_CORE_GB=ON
- -DM_CORE_GBA=ON
- -DUSE_DEBUGGERS="$(usex debug)"
- -DUSE_EDITLINE="$(usex debug)"
- -DUSE_EPOXY=OFF
- -DUSE_FFMPEG="$(usex ffmpeg)"
- -DUSE_GDB_STUB="$(usex debug)"
- -DUSE_LIBZIP=OFF
- -DUSE_LZMA=OFF
- -DUSE_MAGICK="$(usex imagemagick)"
- -DUSE_MINIZIP=ON
- -DUSE_PNG=ON
- # build fails with sqlite being disabled (0.6.3)
- -DUSE_SQLITE3=ON
- -DUSE_ZLIB=ON
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- if use qt5 ; then
- dobin ../${P}_build/qt/${PN}-qt
- doman doc/${PN}-qt.6
- domenu res/${PN}-qt.desktop
- for size in 16 24 32 48 64 96 128 256; do
- newicon -s ${size} res/${PN}-${size}.png ${PN}.png
- done
- fi
- if use sdl ; then
- doman doc/${PN}.6
- newbin ../${P}_build/sdl/${PN} ${PN}-sdl
- fi
-
- dolib.so ../${P}_build/lib${PN}.so*
-}
-
-pkg_preinst() {
- if use qt5 ; then
- gnome2_icon_savelist
- fi
-}
-
-pkg_postinst() {
- if use qt5 ; then
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use qt5 ; then
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/
@ 2022-03-01 8:02 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2022-03-01 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 219f791f4599cf5ca3668cbbd9f5c95b20dac98c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 08:01:28 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 08:01:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219f791f
games-emulation/mgba: Revbump to fix compilation against ffmpeg-5
Closes: https://bugs.gentoo.org/834374
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../mgba/files/mgba-0.9.3-ffmpeg5.patch | 117 ++++++++++++++++++
games-emulation/mgba/mgba-0.9.3-r1.ebuild | 132 +++++++++++++++++++++
2 files changed, 249 insertions(+)
diff --git a/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch b/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
new file mode 100644
index 000000000000..cf4f6f56a2d4
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
@@ -0,0 +1,117 @@
+From cdc753516798882a805db1d2042dbce8313382bf Mon Sep 17 00:00:00 2001
+From: Ryan Tandy <ryan@nardis.ca>
+Date: Thu, 3 Feb 2022 19:02:52 -0800
+Subject: [PATCH] FFmpeg: Support FFmpeg 5.0
+
+---
+ src/feature/ffmpeg/ffmpeg-decoder.c | 3 ++-
+ src/feature/ffmpeg/ffmpeg-encoder.c | 25 ++++++++++++++-----------
+ 2 files changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/src/feature/ffmpeg/ffmpeg-decoder.c b/src/feature/ffmpeg/ffmpeg-decoder.c
+index c3bb6d1c5c..daa47fbf2c 100644
+--- a/src/feature/ffmpeg/ffmpeg-decoder.c
++++ b/src/feature/ffmpeg/ffmpeg-decoder.c
+@@ -5,6 +5,7 @@
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ #include "ffmpeg-decoder.h"
+
++#include <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+ void FFmpegDecoderInit(struct FFmpegDecoder* decoder) {
+@@ -38,7 +39,7 @@ bool FFmpegDecoderOpen(struct FFmpegDecoder* decoder, const char* infile) {
+ #else
+ enum AVMediaType type = decoder->context->streams[i]->codec->codec_type;
+ #endif
+- struct AVCodec* codec;
++ const struct AVCodec* codec;
+ struct AVCodecContext* context = NULL;
+ if (type == AVMEDIA_TYPE_VIDEO && decoder->videoStream < 0) {
+ decoder->video = avcodec_alloc_context3(NULL);
+diff --git a/src/feature/ffmpeg/ffmpeg-encoder.c b/src/feature/ffmpeg/ffmpeg-encoder.c
+index ad76ca57b2..be6bd3af5e 100644
+--- a/src/feature/ffmpeg/ffmpeg-encoder.c
++++ b/src/feature/ffmpeg/ffmpeg-encoder.c
+@@ -12,6 +12,9 @@
+
+ #include <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -121,7 +124,7 @@ bool FFmpegEncoderSetAudio(struct FFmpegEncoder* encoder, const char* acodec, un
+ return true;
+ }
+
+- AVCodec* codec = avcodec_find_encoder_by_name(acodec);
++ const AVCodec* codec = avcodec_find_encoder_by_name(acodec);
+ if (!codec) {
+ return false;
+ }
+@@ -193,7 +196,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ return true;
+ }
+
+- AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
++ const AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
+ if (!codec) {
+ return false;
+ }
+@@ -213,7 +216,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ if (encoder->pixFormat == AV_PIX_FMT_NONE) {
+ return false;
+ }
+- if (vbr < 0 && !av_opt_find(&codec->priv_class, "crf", NULL, 0, 0)) {
++ if (vbr < 0 && !av_opt_find((void*) &codec->priv_class, "crf", NULL, 0, 0)) {
+ return false;
+ }
+ encoder->videoCodec = vcodec;
+@@ -223,7 +226,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ }
+
+ bool FFmpegEncoderSetContainer(struct FFmpegEncoder* encoder, const char* container) {
+- AVOutputFormat* oformat = av_guess_format(container, 0, 0);
++ const AVOutputFormat* oformat = av_guess_format(container, 0, 0);
+ if (!oformat) {
+ return false;
+ }
+@@ -241,9 +244,9 @@ void FFmpegEncoderSetLooping(struct FFmpegEncoder* encoder, bool loop) {
+ }
+
+ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
+- AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
+- AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
+- AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
++ const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
++ const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
++ const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
+ if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !oformat || (!acodec && !vcodec)) {
+ return false;
+ }
+@@ -257,8 +260,8 @@ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
+ }
+
+ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
+- AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
+- AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
++ const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
++ const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
+ if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !FFmpegEncoderVerifyContainer(encoder)) {
+ return false;
+ }
+@@ -272,9 +275,9 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
+ encoder->currentVideoFrame = 0;
+ encoder->skipResidue = 0;
+
+- AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
++ const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
+ #ifndef USE_LIBAV
+- avformat_alloc_output_context2(&encoder->context, oformat, 0, outfile);
++ avformat_alloc_output_context2(&encoder->context, (AVOutputFormat*) oformat, 0, outfile);
+ #else
+ encoder->context = avformat_alloc_context();
+ strncpy(encoder->context->filename, outfile, sizeof(encoder->context->filename) - 1);
diff --git a/games-emulation/mgba/mgba-0.9.3-r1.ebuild b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..f2e1ddb6dd3b
--- /dev/null
+++ b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="Game Boy Advance emulator written in C"
+HOMEPAGE="https://mgba.io"
+if [[ "${PV}" == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
+else
+ MY_PV="${PV/_beta/-b}"
+ SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+ [[ "${PV}" == *_beta* ]] || \
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="debug discord elf ffmpeg gles2 gles3 opengl qt5 +sdl sqlite"
+REQUIRED_USE="|| ( qt5 sdl )
+ qt5? ( opengl )"
+
+RDEPEND="
+ media-libs/libpng:0=
+ sys-libs/zlib[minizip]
+ debug? ( dev-libs/libedit )
+ elf? ( dev-libs/elfutils )
+ ffmpeg? ( media-video/ffmpeg:= )
+ opengl? ( media-libs/libglvnd )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtwidgets:5
+ opengl? ( dev-qt/qtopengl:5 )
+ )
+ sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+ sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+ gles2? ( media-libs/libglvnd )
+ gles3? ( media-libs/libglvnd )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-ffmpeg5.patch" #834374
+)
+
+src_prepare() {
+ xdg_environment_reset
+ cmake_src_prepare
+
+ # Get rid of any bundled stuff we don't want
+ local pkg
+ for pkg in libpng lzma sqlite3 zlib ; do
+ rm -r src/third-party/${pkg} || die
+ done
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
+ -DBUILD_GL="$(usex opengl)"
+ -DBUILD_GLES2="$(usex gles2)"
+ -DBUILD_GLES3="$(usex gles3)"
+ -DBUILD_PYTHON=OFF
+ -DBUILD_QT="$(usex qt5)"
+ -DBUILD_SDL="$(usex sdl)"
+ -DBUILD_SHARED=ON
+ # test suite fails to build (>=0.6.0)
+ -DBUILD_SUITE=OFF
+ -DBUILD_TEST=OFF
+ -DM_CORE_GB=ON
+ -DM_CORE_GBA=ON
+ -DUSE_DEBUGGERS="$(usex debug)"
+ -DUSE_DISCORD_RPC="$(usex discord)"
+ -DUSE_EDITLINE="$(usex debug)"
+ -DUSE_ELF="$(usex elf)"
+ -DUSE_EPOXY=OFF
+ -DUSE_FFMPEG="$(usex ffmpeg)"
+ -DUSE_GDB_STUB="$(usex debug)"
+ -DUSE_LIBZIP=OFF
+ -DUSE_LZMA=OFF
+ -DUSE_MINIZIP=ON
+ -DUSE_PNG=ON
+ -DUSE_SQLITE3="$(usex sqlite)"
+ -DUSE_ZLIB=ON
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_install() {
+ if use qt5 ; then
+ dobin ${BUILD_DIR}/qt/${PN}-qt
+ doman doc/${PN}-qt.6
+ domenu res/${PN}-qt.desktop
+ for size in 16 24 32 48 64 96 128 256 ; do
+ newicon -s ${size} res/${PN}-${size}.png ${PN}.png
+ done
+ fi
+ if use sdl ; then
+ doman doc/${PN}.6
+ newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+ fi
+
+ dolib.so ${BUILD_DIR}/lib${PN}.so*
+}
+
+pkg_preinst() {
+ if use qt5 ; then
+ xdg_pkg_preinst
+ fi
+}
+
+pkg_postinst() {
+ if use qt5 ; then
+ xdg_pkg_postinst
+ fi
+}
+
+pkg_postrm() {
+ if use qt5 ; then
+ xdg_pkg_postrm
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/
@ 2024-05-06 14:48 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2024-05-06 14:48 UTC (permalink / raw
To: gentoo-commits
commit: ef95b8d7d6e3f6bd16348d4f2fc31a083859fb87
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 14:45:55 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 6 14:47:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef95b8d7
games-emulation/mgba: fix bundled rapidjson with gcc14
(only used with USE=discord)
Closes: https://bugs.gentoo.org/924019
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch | 17 +++++++++++++++++
games-emulation/mgba/mgba-0.10.3.ebuild | 1 +
games-emulation/mgba/mgba-9999.ebuild | 1 +
3 files changed, 19 insertions(+)
diff --git a/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch b/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch
new file mode 100644
index 000000000000..516c81199bda
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/924019
+(same as https://bugs.gentoo.org/914583 given rapidjson is bundled)
+
+https://github.com/Tencent/rapidjson/issues/718
+https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96
+From: Janusz Chorko <janusz.chorko@apdu.pl>
+Date: Fri, 26 Aug 2016 21:17:38 +0200
+Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718
+--- a/src/third-party/discord-rpc/include/rapidjson/document.h
++++ b/src/third-party/discord-rpc/include/rapidjson/document.h
+@@ -317,6 +317,4 @@
+ GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
+
+- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
+-
+ //! implicit conversion to plain CharType pointer
+ operator const Ch *() const { return s; }
diff --git a/games-emulation/mgba/mgba-0.10.3.ebuild b/games-emulation/mgba/mgba-0.10.3.ebuild
index 1ae84af200cd..0e746e84b175 100644
--- a/games-emulation/mgba/mgba-0.10.3.ebuild
+++ b/games-emulation/mgba/mgba-0.10.3.ebuild
@@ -60,6 +60,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
+ "${FILESDIR}"/${PN}-0.10.3-rapidjson-gcc14-const.patch
)
pkg_setup() {
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index d4ce0e18832b..97441a1c618f 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -63,6 +63,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
+ "${FILESDIR}"/${PN}-0.10.3-rapidjson-gcc14-const.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/
@ 2025-01-07 6:49 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2025-01-07 6:49 UTC (permalink / raw
To: gentoo-commits
commit: b3b4cd81b5d3adb6fa51e4ccce5e81740ed589b3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 7 05:56:59 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 06:47:58 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b4cd81
games-emulation/mgba: drop 0.10.3
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/mgba/Manifest | 1 -
.../files/mgba-0.10.3-rapidjson-gcc14-const.patch | 17 ---
games-emulation/mgba/mgba-0.10.3.ebuild | 117 ---------------------
3 files changed, 135 deletions(-)
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 959842c7dfee..3470bf45e307 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,2 +1 @@
-DIST mgba-0.10.3.tar.gz 14350721 BLAKE2B 2109c53455ece7beba0af30787cd75cad85db334be44e41b51f579f813393f8d83c5c9537832b190bb8b0ac1c28d78e92adb6af23191b17b463847df3360f656 SHA512 de92725a18f00ec8645a75cf434a667bfc5aba954d0ae8be188241371a4a310214123be2cec13d20dbff4f660b401364efb51c43c7bdc24eea40454949062a52
DIST mgba-0.10.4.tar.gz 14355132 BLAKE2B 1f99fd1f79e1645f2de8c1fbd07bdc4996fbc12263fd14b3588e0dcccff910780be73ed92084e53ed873f5e55eef70a983afee2f3f0bd166c578a03bcf57ea0b SHA512 300c09ae8d6dc9677aabb6771345da42b78dc2e4e63e14f1fc404b89737e5161f412f4903488fd222fcf3ac9b0161ba5947a099cd9b5095137d100ce14a14aa3
diff --git a/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch b/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch
deleted file mode 100644
index 516c81199bda..000000000000
--- a/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/924019
-(same as https://bugs.gentoo.org/914583 given rapidjson is bundled)
-
-https://github.com/Tencent/rapidjson/issues/718
-https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96
-From: Janusz Chorko <janusz.chorko@apdu.pl>
-Date: Fri, 26 Aug 2016 21:17:38 +0200
-Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718
---- a/src/third-party/discord-rpc/include/rapidjson/document.h
-+++ b/src/third-party/discord-rpc/include/rapidjson/document.h
-@@ -317,6 +317,4 @@
- GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
-
-- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
--
- //! implicit conversion to plain CharType pointer
- operator const Ch *() const { return s; }
diff --git a/games-emulation/mgba/mgba-0.10.3.ebuild b/games-emulation/mgba/mgba-0.10.3.ebuild
deleted file mode 100644
index 0e746e84b175..000000000000
--- a/games-emulation/mgba/mgba-0.10.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3..4} )
-inherit cmake lua-single xdg
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
-else
- SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-DESCRIPTION="Game Boy Advance Emulator"
-HOMEPAGE="https://mgba.io/"
-
-LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="
- debug discord elf ffmpeg gles2 gles3 gui libretro
- lua +opengl +sdl +sqlite test
-"
-REQUIRED_USE="
- gui? ( || ( gles2 gles3 opengl ) sqlite )
- lua? ( ${LUA_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- media-libs/libpng:=
- sys-libs/zlib:=[minizip]
- debug? ( dev-libs/libedit )
- elf? ( dev-libs/elfutils )
- ffmpeg? ( media-video/ffmpeg:= )
- gles2? ( media-libs/libglvnd )
- gles3? ( media-libs/libglvnd )
- lua? ( ${LUA_DEPS} )
- opengl? ( media-libs/libglvnd )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- )
- sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
- sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="
- ${RDEPEND}
- test? ( dev-util/cmocka )
-"
-BDEPEND="
- gui? ( dev-qt/linguist-tools:5 )
- lua? ( virtual/pkgconfig )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
- "${FILESDIR}"/${PN}-0.10.3-rapidjson-gcc14-const.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CINEMA=$(usex test)
- -DBUILD_GL=$(usex opengl)
- -DBUILD_GLES2=$(usex gles2)
- -DBUILD_GLES3=$(usex gles3)
- -DBUILD_LIBRETRO=$(usex libretro)
- -DBUILD_QT=$(usex gui)
- -DBUILD_ROM_TEST=yes #918855
- -DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
- -DBUILD_SUITE=$(usex test)
- -DBUILD_UPDATER=no
- -DENABLE_SCRIPTING=$(usex lua)
- -DMARKDOWN=no #752048
- -DUSE_DEBUGGERS=$(usex debug)
- -DUSE_DISCORD_RPC=$(usex discord)
- -DUSE_EDITLINE=$(usex debug)
- -DUSE_ELF=$(usex elf)
- -DUSE_EPOXY=no
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GDB_STUB=$(usex debug)
- -DUSE_LIBZIP=no
- -DUSE_LZMA=yes
- -DUSE_MINIZIP=yes
- -DUSE_PNG=yes
- -DUSE_SQLITE3=$(usex sqlite)
- -DUSE_ZLIB=yes
- $(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
- )
- use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
-
- cmake_src_configure
-}
-
-src_test() {
- # CMakeLists.txt forces SKIP_RPATH=yes when PREFIX=/usr
- local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- use !test || rm "${ED}"/usr/bin/mgba-cinema || die
-
- rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-01-07 6:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-23 8:03 [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2018-07-03 14:10 Lars Wendler
2020-02-17 10:12 Lars Wendler
2022-03-01 8:02 Lars Wendler
2024-05-06 14:48 Ionen Wolkens
2025-01-07 6:49 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox