[arch-commits] Commit in vbam/repos (12 files)

2016-10-23 Thread Maxime Gauduin 
Date: Sunday, October 23, 2016 @ 17:46:01
  Author: alucryd
Revision: 193108

archrelease: copy trunk to community-i686, community-x86_64

Added:
  vbam/repos/community-i686/PKGBUILD
(from rev 193107, vbam/trunk/PKGBUILD)
  vbam/repos/community-i686/vbam-fixes.patch
(from rev 193107, vbam/trunk/vbam-fixes.patch)
  vbam/repos/community-x86_64/PKGBUILD
(from rev 193107, vbam/trunk/PKGBUILD)
  vbam/repos/community-x86_64/vbam-fixes.patch
(from rev 193107, vbam/trunk/vbam-fixes.patch)
Deleted:
  vbam/repos/community-i686/PKGBUILD
  vbam/repos/community-i686/cxx11-fixes.patch
  vbam/repos/community-i686/vbam-gtk.install
  vbam/repos/community-i686/vbam-wx.install
  vbam/repos/community-x86_64/PKGBUILD
  vbam/repos/community-x86_64/cxx11-fixes.patch
  vbam/repos/community-x86_64/vbam-gtk.install
  vbam/repos/community-x86_64/vbam-wx.install

+
 /PKGBUILD  |  186 +++
 community-i686/PKGBUILD|   93 -
 community-i686/cxx11-fixes.patch   |   53 -
 community-i686/vbam-fixes.patch|   56 ++
 community-i686/vbam-gtk.install|   14 --
 community-i686/vbam-wx.install |   13 --
 community-x86_64/PKGBUILD  |   93 -
 community-x86_64/cxx11-fixes.patch |   53 -
 community-x86_64/vbam-fixes.patch  |   56 ++
 community-x86_64/vbam-gtk.install  |   14 --
 community-x86_64/vbam-wx.install   |   13 --
 11 files changed, 298 insertions(+), 346 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2016-10-23 17:45:39 UTC (rev 193107)
+++ community-i686/PKGBUILD 2016-10-23 17:46:01 UTC (rev 193108)
@@ -1,93 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin 
-# Contributor: Bartłomiej Piotrowski 
-
-pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=2.0.0b2
-pkgrel=1
-pkgdesc='Nintendo GameBoy Advance emulator'
-arch=('i686' 'x86_64')
-url='http://vba-m.com'
-license=('GPL2')
-depends=('sdl' 'sfml' 'zip')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm'
- 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
- 'openal' 'subversion' 'wxgtk')
-makedepends_i686=('nasm')
-options=('!emptydirs')
-source=('vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=VBA-M_Beta_2'
-'cxx11-fixes.patch')
-sha256sums=('SKIP'
-'610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
-
-prepare() {
-  cd vbam
-
-  patch -Np1 -i ../cxx11-fixes.patch
-
-  if [[ -d build ]]; then
-rm -rf build
-  fi
-  mkdir build
-}
-
-build() {
-  cd vbam/build
-
-  _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'"
-
-  if [[ $CARCH == i686 ]]; then
-_cmakeargs="${_cmakeargs} \
--DENABLE_ASM_CORE='TRUE' \
--DENABLE_ASM_SCALERS='TRUE'"
-  fi
-
-  CXXFLAGS+=' -std=c++11 -fpermissive'
-
-  cmake .. ${_cmakeargs}
-  make
-}
-
-package_vbam-sdl() {
-replaces=('vbam-cli')
-backup=('etc/vbam.cfg')
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf 
"${pkgdir}"/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}}
-}
-
-package_vbam-gtk() {
-depends+=('desktop-file-utils' 'gtkglextmm')
-conflicts=('vbam-wx')
-install='vbam-gtk.install'
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
-  find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
-}
-
-package_vbam-wx() {
-depends+=('desktop-file-utils' 'wxgtk')
-conflicts=('vbam-gtk')
-install='vbam-wx.install'
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  install -m 755 visualboyadvance-m "${pkgdir}"/usr/bin/
-  rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
-  find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
-}
-
-# vim: ts=2 sw=2 et:

Copied: vbam/repos/community-i686/PKGBUILD (from rev 193107, 
vbam/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-10-23 17:46:01 UTC (rev 193108)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Maxime Gauduin 
+# Contributor: Bartłomiej Piotrowski 
+
+pkgbase=vbam
+pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
+pkgver=2.0.0b2
+pkgrel=2
+pkgdesc='Nintendo GameBoy Advance emulator'
+arch=('i686' 'x86_64')
+url='http://vba-m.com'
+license=('GPL2')
+depends=('sdl2' 'sfml' 'zip')
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew'

[arch-commits] Commit in vbam/repos (12 files)

2014-01-05 Thread Maxime Gauduin 
Date: Monday, January 6, 2014 @ 00:05:40
  Author: alucryd
Revision: 103440

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  vbam/repos/community-staging-i686/
  vbam/repos/community-staging-i686/PKGBUILD
(from rev 103439, vbam/trunk/PKGBUILD)
  vbam/repos/community-staging-i686/sfml.patch
(from rev 103439, vbam/trunk/sfml.patch)
  vbam/repos/community-staging-i686/soil.patch
(from rev 103439, vbam/trunk/soil.patch)
  vbam/repos/community-staging-i686/vbam-gtk.install
(from rev 103439, vbam/trunk/vbam-gtk.install)
  vbam/repos/community-staging-i686/vbam-wx.install
(from rev 103439, vbam/trunk/vbam-wx.install)
  vbam/repos/community-staging-x86_64/
  vbam/repos/community-staging-x86_64/PKGBUILD
(from rev 103439, vbam/trunk/PKGBUILD)
  vbam/repos/community-staging-x86_64/sfml.patch
(from rev 103439, vbam/trunk/sfml.patch)
  vbam/repos/community-staging-x86_64/soil.patch
(from rev 103439, vbam/trunk/soil.patch)
  vbam/repos/community-staging-x86_64/vbam-gtk.install
(from rev 103439, vbam/trunk/vbam-gtk.install)
  vbam/repos/community-staging-x86_64/vbam-wx.install
(from rev 103439, vbam/trunk/vbam-wx.install)

---+
 community-staging-i686/PKGBUILD   |  108 
 community-staging-i686/sfml.patch |  181 
 community-staging-i686/soil.patch |   51 +++
 community-staging-i686/vbam-gtk.install   |   14 ++
 community-staging-i686/vbam-wx.install|   13 ++
 community-staging-x86_64/PKGBUILD |  108 
 community-staging-x86_64/sfml.patch   |  181 
 community-staging-x86_64/soil.patch   |   51 +++
 community-staging-x86_64/vbam-gtk.install |   14 ++
 community-staging-x86_64/vbam-wx.install  |   13 ++
 10 files changed, 734 insertions(+)

Copied: vbam/repos/community-staging-i686/PKGBUILD (from rev 103439, 
vbam/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-01-05 23:05:40 UTC (rev 103440)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Maxime Gauduin aluc...@gmail.com
+# Contributor: Bartłomiej Piotrowski nos...@bpiotrowski.pl
+
+pkgbase=vbam
+pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx')
+pkgver=1.8.0.1202
+pkgrel=2
+arch=('i686' 'x86_64')
+url=http://vba-m.com;
+license=('GPL2')
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 
'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 
'openal' 'wxgtk2.8' 'zip')
+[[ $CARCH == i686 ]]  makedepends+=('nasm')
+source=(http://downloads.sourceforge.net/project/vbam/vbam-src/vbam-r${pkgver##*.}-src.tar.bz2;
+'http://downloads.sourceforge.net/sfml/SFML-1.6-sdk-linux-64.tar.gz'
+'http://www.lonesock.net/files/soil.zip'
+'sfml.patch'
+'soil.patch')
+sha256sums=('148d866c08d7a810be5c845247d212f1d1d07395f2ccdecef10ad81a76072877'
+'05bdc32286ab2ec8cb1ccdafe53f31830284e09e11ebfc3ab3836c99a0d9654b'
+'a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701'
+'c3c2fc48f4edc303ad24d91583a57aef9b7ca3b78de1d6734cb666745fff9bad'
+'65705aeef90667bd4e28dd03ac0b43685470f2925b642637b7ff6e2f3acd34c7')
+
+prepare() {
+  patch -Np0 -i soil.patch
+  patch -Np0 -i sfml.patch
+  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
+}
+
+build() {
+# Build static SOIL
+  pushd Simple OpenGL Image Library/src
+  make -f ../projects/makefile/alternate Makefile.txt
+  make -f ../projects/makefile/alternate Makefile.txt 
DESTDIR=${srcdir}/staging install
+  popd
+
+# Build static SFML
+  pushd SFML-1.6
+  make
+  make DESTDIR=${srcdir}/staging/usr install
+  popd
+
+# Build VBA-M
+  if [[ -d build ]]; then
+rm -rf build
+  fi
+  mkdir build  cd build
+
+  local _cmakeargs=-DCMAKE_INSTALL_PREFIX='/usr' 
-DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include -DENABLE_GTK='ON' 
-DENABLE_WX='ON' \
+-DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' 
-DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
+-DSFML_INCLUDE_DIR='../staging/usr/include/SFML' \
+
-DSFML_AUDIO_INCLUDE_DIR='../staging/usr/include/SFML/Audio' \
+
-DSFML_AUDIO_LIBRARY='../staging/usr/lib/libsfml-audio-s.a' \
+
-DSFML_GRAPHICS_INCLUDE_DIR='../staging/usr/include/SFML/Graphics' \
+
-DSFML_GRAPHICS_LIBRARY='../staging/usr/lib/libsfml-graphics-s.a' \
+
-DSFML_NETWORK_INCLUDE_DIR='../staging/usr/include/SFML/Network' \
+
-DSFML_NETWORK_LIBRARY='../staging/usr/lib/libsfml-network-s.a' \
+
-DSFML_SYSTEM_INCLUDE_DIR='../staging/usr/include/SFML/System' \
+
-DSFML_SYSTEM_LIBRARY='../staging/usr/lib/libsfml-system-s.a'
+