merge of '457771c2a6f985f7194f3c01439f7cf7ce49ddda'

     and '83be462b02e37b4596b7f221a4906b75dd03d154'

4 files changed, 85 insertions, 0 deletions

diff --git a/packages/fceu/.mtn2git_empty b/packages/fceu/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fceu/.mtn2git_empty
diff --git a/packages/fceu/fceu_0.98.13-pre.bb b/packages/fceu/fceu_0.98.13-pre.bb
new file mode 100644
index 0000000000..a2645e9d5c
--- /dev/null
+++ b/packages/fceu/fceu_0.98.13-pre.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "FCEU Ultra NES Emulator"
+
+SECTION = "games"
+LICENSE = "GPL"
+HOMEPAGE = "http://fceultra.sourceforge.net"
+DEPENDS = "virtual/libsdl"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/fceultra/fceu-${PV}.src.tar.bz2 \
+	   file://fceu.patch;pnum=0;patch=1 \
+	  "
+
+S = "${WORKDIR}/fceu"
+
+inherit autotools pkgconfig
+
+do_configure() {
+    oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/packages/fceu/files/.mtn2git_empty b/packages/fceu/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fceu/files/.mtn2git_empty
diff --git a/packages/fceu/files/fceu.patch b/packages/fceu/files/fceu.patch
new file mode 100644
index 0000000000..ae54671cde
--- /dev/null
+++ b/packages/fceu/files/fceu.patch
@@ -0,0 +1,58 @@
+--- configure.orig	Wed Sep 15 20:31:55 2004
++++ configure	Mon Feb 28 08:45:42 2005
+@@ -308,7 +308,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP WIN32_TRUE WIN32_FALSE UNIX_TRUE UNIX_FALSE USE_SEXYAL_TRUE USE_SEXYAL_FALSE NATIVEWIN32_TRUE NATIVEWIN32_FALSE OPENGL_TRUE OPENGL_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS C80x86_TRUE C80x86_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP WIN32_TRUE WIN32_FALSE UNIX_TRUE UNIX_FALSE USE_SEXYAL_TRUE USE_SEXYAL_FALSE NATIVEWIN32_TRUE NATIVEWIN32_FALSE OPENGL_TRUE OPENGL_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -5130,21 +5130,11 @@
+ fi
+ 
+ 
+-if expr match "$target_cpu" 'i.86' > /dev/null; then
++if echo ${target_cpu} | grep -q 'i.86' > /dev/null; then
+ 	cat >>confdefs.h <<\_ACEOF
+ #define C80x86 1
+ _ACEOF
+ 
+-
+-
+-if true; then
+-  C80x86_TRUE=
+-  C80x86_FALSE='#'
+-else
+-  C80x86_TRUE='#'
+-  C80x86_FALSE=
+-fi
+-
+ fi
+ 
+ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+@@ -5589,13 +5579,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test -z "${C80x86_TRUE}" && test -z "${C80x86_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"C80x86\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"C80x86\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+@@ -6188,8 +6171,6 @@
+ s,@SDL_CONFIG@,$SDL_CONFIG,;t t
+ s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t
+ s,@SDL_LIBS@,$SDL_LIBS,;t t
+-s,@C80x86_TRUE@,$C80x86_TRUE,;t t
+-s,@C80x86_FALSE@,$C80x86_FALSE,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+