Date: Sunday, December 31, 2017 @ 13:09:54 Author: alucryd Revision: 277576
upgpkg: vbam 2.0.1-1 Modified: vbam/trunk/PKGBUILD (contents, properties) Deleted: vbam/trunk/vbam-fixes.patch ------------------+ PKGBUILD | 96 ++++++++++++++++++++--------------------------------- vbam-fixes.patch | 56 ------------------------------ 2 files changed, 37 insertions(+), 115 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-31 12:31:52 UTC (rev 277575) +++ PKGBUILD 2017-12-31 13:09:54 UTC (rev 277576) @@ -3,92 +3,70 @@ # Contributor: Bartłomiej Piotrowski <[email protected]> pkgbase=vbam -pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx') -pkgver=2.0.0b2 -pkgrel=3 +pkgname=('vbam-sdl' 'vbam-wx') +pkgver=2.0.1 +pkgrel=1 pkgdesc='Nintendo GameBoy Advance emulator' arch=('x86_64') url='http://vba-m.com' license=('GPL2') -depends=('sdl2' 'sfml' 'zip') -makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm' - 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' - 'openal' 'subversion' 'wxgtk3') -makedepends_i686=('nasm') -options=('!emptydirs') -_commit='1eb768578bc0c4fa17396f573a4b37a652f12acd' -source=("vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit}"; - 'vbam-fixes.patch') -sha256sums=('SKIP' - 'be860c010e1185c1fa3938f57fd824b9e8e8430a00f851ff21a033de7bce5cf8') +depends=('gcc-libs' 'glibc' 'libgl' 'libpng' 'sdl2' 'sfml' 'zlib') +makedepends=('cmake' 'ffmpeg' 'wxgtk3' 'zip') +source=("vbam-${pkgver}.tar.gz::https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${pkgver}.tar.gz";) +sha256sums=('0204787317311cf6dd08e28f2dff4f52cdb97356dd851b96a9054abe4281143e') prepare() { - cd vbam - - if [[ -d build ]]; then - rm -rf build - fi - mkdir build - - patch -Np1 -i ../vbam-fixes.patch + for p in sdl wx; do + if [[ -d build-$p ]]; then + rm -rf build-$p + fi + mkdir build-$p + done } build() { - cd vbam/build + cd build-sdl - _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_SKIP_RPATH='TRUE' \ - -DENABLE_GTK='TRUE' \ - -DENABLE_WX='TRUE' \ - -DENABLE_FFMPEG='FALSE' \ - -DENABLE_LINK='TRUE' \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3" + cmake ../visualboyadvance-m-${pkgver} \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_SKIP_RPATH='TRUE' \ + -DENABLE_SDL='TRUE' \ + -DENABLE_WX='FALSE' \ + -DENABLE_LINK='TRUE' + make - if [[ $CARCH == i686 ]]; then - _cmakeargs="${_cmakeargs} \ - -DENABLE_ASM_CORE='TRUE' \ - -DENABLE_ASM_SCALERS='TRUE'" - fi + cd ../build-wx - CXXFLAGS+=' -std=c++11 -fpermissive' - - cmake .. ${_cmakeargs} + cmake ../visualboyadvance-m-${pkgver} \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_SKIP_RPATH='TRUE' \ + -DENABLE_SDL='FALSE' \ + -DENABLE_WX='TRUE' \ + -DENABLE_FFMPEG='TRUE' \ + -DENABLE_LINK='TRUE' \ + -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-gtk3' make } package_vbam-sdl() { -replaces=('vbam-cli') backup=('etc/vbam.cfg') - - cd vbam/build - - make DESTDIR="${pkgdir}" install - mv "${pkgdir}"/{usr/etc,} - rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}} -} - -package_vbam-gtk() { -depends+=('gtkglextmm') conflicts=('vbam-wx') - cd vbam/build + cd build-sdl make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}} - find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} + } package_vbam-wx() { -depends+=('wxgtk3') -conflicts=('vbam-gtk') +depends+=('glib2' 'gtk3' 'openal' 'wxgtk3' 'zip' + 'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswscale.so') +conflicts=('vbam-sdl') - cd vbam/build + cd build-wx make DESTDIR="${pkgdir}" install - install -m 755 visualboyadvance-m "${pkgdir}"/usr/bin/ - rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}} - find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} + } # vim: ts=2 sw=2 et: Property changes on: vbam/trunk/PKGBUILD ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: vbam-fixes.patch =================================================================== --- vbam-fixes.patch 2017-12-31 12:31:52 UTC (rev 277575) +++ vbam-fixes.patch 2017-12-31 13:09:54 UTC (rev 277576) @@ -1,56 +0,0 @@ -diff -rupN vbam.orig/src/gtk/CMakeLists.txt vbam/src/gtk/CMakeLists.txt ---- vbam.orig/src/gtk/CMakeLists.txt 2016-10-23 19:14:22.423451961 +0200 -+++ vbam/src/gtk/CMakeLists.txt 2016-10-23 19:14:33.346550202 +0200 -@@ -47,7 +47,7 @@ SET(SRC_GTK - soundconfig.cpp - screenarea.cpp - screenarea-cairo.cpp -- #screenarea-opengl.cpp -+ screenarea-opengl.cpp - tools.cpp - window.cpp - ../sdl/inputSDL.cpp -diff -rupN vbam.orig/src/gtk/screenarea.cpp vbam/src/gtk/screenarea.cpp ---- vbam.orig/src/gtk/screenarea.cpp 2016-10-23 19:14:22.423451961 +0200 -+++ vbam/src/gtk/screenarea.cpp 2016-10-23 19:14:33.346550202 +0200 -@@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int - pixbuf->fill(0); - - #if !GTK_CHECK_VERSION(3, 0, 0) -- m_poEmptyCursor = new Gdk::Cursor(get_display, pixbuf, 0, 0); -+ m_poEmptyCursor = new Gdk::Cursor(get_display(), pixbuf, 0, 0); - #else - m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0); - #endif -diff -rupN vbam.orig/src/sdl/expr.cpp vbam/src/sdl/expr.cpp ---- vbam.orig/src/sdl/expr.cpp 2016-10-23 19:14:22.423451961 +0200 -+++ vbam/src/sdl/expr.cpp 2016-10-23 19:14:33.346550202 +0200 -@@ -85,12 +85,10 @@ enum yytokentype { - /* Copy the first part of user declarations. */ - #line 1 "expr.ypp" - --namespace std { - #include <memory.h> - #include <stdio.h> --#include <stdlib.h> -+#include <cstdlib> - #include <string.h> --} - - using namespace std; - -diff -rupN vbam.orig/src/sdl/expr.ypp vbam/src/sdl/expr.ypp ---- vbam.orig/src/sdl/expr.ypp 2016-10-23 19:14:22.423451961 +0200 -+++ vbam/src/sdl/expr.ypp 2016-10-23 19:15:20.352228711 +0200 -@@ -1,10 +1,8 @@ - %{ --namespace std { - #include <stdio.h> - #include <memory.h> --#include <stdlib.h> -+#include <cstdlib> - #include <string.h> --} - - using namespace std; -
