May 2015 - rpmfusion-commits

rpms/gstreamer1-libav/devel .cvsignore, 1.12, 1.13 gstreamer1-libav.spec, 1.15, 1.16 sources, 1.12, 1.13

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gstreamer1-libav/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6042 Modified Files: .cvsignore gstreamer1-libav.spec sources Log Message: * Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-1 - Update to 1.4.5 - Update libav to 10.6 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gstreamer1-libav/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Oct 2014 11:34:37 -0000 1.12 +++ .cvsignore 16 May 2015 07:40:24 -0000 1.13 @@ -1 +1,2 @@ -gst-libav-1.4.3.tar.xz +gst-libav-1.4.5.tar.xz +libav-10.6.tar.xz Index: gstreamer1-libav.spec =================================================================== RCS file: /cvs/free/rpms/gstreamer1-libav/devel/gstreamer1-libav.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gstreamer1-libav.spec 1 Oct 2014 11:34:37 -0000 1.15 +++ gstreamer1-libav.spec 16 May 2015 07:40:24 -0000 1.16 @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.4.3 +Version: 1.4.5 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,7 +7,7 @@ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -# Source1: http://libav.org/releases/libav-9.13.tar.xz +Source1: http://libav.org/releases/libav-10.6.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch BuildRequires: gstreamer1-devel >= 1.4.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.4.0 @@ -42,10 +42,9 @@ %prep -%setup -q -n gst-libav-%{version} -# -a 1 -#rm -r gst-libs/ext/libav -#mv libav-9.13 gst-libs/ext/libav +%setup -q -n gst-libav-%{version} -a 1 +rm -r gst-libs/ext/libav +mv libav-10.6 gst-libs/ext/libav %patch0 -p1 @@ -72,6 +71,10 @@ %changelog +* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-1 +- Update to 1.4.5 +- Update libav to 10.6 + * Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.3-1 - Update to 1.4.3 - Includes libav 10.5 Index: sources =================================================================== RCS file: /cvs/free/rpms/gstreamer1-libav/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Oct 2014 11:34:37 -0000 1.12 +++ sources 16 May 2015 07:40:24 -0000 1.13 @@ -1 +1,2 @@ -248b6aae752710bbae77af01f74a082d gst-libav-1.4.3.tar.xz +f4922a46adbcbe7bd01331ff5dc7979d gst-libav-1.4.5.tar.xz +dcdf0e8c2f5fa1fc69d61cd8154cbe46 libav-10.6.tar.xz

9 years, 6 months

1
0
0 / 0

rpms/gstreamer1-plugins-bad-freeworld/devel .cvsignore, 1.12, 1.13 gstreamer1-plugins-bad-freeworld.spec, 1.13, 1.14 sources, 1.12, 1.13

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5940 Modified Files: .cvsignore gstreamer1-plugins-bad-freeworld.spec sources Log Message: * Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-1 - Rebase to new upstream release 1.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Oct 2014 11:34:49 -0000 1.12 +++ .cvsignore 16 May 2015 07:40:13 -0000 1.13 @@ -1 +1 @@ -gst-plugins-bad-1.4.3.tar.xz +gst-plugins-bad-1.4.5.tar.xz Index: gstreamer1-plugins-bad-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel/gstreamer1-plugins-bad-freeworld.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gstreamer1-plugins-bad-freeworld.spec 1 Oct 2014 11:34:49 -0000 1.13 +++ gstreamer1-plugins-bad-freeworld.spec 16 May 2015 07:40:13 -0000 1.14 @@ -4,7 +4,7 @@ Summary: GStreamer 1.0 streaming media framework "bad" plug-ins Name: gstreamer1-plugins-bad-freeworld -Version: 1.4.3 +Version: 1.4.5 Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia @@ -91,6 +91,9 @@ %changelog +* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-1 +- Rebase to new upstream release 1.4.5 + * Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.3-1 - Rebase to new upstream release 1.4.3 Index: sources =================================================================== RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Oct 2014 11:34:49 -0000 1.12 +++ sources 16 May 2015 07:40:13 -0000 1.13 @@ -1 +1 @@ -77c6bf4b7a328f03860a59171aa1bec5 gst-plugins-bad-1.4.3.tar.xz +e0bb39412cf4a48fe0397bcf3a7cd451 gst-plugins-bad-1.4.5.tar.xz

9 years, 6 months

1
0
0 / 0

rpms/gstreamer1-plugins-ugly/devel .cvsignore, 1.14, 1.15 gstreamer1-plugins-ugly.spec, 1.21, 1.22 sources, 1.14, 1.15

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gstreamer1-plugins-ugly/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5824 Modified Files: .cvsignore gstreamer1-plugins-ugly.spec sources Log Message: * Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-1 - Rebase to new upstream release 1.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 1 Oct 2014 11:35:06 -0000 1.14 +++ .cvsignore 16 May 2015 07:39:58 -0000 1.15 @@ -1 +1 @@ -gst-plugins-ugly-1.4.3.tar.xz +gst-plugins-ugly-1.4.5.tar.xz Index: gstreamer1-plugins-ugly.spec =================================================================== RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/devel/gstreamer1-plugins-ugly.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gstreamer1-plugins-ugly.spec 1 Oct 2014 11:35:06 -0000 1.21 +++ gstreamer1-plugins-ugly.spec 16 May 2015 07:39:58 -0000 1.22 @@ -1,6 +1,6 @@ Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins Name: gstreamer1-plugins-ugly -Version: 1.4.3 +Version: 1.4.5 Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia @@ -95,6 +95,9 @@ %changelog +* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-1 +- Rebase to new upstream release 1.4.5 + * Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.3-1 - Rebase to new upstream release 1.4.3 Index: sources =================================================================== RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 1 Oct 2014 11:35:06 -0000 1.14 +++ sources 16 May 2015 07:39:58 -0000 1.15 @@ -1 +1 @@ -239f055afb4ec0cf5ff8cde5a4a5bb9b gst-plugins-ugly-1.4.3.tar.xz +6954beed7bb9a93e426dee543ff46393 gst-plugins-ugly-1.4.5.tar.xz

9 years, 6 months

1
0
0 / 0

rpms/gstreamer-ffmpeg/F-20 .cvsignore, 1.22, 1.23 gstreamer-ffmpeg.spec, 1.33, 1.34 sources, 1.22, 1.23

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gstreamer-ffmpeg/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5425 Modified Files: .cvsignore gstreamer-ffmpeg.spec sources Log Message: * Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-15 - Upgrade the buildin libav to 0.8.17 to get all the security fixes from upstream libav Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-20/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 1 Oct 2014 10:03:49 -0000 1.22 +++ .cvsignore 16 May 2015 07:31:47 -0000 1.23 @@ -1,2 +1,2 @@ gst-ffmpeg-0.10.13.tar.bz2 -libav-0.8.16.tar.xz +libav-0.8.17.tar.xz Index: gstreamer-ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-20/gstreamer-ffmpeg.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gstreamer-ffmpeg.spec 1 Oct 2014 10:03:49 -0000 1.33 +++ gstreamer-ffmpeg.spec 16 May 2015 07:31:47 -0000 1.34 @@ -1,6 +1,6 @@ Name: gstreamer-ffmpeg Version: 0.10.13 -Release: 14%{?dist} +Release: 15%{?dist} Summary: GStreamer FFmpeg-based plug-ins Group: Applications/Multimedia # the ffmpeg plugin is LGPL, the postproc plugin is GPL @@ -8,7 +8,7 @@ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar... # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-0.8.16.tar.xz +Source1: http://libav.org/releases/libav-0.8.17.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch # Patches cherry picked from upstream for newer libav and bugfixes Patch1: 0001-configure.ac-Fix-for-new-libav.patch @@ -57,7 +57,7 @@ %patch11 -p1 %patch12 -p1 rm -r gst-libs/ext/libav -mv libav-0.8.16 gst-libs/ext/libav +mv libav-0.8.17 gst-libs/ext/libav %build @@ -83,6 +83,10 @@ %changelog +* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-15 +- Upgrade the buildin libav to 0.8.17 to get all the security fixes from + upstream libav + * Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-14 - Upgrade the buildin libav to 0.8.16 to get all the security fixes from upstream libav Index: sources =================================================================== RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-20/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 1 Oct 2014 10:03:49 -0000 1.22 +++ sources 16 May 2015 07:31:47 -0000 1.23 @@ -1,2 +1,2 @@ 7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2 -224fdcd93fe375cb4c49f4ff47492f54 libav-0.8.16.tar.xz +4232d39bcecae7d61ef924c031591ca5 libav-0.8.17.tar.xz

9 years, 6 months

1
0
0 / 0

rpms/gstreamer-ffmpeg/devel .cvsignore, 1.22, 1.23 gstreamer-ffmpeg.spec, 1.33, 1.34 sources, 1.22, 1.23

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gstreamer-ffmpeg/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5285 Modified Files: .cvsignore gstreamer-ffmpeg.spec sources Log Message: * Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-15 - Upgrade the buildin libav to 0.8.17 to get all the security fixes from upstream libav Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 1 Oct 2014 10:03:16 -0000 1.22 +++ .cvsignore 16 May 2015 07:30:28 -0000 1.23 @@ -1,2 +1,2 @@ gst-ffmpeg-0.10.13.tar.bz2 -libav-0.8.16.tar.xz +libav-0.8.17.tar.xz Index: gstreamer-ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/gstreamer-ffmpeg.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gstreamer-ffmpeg.spec 1 Oct 2014 10:03:16 -0000 1.33 +++ gstreamer-ffmpeg.spec 16 May 2015 07:30:28 -0000 1.34 @@ -1,6 +1,6 @@ Name: gstreamer-ffmpeg Version: 0.10.13 -Release: 14%{?dist} +Release: 15%{?dist} Summary: GStreamer FFmpeg-based plug-ins Group: Applications/Multimedia # the ffmpeg plugin is LGPL, the postproc plugin is GPL @@ -8,7 +8,7 @@ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar... # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-0.8.16.tar.xz +Source1: http://libav.org/releases/libav-0.8.17.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch # Patches cherry picked from upstream for newer libav and bugfixes Patch1: 0001-configure.ac-Fix-for-new-libav.patch @@ -57,7 +57,7 @@ %patch11 -p1 %patch12 -p1 rm -r gst-libs/ext/libav -mv libav-0.8.16 gst-libs/ext/libav +mv libav-0.8.17 gst-libs/ext/libav %build @@ -83,6 +83,10 @@ %changelog +* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-15 +- Upgrade the buildin libav to 0.8.17 to get all the security fixes from + upstream libav + * Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-14 - Upgrade the buildin libav to 0.8.16 to get all the security fixes from upstream libav Index: sources =================================================================== RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 1 Oct 2014 10:03:16 -0000 1.22 +++ sources 16 May 2015 07:30:28 -0000 1.23 @@ -1,2 +1,2 @@ 7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2 -224fdcd93fe375cb4c49f4ff47492f54 libav-0.8.16.tar.xz +4232d39bcecae7d61ef924c031591ca5 libav-0.8.17.tar.xz

9 years, 6 months

1
0
0 / 0

rpms/gstreamer1-libav/F-20 .cvsignore, 1.12, 1.13 gstreamer1-libav.spec, 1.15, 1.16 sources, 1.12, 1.13

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gstreamer1-libav/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4889 Modified Files: .cvsignore gstreamer1-libav.spec sources Log Message: * Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-4 - Update libav to 9.18 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gstreamer1-libav/F-20/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Oct 2014 10:09:41 -0000 1.12 +++ .cvsignore 16 May 2015 07:22:17 -0000 1.13 @@ -1,2 +1,2 @@ gst-libav-1.2.4.tar.xz -libav-9.17.tar.xz +libav-9.18.tar.xz Index: gstreamer1-libav.spec =================================================================== RCS file: /cvs/free/rpms/gstreamer1-libav/F-20/gstreamer1-libav.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gstreamer1-libav.spec 1 Oct 2014 10:09:42 -0000 1.15 +++ gstreamer1-libav.spec 16 May 2015 07:22:17 -0000 1.16 @@ -1,13 +1,13 @@ Name: gstreamer1-libav Version: 1.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-9.17.tar.xz +Source1: http://libav.org/releases/libav-9.18.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 @@ -30,7 +30,7 @@ %prep %setup -q -n gst-libav-%{version} -a 1 rm -r gst-libs/ext/libav -mv libav-9.17 gst-libs/ext/libav +mv libav-9.18 gst-libs/ext/libav %patch0 -p1 @@ -53,6 +53,9 @@ %changelog +* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-4 +- Update libav to 9.18 + * Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-3 - Update libav to 9.17 Index: sources =================================================================== RCS file: /cvs/free/rpms/gstreamer1-libav/F-20/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Oct 2014 10:09:42 -0000 1.12 +++ sources 16 May 2015 07:22:17 -0000 1.13 @@ -1,2 +1,2 @@ 6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz -697ce3faef1d9813bc1e7384b1089001 libav-9.17.tar.xz +75e838068a75fb88e1b4ea0546bc16f0 libav-9.18.tar.xz

9 years, 6 months

1
0
0 / 0

rpms/mpv/devel .cvsignore, 1.16, 1.17 mpv.spec, 1.40, 1.41 sources, 1.16, 1.17

by Miro Hrončok

Author: churchyard Update of /cvs/free/rpms/mpv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2802 Modified Files: .cvsignore mpv.spec sources Log Message: * Sat May 16 2015 Miro Hrončok <mhroncok(a)redhat.com> - 0.9.1-1 - Update to 0.9.1 - BR compat-lua-devel because mpv does not work with lua 5.3 - Add BR lcms2-devel (#3643) - Removed --enable-joystick and --enable-lirc (no longer used) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mpv/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 13 Apr 2015 11:34:45 -0000 1.16 +++ .cvsignore 16 May 2015 00:30:45 -0000 1.17 @@ -1 +1 @@ -v0.8.3.tar.gz +v0.9.1.tar.gz Index: mpv.spec =================================================================== RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- mpv.spec 28 Apr 2015 21:08:42 -0000 1.40 +++ mpv.spec 16 May 2015 00:30:45 -0000 1.41 @@ -1,6 +1,6 @@ Name: mpv -Version: 0.8.3 -Release: 3%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ URL: http://%{name}.io/ @@ -16,9 +16,11 @@ BuildRequires: aalib-devel BuildRequires: alsa-lib-devel BuildRequires: bzip2-devel +BuildRequires: compat-lua-devel BuildRequires: desktop-file-utils BuildRequires: ffmpeg-devel BuildRequires: ffmpeg-libs +BuildRequires: lcms2-devel BuildRequires: libcdio-devel BuildRequires: libcdio-paranoia-devel BuildRequires: libGL-devel @@ -38,7 +40,6 @@ BuildRequires: libwayland-server-devel BuildRequires: libxkbcommon-devel BuildRequires: lirc-devel -BuildRequires: lua-devel BuildRequires: ncurses-devel BuildRequires: pulseaudio-libs-devel BuildRequires: python-docutils @@ -71,8 +72,6 @@ --mandir="%{_mandir}" \ --docdir="%{_docdir}/%{name}" \ --confdir="%{_sysconfdir}/%{name}" \ - --enable-joystick \ - --enable-lirc \ --disable-sdl1 --disable-sdl2 \ --disable-build-date \ --disable-debug @@ -121,6 +120,12 @@ %config(noreplace) %{_sysconfdir}/%{name}/input.conf %changelog +* Sat May 16 2015 Miro Hrončok <mhroncok(a)redhat.com> - 0.9.1-1 +- Update to 0.9.1 +- BR compat-lua-devel because mpv does not work with lua 5.3 +- Add BR lcms2-devel (#3643) +- Removed --enable-joystick and --enable-lirc (no longer used) + * Tue Apr 28 2015 Miro Hrončok <mhroncok(a)redhat.com> - 0.8.3-3 - Conditionalize old waf patch Index: sources =================================================================== RCS file: /cvs/free/rpms/mpv/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 13 Apr 2015 11:34:45 -0000 1.16 +++ sources 16 May 2015 00:30:45 -0000 1.17 @@ -1 +1 @@ -a34ff41da1d5393ac8d6f9fbb743d3bd v0.8.3.tar.gz +c766cf3d6a7eb82a74564c47fa14d4a5 v0.9.1.tar.gz

9 years, 6 months

1
0
0 / 0

rpms/desmume/F-19 desmume-0.9.11-dontlookinbuilddir.patch, NONE, 1.1 desmume-0.9.11-tinyxml.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 desmume.spec, 1.22, 1.23 sources, 1.12, 1.13 desmume-0.9-dontlookinbuilddir.patch, 1.1, NONE desmume-0.9.10-glx_3Demu.patch, 1.1, NONE desmume-0.9.10-tinyxml.patch, 1.1, NONE

by Andrea Musuruane

Author: musuruan Update of /cvs/free/rpms/desmume/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10345 Modified Files: .cvsignore desmume.spec sources Added Files: desmume-0.9.11-dontlookinbuilddir.patch desmume-0.9.11-tinyxml.patch Removed Files: desmume-0.9-dontlookinbuilddir.patch desmume-0.9.10-glx_3Demu.patch desmume-0.9.10-tinyxml.patch Log Message: * Thu May 14 2015 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.11-1 - Updated to upstream version 0.9.11 - Spec file cleanup desmume-0.9.11-dontlookinbuilddir.patch: main.cpp | 5 ----- 1 file changed, 5 deletions(-) --- NEW FILE desmume-0.9.11-dontlookinbuilddir.patch --- diff -durN desmume-0.9.11.orig/src/gtk-glade/main.cpp desmume-0.9.11/src/gtk-glade/main.cpp --- desmume-0.9.11.orig/src/gtk-glade/main.cpp 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/main.cpp 2015-05-14 14:30:47.121562491 +0200 @@ -324,11 +324,6 @@ { gchar *path; - /* looking in uninstalled (aka building) dir first */ - path = g_build_filename (GLADEUI_UNINSTALLED_DIR, filename, NULL); - if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path; - g_free (path); - /* looking in installed dir */ path = g_build_filename (DATADIR, filename, NULL); if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path; desmume-0.9.11-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 +- utils/advanscene.cpp | 2 +- 9 files changed, 10 insertions(+), 42 deletions(-) --- NEW FILE desmume-0.9.11-tinyxml.patch --- diff -durN desmume-0.9.11.orig/src/cli/Makefile.am desmume-0.9.11/src/cli/Makefile.am --- desmume-0.9.11.orig/src/cli/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/cli/Makefile.am 2015-05-14 14:33:02.656690231 +0200 @@ -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.11.orig/src/cli/Makefile.in desmume-0.9.11/src/cli/Makefile.in --- desmume-0.9.11.orig/src/cli/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/cli/Makefile.in 2015-05-14 14:33:02.657690240 +0200 @@ -311,7 +311,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.11.orig/src/gtk/Makefile.am desmume-0.9.11/src/gtk/Makefile.am --- desmume-0.9.11.orig/src/gtk/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk/Makefile.am 2015-05-14 14:33:02.657690240 +0200 @@ -32,7 +32,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.11.orig/src/gtk/Makefile.in desmume-0.9.11/src/gtk/Makefile.in --- desmume-0.9.11.orig/src/gtk/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/gtk/Makefile.in 2015-05-14 14:33:02.658690248 +0200 @@ -382,7 +382,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.11.orig/src/gtk-glade/Makefile.am desmume-0.9.11/src/gtk-glade/Makefile.am --- desmume-0.9.11.orig/src/gtk-glade/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/Makefile.am 2015-05-14 14:33:02.658690248 +0200 @@ -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.11.orig/src/gtk-glade/Makefile.in desmume-0.9.11/src/gtk-glade/Makefile.in --- desmume-0.9.11.orig/src/gtk-glade/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/Makefile.in 2015-05-14 14:33:02.658690248 +0200 @@ -367,7 +367,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.11.orig/src/Makefile.am desmume-0.9.11/src/Makefile.am --- desmume-0.9.11.orig/src/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/Makefile.am 2015-05-14 14:37:46.164049196 +0200 @@ -81,12 +81,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 \ utils/glcorearb.h \ 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 \ @@ -204,3 +198,5 @@ libdesmume_a_SOURCES += gdbstub.h endif libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT) +LIBS += -ltinyxml + diff -durN desmume-0.9.11.orig/src/Makefile.in desmume-0.9.11/src/Makefile.in --- desmume-0.9.11.orig/src/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/Makefile.in 2015-05-14 14:39:53.916112176 +0200 @@ -184,9 +184,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 \ utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ @@ -324,10 +321,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) \ @@ -475,7 +468,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@ @@ -625,9 +618,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 \ utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ @@ -760,20 +750,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) @@ -1175,10 +1151,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@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ diff -durN desmume-0.9.11.orig/src/utils/advanscene.cpp desmume-0.9.11/src/utils/advanscene.cpp --- desmume-0.9.11.orig/src/utils/advanscene.cpp 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/utils/advanscene.cpp 2015-05-14 14:33:02.661690273 +0200 @@ -19,7 +19,7 @@ #include <time.h> #define TIXML_USE_STL -#include "tinyxml/tinyxml.h" +#include <tinyxml.h> #include "advanscene.h" #include "../common.h" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/desmume/F-19/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 Dec 2013 07:21:07 -0000 1.12 +++ .cvsignore 15 May 2015 08:30:11 -0000 1.13 @@ -1 +1 @@ -desmume-0.9.10.tar.tar +desmume-0.9.11.tar.gz Index: desmume.spec =================================================================== RCS file: /cvs/free/rpms/desmume/F-19/desmume.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- desmume.spec 10 Dec 2013 07:21:09 -0000 1.22 +++ desmume.spec 15 May 2015 08:30:11 -0000 1.23 @@ -1,31 +1,20 @@ -%if (0%{?fedora} && 0%{?fedora}) < 19 -%global with_desktop_vendor_tag 1 -%endif - Name: desmume -Version: 0.9.10 +Version: 0.9.11 Release: 1%{?dist} Summary: A Nintendo DS emulator License: GPLv2+ URL: http://desmume.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.tar +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Do not look into builddir -Patch0: %{name}-0.9-dontlookinbuilddir.patch -# Fix compile errors -# Upstream CVS -Patch1: %{name}-0.9.10-glx_3Demu.patch +Patch0: %{name}-0.9.11-dontlookinbuilddir.patch # Use system tinyxml instead of the embedded copy -Patch2: %{name}-0.9.10-tinyxml.patch +Patch1: %{name}-0.9.11-tinyxml.patch BuildRequires: gtkglext-devel BuildRequires: libglade2-devel BuildRequires: openal-soft-devel -%if 0%{?fedora} >= 20 -BuildRequires: compat-lua-devel -%else -BuildRequires: lua-devel -%endif +BuildRequires: lua-devel BuildRequires: zziplib-devel BuildRequires: agg-devel BuildRequires: tinyxml-devel @@ -64,7 +53,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Remove bundled tinyxml rm -rf src/utils/tinyxml @@ -81,9 +69,10 @@ done # Fix premissions -chmod 644 src/*.{cpp,h} -chmod 644 src/gtk-glade/*.{cpp,h} -chmod 644 src/gtk-glade/dTools/*.{cpp,h} +chmod 644 COPYING README README.LIN +chmod 644 src/filter/hq4x.dat +chmod 644 src/gtk/DeSmuME.xpm +find src -name *.[ch]* -exec chmod 644 {} \; # Fix glade path sed -i 's|gladedir = $(datadir)/desmume/glade|gladedir = $(datadir)/desmume-glade/|g' src/gtk-glade/Makefile.{am,in} @@ -98,7 +87,8 @@ %build %configure \ --enable-openal \ - --enable-glade + --enable-glade \ + --enable-wifi make %{?_smp_mflags} @@ -117,9 +107,6 @@ mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install \ --delete-original \ -%if %{with_desktop_vendor_tag} - --vendor dribble \ -%endif --remove-key Version \ --remove-category GNOME \ --remove-category GTK \ @@ -128,9 +115,6 @@ desktop-file-install \ --delete-original \ -%if %{with_desktop_vendor_tag} - --vendor dribble \ -%endif --remove-key Version \ --remove-category GNOME \ --remove-category GTK \ @@ -174,11 +158,7 @@ %files %{_bindir}/%{name} %{_datadir}/icons/hicolor/32x32/apps/DeSmuME.xpm -%if %{with_desktop_vendor_tag} -%{_datadir}/applications/dribble-%{name}.desktop -%else %{_datadir}/applications/%{name}.desktop -%endif %{_mandir}/man1/%{name}.1* %doc AUTHORS ChangeLog COPYING README README.LIN @@ -187,11 +167,7 @@ %{_bindir}/%{name}-glade %{_datadir}/%{name}-glade %{_datadir}/icons/hicolor/32x32/apps/DeSmuME-glade.xpm -%if %{with_desktop_vendor_tag} -%{_datadir}/applications/dribble-%{name}-glade.desktop -%else %{_datadir}/applications/%{name}-glade.desktop -%endif %{_mandir}/man1/%{name}-glade.1* %doc AUTHORS ChangeLog COPYING README README.LIN @@ -203,6 +179,13 @@ %changelog +* Thu May 14 2015 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.11-1 +- Updated to upstream version 0.9.11 +- Spec file cleanup + +* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * 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 Index: sources =================================================================== RCS file: /cvs/free/rpms/desmume/F-19/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 Dec 2013 07:21:09 -0000 1.12 +++ sources 15 May 2015 08:30:11 -0000 1.13 @@ -1 +1 @@ -a6aedfe5d6437d481aa9ac5fb5aebbea desmume-0.9.10.tar.tar +269b5d4ddc5715720469a9d0efc53044 desmume-0.9.11.tar.gz --- desmume-0.9-dontlookinbuilddir.patch DELETED --- --- desmume-0.9.10-glx_3Demu.patch DELETED --- --- desmume-0.9.10-tinyxml.patch DELETED ---

9 years, 6 months

1
0
0 / 0

rpms/desmume/F-20 desmume-0.9.11-dontlookinbuilddir.patch, NONE, 1.1 desmume-0.9.11-tinyxml.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 desmume.spec, 1.22, 1.23 sources, 1.12, 1.13 desmume-0.9-dontlookinbuilddir.patch, 1.1, NONE desmume-0.9.10-glx_3Demu.patch, 1.1, NONE desmume-0.9.10-tinyxml.patch, 1.1, NONE

by Andrea Musuruane

Author: musuruan Update of /cvs/free/rpms/desmume/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10234 Modified Files: .cvsignore desmume.spec sources Added Files: desmume-0.9.11-dontlookinbuilddir.patch desmume-0.9.11-tinyxml.patch Removed Files: desmume-0.9-dontlookinbuilddir.patch desmume-0.9.10-glx_3Demu.patch desmume-0.9.10-tinyxml.patch Log Message: * Thu May 14 2015 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.11-1 - Updated to upstream version 0.9.11 - Spec file cleanup desmume-0.9.11-dontlookinbuilddir.patch: main.cpp | 5 ----- 1 file changed, 5 deletions(-) --- NEW FILE desmume-0.9.11-dontlookinbuilddir.patch --- diff -durN desmume-0.9.11.orig/src/gtk-glade/main.cpp desmume-0.9.11/src/gtk-glade/main.cpp --- desmume-0.9.11.orig/src/gtk-glade/main.cpp 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/main.cpp 2015-05-14 14:30:47.121562491 +0200 @@ -324,11 +324,6 @@ { gchar *path; - /* looking in uninstalled (aka building) dir first */ - path = g_build_filename (GLADEUI_UNINSTALLED_DIR, filename, NULL); - if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path; - g_free (path); - /* looking in installed dir */ path = g_build_filename (DATADIR, filename, NULL); if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path; desmume-0.9.11-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 +- utils/advanscene.cpp | 2 +- 9 files changed, 10 insertions(+), 42 deletions(-) --- NEW FILE desmume-0.9.11-tinyxml.patch --- diff -durN desmume-0.9.11.orig/src/cli/Makefile.am desmume-0.9.11/src/cli/Makefile.am --- desmume-0.9.11.orig/src/cli/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/cli/Makefile.am 2015-05-14 14:33:02.656690231 +0200 @@ -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.11.orig/src/cli/Makefile.in desmume-0.9.11/src/cli/Makefile.in --- desmume-0.9.11.orig/src/cli/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/cli/Makefile.in 2015-05-14 14:33:02.657690240 +0200 @@ -311,7 +311,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.11.orig/src/gtk/Makefile.am desmume-0.9.11/src/gtk/Makefile.am --- desmume-0.9.11.orig/src/gtk/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk/Makefile.am 2015-05-14 14:33:02.657690240 +0200 @@ -32,7 +32,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.11.orig/src/gtk/Makefile.in desmume-0.9.11/src/gtk/Makefile.in --- desmume-0.9.11.orig/src/gtk/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/gtk/Makefile.in 2015-05-14 14:33:02.658690248 +0200 @@ -382,7 +382,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.11.orig/src/gtk-glade/Makefile.am desmume-0.9.11/src/gtk-glade/Makefile.am --- desmume-0.9.11.orig/src/gtk-glade/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/Makefile.am 2015-05-14 14:33:02.658690248 +0200 @@ -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.11.orig/src/gtk-glade/Makefile.in desmume-0.9.11/src/gtk-glade/Makefile.in --- desmume-0.9.11.orig/src/gtk-glade/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/Makefile.in 2015-05-14 14:33:02.658690248 +0200 @@ -367,7 +367,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.11.orig/src/Makefile.am desmume-0.9.11/src/Makefile.am --- desmume-0.9.11.orig/src/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/Makefile.am 2015-05-14 14:37:46.164049196 +0200 @@ -81,12 +81,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 \ utils/glcorearb.h \ 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 \ @@ -204,3 +198,5 @@ libdesmume_a_SOURCES += gdbstub.h endif libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT) +LIBS += -ltinyxml + diff -durN desmume-0.9.11.orig/src/Makefile.in desmume-0.9.11/src/Makefile.in --- desmume-0.9.11.orig/src/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/Makefile.in 2015-05-14 14:39:53.916112176 +0200 @@ -184,9 +184,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 \ utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ @@ -324,10 +321,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) \ @@ -475,7 +468,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@ @@ -625,9 +618,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 \ utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ @@ -760,20 +750,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) @@ -1175,10 +1151,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@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ diff -durN desmume-0.9.11.orig/src/utils/advanscene.cpp desmume-0.9.11/src/utils/advanscene.cpp --- desmume-0.9.11.orig/src/utils/advanscene.cpp 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/utils/advanscene.cpp 2015-05-14 14:33:02.661690273 +0200 @@ -19,7 +19,7 @@ #include <time.h> #define TIXML_USE_STL -#include "tinyxml/tinyxml.h" +#include <tinyxml.h> #include "advanscene.h" #include "../common.h" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/desmume/F-20/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 Dec 2013 07:20:22 -0000 1.12 +++ .cvsignore 15 May 2015 08:29:46 -0000 1.13 @@ -1 +1 @@ -desmume-0.9.10.tar.tar +desmume-0.9.11.tar.gz Index: desmume.spec =================================================================== RCS file: /cvs/free/rpms/desmume/F-20/desmume.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- desmume.spec 10 Dec 2013 07:20:22 -0000 1.22 +++ desmume.spec 15 May 2015 08:29:46 -0000 1.23 @@ -1,31 +1,20 @@ -%if (0%{?fedora} && 0%{?fedora}) < 19 -%global with_desktop_vendor_tag 1 -%endif - Name: desmume -Version: 0.9.10 +Version: 0.9.11 Release: 1%{?dist} Summary: A Nintendo DS emulator License: GPLv2+ URL: http://desmume.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.tar +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Do not look into builddir -Patch0: %{name}-0.9-dontlookinbuilddir.patch -# Fix compile errors -# Upstream CVS -Patch1: %{name}-0.9.10-glx_3Demu.patch +Patch0: %{name}-0.9.11-dontlookinbuilddir.patch # Use system tinyxml instead of the embedded copy -Patch2: %{name}-0.9.10-tinyxml.patch +Patch1: %{name}-0.9.11-tinyxml.patch BuildRequires: gtkglext-devel BuildRequires: libglade2-devel BuildRequires: openal-soft-devel -%if 0%{?fedora} >= 20 -BuildRequires: compat-lua-devel -%else -BuildRequires: lua-devel -%endif +BuildRequires: compat-lua-devel BuildRequires: zziplib-devel BuildRequires: agg-devel BuildRequires: tinyxml-devel @@ -64,7 +53,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Remove bundled tinyxml rm -rf src/utils/tinyxml @@ -81,9 +69,10 @@ done # Fix premissions -chmod 644 src/*.{cpp,h} -chmod 644 src/gtk-glade/*.{cpp,h} -chmod 644 src/gtk-glade/dTools/*.{cpp,h} +chmod 644 COPYING README README.LIN +chmod 644 src/filter/hq4x.dat +chmod 644 src/gtk/DeSmuME.xpm +find src -name *.[ch]* -exec chmod 644 {} \; # Fix glade path sed -i 's|gladedir = $(datadir)/desmume/glade|gladedir = $(datadir)/desmume-glade/|g' src/gtk-glade/Makefile.{am,in} @@ -98,7 +87,8 @@ %build %configure \ --enable-openal \ - --enable-glade + --enable-glade \ + --enable-wifi make %{?_smp_mflags} @@ -117,9 +107,6 @@ mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install \ --delete-original \ -%if %{with_desktop_vendor_tag} - --vendor dribble \ -%endif --remove-key Version \ --remove-category GNOME \ --remove-category GTK \ @@ -128,9 +115,6 @@ desktop-file-install \ --delete-original \ -%if %{with_desktop_vendor_tag} - --vendor dribble \ -%endif --remove-key Version \ --remove-category GNOME \ --remove-category GTK \ @@ -174,11 +158,7 @@ %files %{_bindir}/%{name} %{_datadir}/icons/hicolor/32x32/apps/DeSmuME.xpm -%if %{with_desktop_vendor_tag} -%{_datadir}/applications/dribble-%{name}.desktop -%else %{_datadir}/applications/%{name}.desktop -%endif %{_mandir}/man1/%{name}.1* %doc AUTHORS ChangeLog COPYING README README.LIN @@ -187,11 +167,7 @@ %{_bindir}/%{name}-glade %{_datadir}/%{name}-glade %{_datadir}/icons/hicolor/32x32/apps/DeSmuME-glade.xpm -%if %{with_desktop_vendor_tag} -%{_datadir}/applications/dribble-%{name}-glade.desktop -%else %{_datadir}/applications/%{name}-glade.desktop -%endif %{_mandir}/man1/%{name}-glade.1* %doc AUTHORS ChangeLog COPYING README README.LIN @@ -203,6 +179,13 @@ %changelog +* Thu May 14 2015 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.11-1 +- Updated to upstream version 0.9.11 +- Spec file cleanup + +* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * 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 Index: sources =================================================================== RCS file: /cvs/free/rpms/desmume/F-20/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 Dec 2013 07:20:22 -0000 1.12 +++ sources 15 May 2015 08:29:46 -0000 1.13 @@ -1 +1 @@ -a6aedfe5d6437d481aa9ac5fb5aebbea desmume-0.9.10.tar.tar +269b5d4ddc5715720469a9d0efc53044 desmume-0.9.11.tar.gz --- desmume-0.9-dontlookinbuilddir.patch DELETED --- --- desmume-0.9.10-glx_3Demu.patch DELETED --- --- desmume-0.9.10-tinyxml.patch DELETED ---

9 years, 6 months

1
0
0 / 0

rpms/desmume/devel desmume-0.9.11-dontlookinbuilddir.patch, NONE, 1.1 desmume-0.9.11-tinyxml.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 desmume.spec, 1.23, 1.24 sources, 1.12, 1.13 desmume-0.9-dontlookinbuilddir.patch, 1.1, NONE desmume-0.9.10-glx_3Demu.patch, 1.1, NONE desmume-0.9.10-tinyxml.patch, 1.1, NONE

by Andrea Musuruane

Author: musuruan Update of /cvs/free/rpms/desmume/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10066 Modified Files: .cvsignore desmume.spec sources Added Files: desmume-0.9.11-dontlookinbuilddir.patch desmume-0.9.11-tinyxml.patch Removed Files: desmume-0.9-dontlookinbuilddir.patch desmume-0.9.10-glx_3Demu.patch desmume-0.9.10-tinyxml.patch Log Message: * Thu May 14 2015 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.11-1 - Updated to upstream version 0.9.11 - Spec file cleanup desmume-0.9.11-dontlookinbuilddir.patch: main.cpp | 5 ----- 1 file changed, 5 deletions(-) --- NEW FILE desmume-0.9.11-dontlookinbuilddir.patch --- diff -durN desmume-0.9.11.orig/src/gtk-glade/main.cpp desmume-0.9.11/src/gtk-glade/main.cpp --- desmume-0.9.11.orig/src/gtk-glade/main.cpp 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/main.cpp 2015-05-14 14:30:47.121562491 +0200 @@ -324,11 +324,6 @@ { gchar *path; - /* looking in uninstalled (aka building) dir first */ - path = g_build_filename (GLADEUI_UNINSTALLED_DIR, filename, NULL); - if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path; - g_free (path); - /* looking in installed dir */ path = g_build_filename (DATADIR, filename, NULL); if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path; desmume-0.9.11-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 +- utils/advanscene.cpp | 2 +- 9 files changed, 10 insertions(+), 42 deletions(-) --- NEW FILE desmume-0.9.11-tinyxml.patch --- diff -durN desmume-0.9.11.orig/src/cli/Makefile.am desmume-0.9.11/src/cli/Makefile.am --- desmume-0.9.11.orig/src/cli/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/cli/Makefile.am 2015-05-14 14:33:02.656690231 +0200 @@ -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.11.orig/src/cli/Makefile.in desmume-0.9.11/src/cli/Makefile.in --- desmume-0.9.11.orig/src/cli/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/cli/Makefile.in 2015-05-14 14:33:02.657690240 +0200 @@ -311,7 +311,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.11.orig/src/gtk/Makefile.am desmume-0.9.11/src/gtk/Makefile.am --- desmume-0.9.11.orig/src/gtk/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk/Makefile.am 2015-05-14 14:33:02.657690240 +0200 @@ -32,7 +32,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.11.orig/src/gtk/Makefile.in desmume-0.9.11/src/gtk/Makefile.in --- desmume-0.9.11.orig/src/gtk/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/gtk/Makefile.in 2015-05-14 14:33:02.658690248 +0200 @@ -382,7 +382,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.11.orig/src/gtk-glade/Makefile.am desmume-0.9.11/src/gtk-glade/Makefile.am --- desmume-0.9.11.orig/src/gtk-glade/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/Makefile.am 2015-05-14 14:33:02.658690248 +0200 @@ -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.11.orig/src/gtk-glade/Makefile.in desmume-0.9.11/src/gtk-glade/Makefile.in --- desmume-0.9.11.orig/src/gtk-glade/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/gtk-glade/Makefile.in 2015-05-14 14:33:02.658690248 +0200 @@ -367,7 +367,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.11.orig/src/Makefile.am desmume-0.9.11/src/Makefile.am --- desmume-0.9.11.orig/src/Makefile.am 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/Makefile.am 2015-05-14 14:37:46.164049196 +0200 @@ -81,12 +81,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 \ utils/glcorearb.h \ 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 \ @@ -204,3 +198,5 @@ libdesmume_a_SOURCES += gdbstub.h endif libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT) +LIBS += -ltinyxml + diff -durN desmume-0.9.11.orig/src/Makefile.in desmume-0.9.11/src/Makefile.in --- desmume-0.9.11.orig/src/Makefile.in 2015-02-14 16:07:08.000000000 +0100 +++ desmume-0.9.11/src/Makefile.in 2015-05-14 14:39:53.916112176 +0200 @@ -184,9 +184,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 \ utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ @@ -324,10 +321,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) \ @@ -475,7 +468,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@ @@ -625,9 +618,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 \ utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ @@ -760,20 +750,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) @@ -1175,10 +1151,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@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ diff -durN desmume-0.9.11.orig/src/utils/advanscene.cpp desmume-0.9.11/src/utils/advanscene.cpp --- desmume-0.9.11.orig/src/utils/advanscene.cpp 2015-02-14 16:05:26.000000000 +0100 +++ desmume-0.9.11/src/utils/advanscene.cpp 2015-05-14 14:33:02.661690273 +0200 @@ -19,7 +19,7 @@ #include <time.h> #define TIXML_USE_STL -#include "tinyxml/tinyxml.h" +#include <tinyxml.h> #include "advanscene.h" #include "../common.h" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/desmume/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 Dec 2013 07:20:22 -0000 1.12 +++ .cvsignore 15 May 2015 08:28:27 -0000 1.13 @@ -1 +1 @@ -desmume-0.9.10.tar.tar +desmume-0.9.11.tar.gz Index: desmume.spec =================================================================== RCS file: /cvs/free/rpms/desmume/devel/desmume.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- desmume.spec 31 Aug 2014 00:59:29 -0000 1.23 +++ desmume.spec 15 May 2015 08:28:27 -0000 1.24 @@ -1,31 +1,20 @@ -%if (0%{?fedora} && 0%{?fedora}) < 19 -%global with_desktop_vendor_tag 1 -%endif - Name: desmume -Version: 0.9.10 -Release: 2%{?dist} +Version: 0.9.11 +Release: 1%{?dist} Summary: A Nintendo DS emulator License: GPLv2+ URL: http://desmume.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.tar +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Do not look into builddir -Patch0: %{name}-0.9-dontlookinbuilddir.patch -# Fix compile errors -# Upstream CVS -Patch1: %{name}-0.9.10-glx_3Demu.patch +Patch0: %{name}-0.9.11-dontlookinbuilddir.patch # Use system tinyxml instead of the embedded copy -Patch2: %{name}-0.9.10-tinyxml.patch +Patch1: %{name}-0.9.11-tinyxml.patch BuildRequires: gtkglext-devel BuildRequires: libglade2-devel BuildRequires: openal-soft-devel -%if 0%{?fedora} >= 20 -BuildRequires: compat-lua-devel -%else -BuildRequires: lua-devel -%endif +BuildRequires: compat-lua-devel BuildRequires: zziplib-devel BuildRequires: agg-devel BuildRequires: tinyxml-devel @@ -64,7 +53,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Remove bundled tinyxml rm -rf src/utils/tinyxml @@ -81,9 +69,10 @@ done # Fix premissions -chmod 644 src/*.{cpp,h} -chmod 644 src/gtk-glade/*.{cpp,h} -chmod 644 src/gtk-glade/dTools/*.{cpp,h} +chmod 644 COPYING README README.LIN +chmod 644 src/filter/hq4x.dat +chmod 644 src/gtk/DeSmuME.xpm +find src -name *.[ch]* -exec chmod 644 {} \; # Fix glade path sed -i 's|gladedir = $(datadir)/desmume/glade|gladedir = $(datadir)/desmume-glade/|g' src/gtk-glade/Makefile.{am,in} @@ -98,7 +87,8 @@ %build %configure \ --enable-openal \ - --enable-glade + --enable-glade \ + --enable-wifi make %{?_smp_mflags} @@ -117,9 +107,6 @@ mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install \ --delete-original \ -%if %{with_desktop_vendor_tag} - --vendor dribble \ -%endif --remove-key Version \ --remove-category GNOME \ --remove-category GTK \ @@ -128,9 +115,6 @@ desktop-file-install \ --delete-original \ -%if %{with_desktop_vendor_tag} - --vendor dribble \ -%endif --remove-key Version \ --remove-category GNOME \ --remove-category GTK \ @@ -174,11 +158,7 @@ %files %{_bindir}/%{name} %{_datadir}/icons/hicolor/32x32/apps/DeSmuME.xpm -%if %{with_desktop_vendor_tag} -%{_datadir}/applications/dribble-%{name}.desktop -%else %{_datadir}/applications/%{name}.desktop -%endif %{_mandir}/man1/%{name}.1* %doc AUTHORS ChangeLog COPYING README README.LIN @@ -187,11 +167,7 @@ %{_bindir}/%{name}-glade %{_datadir}/%{name}-glade %{_datadir}/icons/hicolor/32x32/apps/DeSmuME-glade.xpm -%if %{with_desktop_vendor_tag} -%{_datadir}/applications/dribble-%{name}-glade.desktop -%else %{_datadir}/applications/%{name}-glade.desktop -%endif %{_mandir}/man1/%{name}-glade.1* %doc AUTHORS ChangeLog COPYING README README.LIN @@ -203,6 +179,10 @@ %changelog +* Thu May 14 2015 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.11-1 +- Updated to upstream version 0.9.11 +- Spec file cleanup + * Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.9.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/free/rpms/desmume/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 Dec 2013 07:20:22 -0000 1.12 +++ sources 15 May 2015 08:28:27 -0000 1.13 @@ -1 +1 @@ -a6aedfe5d6437d481aa9ac5fb5aebbea desmume-0.9.10.tar.tar +269b5d4ddc5715720469a9d0efc53044 desmume-0.9.11.tar.gz --- desmume-0.9-dontlookinbuilddir.patch DELETED --- --- desmume-0.9.10-glx_3Demu.patch DELETED --- --- desmume-0.9.10-tinyxml.patch DELETED ---

9 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits May 2015