Date: Saturday, January 21, 2023 @ 04:37:19 Author: blakkheim Revision: 1387220
minor cleanup - add maintainer line - use _pkgname variable for longer name - comment out pkgver() since we're using a release - add git rev-parse comment - add -Wno-dev cmake flag - drop unused ffmpeg patch Modified: vbam/trunk/PKGBUILD Deleted: vbam/trunk/vbam-ffmpeg5.0.patch ----------------------+ PKGBUILD | 27 ++++++++++++++++----------- vbam-ffmpeg5.0.patch | 44 -------------------------------------------- 2 files changed, 16 insertions(+), 55 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-01-21 04:23:42 UTC (rev 1387219) +++ PKGBUILD 2023-01-21 04:37:19 UTC (rev 1387220) @@ -1,4 +1,5 @@ # Maintainer: Maxime Gauduin <[email protected]> +# Maintainer: T.J. Townsend <[email protected]> # Contributor: Bartłomiej Piotrowski <[email protected]> pkgbase=vbam @@ -6,6 +7,7 @@ vbam-sdl vbam-wx ) +_pkgname=visualboyadvance-m pkgver=2.1.5 pkgrel=1 pkgdesc='Nintendo GameBoy Advance emulator' @@ -34,32 +36,34 @@ wxwidgets-gtk3 zip ) -_tag=a964f4a5c69ce30d124bd6dcf987bdedc82f3928 -source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git?signed#tag=${_tag}) +_tag=a964f4a5c69ce30d124bd6dcf987bdedc82f3928 # git rev-parse v${pkgver} +source=("git+https://github.com/${_pkgname}/${_pkgname}.git?signed#tag=${_tag}";) b2sums=('SKIP') validpgpkeys=(A0C0E526E36FD2138C149D4D08AB596679D86240) # Rafael Kitover <[email protected]> prepare() { - cd visualboyadvance-m + cd ${_pkgname} # Unbundle doctest (bundled one is not glibc 2.34 compatible) sed -e 's|${CMAKE_SOURCE_DIR}/third_party|/usr|' -i src/wx/tests/CMakeLists.txt } -pkgver() { - cd visualboyadvance-m - git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./' -} +#pkgver() { +# cd ${_pkgname} +# git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./' +#} build() { - cmake -S visualboyadvance-m -B build-sdl -G Ninja \ + cmake -S ${_pkgname} -B build-sdl -G Ninja \ -DCMAKE_BUILD_TYPE='' \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=TRUE \ -DENABLE_SDL=TRUE \ -DENABLE_WX=FALSE \ - -DENABLE_LINK=TRUE + -DENABLE_LINK=TRUE \ + -Wno-dev cmake --build build-sdl - cmake -S visualboyadvance-m -B build-wx -G Ninja \ + + cmake -S ${_pkgname} -B build-wx -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=TRUE \ @@ -66,7 +70,8 @@ -DENABLE_SDL=FALSE \ -DENABLE_WX=TRUE \ -DENABLE_FFMPEG=TRUE \ - -DENABLE_LINK=TRUE + -DENABLE_LINK=TRUE \ + -Wno-dev cmake --build build-wx } Deleted: vbam-ffmpeg5.0.patch =================================================================== --- vbam-ffmpeg5.0.patch 2023-01-21 04:23:42 UTC (rev 1387219) +++ vbam-ffmpeg5.0.patch 2023-01-21 04:37:19 UTC (rev 1387220) @@ -1,44 +0,0 @@ -diff --git a/src/common/ffmpeg.cpp b/src/common/ffmpeg.cpp -index 0c2161ad..55e395b2 100644 ---- a/src/common/ffmpeg.cpp -+++ b/src/common/ffmpeg.cpp -@@ -99,7 +99,7 @@ recording::MediaRet recording::MediaRecorder::setup_audio_stream() - if (!ast) return MRET_ERR_BUFSIZE; - ast->id = oc->nb_streams - 1; - // audio codec -- acodec = avcodec_find_encoder(fmt->audio_codec); -+ const AVCodec* acodec = avcodec_find_encoder(fmt->audio_codec); - if (!acodec) return MRET_ERR_NOCODEC; - // audio codec context - aenc = avcodec_alloc_context3(acodec); -@@ -254,7 +254,7 @@ recording::MediaRet recording::MediaRecorder::setup_video_stream(int width, int - st->id = oc->nb_streams - 1; - st->time_base = { 1, STREAM_FRAME_RATE }; - // video codec -- vcodec = avcodec_find_encoder(fmt->video_codec); -+ const AVCodec* vcodec = avcodec_find_encoder(fmt->video_codec); - if (!vcodec) return MRET_ERR_FMTGUESS; - // codec context - enc = avcodec_alloc_context3(vcodec); -@@ -510,7 +510,7 @@ recording::MediaRet recording::MediaRecorder::setup_common(const char *fname) - { - avformat_alloc_output_context2(&oc, NULL, NULL, fname); - if (!oc) return MRET_ERR_BUFSIZE; -- fmt = oc->oformat; -+ const AVOutputFormat* fmt = oc->oformat; - return MRET_OK; - } - -diff --git a/src/common/ffmpeg.h b/src/common/ffmpeg.h -index 1f981693..3bcbb588 100644 ---- a/src/common/ffmpeg.h -+++ b/src/common/ffmpeg.h -@@ -20,6 +20,7 @@ extern "C" { - #define UINT64_C(c) (c ## ULL) - #endif - -+#include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> - #include <libavutil/avassert.h> - #include <libavutil/channel_layout.h> -
