rpms/nvidia-173xx-kmod/devel nvidia-173xx-kmod.spec,1.51,1.52
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7249
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-4
- Rebuilt for f20 final kernel
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/devel/nvidia-173xx-kmod.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nvidia-173xx-kmod.spec 7 Dec 2013 18:23:31 -0000 1.51
+++ nvidia-173xx-kmod.spec 10 Dec 2013 19:23:38 -0000 1.52
@@ -8,7 +8,7 @@
Name: nvidia-173xx-kmod
Version: 173.14.38
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -89,6 +89,9 @@
%changelog
+* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-4
+- Rebuilt for f20 final kernel
+
* Sat Dec 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-3
- Rebuilt for f20 final kernel
10 years, 5 months
rpms/xtables-addons-kmod/devel xtables-addons-kmod.spec,1.32,1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7128
Modified Files:
xtables-addons-kmod.spec
Log Message:
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.1
- Rebuilt for f20 final kernel
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xtables-addons-kmod.spec 7 Dec 2013 18:23:22 -0000 1.32
+++ xtables-addons-kmod.spec 10 Dec 2013 19:23:28 -0000 1.33
@@ -8,7 +8,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 2.3
-Release: 3%{?dist}.1
+Release: 4%{?dist}.1
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@
rm -rf %{buildroot}
%changelog
+* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.1
+- Rebuilt for f20 final kernel
+
* Sat Dec 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-3.1
- Rebuilt for f20 final kernel
10 years, 5 months
rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.26,1.27
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7007
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.4-4
- Rebuilt for f20 final kernel
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- VirtualBox-kmod.spec 7 Dec 2013 18:23:12 -0000 1.26
+++ VirtualBox-kmod.spec 10 Dec 2013 19:23:16 -0000 1.27
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.3.4
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.4-4
+- Rebuilt for f20 final kernel
+
* Sat Dec 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.4-3
- Rebuilt for f20 final kernel
10 years, 5 months
rpms/openafs-kmod/devel openafs-kmod.spec,1.38,1.39
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6883
Modified Files:
openafs-kmod.spec
Log Message:
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.4
- Rebuilt for f20 final kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- openafs-kmod.spec 7 Dec 2013 18:23:05 -0000 1.38
+++ openafs-kmod.spec 10 Dec 2013 19:23:06 -0000 1.39
@@ -23,7 +23,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.6
-Release: 0.%{pre}%{?dist}.3
+Release: 0.%{pre}%{?dist}.4
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -99,6 +99,9 @@
%changelog
+* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.4
+- Rebuilt for f20 final kernel
+
* Sat Dec 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.3
- Rebuilt for f20 final kernel
10 years, 5 months
rpms/ndiswrapper-kmod/devel ndiswrapper-kmod.spec,1.63,1.64
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6757
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-5
- Rebuilt for f20 final kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/devel/ndiswrapper-kmod.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ndiswrapper-kmod.spec 7 Dec 2013 18:22:57 -0000 1.63
+++ ndiswrapper-kmod.spec 10 Dec 2013 19:22:58 -0000 1.64
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.59
-Release: 4%{?pre}%{?dist}
+Release: 5%{?pre}%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -75,6 +75,9 @@
%changelog
+* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-5
+- Rebuilt for f20 final kernel
+
* Sat Dec 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-4
- Rebuilt for f20 final kernel
10 years, 5 months
rpms/buildsys-build-rpmfusion/devel buildsys-build-rpmfusion-kerneldevpkgs-current, 1.27, 1.28 buildsys-build-rpmfusion.spec, 1.46, 1.47
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6493
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-0.6
- rebuild for kernel 3.11.10-301.fc20
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- buildsys-build-rpmfusion-kerneldevpkgs-current 7 Dec 2013 15:14:17 -0000 1.27
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 10 Dec 2013 19:18:24 -0000 1.28
@@ -1,4 +1,4 @@
-3.11.10-300.fc20
-3.11.10-300.fc20smp
-3.11.10-300.fc20PAE
-3.11.10-300.fc20lpae
+3.11.10-301.fc20
+3.11.10-301.fc20smp
+3.11.10-301.fc20PAE
+3.11.10-301.fc20lpae
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- buildsys-build-rpmfusion.spec 7 Dec 2013 17:17:30 -0000 1.46
+++ buildsys-build-rpmfusion.spec 10 Dec 2013 19:18:24 -0000 1.47
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 20
-Release: 0.5
+Release: 0.6
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-0.6
+- rebuild for kernel 3.11.10-301.fc20
+
* Sat Dec 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-0.5
- Fix kernel variant + separator
- rebuild for kernel 3.11.10-300.fc20
10 years, 5 months
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
by Andrea Musuruane
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(a)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@utils/libfat/$(DEPDIR)/libfat_public_api.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/lock.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/partition.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinystr.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxml.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po(a)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(a)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(a)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(a)gmail.com> 0.8-1
- Updated to upstream version 0.8
-* Sun Sep 08 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.7.3-4
+* Sat Sep 08 2007 Andrea Musuruane <musuruan(a)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
10 years, 5 months
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
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23811
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(a)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@utils/libfat/$(DEPDIR)/libfat_public_api.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/lock.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/partition.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinystr.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxml.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po(a)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-19/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 4 May 2013 16:57:57 -0000 1.11
+++ .cvsignore 10 Dec 2013 07:21:07 -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-19/desmume.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- desmume.spec 4 May 2013 16:57:57 -0000 1.21
+++ desmume.spec 10 Dec 2013 07:21:09 -0000 1.22
@@ -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(a)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(a)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(a)gmail.com> 0.8-1
- Updated to upstream version 0.8
-* Sun Sep 08 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.7.3-4
+* Sat Sep 08 2007 Andrea Musuruane <musuruan(a)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-19/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 May 2013 16:57:57 -0000 1.11
+++ sources 10 Dec 2013 07:21:09 -0000 1.12
@@ -1 +1 @@
-458b5f8b3dbb38a47e6d0518f97aa82a desmume-0.9.9.tar.gz
+a6aedfe5d6437d481aa9ac5fb5aebbea desmume-0.9.10.tar.tar
10 years, 5 months
rpms/desmume/devel 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
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23672
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(a)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@utils/libfat/$(DEPDIR)/libfat_public_api.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/lock.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/partition.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinystr.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxml.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po(a)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/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 4 May 2013 16:34:56 -0000 1.11
+++ .cvsignore 10 Dec 2013 07:20:22 -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/devel/desmume.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- desmume.spec 4 May 2013 16:34:56 -0000 1.21
+++ desmume.spec 10 Dec 2013 07:20:22 -0000 1.22
@@ -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(a)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(a)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(a)gmail.com> 0.8-1
- Updated to upstream version 0.8
-* Sun Sep 08 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.7.3-4
+* Sat Sep 08 2007 Andrea Musuruane <musuruan(a)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/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 May 2013 16:34:56 -0000 1.11
+++ sources 10 Dec 2013 07:20:22 -0000 1.12
@@ -1 +1 @@
-458b5f8b3dbb38a47e6d0518f97aa82a desmume-0.9.9.tar.gz
+a6aedfe5d6437d481aa9ac5fb5aebbea desmume-0.9.10.tar.tar
10 years, 5 months
rpms/xmms2-freeworld/devel xmms2-ffmpeg.patch, 1.3, 1.4 xmms2-freeworld.spec, 1.16, 1.17
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/xmms2-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29268
Modified Files:
xmms2-ffmpeg.patch xmms2-freeworld.spec
Log Message:
* Mon Dec 09 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8-11
- fix ffmpeg compile error
xmms2-ffmpeg.patch:
avcodec.c | 9 +++++----
avcodec_compat.h | 18 ++++++++++++++++++
2 files changed, 23 insertions(+), 4 deletions(-)
Index: xmms2-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/xmms2-freeworld/devel/xmms2-ffmpeg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmms2-ffmpeg.patch 2 Nov 2012 01:50:27 -0000 1.3
+++ xmms2-ffmpeg.patch 9 Dec 2013 11:33:10 -0000 1.4
@@ -1,6 +1,14 @@
diff -rupN xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec.c xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
--- xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec.c 2011-10-20 15:26:08.000000000 -0400
+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c 2012-11-01 21:36:57.426070895 -0400
+@@ -27,6 +27,7 @@
+ #include "avcodec_compat.h"
+
+ #define AVCODEC_BUFFER_SIZE 16384
++#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+
+ typedef struct {
+ AVCodecContext *codecctx;
@@ -200,7 +200,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
}
}
@@ -19,6 +27,24 @@
XMMS_DBG ("Opening decoder '%s' failed", codec->name);
goto err;
} else {
+@@ -263,7 +264,7 @@ xmms_avcodec_read (xmms_xform_t *xform,
+ xmms_error_t *error)
+ {
+ xmms_avcodec_data_t *data;
+- char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
++ char outbuf[MAX_AUDIO_FRAME_SIZE];
+ gint outbufsize, bytes_read = 0;
+ guint size;
+
+@@ -371,7 +372,7 @@ static gint64
+ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t whence, xmms_error_t *err)
+ {
+ xmms_avcodec_data_t *data;
+- char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
++ char outbuf[MAX_AUDIO_FRAME_SIZE];
+ gint outbufsize, bytes_read = 0;
+ gint64 ret = -1;
+
diff -rupN xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec_compat.h xmms2-0.8DrO_o/src/plugins/avcodec/avcodec_compat.h
--- xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec_compat.h 2011-10-20 15:26:08.000000000 -0400
+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec_compat.h 2012-11-01 21:35:50.276405569 -0400
Index: xmms2-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xmms2-freeworld/devel/xmms2-freeworld.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xmms2-freeworld.spec 8 Dec 2013 20:07:39 -0000 1.16
+++ xmms2-freeworld.spec 9 Dec 2013 11:33:10 -0000 1.17
@@ -3,7 +3,7 @@
Name: xmms2-freeworld
Summary: Plugins for XMMS2 that cannot be included in Fedora
Version: 0.8
-Release: 10%{?dist}
+Release: 11%{?dist}
License: LGPLv2+ and GPL+ and BSD
Group: Applications/Multimedia
# Fedora's xmms2 has to use a sanitized tarball, we don't.
@@ -208,6 +208,9 @@
%{_libdir}/xmms2/libxmms_mp4.so
%changelog
+* Mon Dec 09 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8-11
+- fix ffmpeg compile error
+
* Sun Dec 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8-10
- Rebuilt
10 years, 5 months