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

Maxime Gauduin alucryd at archlinux.org
Mon May 11 12:57:42 UTC 2015


    Date: Monday, May 11, 2015 @ 14:57:41
  Author: alucryd
Revision: 133230

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

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

-------------------------------------+
 /PKGBUILD                           |  188 ++++++++++++++++++++++++++++++++++
 /vbam-gtk.install                   |   28 +++++
 /vbam-wx-icon.patch                 |   36 ++++++
 /vbam-wx.install                    |   26 ++++
 community-i686/PKGBUILD             |   94 -----------------
 community-i686/vbam-gtk.install     |   14 --
 community-i686/vbam-wx-icon.patch   |   18 ---
 community-i686/vbam-wx.install      |   13 --
 community-x86_64/PKGBUILD           |   94 -----------------
 community-x86_64/vbam-gtk.install   |   14 --
 community-x86_64/vbam-wx-icon.patch |   18 ---
 community-x86_64/vbam-wx.install    |   13 --
 12 files changed, 278 insertions(+), 278 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-05-11 12:57:13 UTC (rev 133229)
+++ community-i686/PKGBUILD	2015-05-11 12:57:41 UTC (rev 133230)
@@ -1,94 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=1.8.0.1292
-pkgrel=1
-pkgdesc='Nintendo GameBoy Advance emulator'
-arch=('i686' 'x86_64')
-url='http://vba-m.com'
-license=('GPL2')
-makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'gtkglextmm'
-             'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
-             'openal' 'sfml' 'subversion' 'wxgtk2.8' 'zip')
-makedepends_i686=('nasm')
-source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=${pkgver##*.}"
-        'vbam-wx-icon.patch')
-sha256sums=('SKIP'
-            '2c7280ba61359aaaa04edbad4f522aa8b03f3b00a4ab7600b76f60b83a394ea5')
-
-prepare() {
-  cd vbam
-
-  patch -Np1 -i ../vbam-wx-icon.patch
-  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
-  sed 's|Common/|common/|' -i src/gba/debugger-expr-yacc.cpp
-}
-
-build() {
-  cd vbam
-
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build && cd build
-
-  _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
-              -DCMAKE_INSTALL_PREFIX='/usr' \
-              -DCMAKE_SKIP_RPATH='TRUE' \
-              -DENABLE_GTK='TRUE' \
-              -DENABLE_WX='TRUE' \
-              -DENABLE_FFMPEG='TRUE' \
-              -DENABLE_LINK='TRUE' \
-              -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
-              -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'"
-
-  if [[ $CARCH == i686 ]]; then
-    _cmakeargs="${_cmakeargs} \
-                -DENABLE_ASM_CORE='TRUE' \
-                -DENABLE_ASM_SCALERS='TRUE'"
-  fi
-
-  cmake .. ${_cmakeargs}
-  make
-}
-
-package_vbam-sdl() {
-depends=('sdl' 'sfml')
-replaces=('vbam-cli')
-backup=('etc/vbam.cfg')
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share}
-}
-
-package_vbam-gtk() {
-depends=('desktop-file-utils' 'gtkglextmm' 'sdl' 'sfml')
-conflicts=('vbam-wx')
-install='vbam-gtk.install'
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/bin/vbam}
-  find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
-}
-
-package_vbam-wx() {
-depends=('ffmpeg' 'sfml' 'wxgtk2.8')
-conflicts=('vbam-gtk')
-options=('!emptydirs')
-install='vbam-wx.install'
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{bin,share}/vbam}
-  find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
-}
-
-# vim: ts=2 sw=2 et:

Copied: vbam/repos/community-i686/PKGBUILD (from rev 133229, vbam/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-05-11 12:57:41 UTC (rev 133230)
@@ -0,0 +1,94 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=vbam
+pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
+pkgver=1.8.0.1292
+pkgrel=2
+pkgdesc='Nintendo GameBoy Advance emulator'
+arch=('i686' 'x86_64')
+url='http://vba-m.com'
+license=('GPL2')
+makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'gtkglextmm'
+             'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+             'openal' 'sfml' 'subversion' 'wxgtk2.8' 'zip')
+makedepends_i686=('nasm')
+source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=${pkgver##*.}"
+        'vbam-wx-icon.patch')
+sha256sums=('SKIP'
+            '2c7280ba61359aaaa04edbad4f522aa8b03f3b00a4ab7600b76f60b83a394ea5')
+
+prepare() {
+  cd vbam
+
+  patch -Np1 -i ../vbam-wx-icon.patch
+  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
+  sed 's|Common/|common/|' -i src/gba/debugger-expr-yacc.cpp
+}
+
+build() {
+  cd vbam
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
+              -DCMAKE_INSTALL_PREFIX='/usr' \
+              -DCMAKE_SKIP_RPATH='TRUE' \
+              -DENABLE_GTK='TRUE' \
+              -DENABLE_WX='TRUE' \
+              -DENABLE_FFMPEG='TRUE' \
+              -DENABLE_LINK='TRUE' \
+              -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
+              -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'"
+
+  if [[ $CARCH == i686 ]]; then
+    _cmakeargs="${_cmakeargs} \
+                -DENABLE_ASM_CORE='TRUE' \
+                -DENABLE_ASM_SCALERS='TRUE'"
+  fi
+
+  cmake .. ${_cmakeargs}
+  make
+}
+
+package_vbam-sdl() {
+depends=('sdl' 'sfml')
+replaces=('vbam-cli')
+backup=('etc/vbam.cfg')
+
+  cd vbam/build
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share}
+}
+
+package_vbam-gtk() {
+depends=('desktop-file-utils' 'gtkglextmm' 'sdl' 'sfml')
+conflicts=('vbam-wx')
+install='vbam-gtk.install'
+
+  cd vbam/build
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/{etc,usr/bin/vbam}
+  find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
+}
+
+package_vbam-wx() {
+depends=('ffmpeg' 'sfml' 'wxgtk2.8')
+conflicts=('vbam-gtk')
+options=('!emptydirs')
+install='vbam-wx.install'
+
+  cd vbam/build
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/{etc,usr/{bin,share}/vbam}
+  find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
+}
+
+# vim: ts=2 sw=2 et:

Deleted: community-i686/vbam-gtk.install
===================================================================
--- community-i686/vbam-gtk.install	2015-05-11 12:57:13 UTC (rev 133229)
+++ community-i686/vbam-gtk.install	2015-05-11 12:57:41 UTC (rev 133230)
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim: ts=2 sw=2 et:

Copied: vbam/repos/community-i686/vbam-gtk.install (from rev 133229, vbam/trunk/vbam-gtk.install)
===================================================================
--- community-i686/vbam-gtk.install	                        (rev 0)
+++ community-i686/vbam-gtk.install	2015-05-11 12:57:41 UTC (rev 133230)
@@ -0,0 +1,14 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:

Deleted: community-i686/vbam-wx-icon.patch
===================================================================
--- community-i686/vbam-wx-icon.patch	2015-05-11 12:57:13 UTC (rev 133229)
+++ community-i686/vbam-wx-icon.patch	2015-05-11 12:57:41 UTC (rev 133230)
@@ -1,18 +0,0 @@
-diff -rupN vbam.orig/src/wx/CMakeLists.txt vbam/src/wx/CMakeLists.txt
---- vbam.orig/src/wx/CMakeLists.txt	2015-04-09 10:39:02.684326894 +0200
-+++ vbam/src/wx/CMakeLists.txt	2015-04-09 10:39:28.696831250 +0200
-@@ -76,6 +76,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ic
- ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
-                    # doing this in its own dir prevents name prefixes
- 		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.xrc wxvbam.xrc
-+		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/vbam.png vbam.png
-                    COMMAND wxrc wxvbam.xrc -o wxvbam.xrs
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- 		   DEPENDS wxvbam.xrc)
-@@ -184,4 +185,4 @@ if(APPLE)
-     SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- endif(APPLE)
-     
--SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
-\ No newline at end of file
-+SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})

Copied: vbam/repos/community-i686/vbam-wx-icon.patch (from rev 133229, vbam/trunk/vbam-wx-icon.patch)
===================================================================
--- community-i686/vbam-wx-icon.patch	                        (rev 0)
+++ community-i686/vbam-wx-icon.patch	2015-05-11 12:57:41 UTC (rev 133230)
@@ -0,0 +1,18 @@
+diff -rupN vbam.orig/src/wx/CMakeLists.txt vbam/src/wx/CMakeLists.txt
+--- vbam.orig/src/wx/CMakeLists.txt	2015-04-09 10:39:02.684326894 +0200
++++ vbam/src/wx/CMakeLists.txt	2015-04-09 10:39:28.696831250 +0200
+@@ -76,6 +76,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ic
+ ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
+                    # doing this in its own dir prevents name prefixes
+ 		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.xrc wxvbam.xrc
++		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/vbam.png vbam.png
+                    COMMAND wxrc wxvbam.xrc -o wxvbam.xrs
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ 		   DEPENDS wxvbam.xrc)
+@@ -184,4 +185,4 @@ if(APPLE)
+     SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ endif(APPLE)
+     
+-SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
+\ No newline at end of file
++SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})

Deleted: community-i686/vbam-wx.install
===================================================================
--- community-i686/vbam-wx.install	2015-05-11 12:57:13 UTC (rev 133229)
+++ community-i686/vbam-wx.install	2015-05-11 12:57:41 UTC (rev 133230)
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim: ts=2 sw=2 et:

Copied: vbam/repos/community-i686/vbam-wx.install (from rev 133229, vbam/trunk/vbam-wx.install)
===================================================================
--- community-i686/vbam-wx.install	                        (rev 0)
+++ community-i686/vbam-wx.install	2015-05-11 12:57:41 UTC (rev 133230)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-05-11 12:57:13 UTC (rev 133229)
+++ community-x86_64/PKGBUILD	2015-05-11 12:57:41 UTC (rev 133230)
@@ -1,94 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=1.8.0.1292
-pkgrel=1
-pkgdesc='Nintendo GameBoy Advance emulator'
-arch=('i686' 'x86_64')
-url='http://vba-m.com'
-license=('GPL2')
-makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'gtkglextmm'
-             'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
-             'openal' 'sfml' 'subversion' 'wxgtk2.8' 'zip')
-makedepends_i686=('nasm')
-source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=${pkgver##*.}"
-        'vbam-wx-icon.patch')
-sha256sums=('SKIP'
-            '2c7280ba61359aaaa04edbad4f522aa8b03f3b00a4ab7600b76f60b83a394ea5')
-
-prepare() {
-  cd vbam
-
-  patch -Np1 -i ../vbam-wx-icon.patch
-  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
-  sed 's|Common/|common/|' -i src/gba/debugger-expr-yacc.cpp
-}
-
-build() {
-  cd vbam
-
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build && cd build
-
-  _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
-              -DCMAKE_INSTALL_PREFIX='/usr' \
-              -DCMAKE_SKIP_RPATH='TRUE' \
-              -DENABLE_GTK='TRUE' \
-              -DENABLE_WX='TRUE' \
-              -DENABLE_FFMPEG='TRUE' \
-              -DENABLE_LINK='TRUE' \
-              -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
-              -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'"
-
-  if [[ $CARCH == i686 ]]; then
-    _cmakeargs="${_cmakeargs} \
-                -DENABLE_ASM_CORE='TRUE' \
-                -DENABLE_ASM_SCALERS='TRUE'"
-  fi
-
-  cmake .. ${_cmakeargs}
-  make
-}
-
-package_vbam-sdl() {
-depends=('sdl' 'sfml')
-replaces=('vbam-cli')
-backup=('etc/vbam.cfg')
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share}
-}
-
-package_vbam-gtk() {
-depends=('desktop-file-utils' 'gtkglextmm' 'sdl' 'sfml')
-conflicts=('vbam-wx')
-install='vbam-gtk.install'
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/bin/vbam}
-  find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
-}
-
-package_vbam-wx() {
-depends=('ffmpeg' 'sfml' 'wxgtk2.8')
-conflicts=('vbam-gtk')
-options=('!emptydirs')
-install='vbam-wx.install'
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{bin,share}/vbam}
-  find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
-}
-
-# vim: ts=2 sw=2 et:

Copied: vbam/repos/community-x86_64/PKGBUILD (from rev 133229, vbam/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-05-11 12:57:41 UTC (rev 133230)
@@ -0,0 +1,94 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=vbam
+pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
+pkgver=1.8.0.1292
+pkgrel=2
+pkgdesc='Nintendo GameBoy Advance emulator'
+arch=('i686' 'x86_64')
+url='http://vba-m.com'
+license=('GPL2')
+makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'gtkglextmm'
+             'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+             'openal' 'sfml' 'subversion' 'wxgtk2.8' 'zip')
+makedepends_i686=('nasm')
+source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=${pkgver##*.}"
+        'vbam-wx-icon.patch')
+sha256sums=('SKIP'
+            '2c7280ba61359aaaa04edbad4f522aa8b03f3b00a4ab7600b76f60b83a394ea5')
+
+prepare() {
+  cd vbam
+
+  patch -Np1 -i ../vbam-wx-icon.patch
+  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
+  sed 's|Common/|common/|' -i src/gba/debugger-expr-yacc.cpp
+}
+
+build() {
+  cd vbam
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
+              -DCMAKE_INSTALL_PREFIX='/usr' \
+              -DCMAKE_SKIP_RPATH='TRUE' \
+              -DENABLE_GTK='TRUE' \
+              -DENABLE_WX='TRUE' \
+              -DENABLE_FFMPEG='TRUE' \
+              -DENABLE_LINK='TRUE' \
+              -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
+              -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'"
+
+  if [[ $CARCH == i686 ]]; then
+    _cmakeargs="${_cmakeargs} \
+                -DENABLE_ASM_CORE='TRUE' \
+                -DENABLE_ASM_SCALERS='TRUE'"
+  fi
+
+  cmake .. ${_cmakeargs}
+  make
+}
+
+package_vbam-sdl() {
+depends=('sdl' 'sfml')
+replaces=('vbam-cli')
+backup=('etc/vbam.cfg')
+
+  cd vbam/build
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share}
+}
+
+package_vbam-gtk() {
+depends=('desktop-file-utils' 'gtkglextmm' 'sdl' 'sfml')
+conflicts=('vbam-wx')
+install='vbam-gtk.install'
+
+  cd vbam/build
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/{etc,usr/bin/vbam}
+  find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
+}
+
+package_vbam-wx() {
+depends=('ffmpeg' 'sfml' 'wxgtk2.8')
+conflicts=('vbam-gtk')
+options=('!emptydirs')
+install='vbam-wx.install'
+
+  cd vbam/build
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/{etc,usr/{bin,share}/vbam}
+  find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
+}
+
+# vim: ts=2 sw=2 et:

Deleted: community-x86_64/vbam-gtk.install
===================================================================
--- community-x86_64/vbam-gtk.install	2015-05-11 12:57:13 UTC (rev 133229)
+++ community-x86_64/vbam-gtk.install	2015-05-11 12:57:41 UTC (rev 133230)
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim: ts=2 sw=2 et:

Copied: vbam/repos/community-x86_64/vbam-gtk.install (from rev 133229, vbam/trunk/vbam-gtk.install)
===================================================================
--- community-x86_64/vbam-gtk.install	                        (rev 0)
+++ community-x86_64/vbam-gtk.install	2015-05-11 12:57:41 UTC (rev 133230)
@@ -0,0 +1,14 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:

Deleted: community-x86_64/vbam-wx-icon.patch
===================================================================
--- community-x86_64/vbam-wx-icon.patch	2015-05-11 12:57:13 UTC (rev 133229)
+++ community-x86_64/vbam-wx-icon.patch	2015-05-11 12:57:41 UTC (rev 133230)
@@ -1,18 +0,0 @@
-diff -rupN vbam.orig/src/wx/CMakeLists.txt vbam/src/wx/CMakeLists.txt
---- vbam.orig/src/wx/CMakeLists.txt	2015-04-09 10:39:02.684326894 +0200
-+++ vbam/src/wx/CMakeLists.txt	2015-04-09 10:39:28.696831250 +0200
-@@ -76,6 +76,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ic
- ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
-                    # doing this in its own dir prevents name prefixes
- 		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.xrc wxvbam.xrc
-+		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/vbam.png vbam.png
-                    COMMAND wxrc wxvbam.xrc -o wxvbam.xrs
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- 		   DEPENDS wxvbam.xrc)
-@@ -184,4 +185,4 @@ if(APPLE)
-     SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- endif(APPLE)
-     
--SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
-\ No newline at end of file
-+SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})

Copied: vbam/repos/community-x86_64/vbam-wx-icon.patch (from rev 133229, vbam/trunk/vbam-wx-icon.patch)
===================================================================
--- community-x86_64/vbam-wx-icon.patch	                        (rev 0)
+++ community-x86_64/vbam-wx-icon.patch	2015-05-11 12:57:41 UTC (rev 133230)
@@ -0,0 +1,18 @@
+diff -rupN vbam.orig/src/wx/CMakeLists.txt vbam/src/wx/CMakeLists.txt
+--- vbam.orig/src/wx/CMakeLists.txt	2015-04-09 10:39:02.684326894 +0200
++++ vbam/src/wx/CMakeLists.txt	2015-04-09 10:39:28.696831250 +0200
+@@ -76,6 +76,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ic
+ ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
+                    # doing this in its own dir prevents name prefixes
+ 		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.xrc wxvbam.xrc
++		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/vbam.png vbam.png
+                    COMMAND wxrc wxvbam.xrc -o wxvbam.xrs
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ 		   DEPENDS wxvbam.xrc)
+@@ -184,4 +185,4 @@ if(APPLE)
+     SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ endif(APPLE)
+     
+-SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
+\ No newline at end of file
++SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})

Deleted: community-x86_64/vbam-wx.install
===================================================================
--- community-x86_64/vbam-wx.install	2015-05-11 12:57:13 UTC (rev 133229)
+++ community-x86_64/vbam-wx.install	2015-05-11 12:57:41 UTC (rev 133230)
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim: ts=2 sw=2 et:

Copied: vbam/repos/community-x86_64/vbam-wx.install (from rev 133229, vbam/trunk/vbam-wx.install)
===================================================================
--- community-x86_64/vbam-wx.install	                        (rev 0)
+++ community-x86_64/vbam-wx.install	2015-05-11 12:57:41 UTC (rev 133230)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:



More information about the arch-commits mailing list