Merge pull request #1395 from thypon/vbam

Vbam

common/shlibs

@@ -1996,3 +1996,10 @@ libbitcoinconsensus.so.0 litecoin-0.10.1.2_1
 libnfc.so.0 libnfc-1.7.1_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
+libgdkglextmm-x11-1.2.so.0 gtkglextmm-1.2.0_1
+libgtkglextmm-x11-1.2.so.0 gtkglextmm-1.2.0_1
+libsfml-network.so.2.2.0 SFML-2.2_1
+libsfml-system.so.2.2.0 SFML-2.2_1
+libsfml-window.so.2.2.0 SFML-2.2_1
+libsfml-audio.so.2.2.0 SFML-2.2_1
+libsfml-graphics.so.2.2.0 SFML-2.2_1

srcpkgs/SFML-devel

@@ -0,0 +1 @@
+SFML/

srcpkgs/SFML/template

@@ -0,0 +1,25 @@
+# Template file for 'SFML'
+pkgname=SFML
+version=2.2
+revision=1
+build_style=cmake
+hostmakedepends="cmake doxygen"
+makedepends="libsndfile-devel libXrandr-devel libjpeg-turbo-devel libopenal-devel glew-devel freetype-devel MesaLib-devel glu-devel"
+short_desc="Simple and Fast Multimedia Library"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="zlib"
+homepage="http://www.sfml-dev.org/"
+distfiles="https://github.com/LaurentGomila/${pkgname}/archive/${version}.tar.gz"
+checksum=543458923e35868c16ac70e5f4c3bf172e136af9820d7b546b52afc7f1fc77f5
+configure_args="-DSFML_BUILD_EXAMPLES=1 -DSFML_BUILD_DOC=1 -DSFML_INSTALL_PKGCONFIG_FILES=1"
+
+SFML-devel_package() {
+	depends="SFML>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/SFML
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/gtkglextmm-devel

@@ -0,0 +1 @@
+gtkglextmm

srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch

@@ -0,0 +1,28 @@
+Description: Fix FTBFS due to missing GdkSpanFunc definition
+ .
+ The sequence of #include directives is important - if gtk/gtkglwidget.h
+ is included first, before widget.h, it includes gdk.h without undefing
+ GDK_DISABLE_DEPRECATED - this leads to GdkSpanFunc not being defined
+ and compilation errors. 
+ The fix is to first include widget.h which includes the right gdkmm header
+ which defines GDK_DISABLE_DEPRECATED before including gdk.h.
+Forwarded: no
+Bug-Ubuntu: http://launchpad.net/bugs/662572
+
+Index: gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc
+===================================================================
+--- gtkglext/gtkmm/gl/widget.cc	2010-12-08 13:31:59.651270000 +0100
++++ gtkglext/gtkmm/gl/widget.cc	2010-12-08 13:32:10.871270000 +0100
+@@ -17,10 +17,10 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gtk/gtkglwidget.h>
+-
+ #include "widget.h"
+ 
++#include <gtk/gtkglwidget.h>
++
+ namespace Gtk
+ {
+   namespace GL

srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch

@@ -0,0 +1,121 @@
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
+===================================================================
+--- gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:40:48.363207736 +0200
++++ gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -1,15 +1,8 @@
+-
+-#include <glib.h>
+-
+ // Disable the 'const' function attribute of the get_type() functions.
+ // GCC would optimize them out because we don't use the return value.
+ #undef  G_GNUC_CONST
+ #define G_GNUC_CONST /* empty */
+ 
+-#include <gdkmm/gl/wrap_init.h>
+-#include <glibmm/error.h>
+-#include <glibmm/object.h>
+-
+ // #include the widget headers so that we can call the get_type() static methods:
+ 
+ #include "tokens.h"
+@@ -19,6 +12,12 @@
+ #include "pixmap.h"
+ #include "window.h"
+ 
++#include <glib.h>
++
++#include <gdkmm/gl/wrap_init.h>
++#include <glibmm/error.h>
++#include <glibmm/object.h>
++
+ extern "C"
+ {
+ 
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
+===================================================================
+--- gdkglext/gdkmm/gl/query.cc	2013-05-16 23:40:48.363207736 +0200
++++ gdkglext/gdkmm/gl/query.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,10 +17,10 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gdk/gdkglquery.h>
+-
+ #include "query.h"
+ 
++#include <gdk/gdkglquery.h>
++
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
+===================================================================
+--- gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:40:48.363207736 +0200
++++ gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,11 +17,11 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include "pixmapext.h"
++
+ #include <gdk/gdkgldrawable.h>
+ #include <gdk/gdkglpixmap.h>
+ 
+-#include "pixmapext.h"
+-
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
+===================================================================
+--- gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:40:48.363207736 +0200
++++ gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,11 +17,11 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include "windowext.h"
++
+ #include <gdk/gdkgldrawable.h>
+ #include <gdk/gdkglwindow.h>
+ 
+-#include "windowext.h"
+-
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
+===================================================================
+--- gdkglext/gdkmm/gl/font.cc	2004-05-18 08:01:49.000000000 +0200
++++ gdkglext/gdkmm/gl/font.cc	2013-05-16 23:43:07.637456821 +0200
+@@ -17,10 +17,10 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gdk/gdkglfont.h>
+-
+ #include "font.h"
+ 
++#include <gdk/gdkglfont.h>
++
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
+===================================================================
+--- gdkglext/gdkmm/gl/init.cc	2003-02-27 10:49:24.000000000 +0100
++++ gdkglext/gdkmm/gl/init.cc	2013-05-16 23:44:38.320316782 +0200
+@@ -19,11 +19,11 @@
+ 
+ #include <cstdlib>
+ 
+-#include <gdk/gdkglinit.h>
+-
+ #include "wrap_init.h"
+ #include "init.h"
+ 
++#include <gdk/gdkglinit.h>
++
+ namespace Gdk
+ {
+   namespace GL

srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch

@@ -0,0 +1,24 @@
+diff --git a/gtkglext/gtkmm/gl/drawingarea.cc b/gtkglext/gtkmm/gl/drawingarea.cc
+index 82bb7f4..5a8c5e3 100644
+--- gtkglext/gtkmm/gl/drawingarea.cc
++++ gtkglext/gtkmm/gl/drawingarea.cc
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include <glibmm.h>
+ #include "drawingarea.h"
+ 
+ namespace Gtk
+diff --git a/gtkglext/gtkmm/gl/widget.cc b/gtkglext/gtkmm/gl/widget.cc
+index 598d6e2..2d6833b 100644
+--- gtkglext/gtkmm/gl/widget.cc
++++ gtkglext/gtkmm/gl/widget.cc
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include <glibmm.h>
+ #include "widget.h"
+ 
+ #include <gtk/gtkglwidget.h>

srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch

@@ -0,0 +1,11 @@
+--- m4macros/gtkglextmm.m4	2004-05-18 08:29:34.000000000 +0200
++++ m4macros/gtkglextmm.m4	2006-05-31 16:46:09.000000000 +0200
+@@ -222,7 +222,7 @@
+ dnl AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD([ACTION-IF-SUPPORTED [, ACTION-IF-NOT-SUPPORTED]])
+ dnl Checks whether gtkglextmm supports multihead.
+ dnl
+-AC_DEFUN(AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD,
++AC_DEFUN([AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD],
+ [ AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_CACHE_CHECK([whether gtkglextmm supports multihead],

srcpkgs/gtkglextmm/template

@@ -0,0 +1,28 @@
+# Template file for 'gtkglextmm'
+pkgname=gtkglextmm
+version=1.2.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="gtkglext-devel gtkmm2-devel pangomm-devel"
+short_desc="C++ bindings for gtkglext"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="LGPL-2.1"
+homepage="https://projects.gnome.org/gtkglext/"
+distfiles="${SOURCEFORGE_SITE}/gtkglext/${pkgname}-${version}.tar.bz2"
+checksum=6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea
+nocross=yes
+
+gtkglextmm-devel_package() {
+	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/doc
+		vmove usr/share/aclocal
+		vmove usr/lib/gtkglextmm-1.2
+	}
+}

srcpkgs/vba-m/template

@@ -0,0 +1,20 @@
+# Template file for 'vbam'
+pkgname=vba-m
+version=1292
+revision=1
+wrksrc=sources
+build_style=cmake
+hostmakedepends="unzip cmake pkg-config"
+makedepends="zlib-devel libpng-devel MesaLib-devel SDL-devel gtkmm2-devel gtkglext-devel gtkglextmm-devel ffmpeg-devel gtk+-devel SFML-devel"
+short_desc="Gameboy Advance Emulator"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="GPL-2"
+homepage="http://sourceforge.net/projects/vbam/"
+distfiles="${SOURCEFORGE_SITE}/project/vbam/vbam-src/${pkgname}-SVN${version}-sources.zip"
+checksum=edaca73fb9887eef6bab3d573b54c058e3412823e5bdcb3b1b76c4ce9f7ea3eb
+configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
+conf_files="/etc/vbam.cfg"
+
+pre_configure() {
+	sed 's|Common/|common/|' -i src/gba/debugger-expr-yacc.cpp
+}