[arch-commits] Commit in vbam/repos/community-x86_64 (4 files)
Maxime Gauduin
alucryd at gemini.archlinux.org
Tue Aug 23 08:11:54 UTC 2022
Date: Tuesday, August 23, 2022 @ 08:11:53
Author: alucryd
Revision: 1274936
archrelease: copy trunk to community-x86_64
Added:
vbam/repos/community-x86_64/PKGBUILD
(from rev 1274935, vbam/trunk/PKGBUILD)
vbam/repos/community-x86_64/vbam-ffmpeg5.0.patch
(from rev 1274935, vbam/trunk/vbam-ffmpeg5.0.patch)
Deleted:
vbam/repos/community-x86_64/PKGBUILD
vbam/repos/community-x86_64/vbam-ffmpeg5.0.patch
----------------------+
PKGBUILD | 198 ++++++++++++++++++++++++-------------------------
vbam-ffmpeg5.0.patch | 88 ++++++++++-----------
2 files changed, 143 insertions(+), 143 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-23 08:11:42 UTC (rev 1274935)
+++ PKGBUILD 2022-08-23 08:11:53 UTC (rev 1274936)
@@ -1,99 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=vbam
-pkgname=(
- vbam-sdl
- vbam-wx
-)
-pkgver=2.1.4.r568.639003a8
-pkgrel=1
-pkgdesc='Nintendo GameBoy Advance emulator'
-arch=(x86_64)
-url=https://vba-m.com
-license=(GPL2)
-depends=(
- glu
- libavcodec.so
- libavformat.so
- libavutil.so
- libswscale.so
- libgl
- libpng
- sdl2
- sfml
- zlib
-)
-makedepends=(
- cmake
- doctest
- ffmpeg
- git
- libglvnd
- ninja
- wxwidgets-gtk3
- zip
-)
-#_tag=8f4862de88de2f95866b7e501304f1e57a4e0abb
-_commit=639003a8b63e7955159b0d3747a38e2ecbd9c15a
-#source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git?signed#tag=${_tag})
-source=(
- git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit}
- vbam-ffmpeg5.0.patch
-)
-b2sums=('SKIP'
- 'c24813fab7a155ac0711e4c5764148d45dae8c1a57938fd8ce253368c31f7d91c2c912f5b0da48c70952f990449315489f175e0894d9f4a75efc53a3e6abd162')
-#validpgpkeys=(A0C0E526E36FD2138C149D4D08AB596679D86240) # Rafael Kitover <rkitover at gmail.com>
-
-prepare() {
- cd visualboyadvance-m
- #patch -Np1 -i ../vbam-ffmpeg5.0.patch
- sed -e 's|${CMAKE_SOURCE_DIR}/third_party|/usr|' -i src/wx/tests/CMakeLists.txt # Unbundle doctest (bundled one is not glibc 2.34 compatible)
-}
-
-pkgver() {
- cd visualboyadvance-m
- git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./'
-}
-
-build() {
- cmake -S visualboyadvance-m -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
- cmake --build build-sdl
- cmake -S visualboyadvance-m -B build-wx -G Ninja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_SKIP_RPATH=TRUE \
- -DENABLE_SDL=FALSE \
- -DENABLE_WX=TRUE \
- -DENABLE_FFMPEG=TRUE \
- -DENABLE_LINK=TRUE
- cmake --build build-wx
-}
-
-package_vbam-sdl() {
- backup=(etc/vbam.cfg)
- conflicts=(vbam-wx)
-
- DESTDIR="${pkgdir}" cmake --install build-sdl
-}
-
-package_vbam-wx() {
- depends+=(
- glib2
- gtk3
- openal
- wxwidgets-gtk3
- zip
- )
- conflicts=(vbam-sdl)
-
- DESTDIR="${pkgdir}" cmake --install build-wx
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-x86_64/PKGBUILD (from rev 1274935, vbam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-23 08:11:53 UTC (rev 1274936)
@@ -0,0 +1,99 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=vbam
+pkgname=(
+ vbam-sdl
+ vbam-wx
+)
+pkgver=2.1.4.r573.7f1d49d3
+pkgrel=1
+pkgdesc='Nintendo GameBoy Advance emulator'
+arch=(x86_64)
+url=https://vba-m.com
+license=(GPL2)
+depends=(
+ glu
+ libavcodec.so
+ libavformat.so
+ libavutil.so
+ libswscale.so
+ libgl
+ libpng
+ sdl2
+ sfml
+ zlib
+)
+makedepends=(
+ cmake
+ doctest
+ ffmpeg
+ git
+ libglvnd
+ ninja
+ wxwidgets-gtk3
+ zip
+)
+#_tag=8f4862de88de2f95866b7e501304f1e57a4e0abb
+_commit=7f1d49d3d000041469c5e7d3ae3145563d787c26
+#source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git?signed#tag=${_tag})
+source=(
+ git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit}
+ vbam-ffmpeg5.0.patch
+)
+b2sums=('SKIP'
+ 'c24813fab7a155ac0711e4c5764148d45dae8c1a57938fd8ce253368c31f7d91c2c912f5b0da48c70952f990449315489f175e0894d9f4a75efc53a3e6abd162')
+#validpgpkeys=(A0C0E526E36FD2138C149D4D08AB596679D86240) # Rafael Kitover <rkitover at gmail.com>
+
+prepare() {
+ cd visualboyadvance-m
+ #patch -Np1 -i ../vbam-ffmpeg5.0.patch
+ sed -e 's|${CMAKE_SOURCE_DIR}/third_party|/usr|' -i src/wx/tests/CMakeLists.txt # Unbundle doctest (bundled one is not glibc 2.34 compatible)
+}
+
+pkgver() {
+ cd visualboyadvance-m
+ git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./'
+}
+
+build() {
+ cmake -S visualboyadvance-m -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
+ cmake --build build-sdl
+ cmake -S visualboyadvance-m -B build-wx -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=TRUE \
+ -DENABLE_SDL=FALSE \
+ -DENABLE_WX=TRUE \
+ -DENABLE_FFMPEG=TRUE \
+ -DENABLE_LINK=TRUE
+ cmake --build build-wx
+}
+
+package_vbam-sdl() {
+ backup=(etc/vbam.cfg)
+ conflicts=(vbam-wx)
+
+ DESTDIR="${pkgdir}" cmake --install build-sdl
+}
+
+package_vbam-wx() {
+ depends+=(
+ glib2
+ gtk3
+ openal
+ wxwidgets-gtk3
+ zip
+ )
+ conflicts=(vbam-sdl)
+
+ DESTDIR="${pkgdir}" cmake --install build-wx
+}
+
+# vim: ts=2 sw=2 et:
Deleted: vbam-ffmpeg5.0.patch
===================================================================
--- vbam-ffmpeg5.0.patch 2022-08-23 08:11:42 UTC (rev 1274935)
+++ vbam-ffmpeg5.0.patch 2022-08-23 08:11:53 UTC (rev 1274936)
@@ -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>
-
Copied: vbam/repos/community-x86_64/vbam-ffmpeg5.0.patch (from rev 1274935, vbam/trunk/vbam-ffmpeg5.0.patch)
===================================================================
--- vbam-ffmpeg5.0.patch (rev 0)
+++ vbam-ffmpeg5.0.patch 2022-08-23 08:11:53 UTC (rev 1274936)
@@ -0,0 +1,44 @@
+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>
+
More information about the arch-commits
mailing list