+++ /dev/null
---- vbam-1.8.0.1228/src/common/ffmpeg.cpp
-+++ vbam-1.8.0.1228/src/common/ffmpeg.cpp
-@@ -178,17 +178,31 @@ MediaRet MediaRecorder::setup_video_stre
- // make sure RGB is supported (mostly not)
- if(codec->pix_fmts) {
- const enum PixelFormat *p;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- int64_t mask = 0;
-+#endif
- for(p = codec->pix_fmts; *p != -1; p++) {
- // may get complaints about 1LL; thus the cast
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- mask |= ((int64_t)1) << *p;
-+#endif
- if(*p == pixfmt)
- break;
- }
- if(*p == -1) {
- // if not supported, use a converter to the next best format
- // this is swscale, the converter used by the output demo
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- enum PixelFormat dp = (PixelFormat)avcodec_find_best_pix_fmt(mask, pixfmt, 0, NULL);
-+#else
-+#if LIBAVCODEC_VERSION_MICRO >= 100
-+// FFmpeg
-+ enum AVPixelFormat dp = avcodec_find_best_pix_fmt_of_list(codec->pix_fmts, pixfmt, 0, NULL);
-+#else
-+// Libav
-+ enum AVPixelFormat dp = avcodec_find_best_pix_fmt2(codec->pix_fmts, pixfmt, 0, NULL);
-+#endif
-+#endif
- if(dp == -1)
- dp = codec->pix_fmts[0];
- if(!(convpic = avcodec_alloc_frame()) ||
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-
-inherit eutils cmake-utils wxwidgets gnome2-utils fdo-mime games
-
-ESVN_REPO_URI="https://vbam.svn.sourceforge.net/svnroot/vbam/trunk"
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="http://sourceforge.net/projects/vbam/"
-SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="|| ( sdl gtk wxwidgets )"
-
-RDEPEND=">=media-libs/libpng-1.4:0=
- media-libs/libsdl[joystick]
- link? ( <media-libs/libsfml-2.0 )
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- ffmpeg? ( virtual/ffmpeg[-libav] )
- gtk? ( >=dev-cpp/glibmm-2.4.0:2
- >=dev-cpp/gtkmm-2.4.0:2.4
- >=dev-cpp/gtkglextmm-1.2.0 )
- lirc? ( app-misc/lirc )
- nls? ( virtual/libintl )
- wxwidgets? (
- cairo? ( x11-libs/cairo )
- openal? ( media-libs/openal )
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
- )"
-DEPEND="${RDEPEND}
- wxwidgets? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
- x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
- nls? ( sys-devel/gettext )
- app-arch/xz-utils
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ffmpeg2.patch
- epatch "${FILESDIR}"/${P}-header.patch
-
- # fix issue with zlib-1.2.5.1 macros (bug #383179)
- sed -i '1i#define OF(x) x' src/common/memgzio.c || die
-
- sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
- CMakeLists.txt src/wx/CMakeLists.txt || die
-
- # fix desktop file QA warnings
- edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_enable cairo CAIRO)
- $(cmake-utils_use_enable ffmpeg FFMPEG)
- $(cmake-utils_use_enable gtk GTK)
- $(cmake-utils_use_enable link LINK)
- $(cmake-utils_use_enable lirc LIRC)
- $(cmake-utils_use_enable nls NLS)
- $(cmake-utils_use_enable openal OPENAL)
- $(cmake-utils_use_enable sdl SDL)
- $(cmake-utils_use_enable wxwidgets WX)
- $(cmake-utils_use_enable x86 ASM_CORE)
- $(cmake-utils_use_enable x86 ASM_SCALERS)
- -DCMAKE_SKIP_RPATH=ON
- -DDATA_INSTALL_DIR=share/games/${PN}
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use sdl ; then
- dodoc doc/ReadMe.SDL.txt || die
- doman debian/vbam.1 || die
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- if use gtk || use wxwidgets ; then
- gnome2_icon_savelist
- fi
-}
-
-pkg_postinst() {
- games_pkg_postinst
- if use gtk || use wxwidgets ; then
- gnome2_icon_cache_update
- fi
- use gtk && fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- if use gtk || use wxwidgets ; then
- gnome2_icon_cache_update
- fi
- use gtk && fdo-mime_desktop_database_update
-}