rpms/desmume/F-18 desmume-0.9.10-glx_3Demu.patch, NONE, 1.1 desmume-0.9.10-tinyxml.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 desmume.spec, 1.20, 1.21 sources, 1.11, 1.12
Andrea Musuruane
musuruan at rpmfusion.org
Tue Dec 10 08:21:45 CET 2013
- Previous message: rpms/desmume/F-19 desmume-0.9.10-glx_3Demu.patch, NONE, 1.1 desmume-0.9.10-tinyxml.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 desmume.spec, 1.21, 1.22 sources, 1.11, 1.12
- Next message: rpms/buildsys-build-rpmfusion/devel buildsys-build-rpmfusion-kerneldevpkgs-current, 1.27, 1.28 buildsys-build-rpmfusion.spec, 1.46, 1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: musuruan
Update of /cvs/free/rpms/desmume/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23946
Modified Files:
.cvsignore desmume.spec sources
Added Files:
desmume-0.9.10-glx_3Demu.patch desmume-0.9.10-tinyxml.patch
Log Message:
* Sun Dec 01 2013 Andrea Musuruane <musuruan at gmail.com> - 0.9.10-1
- Updated to upstream version 0.9.10
- Added a patch to use system tinyxml
- Built with compat-lua for F20+
- Dropped cleaning at the beginning of %install
- Updated desktop database because desmume desktop entry has MimeType key
desmume-0.9.10-glx_3Demu.patch:
glx_3Demu.cpp | 2 +-
glx_3Demu.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE desmume-0.9.10-glx_3Demu.patch ---
diff -durN desmume-0.9.10.orig/src/gtk/glx_3Demu.cpp desmume-0.9.10/src/gtk/glx_3Demu.cpp
--- desmume-0.9.10.orig/src/gtk/glx_3Demu.cpp 2013-11-28 01:36:53.712615822 +0100
+++ desmume-0.9.10/src/gtk/glx_3Demu.cpp 2013-12-07 16:34:40.322590273 +0100
@@ -31,7 +31,7 @@
static GLXContext ctx;
static GLXPbuffer pbuf;
-void deinit_glx_3Demu(void)
+int deinit_glx_3Demu(void)
{
Display *dpy = glXGetCurrentDisplay();
diff -durN desmume-0.9.10.orig/src/gtk/glx_3Demu.h desmume-0.9.10/src/gtk/glx_3Demu.h
--- desmume-0.9.10.orig/src/gtk/glx_3Demu.h 2013-11-28 01:36:53.716615886 +0100
+++ desmume-0.9.10/src/gtk/glx_3Demu.h 2013-12-07 16:34:51.638591188 +0100
@@ -20,5 +20,5 @@
#ifdef HAVE_GL_GLX
int init_glx_3Demu(void);
-void deinit_glx_3Demu(void);
+int deinit_glx_3Demu(void);
#endif
desmume-0.9.10-tinyxml.patch:
Makefile.am | 8 ++------
Makefile.in | 30 +-----------------------------
cli/Makefile.am | 2 +-
cli/Makefile.in | 2 +-
gtk-glade/Makefile.am | 2 +-
gtk-glade/Makefile.in | 2 +-
gtk/Makefile.am | 2 +-
gtk/Makefile.in | 2 +-
mc.h | 2 +-
utils/advanscene.cpp | 2 +-
10 files changed, 11 insertions(+), 43 deletions(-)
--- NEW FILE desmume-0.9.10-tinyxml.patch ---
diff -durN desmume-0.9.10.orig/src/cli/Makefile.am desmume-0.9.10/src/cli/Makefile.am
--- desmume-0.9.10.orig/src/cli/Makefile.am 2013-11-28 01:37:28.273174019 +0100
+++ desmume-0.9.10/src/cli/Makefile.am 2013-12-07 17:31:46.894867356 +0100
@@ -5,7 +5,7 @@
bin_PROGRAMS = desmume-cli
desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp
-desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS)
+desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml
if HAVE_GDB_STUB
desmume_cli_LDADD += ../gdbstub/libgdbstub.a
endif
diff -durN desmume-0.9.10.orig/src/cli/Makefile.in desmume-0.9.10/src/cli/Makefile.in
--- desmume-0.9.10.orig/src/cli/Makefile.in 2013-11-28 01:43:26.222899413 +0100
+++ desmume-0.9.10/src/cli/Makefile.in 2013-12-07 17:30:15.228859944 +0100
@@ -387,7 +387,7 @@
desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp
desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) \
$(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) \
- $(LIBSOUNDTOUCH_LIBS) $(am__append_1)
+ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1)
all: all-recursive
.SUFFIXES:
diff -durN desmume-0.9.10.orig/src/gtk/Makefile.am desmume-0.9.10/src/gtk/Makefile.am
--- desmume-0.9.10.orig/src/gtk/Makefile.am 2013-11-28 01:36:53.712615822 +0100
+++ desmume-0.9.10/src/gtk/Makefile.am 2013-12-07 16:56:36.072696668 +0100
@@ -27,7 +27,7 @@
../filter/videofilter.cpp ../filter/videofilter.h \
main.cpp main.h
desmume_LDADD = ../libdesmume.a \
- $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS)
+ $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml
if HAVE_GDB_STUB
desmume_LDADD += ../gdbstub/libgdbstub.a
endif
diff -durN desmume-0.9.10.orig/src/gtk/Makefile.in desmume-0.9.10/src/gtk/Makefile.in
--- desmume-0.9.10.orig/src/gtk/Makefile.in 2013-11-28 01:43:26.522904152 +0100
+++ desmume-0.9.10/src/gtk/Makefile.in 2013-12-07 16:56:08.242694418 +0100
@@ -452,7 +452,7 @@
desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \
$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) $(am__append_2) \
+ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) $(am__append_2) \
$(am__append_3)
UPDATE_DESKTOP = \
appsdir=$(DESTDIR)$(datadir)/applications ; \
diff -durN desmume-0.9.10.orig/src/gtk-glade/Makefile.am desmume-0.9.10/src/gtk-glade/Makefile.am
--- desmume-0.9.10.orig/src/gtk-glade/Makefile.am 2013-11-28 01:37:17.657002591 +0100
+++ desmume-0.9.10/src/gtk-glade/Makefile.am 2013-12-07 17:27:38.518847271 +0100
@@ -33,7 +33,7 @@
desmume_glade_LDADD = ../libdesmume.a \
$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
- $(LIBSOUNDTOUCH_LIBS)
+ $(IBSOUNDTOUCH_LIBS) -ltinyxml
if HAVE_GDB_STUB
desmume_glade_LDADD += ../gdbstub/libgdbstub.a
endif
diff -durN desmume-0.9.10.orig/src/gtk-glade/Makefile.in desmume-0.9.10/src/gtk-glade/Makefile.in
--- desmume-0.9.10.orig/src/gtk-glade/Makefile.in 2013-11-28 01:43:26.414902446 +0100
+++ desmume-0.9.10/src/gtk-glade/Makefile.in 2013-12-07 17:27:07.673844777 +0100
@@ -443,7 +443,7 @@
desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \
$(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
- $(LIBSOUNDTOUCH_LIBS) $(am__append_1)
+ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1)
all: all-recursive
.SUFFIXES:
diff -durN desmume-0.9.10.orig/src/Makefile.am desmume-0.9.10/src/Makefile.am
--- desmume-0.9.10.orig/src/Makefile.am 2013-11-28 01:37:28.421176409 +0100
+++ desmume-0.9.10/src/Makefile.am 2013-12-07 17:32:42.702871869 +0100
@@ -82,12 +82,6 @@
utils/libfat/mem_allocate.h \
utils/libfat/partition.cpp \
utils/libfat/partition.h \
- utils/tinyxml/tinystr.cpp \
- utils/tinyxml/tinystr.h \
- utils/tinyxml/tinyxml.cpp \
- utils/tinyxml/tinyxml.h \
- utils/tinyxml/tinyxmlerror.cpp \
- utils/tinyxml/tinyxmlparser.cpp \
addons/slot2_auto.cpp addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/slot2_gbagame.cpp addons/slot2_none.cpp addons/slot2_rumblepak.cpp addons/slot2_guitarGrip.cpp addons/slot2_expMemory.cpp addons/slot2_piano.cpp addons/slot2_passme.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail_nand.cpp addons/slot1_retail_auto.cpp addons/slot1_retail_mcrom.cpp addons/slot1_retail_mcrom_debug.cpp addons/slot1comp_mc.cpp addons/slot1comp_mc.h addons/slot1comp_rom.h addons/slot1comp_rom.cpp addons/slot1comp_protocol.h addons/slot1comp_protocol.cpp \
cheatSystem.cpp cheatSystem.h \
texcache.cpp texcache.h rasterize.cpp rasterize.h \
@@ -203,3 +197,5 @@
libdesmume_a_SOURCES += gdbstub.h
endif
libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
+LIBS += -ltinyxml
+
diff -durN desmume-0.9.10.orig/src/Makefile.in desmume-0.9.10/src/Makefile.in
--- desmume-0.9.10.orig/src/Makefile.in 2013-11-28 01:43:26.158898402 +0100
+++ desmume-0.9.10/src/Makefile.in 2013-12-07 18:03:29.755021227 +0100
@@ -215,9 +215,6 @@
utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \
utils/libfat/lock.h utils/libfat/mem_allocate.h \
utils/libfat/partition.cpp utils/libfat/partition.h \
- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \
- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \
- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \
addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
@@ -354,10 +351,6 @@
utils/libfat/libfat.$(OBJEXT) \
utils/libfat/libfat_public_api.$(OBJEXT) \
utils/libfat/lock.$(OBJEXT) utils/libfat/partition.$(OBJEXT) \
- utils/tinyxml/tinystr.$(OBJEXT) \
- utils/tinyxml/tinyxml.$(OBJEXT) \
- utils/tinyxml/tinyxmlerror.$(OBJEXT) \
- utils/tinyxml/tinyxmlparser.$(OBJEXT) \
addons/slot2_auto.$(OBJEXT) addons/slot2_mpcf.$(OBJEXT) \
addons/slot2_paddle.$(OBJEXT) addons/slot2_gbagame.$(OBJEXT) \
addons/slot2_none.$(OBJEXT) addons/slot2_rumblepak.$(OBJEXT) \
@@ -554,7 +547,7 @@
LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
LIBGLADE_LIBS = @LIBGLADE_LIBS@
LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -ltinyxml
LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@
LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@
LTLIBOBJS = @LTLIBOBJS@
@@ -704,9 +697,6 @@
utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \
utils/libfat/lock.h utils/libfat/mem_allocate.h \
utils/libfat/partition.cpp utils/libfat/partition.h \
- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \
- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \
- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \
addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
@@ -839,20 +829,6 @@
utils/libfat/$(DEPDIR)/$(am__dirstamp)
utils/libfat/partition.$(OBJEXT): utils/libfat/$(am__dirstamp) \
utils/libfat/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/$(am__dirstamp):
- @$(MKDIR_P) utils/tinyxml
- @: > utils/tinyxml/$(am__dirstamp)
-utils/tinyxml/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) utils/tinyxml/$(DEPDIR)
- @: > utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/tinystr.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
- utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/tinyxml.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
- utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/tinyxmlerror.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
- utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/tinyxmlparser.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
- utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
addons/$(am__dirstamp):
@$(MKDIR_P) addons
@: > addons/$(am__dirstamp)
@@ -1171,10 +1147,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/libfat_public_api.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/lock.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/partition.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinystr.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxml.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po at am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
diff -durN desmume-0.9.10.orig/src/mc.h desmume-0.9.10/src/mc.h
--- desmume-0.9.10.orig/src/mc.h 2013-11-28 01:37:26.713148829 +0100
+++ desmume-0.9.10/src/mc.h 2013-12-07 16:54:50.433688126 +0100
@@ -26,7 +26,7 @@
#include "types.h"
#include "emufile.h"
#include "common.h"
-#include "utils/tinyxml/tinyxml.h"
+#include <tinyxml.h>
#define MAX_SAVE_TYPES 13
#define MC_TYPE_AUTODETECT 0x0
diff -durN desmume-0.9.10.orig/src/utils/advanscene.cpp desmume-0.9.10/src/utils/advanscene.cpp
--- desmume-0.9.10.orig/src/utils/advanscene.cpp 2013-11-28 01:37:27.861167366 +0100
+++ desmume-0.9.10/src/utils/advanscene.cpp 2013-12-08 10:01:01.662018138 +0100
@@ -19,7 +19,7 @@
#include <time.h>
#define TIXML_USE_STL
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#include "advanscene.h"
#include "mc.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-18/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 4 May 2013 16:58:34 -0000 1.11
+++ .cvsignore 10 Dec 2013 07:21:45 -0000 1.12
@@ -1 +1 @@
-desmume-0.9.9.tar.gz
+desmume-0.9.10.tar.tar
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-18/desmume.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- desmume.spec 4 May 2013 16:58:35 -0000 1.20
+++ desmume.spec 10 Dec 2013 07:21:45 -0000 1.21
@@ -3,24 +3,36 @@
%endif
Name: desmume
-Version: 0.9.9
+Version: 0.9.10
Release: 1%{?dist}
Summary: A Nintendo DS emulator
License: GPLv2+
URL: http://desmume.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.tar
# Do not look into builddir
Patch0: %{name}-0.9-dontlookinbuilddir.patch
+# Fix compile errors
+# Upstream CVS
+Patch1: %{name}-0.9.10-glx_3Demu.patch
+# Use system tinyxml instead of the embedded copy
+Patch2: %{name}-0.9.10-tinyxml.patch
BuildRequires: gtkglext-devel
BuildRequires: libglade2-devel
BuildRequires: openal-soft-devel
-BuildRequires: lua-devel
+%if 0%{?fedora} >= 20
+BuildRequires: compat-lua-devel
+%else
+BuildRequires: lua-devel
+%endif
BuildRequires: zziplib-devel
+BuildRequires: agg-devel
+BuildRequires: tinyxml-devel
+# Not yet in Fedora
+#BuildRequires: soundtouch-devel >= 1.5.0
BuildRequires: gettext
BuildRequires: intltool
-BuildRequires: agg-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -51,6 +63,11 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+# Remove bundled tinyxml
+rm -rf src/utils/tinyxml
# Fix end-of-line encoding
sed -i 's/\r//' AUTHORS
@@ -86,7 +103,6 @@
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# Remove installed icon
@@ -126,7 +142,7 @@
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
+/usr/bin/update-desktop-database &> /dev/null || :
%post glade
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -137,6 +153,7 @@
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+/usr/bin/update-desktop-database &> /dev/null || :
%postun glade
@@ -186,6 +203,13 @@
%changelog
+* Sun Dec 01 2013 Andrea Musuruane <musuruan at gmail.com> - 0.9.10-1
+- Updated to upstream version 0.9.10
+- Added a patch to use system tinyxml
+- Built with compat-lua for F20+
+- Dropped cleaning at the beginning of %%install
+- Updated desktop database because desmume desktop entry has MimeType key
+
* Wed May 01 2013 Andrea Musuruane <musuruan at gmail.com> - 0.9.9-1
- Updated to upstream version 0.9.9
- Dropped obsolete Group, Buildroot, %%clean and %%defattr
@@ -257,7 +281,7 @@
* Wed Apr 23 2008 Andrea Musuruane <musuruan at gmail.com> 0.8-1
- Updated to upstream version 0.8
-* Sun Sep 08 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.3-4
+* Sat Sep 08 2007 Andrea Musuruane <musuruan at gmail.com> 0.7.3-4
- Using debian sources because many things were missing from upstream
- Removed no longer needed automake and autoconf from BR
- Updated icon cache scriptlets to be compliant to new guidelines
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 May 2013 16:58:35 -0000 1.11
+++ sources 10 Dec 2013 07:21:45 -0000 1.12
@@ -1 +1 @@
-458b5f8b3dbb38a47e6d0518f97aa82a desmume-0.9.9.tar.gz
+a6aedfe5d6437d481aa9ac5fb5aebbea desmume-0.9.10.tar.tar
- Previous message: rpms/desmume/F-19 desmume-0.9.10-glx_3Demu.patch, NONE, 1.1 desmume-0.9.10-tinyxml.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 desmume.spec, 1.21, 1.22 sources, 1.11, 1.12
- Next message: rpms/buildsys-build-rpmfusion/devel buildsys-build-rpmfusion-kerneldevpkgs-current, 1.27, 1.28 buildsys-build-rpmfusion.spec, 1.46, 1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list