rpms/mpd/F-17 mpd-0.16.8-socket-location.patch, NONE, 1.1 mpd.tmpfiles.d, NONE, 1.1 mpd.spec, 1.28, 1.29
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13504/F-17
Modified Files:
mpd.spec
Added Files:
mpd-0.16.8-socket-location.patch mpd.tmpfiles.d
Log Message:
Add tmpfiles.d/mpd.conf
mpd-0.16.8-socket-location.patch:
mpdconf.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mpd-0.16.8-socket-location.patch ---
diff -Naur a/doc/mpdconf.example b/doc/mpdconf.example
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -81,7 +81,7 @@
#bind_to_address "any"
#
# And for Unix Socket
-#bind_to_address "~/.mpd/socket"
+#bind_to_address "/run/mpd/socket"
#
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
--- NEW FILE mpd.tmpfiles.d ---
d /run/mpd 0755 mpd mpd -
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-17/mpd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mpd.spec 23 Feb 2013 23:06:47 -0000 1.28
+++ mpd.spec 24 Feb 2013 09:14:30 -0000 1.29
@@ -7,6 +7,7 @@
%global mpd_logdir %{_localstatedir}/log/mpd
%global mpd_musicdir %{mpd_homedir}/music
%global mpd_playlistsdir %{mpd_homedir}/playlists
+%global mpd_rundir /run/mpd
%global mpd_configfile %{_sysconfdir}/mpd.conf
%global mpd_dbfile %{mpd_homedir}/mpd.db
@@ -16,7 +17,7 @@
Name: mpd
Epoch: 1
Version: 0.16.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
@@ -24,7 +25,9 @@
Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
Source1: mpd.logrotate
+Source2: mpd.tmpfiles.d
Patch0: mpd-0.16.7-default-pulseaudio.patch
+Patch1: mpd-0.16.8-socket-location.patch
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@@ -74,6 +77,7 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
%build
sed -i -e "s,sound.target,sound.target network.target,g" mpd.service.in
@@ -91,6 +95,11 @@
install -p -D -m 0644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+install -p -D -m 0644 %{SOURCE2} \
+ $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/mpd.conf
+mkdir -p %{buildroot}/run
+install -d -m 0755 %{buildroot}/%{mpd_rundir}
+
mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
@@ -161,18 +170,24 @@
%{_unitdir}/mpd.service
%config(noreplace) %{mpd_configfile}
%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
+%{_prefix}/lib/tmpfiles.d/%{name}.conf
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
%dir %{mpd_logdir}
%dir %{mpd_musicdir}
%dir %{mpd_playlistsdir}
+%dir %{mpd_rundir}
%ghost %{mpd_dbfile}
%ghost %{mpd_logfile}
%ghost %{mpd_statefile}
%changelog
+* Sun Feb 24 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-7
+- add tmpfiles.d/mpd.conf in case user wishes to use socket file
+- change default socket location in mpd.conf, but leave commented
+
* Sat Feb 23 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-6
- add a logrotate file
@@ -183,19 +198,19 @@
- Rebuilt for FFmpeg
- Switch BR to pkgconfig(libpulse)
-* Fri May 11 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-3
+* Fri May 11 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.8-3
- enable lastfm support
- enable hardened build
- remove redundant libsidplay-devel BR, as mpd requires libsidplay2
-* Mon Apr 09 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-2
+* Mon Apr 09 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.8-2
- add missing chowns to %%post scriptlet
- add missing %%{mpd_logdir} to %%files
-* Mon Apr 09 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.8-1
+* Mon Apr 09 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-1
- update to 0.16.8
-* Sat Feb 25 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.7-2
+* Sat Feb 25 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.7-2
- remove obsolete BuildRoot tag, %%clean section and unnecessary macros
- do not add mpd to pulse-rt group as system mode is not recommended by
pulseaudio upstream, and the group no longer exists
@@ -203,10 +218,10 @@
- add Epoch (for triggerun scriptlet) to allow updates to F16
- change default audio output to pulseaudio
-* Sun Feb 05 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.7-1
+* Sun Feb 05 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.7-1
- update to 0.16.7
-* Sun Jan 08 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.6-1
+* Sun Jan 08 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.6-1
- update to 0.16.6
- add convenient global variables
- add systemd unit file instead of initscript
11 years, 1 month
rpms/mpd/F-18 mpd-0.16.8-socket-location.patch, NONE, 1.1 mpd.tmpfiles.d, NONE, 1.1 mpd.spec, 1.31, 1.32
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13168/F-18
Modified Files:
mpd.spec
Added Files:
mpd-0.16.8-socket-location.patch mpd.tmpfiles.d
Log Message:
Add tmpfiles.d/mpd.conf
mpd-0.16.8-socket-location.patch:
mpdconf.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mpd-0.16.8-socket-location.patch ---
diff -Naur a/doc/mpdconf.example b/doc/mpdconf.example
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -81,7 +81,7 @@
#bind_to_address "any"
#
# And for Unix Socket
-#bind_to_address "~/.mpd/socket"
+#bind_to_address "/run/mpd/socket"
#
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
--- NEW FILE mpd.tmpfiles.d ---
d /run/mpd 0755 mpd mpd -
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-18/mpd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mpd.spec 23 Feb 2013 22:59:20 -0000 1.31
+++ mpd.spec 24 Feb 2013 09:10:26 -0000 1.32
@@ -7,6 +7,7 @@
%global mpd_logdir %{_localstatedir}/log/mpd
%global mpd_musicdir %{mpd_homedir}/music
%global mpd_playlistsdir %{mpd_homedir}/playlists
+%global mpd_rundir /run/mpd
%global mpd_configfile %{_sysconfdir}/mpd.conf
%global mpd_dbfile %{mpd_homedir}/mpd.db
@@ -16,7 +17,7 @@
Name: mpd
Epoch: 1
Version: 0.16.8
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
@@ -24,7 +25,9 @@
Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
Source1: mpd.logrotate
+Source2: mpd.tmpfiles.d
Patch0: mpd-0.16.7-default-pulseaudio.patch
+Patch1: mpd-0.16.8-socket-location.patch
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@@ -74,6 +77,7 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
%build
sed -i -e "s,sound.target,sound.target network.target,g" mpd.service.in
@@ -91,6 +95,11 @@
install -p -D -m 0644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+install -p -D -m 0644 %{SOURCE2} \
+ $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/mpd.conf
+mkdir -p %{buildroot}/run
+install -d -m 0755 %{buildroot}/%{mpd_rundir}
+
mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
@@ -139,18 +148,24 @@
%{_unitdir}/mpd.service
%config(noreplace) %{mpd_configfile}
%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
+%{_prefix}/lib/tmpfiles.d/%{name}.conf
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
%dir %{mpd_logdir}
%dir %{mpd_musicdir}
%dir %{mpd_playlistsdir}
+%dir %{mpd_rundir}
%ghost %{mpd_dbfile}
%ghost %{mpd_logfile}
%ghost %{mpd_statefile}
%changelog
+* Sun Feb 24 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-8
+- add tmpfiles.d/mpd.conf in case user wishes to use socket file
+- change default socket location in mpd.conf, but leave commented
+
* Sat Feb 23 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-7
- update systemd scriptlets and remove chkconfig from the Requires
- add a logrotate file
@@ -165,19 +180,19 @@
- Rebuilt for FFmpeg
- Switch BR to pkgconfig(libpulse)
-* Fri May 11 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-3
+* Fri May 11 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.8-3
- enable lastfm support
- enable hardened build
- remove redundant libsidplay-devel BR, as mpd requires libsidplay2
-* Mon Apr 09 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-2
+* Mon Apr 09 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.8-2
- add missing chowns to %%post scriptlet
- add missing %%{mpd_logdir} to %%files
-* Mon Apr 09 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.8-1
+* Mon Apr 09 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-1
- update to 0.16.8
-* Sat Feb 25 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.7-2
+* Sat Feb 25 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.7-2
- remove obsolete BuildRoot tag, %%clean section and unnecessary macros
- do not add mpd to pulse-rt group as system mode is not recommended by
pulseaudio upstream, and the group no longer exists
@@ -185,10 +200,10 @@
- add Epoch (for triggerun scriptlet) to allow updates to F16
- change default audio output to pulseaudio
-* Sun Feb 05 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.7-1
+* Sun Feb 05 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.7-1
- update to 0.16.7
-* Sun Jan 08 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.6-1
+* Sun Jan 08 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.6-1
- update to 0.16.6
- add convenient global variables
- add systemd unit file instead of initscript
11 years, 1 month
rpms/mpd/devel mpd-0.16.8-socket-location.patch, NONE, 1.1 mpd.tmpfiles.d, NONE, 1.1 mpd.spec, 1.32, 1.33
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12500/devel
Modified Files:
mpd.spec
Added Files:
mpd-0.16.8-socket-location.patch mpd.tmpfiles.d
Log Message:
Add tmpfiles.d/mpd.conf
mpd-0.16.8-socket-location.patch:
mpdconf.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mpd-0.16.8-socket-location.patch ---
diff -Naur a/doc/mpdconf.example b/doc/mpdconf.example
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -81,7 +81,7 @@
#bind_to_address "any"
#
# And for Unix Socket
-#bind_to_address "~/.mpd/socket"
+#bind_to_address "/run/mpd/socket"
#
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
--- NEW FILE mpd.tmpfiles.d ---
d /run/mpd 0755 mpd mpd -
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mpd.spec 23 Feb 2013 18:33:26 -0000 1.32
+++ mpd.spec 24 Feb 2013 09:04:05 -0000 1.33
@@ -7,6 +7,7 @@
%global mpd_logdir %{_localstatedir}/log/mpd
%global mpd_musicdir %{mpd_homedir}/music
%global mpd_playlistsdir %{mpd_homedir}/playlists
+%global mpd_rundir /run/mpd
%global mpd_configfile %{_sysconfdir}/mpd.conf
%global mpd_dbfile %{mpd_homedir}/mpd.db
@@ -16,7 +17,7 @@
Name: mpd
Epoch: 1
Version: 0.17.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
@@ -24,7 +25,9 @@
Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
Source1: mpd.logrotate
+Source2: mpd.tmpfiles.d
Patch0: mpd-0.16.7-default-pulseaudio.patch
+Patch1: mpd-0.16.8-socket-location.patch
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@@ -73,6 +76,7 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
%build
%{configure} \
@@ -89,6 +93,11 @@
install -p -D -m 0644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+install -p -D -m 0644 %{SOURCE2} \
+ $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/mpd.conf
+mkdir -p %{buildroot}/run
+install -d -m 0755 %{buildroot}/%{mpd_rundir}
+
mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
@@ -137,18 +146,24 @@
%{_unitdir}/mpd.service
%config(noreplace) %{mpd_configfile}
%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
+%{_prefix}/lib/tmpfiles.d/%{name}.conf
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
%dir %{mpd_logdir}
%dir %{mpd_musicdir}
%dir %{mpd_playlistsdir}
+%dir %{mpd_rundir}
%ghost %{mpd_dbfile}
%ghost %{mpd_logfile}
%ghost %{mpd_statefile}
%changelog
+* Sun Feb 24 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.17.3-2
+- add tmpfiles.d/mpd.conf in case user wishes to use socket file
+- change default socket location in mpd.conf, but leave commented
+
* Sat Feb 23 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.17.3-1
- update to upstream release 0.17.3
- new CUE parser so remove libcue from BuildRequires
@@ -165,19 +180,19 @@
- Rebuilt for FFmpeg
- Switch BR to pkgconfig(libpulse)
-* Fri May 11 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-3
+* Fri May 11 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.8-3
- enable lastfm support
- enable hardened build
- remove redundant libsidplay-devel BR, as mpd requires libsidplay2
-* Mon Apr 09 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-2
+* Mon Apr 09 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.8-2
- add missing chowns to %%post scriptlet
- add missing %%{mpd_logdir} to %%files
-* Mon Apr 09 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.8-1
+* Mon Apr 09 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-1
- update to 0.16.8
-* Sat Feb 25 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.7-2
+* Sat Feb 25 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.7-2
- remove obsolete BuildRoot tag, %%clean section and unnecessary macros
- do not add mpd to pulse-rt group as system mode is not recommended by
pulseaudio upstream, and the group no longer exists
@@ -185,10 +200,10 @@
- add Epoch (for triggerun scriptlet) to allow updates to F16
- change default audio output to pulseaudio
-* Sun Feb 05 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.7-1
+* Sun Feb 05 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.7-1
- update to 0.16.7
-* Sun Jan 08 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.6-1
+* Sun Jan 08 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.6-1
- update to 0.16.6
- add convenient global variables
- add systemd unit file instead of initscript
11 years, 1 month
rpms/mpd/F-17 mpd.logrotate,NONE,1.1 mpd.spec,1.27,1.28
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13970/F-17
Modified Files:
mpd.spec
Added Files:
mpd.logrotate
Log Message:
Add a logrotate file
--- NEW FILE mpd.logrotate ---
/var/log/mpd/*.log {
weekly
missingok
rotate 7
compress
notifempty
copytruncate
create 600
}
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-17/mpd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mpd.spec 1 Sep 2012 19:58:02 -0000 1.27
+++ mpd.spec 23 Feb 2013 23:06:47 -0000 1.28
@@ -16,13 +16,14 @@
Name: mpd
Epoch: 1
Version: 0.16.8
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
+Source1: mpd.logrotate
Patch0: mpd-0.16.7-default-pulseaudio.patch
BuildRequires: alsa-lib-devel
@@ -45,7 +46,7 @@
BuildRequires: libmpcdec-devel
BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
-BuildRequires: libshout-devel
+BuildRequires: libshout-devel
BuildRequires: libvorbis-devel
BuildRequires: mikmod-devel
BuildRequires: pkgconfig(libpulse)
@@ -87,6 +88,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
+install -p -D -m 0644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+
mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
@@ -156,6 +160,7 @@
%{_mandir}/man5/mpd.conf.5*
%{_unitdir}/mpd.service
%config(noreplace) %{mpd_configfile}
+%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
@@ -168,6 +173,9 @@
%changelog
+* Sat Feb 23 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-6
+- add a logrotate file
+
* Fri Aug 17 2012 Adrian Reber <adrian(a)lisas.de> - 1:0.16.8-5
- fix "mpd fails to bind an addres: started too early" (#2447)
11 years, 1 month
rpms/mpd/F-18 mpd.logrotate,NONE,1.1 mpd.spec,1.30,1.31
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13253/F-18
Modified Files:
mpd.spec
Added Files:
mpd.logrotate
Log Message:
Add a logrotate file and update the systemd scriptlets
--- NEW FILE mpd.logrotate ---
/var/log/mpd/*.log {
weekly
missingok
rotate 7
compress
notifempty
copytruncate
create 600
}
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-18/mpd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mpd.spec 24 Nov 2012 15:23:29 -0000 1.30
+++ mpd.spec 23 Feb 2013 22:59:20 -0000 1.31
@@ -16,13 +16,14 @@
Name: mpd
Epoch: 1
Version: 0.16.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
+Source1: mpd.logrotate
Patch0: mpd-0.16.7-default-pulseaudio.patch
BuildRequires: alsa-lib-devel
@@ -45,7 +46,7 @@
BuildRequires: libmpcdec-devel
BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
-BuildRequires: libshout-devel
+BuildRequires: libshout-devel
BuildRequires: libvorbis-devel
BuildRequires: mikmod-devel
BuildRequires: pkgconfig(libpulse)
@@ -55,9 +56,9 @@
BuildRequires: zziplib-devel
BuildRequires: systemd-units
Requires(pre): shadow-utils
-Requires(post): chkconfig, systemd-units
-Requires(preun): chkconfig, initscripts, systemd-units
-Requires(postun): initscripts, systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
Conflicts: mpich2
%description
@@ -87,6 +88,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
+install -p -D -m 0644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+
mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
@@ -118,35 +122,13 @@
fi
%post
-if [ $1 -eq 1 ]; then
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-else
- # as we switched from running as root.root to mpd.mpd
- # chown the db files and playlists on upgrades
- chown -R %{mpd_user}.%{mpd_group} \
- %{mpd_homedir} > /dev/null 2>&1 ||:
- chown -R %{mpd_user}.%{mpd_group} \
- %{mpd_logdir} > /dev/null 2>&1 ||:
-fi
-
-%triggerun -- mpd < 1:0.16.7-2
-if /sbin/chkconfig --level 3 mpd; then
- /bin/systemctl enable mpd.service >/dev/null 2>&1 || :
-fi
-/sbin/chkconfig --del mpd >/dev/null 2>&1 || :
-/bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
+%systemd_post mpd.service
%preun
-if [ $1 -eq 0 ]; then
- /bin/systemctl --no-reload disable mpd.service >/dev/null 2>&1 || :
- /bin/systemctl stop mpd.service >/dev/null 2>&1 || :
-fi
+%systemd_preun mpd.service
%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ]; then
- /bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart mpd.service
%files
@@ -156,6 +138,7 @@
%{_mandir}/man5/mpd.conf.5*
%{_unitdir}/mpd.service
%config(noreplace) %{mpd_configfile}
+%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
@@ -168,6 +151,10 @@
%changelog
+* Sat Feb 23 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-7
+- update systemd scriptlets and remove chkconfig from the Requires
+- add a logrotate file
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.16.8-6
- Rebuilt for FFmpeg 1.0
11 years, 1 month
rpms/mpd/devel mpd.logrotate, NONE, 1.1 .cvsignore, 1.15, 1.16 mpd.spec, 1.31, 1.32 sources, 1.15, 1.16
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7860/devel
Modified Files:
.cvsignore mpd.spec sources
Added Files:
mpd.logrotate
Log Message:
Update to upstream release 0.17.3 and various fixes
--- NEW FILE mpd.logrotate ---
/var/log/mpd/*.log {
weekly
missingok
rotate 7
compress
notifempty
copytruncate
create 600
}
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 9 Apr 2012 15:47:40 -0000 1.15
+++ .cvsignore 23 Feb 2013 18:33:26 -0000 1.16
@@ -1 +1 @@
-mpd-0.16.8.tar.bz2
+mpd-0.17.3.tar.bz2
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mpd.spec 30 Jan 2013 16:55:04 -0000 1.31
+++ mpd.spec 23 Feb 2013 18:33:26 -0000 1.32
@@ -15,14 +15,15 @@
Name: mpd
Epoch: 1
-Version: 0.16.8
-Release: 7%{?dist}
+Version: 0.17.3
+Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
+Source1: mpd.logrotate
Patch0: mpd-0.16.7-default-pulseaudio.patch
BuildRequires: alsa-lib-devel
@@ -36,7 +37,6 @@
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: lame-devel
BuildRequires: libao-devel
-BuildRequires: libcue-devel
BuildRequires: libcurl-devel
BuildRequires: libid3tag-devel
BuildRequires: libmad-devel
@@ -45,7 +45,7 @@
BuildRequires: libmpcdec-devel
BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
-BuildRequires: libshout-devel
+BuildRequires: libshout-devel
BuildRequires: libvorbis-devel
BuildRequires: mikmod-devel
BuildRequires: pkgconfig(libpulse)
@@ -55,9 +55,9 @@
BuildRequires: zziplib-devel
BuildRequires: systemd-units
Requires(pre): shadow-utils
-Requires(post): chkconfig, systemd-units
-Requires(preun): chkconfig, initscripts, systemd-units
-Requires(postun): initscripts, systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
Conflicts: mpich2
%description
@@ -75,7 +75,6 @@
%patch0 -p0
%build
-sed -i -e "s,sound.target,sound.target network.target,g" mpd.service.in
%{configure} \
--with-systemdsystemunitdir=%{_unitdir} \
--enable-bzip2 \
@@ -87,6 +86,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
+install -p -D -m 0644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+
mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
@@ -118,35 +120,13 @@
fi
%post
-if [ $1 -eq 1 ]; then
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-else
- # as we switched from running as root.root to mpd.mpd
- # chown the db files and playlists on upgrades
- chown -R %{mpd_user}.%{mpd_group} \
- %{mpd_homedir} > /dev/null 2>&1 ||:
- chown -R %{mpd_user}.%{mpd_group} \
- %{mpd_logdir} > /dev/null 2>&1 ||:
-fi
-
-%triggerun -- mpd < 1:0.16.7-2
-if /sbin/chkconfig --level 3 mpd; then
- /bin/systemctl enable mpd.service >/dev/null 2>&1 || :
-fi
-/sbin/chkconfig --del mpd >/dev/null 2>&1 || :
-/bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
+%systemd_post mpd.service
%preun
-if [ $1 -eq 0 ]; then
- /bin/systemctl --no-reload disable mpd.service >/dev/null 2>&1 || :
- /bin/systemctl stop mpd.service >/dev/null 2>&1 || :
-fi
+%systemd_preun mpd.service
%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ]; then
- /bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart mpd.service
%files
@@ -156,6 +136,7 @@
%{_mandir}/man5/mpd.conf.5*
%{_unitdir}/mpd.service
%config(noreplace) %{mpd_configfile}
+%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
@@ -168,8 +149,11 @@
%changelog
-* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.16.8-7
-- Rebuilt for ffmpeg
+* Sat Feb 23 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.17.3-1
+- update to upstream release 0.17.3
+- new CUE parser so remove libcue from BuildRequires
+- update systemd scriptlets and remove chkconfig from the Requires
+- add a logrotate file
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.16.8-6
- Rebuilt for FFmpeg 1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 9 Apr 2012 15:47:40 -0000 1.15
+++ sources 23 Feb 2013 18:33:26 -0000 1.16
@@ -1 +1 @@
-b412a9d0b3457bea1bb87904a8f80c04 mpd-0.16.8.tar.bz2
+cfc9dbf54f52569b998677fe1fa79c11 mpd-0.17.3.tar.bz2
11 years, 1 month
rpms/dolphin-emu/devel dolphin-emu.spec,1.3,1.4
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/dolphin-emu/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6831/devel
Modified Files:
dolphin-emu.spec
Log Message:
Fixed some SPEC typos
Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dolphin-emu.spec 23 Feb 2013 16:53:33 -0000 1.3
+++ dolphin-emu.spec 23 Feb 2013 18:09:42 -0000 1.4
@@ -1,6 +1,6 @@
Name: dolphin-emu
Version: 3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Gamecube / Wii / Triforce Emulator
Url: http://www.dolphin-emulator.com/
@@ -121,6 +121,9 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Feb 19 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-2
+- Fixed date typos in SPEC
+
* Tue Feb 19 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-1
- Updated to latest stable: removed GCC patch, updated CLRun patch
- Added patch to build on wxwidgets 2.8 (temporary workaround)
@@ -141,7 +144,7 @@
* Sat Jun 02 2012 Xiao-Long Chen <chenxiaolong(a)cxl.epac.to> - 3.0-9
- Add patch to fix build with gcc 4.7.0 in fc17
-* Tue Apr 5 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-8
+* Thu Apr 5 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-8
- Removed bundled CLRun
* Tue Mar 13 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-7
@@ -161,7 +164,7 @@
- Fixed Licensing
- Split sources and fixed source grab commands
-* Sun Jan 27 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-4
+* Fri Jan 27 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-4
- Tweaked to now be able to encode frame dumps
* Sun Jan 22 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-3
11 years, 1 month
rpms/dolphin-emu/F-17 dolphin-emu-3.5-clrun.patch, NONE, 1.1 dolphin-emu-3.5-wx28.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dolphin-emu.spec, 1.1, 1.2 sources, 1.2, 1.3 dolphin-emu-3.0-clrun.patch, 1.1, NONE dolphin-emu-gcc-4.7.patch, 1.1, NONE
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/dolphin-emu/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2994/F-17
Modified Files:
.cvsignore dolphin-emu.spec sources
Added Files:
dolphin-emu-3.5-clrun.patch dolphin-emu-3.5-wx28.patch
Removed Files:
dolphin-emu-3.0-clrun.patch dolphin-emu-gcc-4.7.patch
Log Message:
Update to latest stable version
dolphin-emu-3.5-clrun.patch:
CMakeLists.txt | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
--- NEW FILE dolphin-emu-3.5-clrun.patch ---
diff -rupN dolphin-emu-3.5.orig/CMakeLists.txt dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5.orig/CMakeLists.txt 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/CMakeLists.txt 2013-02-20 14:04:51.356373309 -0500
@@ -477,10 +477,21 @@ else()
check_lib(CGGL CgGL Cg/cgGL.h)
endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- find_library(CL OpenCL)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
-else()
+if(UNIX)
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") #If OSX
+ find_library(CL OpenCL)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
+ else() #If Unix-like/Linux
+ option(USE_EXTERNAL_CLRUN "Enables use of an externel CLRun library (CLRUN_INCLUDE_PATH needs to be defined)" OFF)
+ if(USE_EXTERNAL_CLRUN)
+ find_library(CL clrun)
+ include_directories("${CLRUN_INCLUDE_PATH}")
+ else(USE_EXTERNAL_CLRUN)
+ include_directories(Externals/CLRun/include)
+ add_subdirectory(Externals/CLRun)
+ endif(USE_EXTERNAL_CLRUN)
+ endif()
+else() #If Windows
include_directories(Externals/CLRun/include)
add_subdirectory(Externals/CLRun)
endif()
dolphin-emu-3.5-wx28.patch:
CMakeLists.txt | 2 -
Source/Core/DolphinWX/Src/Frame.cpp | 2 -
Source/Core/DolphinWX/Src/GameListCtrl.cpp | 6 ++---
Source/Core/DolphinWX/Src/ISOProperties.cpp | 6 -----
Source/Core/DolphinWX/Src/Main.cpp | 32 ++++++++++++++--------------
Source/Core/DolphinWX/Src/NetWindow.cpp | 1
Source/Core/DolphinWX/Src/WXInputBase.cpp | 2 -
7 files changed, 24 insertions(+), 27 deletions(-)
--- NEW FILE dolphin-emu-3.5-wx28.patch ---
diff -rupN dolphin-emu-3.5.orig/CMakeLists.txt dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5.orig/CMakeLists.txt 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/CMakeLists.txt 2013-02-19 18:58:51.099823833 -0500
@@ -500,7 +500,7 @@ if(NOT DISABLE_WX)
)
message("Found wxWidgets version ${wxWidgets_VERSION}")
if(UNIX AND NOT APPLE)
- set(wxMIN_VERSION "2.9.3")
+ set(wxMIN_VERSION "2.8.12")
else()
set(wxMIN_VERSION "2.9.4")
endif()
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Frame.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/Frame.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Frame.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/Frame.cpp 2013-02-19 19:17:59.323425042 -0500
@@ -753,7 +753,7 @@ void CFrame::OnGameListCtrl_ItemActivate
bool IsHotkey(wxKeyEvent &event, int Id)
{
- return (event.GetKeyCode() != WXK_NONE &&
+ return (event.GetKeyCode() &&
event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
}
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/GameListCtrl.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/GameListCtrl.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/GameListCtrl.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/GameListCtrl.cpp 2013-02-19 19:23:14.454606065 -0500
@@ -593,9 +593,9 @@ void CGameListCtrl::ScanForISOs()
SplitPath(rFilenames[i], NULL, &FileName, NULL);
// Update with the progress (i) and the message
- dialog.Update(i, wxString::Format(_("Scanning %s"),
- wxString(FileName.c_str(), *wxConvCurrent).c_str()));
- if (dialog.WasCancelled())
+ bool Cont = dialog.Update(i,
+ wxString::Format(_("Scanning %s"), wxString(FileName.c_str(), *wxConvCurrent).c_str()));
+ if (!Cont)
break;
std::auto_ptr<GameListItem> iso_file(new GameListItem(rFilenames[i]));
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/ISOProperties.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/ISOProperties.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/ISOProperties.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/ISOProperties.cpp 2013-02-19 19:27:50.417130313 -0500
@@ -740,11 +740,7 @@ void CISOProperties::ExportDir(const cha
{
dialog.SetTitle(wxString::Format(wxT("%s : %d%%"), dialogTitle.c_str(),
(u32)(((float)(i - index[0]) / (float)(index[1] - index[0])) * 100)));
-
- dialog.Update(i, wxString::Format(_("Extracting %s"),
- wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str()));
-
- if (dialog.WasCancelled())
+ if (!dialog.Update(i, wxString::Format(_("Extracting %s"), wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str())))
break;
if (fst[i]->IsDirectory())
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Main.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/Main.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Main.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/Main.cpp 2013-02-19 19:40:17.136618692 -0500
@@ -114,38 +114,38 @@ bool DolphinApp::OnInit()
wxCmdLineEntryDesc cmdLineDesc[] =
{
{
- wxCMD_LINE_SWITCH, "h", "help",
- "Show this help message",
+ wxCMD_LINE_SWITCH, wxS("h"), wxS("help"),
+ wxS("Show this help message"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
},
{
- wxCMD_LINE_SWITCH, "d", "debugger",
- "Opens the debugger",
+ wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"),
+ wxS("Opens the debugger"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_SWITCH, "l", "logger",
- "Opens the logger",
+ wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"),
+ wxS("Opens the logger"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "e", "exec",
- "Loads the specified file (DOL,ELF,GCM,ISO,WAD)",
+ wxCMD_LINE_OPTION, wxS("e"), wxS("exec"),
+ wxS("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_SWITCH, "b", "batch",
- "Exit Dolphin with emulator",
+ wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"),
+ wxS("Exit Dolphin with emulator"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "V", "video_backend",
- "Specify a video backend",
+ wxCMD_LINE_OPTION, wxS("V"), wxS("video_backend"),
+ wxS("Specify a video backend"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "A", "audio_emulation",
- "Low level (LLE) or high level (HLE) audio",
+ wxCMD_LINE_OPTION, wxS("A"), wxS("audio_emulation"),
+ wxS("Low level (LLE) or high level (HLE) audio"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
@@ -237,9 +237,9 @@ bool DolphinApp::OnInit()
if (selectAudioEmulation)
{
- if (audioEmulationName == "HLE")
+ if (audioEmulationName == wxS("HLE"))
SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true;
- else if (audioEmulationName == "LLE")
+ else if (audioEmulationName == wxS("LLE"))
SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false;
}
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/NetWindow.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/NetWindow.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/NetWindow.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/NetWindow.cpp 2013-02-19 19:43:23.706012655 -0500
@@ -29,6 +29,7 @@
#define NETPLAY_TITLEBAR "Dolphin NetPlay"
+DEFINE_EVENT_TYPE(wxEVT_THREAD)
BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame)
EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
END_EVENT_TABLE()
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/WXInputBase.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/WXInputBase.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/WXInputBase.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/WXInputBase.cpp 2013-02-19 19:46:24.058458372 -0500
@@ -43,7 +43,7 @@ const wxString WXKeyToString(int keycode
case WXK_CLEAR: return _("Clear");
case WXK_SHIFT: return wxT("Shift");
case WXK_ALT: return wxT("Alt");
- case WXK_RAW_CONTROL: return _("Control");
+ case WXK_CONTROL: return _("Control");
#ifdef __WXOSX__
case WXK_COMMAND: return _("Command");
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-17/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 5 Jul 2012 15:47:19 -0000 1.2
+++ .cvsignore 23 Feb 2013 16:55:36 -0000 1.3
@@ -1,2 +1,2 @@
-dolphin-emu-3.0.tar.xz
+dolphin-emu-3.5.tar.xz
dolphin-emu-extra.tar.xz
Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-17/dolphin-emu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dolphin-emu.spec 5 Jul 2012 15:47:19 -0000 1.1
+++ dolphin-emu.spec 23 Feb 2013 16:55:38 -0000 1.2
@@ -1,6 +1,6 @@
Name: dolphin-emu
-Version: 3.0
-Release: 10%{?dist}
+Version: 3.5
+Release: 1%{?dist}
Summary: Gamecube / Wii / Triforce Emulator
Url: http://www.dolphin-emulator.com/
@@ -17,9 +17,8 @@
Source1: %{name}-extra.tar.xz
#Kudos to Richard on this one (allows for shared clrun lib):
Patch0: %{name}-%{version}-clrun.patch
-#Build fix for gcc 4.7.0 (backwards compatible)
-#Note this is already fixed in the unstable version
-Patch1: dolphin-emu-gcc-4.7.patch
+#Allows for building with wxwidget 2.8.12, rather than 2.9.3
+Patch1: %{name}-%{version}-wx28.patch
# Dolphin only runs on Intel x86 archictures
ExclusiveArch: i686 x86_64
@@ -47,7 +46,6 @@
BuildRequires: SOIL-devel
BuildRequires: gettext
BuildRequires: desktop-file-utils
-BuildRequires: ffmpeg-devel
BuildRequires: bochs-devel
BuildRequires: opencl-utils-devel
Requires: hicolor-icon-theme
@@ -61,7 +59,7 @@
%prep
%setup -q -a 1
%patch0 -p1 -b .clrun
-%patch1 -p1 -b .gcc470
+%patch1 -p1 -b .wx28
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
#Remove all Bundled Libraries except Bochs:
@@ -78,10 +76,9 @@
ln -s /usr/include/bochs/disasm/*.h ./
%build
-#Required for ffmpeg header to build
-export CPATH='/usr/include/ffmpeg'
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DBUILD_SHARED_LIBS:BOOL=OFF \
+ -DBUILD_SHARED_LIBS=FALSE \
+ -DENCODE_FRAMEDUMPS=FALSE \
-DUSE_EXTERNAL_CLRUN=TRUE \
-DCLRUN_INCLUDE_PATH=%{_includedir}/opencl-utils/include \
.
@@ -100,8 +97,6 @@
%{name}-extra/%{name}.desktop
install -p -D -m 0644 %{name}-extra/%{name}.1 \
%{buildroot}/%{_mandir}/man1/%{name}.1
-#This zerolength file has no purpose and removed in the unstable version:
-rm -f %{buildroot}/%{_datadir}/%{name}/user/GameConfig/WBEEJV.ini
%find_lang %{name}
%files -f %{name}.lang
@@ -126,6 +121,18 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Feb 19 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-1
+- Updated to latest stable: removed GCC patch, updated CLRun patch
+- Added patch to build on wxwidgets 2.8 (temporary workaround)
+
+* Sat Feb 16 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-12
+- Removed patch for libav and disabled ffmpeg, caused rendering issues
+- Minor consistency fixes to SPEC file
+
+* Fri Dec 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-11
+- Added patch for recent libav api change in fc18, credit to Xiao-Long Chen
+- Renamed patch 1 for consistency
+
* Mon Jun 25 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-10
- Changed CLRun buildrequire package name
- Renamed GCC 4.7 patch to suit fedora standards
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-17/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Jul 2012 15:47:19 -0000 1.2
+++ sources 23 Feb 2013 16:55:38 -0000 1.3
@@ -1,2 +1,2 @@
-6fb4c50ddb22cd6413b24ac76bd2735f dolphin-emu-3.0.tar.xz
-9c4335d15000b73a81ee9b00202866e3 dolphin-emu-extra.tar.xz
+1e07d6c93da0f7bea95d3910540cf979 dolphin-emu-3.5.tar.xz
+f9cddcbc0e00e4d19465fc23542ac2bd dolphin-emu-extra.tar.xz
--- dolphin-emu-3.0-clrun.patch DELETED ---
--- dolphin-emu-gcc-4.7.patch DELETED ---
11 years, 1 month
rpms/dolphin-emu/devel dolphin-emu-3.5-clrun.patch, NONE, 1.1 dolphin-emu-3.5-wx28.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dolphin-emu.spec, 1.2, 1.3 sources, 1.2, 1.3 dolphin-emu-3.0-clrun.patch, 1.1, NONE dolphin-emu-3.0-gcc-4.7.patch, 1.1, NONE
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/dolphin-emu/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2704/devel
Modified Files:
.cvsignore dolphin-emu.spec sources
Added Files:
dolphin-emu-3.5-clrun.patch dolphin-emu-3.5-wx28.patch
Removed Files:
dolphin-emu-3.0-clrun.patch dolphin-emu-3.0-gcc-4.7.patch
Log Message:
Update to latest stable version
dolphin-emu-3.5-clrun.patch:
CMakeLists.txt | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
--- NEW FILE dolphin-emu-3.5-clrun.patch ---
diff -rupN dolphin-emu-3.5.orig/CMakeLists.txt dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5.orig/CMakeLists.txt 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/CMakeLists.txt 2013-02-20 14:04:51.356373309 -0500
@@ -477,10 +477,21 @@ else()
check_lib(CGGL CgGL Cg/cgGL.h)
endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- find_library(CL OpenCL)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
-else()
+if(UNIX)
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") #If OSX
+ find_library(CL OpenCL)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
+ else() #If Unix-like/Linux
+ option(USE_EXTERNAL_CLRUN "Enables use of an externel CLRun library (CLRUN_INCLUDE_PATH needs to be defined)" OFF)
+ if(USE_EXTERNAL_CLRUN)
+ find_library(CL clrun)
+ include_directories("${CLRUN_INCLUDE_PATH}")
+ else(USE_EXTERNAL_CLRUN)
+ include_directories(Externals/CLRun/include)
+ add_subdirectory(Externals/CLRun)
+ endif(USE_EXTERNAL_CLRUN)
+ endif()
+else() #If Windows
include_directories(Externals/CLRun/include)
add_subdirectory(Externals/CLRun)
endif()
dolphin-emu-3.5-wx28.patch:
CMakeLists.txt | 2 -
Source/Core/DolphinWX/Src/Frame.cpp | 2 -
Source/Core/DolphinWX/Src/GameListCtrl.cpp | 6 ++---
Source/Core/DolphinWX/Src/ISOProperties.cpp | 6 -----
Source/Core/DolphinWX/Src/Main.cpp | 32 ++++++++++++++--------------
Source/Core/DolphinWX/Src/NetWindow.cpp | 1
Source/Core/DolphinWX/Src/WXInputBase.cpp | 2 -
7 files changed, 24 insertions(+), 27 deletions(-)
--- NEW FILE dolphin-emu-3.5-wx28.patch ---
diff -rupN dolphin-emu-3.5.orig/CMakeLists.txt dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5.orig/CMakeLists.txt 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/CMakeLists.txt 2013-02-19 18:58:51.099823833 -0500
@@ -500,7 +500,7 @@ if(NOT DISABLE_WX)
)
message("Found wxWidgets version ${wxWidgets_VERSION}")
if(UNIX AND NOT APPLE)
- set(wxMIN_VERSION "2.9.3")
+ set(wxMIN_VERSION "2.8.12")
else()
set(wxMIN_VERSION "2.9.4")
endif()
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Frame.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/Frame.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Frame.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/Frame.cpp 2013-02-19 19:17:59.323425042 -0500
@@ -753,7 +753,7 @@ void CFrame::OnGameListCtrl_ItemActivate
bool IsHotkey(wxKeyEvent &event, int Id)
{
- return (event.GetKeyCode() != WXK_NONE &&
+ return (event.GetKeyCode() &&
event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
}
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/GameListCtrl.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/GameListCtrl.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/GameListCtrl.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/GameListCtrl.cpp 2013-02-19 19:23:14.454606065 -0500
@@ -593,9 +593,9 @@ void CGameListCtrl::ScanForISOs()
SplitPath(rFilenames[i], NULL, &FileName, NULL);
// Update with the progress (i) and the message
- dialog.Update(i, wxString::Format(_("Scanning %s"),
- wxString(FileName.c_str(), *wxConvCurrent).c_str()));
- if (dialog.WasCancelled())
+ bool Cont = dialog.Update(i,
+ wxString::Format(_("Scanning %s"), wxString(FileName.c_str(), *wxConvCurrent).c_str()));
+ if (!Cont)
break;
std::auto_ptr<GameListItem> iso_file(new GameListItem(rFilenames[i]));
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/ISOProperties.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/ISOProperties.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/ISOProperties.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/ISOProperties.cpp 2013-02-19 19:27:50.417130313 -0500
@@ -740,11 +740,7 @@ void CISOProperties::ExportDir(const cha
{
dialog.SetTitle(wxString::Format(wxT("%s : %d%%"), dialogTitle.c_str(),
(u32)(((float)(i - index[0]) / (float)(index[1] - index[0])) * 100)));
-
- dialog.Update(i, wxString::Format(_("Extracting %s"),
- wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str()));
-
- if (dialog.WasCancelled())
+ if (!dialog.Update(i, wxString::Format(_("Extracting %s"), wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str())))
break;
if (fst[i]->IsDirectory())
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Main.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/Main.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Main.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/Main.cpp 2013-02-19 19:40:17.136618692 -0500
@@ -114,38 +114,38 @@ bool DolphinApp::OnInit()
wxCmdLineEntryDesc cmdLineDesc[] =
{
{
- wxCMD_LINE_SWITCH, "h", "help",
- "Show this help message",
+ wxCMD_LINE_SWITCH, wxS("h"), wxS("help"),
+ wxS("Show this help message"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
},
{
- wxCMD_LINE_SWITCH, "d", "debugger",
- "Opens the debugger",
+ wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"),
+ wxS("Opens the debugger"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_SWITCH, "l", "logger",
- "Opens the logger",
+ wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"),
+ wxS("Opens the logger"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "e", "exec",
- "Loads the specified file (DOL,ELF,GCM,ISO,WAD)",
+ wxCMD_LINE_OPTION, wxS("e"), wxS("exec"),
+ wxS("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_SWITCH, "b", "batch",
- "Exit Dolphin with emulator",
+ wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"),
+ wxS("Exit Dolphin with emulator"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "V", "video_backend",
- "Specify a video backend",
+ wxCMD_LINE_OPTION, wxS("V"), wxS("video_backend"),
+ wxS("Specify a video backend"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "A", "audio_emulation",
- "Low level (LLE) or high level (HLE) audio",
+ wxCMD_LINE_OPTION, wxS("A"), wxS("audio_emulation"),
+ wxS("Low level (LLE) or high level (HLE) audio"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
@@ -237,9 +237,9 @@ bool DolphinApp::OnInit()
if (selectAudioEmulation)
{
- if (audioEmulationName == "HLE")
+ if (audioEmulationName == wxS("HLE"))
SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true;
- else if (audioEmulationName == "LLE")
+ else if (audioEmulationName == wxS("LLE"))
SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false;
}
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/NetWindow.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/NetWindow.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/NetWindow.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/NetWindow.cpp 2013-02-19 19:43:23.706012655 -0500
@@ -29,6 +29,7 @@
#define NETPLAY_TITLEBAR "Dolphin NetPlay"
+DEFINE_EVENT_TYPE(wxEVT_THREAD)
BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame)
EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
END_EVENT_TABLE()
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/WXInputBase.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/WXInputBase.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/WXInputBase.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/WXInputBase.cpp 2013-02-19 19:46:24.058458372 -0500
@@ -43,7 +43,7 @@ const wxString WXKeyToString(int keycode
case WXK_CLEAR: return _("Clear");
case WXK_SHIFT: return wxT("Shift");
case WXK_ALT: return wxT("Alt");
- case WXK_RAW_CONTROL: return _("Control");
+ case WXK_CONTROL: return _("Control");
#ifdef __WXOSX__
case WXK_COMMAND: return _("Command");
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 5 Jul 2012 15:48:10 -0000 1.2
+++ .cvsignore 23 Feb 2013 16:53:32 -0000 1.3
@@ -1,2 +1,2 @@
-dolphin-emu-3.0.tar.xz
+dolphin-emu-3.5.tar.xz
dolphin-emu-extra.tar.xz
Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dolphin-emu.spec 16 Feb 2013 16:11:20 -0000 1.2
+++ dolphin-emu.spec 23 Feb 2013 16:53:33 -0000 1.3
@@ -1,6 +1,6 @@
Name: dolphin-emu
-Version: 3.0
-Release: 12%{?dist}
+Version: 3.5
+Release: 1%{?dist}
Summary: Gamecube / Wii / Triforce Emulator
Url: http://www.dolphin-emulator.com/
@@ -17,9 +17,8 @@
Source1: %{name}-extra.tar.xz
#Kudos to Richard on this one (allows for shared clrun lib):
Patch0: %{name}-%{version}-clrun.patch
-#Build fix for gcc 4.7.0 (backwards compatible)
-#Note this is already fixed in the unstable version
-Patch1: %{name}-%{version}-gcc-4.7.patch
+#Allows for building with wxwidget 2.8.12, rather than 2.9.3
+Patch1: %{name}-%{version}-wx28.patch
# Dolphin only runs on Intel x86 archictures
ExclusiveArch: i686 x86_64
@@ -60,7 +59,7 @@
%prep
%setup -q -a 1
%patch0 -p1 -b .clrun
-%patch1 -p1 -b .gcc470
+%patch1 -p1 -b .wx28
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
#Remove all Bundled Libraries except Bochs:
@@ -98,8 +97,6 @@
%{name}-extra/%{name}.desktop
install -p -D -m 0644 %{name}-extra/%{name}.1 \
%{buildroot}/%{_mandir}/man1/%{name}.1
-#This zerolength file has no purpose and removed in the unstable version:
-rm -f %{buildroot}/%{_datadir}/%{name}/user/GameConfig/WBEEJV.ini
%find_lang %{name}
%files -f %{name}.lang
@@ -124,6 +121,10 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Feb 19 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-1
+- Updated to latest stable: removed GCC patch, updated CLRun patch
+- Added patch to build on wxwidgets 2.8 (temporary workaround)
+
* Sat Feb 16 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-12
- Removed patch for libav and disabled ffmpeg, caused rendering issues
- Minor consistency fixes to SPEC file
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Jul 2012 15:48:10 -0000 1.2
+++ sources 23 Feb 2013 16:53:34 -0000 1.3
@@ -1,2 +1,2 @@
-6fb4c50ddb22cd6413b24ac76bd2735f dolphin-emu-3.0.tar.xz
-9c4335d15000b73a81ee9b00202866e3 dolphin-emu-extra.tar.xz
+1e07d6c93da0f7bea95d3910540cf979 dolphin-emu-3.5.tar.xz
+f9cddcbc0e00e4d19465fc23542ac2bd dolphin-emu-extra.tar.xz
--- dolphin-emu-3.0-clrun.patch DELETED ---
--- dolphin-emu-3.0-gcc-4.7.patch DELETED ---
11 years, 1 month
rpms/dolphin-emu/F-18 dolphin-emu-3.5-clrun.patch, NONE, 1.1 dolphin-emu-3.5-wx28.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dolphin-emu.spec, 1.3, 1.4 sources, 1.2, 1.3 dolphin-emu-3.0-clrun.patch, 1.1, NONE dolphin-emu-3.0-gcc-4.7.patch, 1.1, NONE
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/dolphin-emu/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2434/F-18
Modified Files:
.cvsignore dolphin-emu.spec sources
Added Files:
dolphin-emu-3.5-clrun.patch dolphin-emu-3.5-wx28.patch
Removed Files:
dolphin-emu-3.0-clrun.patch dolphin-emu-3.0-gcc-4.7.patch
Log Message:
Update to latest stable version
dolphin-emu-3.5-clrun.patch:
CMakeLists.txt | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
--- NEW FILE dolphin-emu-3.5-clrun.patch ---
diff -rupN dolphin-emu-3.5.orig/CMakeLists.txt dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5.orig/CMakeLists.txt 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/CMakeLists.txt 2013-02-20 14:04:51.356373309 -0500
@@ -477,10 +477,21 @@ else()
check_lib(CGGL CgGL Cg/cgGL.h)
endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- find_library(CL OpenCL)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
-else()
+if(UNIX)
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") #If OSX
+ find_library(CL OpenCL)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
+ else() #If Unix-like/Linux
+ option(USE_EXTERNAL_CLRUN "Enables use of an externel CLRun library (CLRUN_INCLUDE_PATH needs to be defined)" OFF)
+ if(USE_EXTERNAL_CLRUN)
+ find_library(CL clrun)
+ include_directories("${CLRUN_INCLUDE_PATH}")
+ else(USE_EXTERNAL_CLRUN)
+ include_directories(Externals/CLRun/include)
+ add_subdirectory(Externals/CLRun)
+ endif(USE_EXTERNAL_CLRUN)
+ endif()
+else() #If Windows
include_directories(Externals/CLRun/include)
add_subdirectory(Externals/CLRun)
endif()
dolphin-emu-3.5-wx28.patch:
CMakeLists.txt | 2 -
Source/Core/DolphinWX/Src/Frame.cpp | 2 -
Source/Core/DolphinWX/Src/GameListCtrl.cpp | 6 ++---
Source/Core/DolphinWX/Src/ISOProperties.cpp | 6 -----
Source/Core/DolphinWX/Src/Main.cpp | 32 ++++++++++++++--------------
Source/Core/DolphinWX/Src/NetWindow.cpp | 1
Source/Core/DolphinWX/Src/WXInputBase.cpp | 2 -
7 files changed, 24 insertions(+), 27 deletions(-)
--- NEW FILE dolphin-emu-3.5-wx28.patch ---
diff -rupN dolphin-emu-3.5.orig/CMakeLists.txt dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5.orig/CMakeLists.txt 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/CMakeLists.txt 2013-02-19 18:58:51.099823833 -0500
@@ -500,7 +500,7 @@ if(NOT DISABLE_WX)
)
message("Found wxWidgets version ${wxWidgets_VERSION}")
if(UNIX AND NOT APPLE)
- set(wxMIN_VERSION "2.9.3")
+ set(wxMIN_VERSION "2.8.12")
else()
set(wxMIN_VERSION "2.9.4")
endif()
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Frame.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/Frame.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Frame.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/Frame.cpp 2013-02-19 19:17:59.323425042 -0500
@@ -753,7 +753,7 @@ void CFrame::OnGameListCtrl_ItemActivate
bool IsHotkey(wxKeyEvent &event, int Id)
{
- return (event.GetKeyCode() != WXK_NONE &&
+ return (event.GetKeyCode() &&
event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
}
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/GameListCtrl.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/GameListCtrl.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/GameListCtrl.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/GameListCtrl.cpp 2013-02-19 19:23:14.454606065 -0500
@@ -593,9 +593,9 @@ void CGameListCtrl::ScanForISOs()
SplitPath(rFilenames[i], NULL, &FileName, NULL);
// Update with the progress (i) and the message
- dialog.Update(i, wxString::Format(_("Scanning %s"),
- wxString(FileName.c_str(), *wxConvCurrent).c_str()));
- if (dialog.WasCancelled())
+ bool Cont = dialog.Update(i,
+ wxString::Format(_("Scanning %s"), wxString(FileName.c_str(), *wxConvCurrent).c_str()));
+ if (!Cont)
break;
std::auto_ptr<GameListItem> iso_file(new GameListItem(rFilenames[i]));
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/ISOProperties.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/ISOProperties.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/ISOProperties.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/ISOProperties.cpp 2013-02-19 19:27:50.417130313 -0500
@@ -740,11 +740,7 @@ void CISOProperties::ExportDir(const cha
{
dialog.SetTitle(wxString::Format(wxT("%s : %d%%"), dialogTitle.c_str(),
(u32)(((float)(i - index[0]) / (float)(index[1] - index[0])) * 100)));
-
- dialog.Update(i, wxString::Format(_("Extracting %s"),
- wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str()));
-
- if (dialog.WasCancelled())
+ if (!dialog.Update(i, wxString::Format(_("Extracting %s"), wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str())))
break;
if (fst[i]->IsDirectory())
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Main.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/Main.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Main.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/Main.cpp 2013-02-19 19:40:17.136618692 -0500
@@ -114,38 +114,38 @@ bool DolphinApp::OnInit()
wxCmdLineEntryDesc cmdLineDesc[] =
{
{
- wxCMD_LINE_SWITCH, "h", "help",
- "Show this help message",
+ wxCMD_LINE_SWITCH, wxS("h"), wxS("help"),
+ wxS("Show this help message"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
},
{
- wxCMD_LINE_SWITCH, "d", "debugger",
- "Opens the debugger",
+ wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"),
+ wxS("Opens the debugger"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_SWITCH, "l", "logger",
- "Opens the logger",
+ wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"),
+ wxS("Opens the logger"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "e", "exec",
- "Loads the specified file (DOL,ELF,GCM,ISO,WAD)",
+ wxCMD_LINE_OPTION, wxS("e"), wxS("exec"),
+ wxS("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_SWITCH, "b", "batch",
- "Exit Dolphin with emulator",
+ wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"),
+ wxS("Exit Dolphin with emulator"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "V", "video_backend",
- "Specify a video backend",
+ wxCMD_LINE_OPTION, wxS("V"), wxS("video_backend"),
+ wxS("Specify a video backend"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION, "A", "audio_emulation",
- "Low level (LLE) or high level (HLE) audio",
+ wxCMD_LINE_OPTION, wxS("A"), wxS("audio_emulation"),
+ wxS("Low level (LLE) or high level (HLE) audio"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
@@ -237,9 +237,9 @@ bool DolphinApp::OnInit()
if (selectAudioEmulation)
{
- if (audioEmulationName == "HLE")
+ if (audioEmulationName == wxS("HLE"))
SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true;
- else if (audioEmulationName == "LLE")
+ else if (audioEmulationName == wxS("LLE"))
SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false;
}
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/NetWindow.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/NetWindow.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/NetWindow.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/NetWindow.cpp 2013-02-19 19:43:23.706012655 -0500
@@ -29,6 +29,7 @@
#define NETPLAY_TITLEBAR "Dolphin NetPlay"
+DEFINE_EVENT_TYPE(wxEVT_THREAD)
BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame)
EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
END_EVENT_TABLE()
diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/WXInputBase.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/WXInputBase.cpp
--- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/WXInputBase.cpp 2013-02-19 18:38:35.000000000 -0500
+++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/WXInputBase.cpp 2013-02-19 19:46:24.058458372 -0500
@@ -43,7 +43,7 @@ const wxString WXKeyToString(int keycode
case WXK_CLEAR: return _("Clear");
case WXK_SHIFT: return wxT("Shift");
case WXK_ALT: return wxT("Alt");
- case WXK_RAW_CONTROL: return _("Control");
+ case WXK_CONTROL: return _("Control");
#ifdef __WXOSX__
case WXK_COMMAND: return _("Command");
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 5 Jul 2012 15:48:10 -0000 1.2
+++ .cvsignore 23 Feb 2013 16:52:41 -0000 1.3
@@ -1,2 +1,2 @@
-dolphin-emu-3.0.tar.xz
+dolphin-emu-3.5.tar.xz
dolphin-emu-extra.tar.xz
Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/dolphin-emu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dolphin-emu.spec 16 Feb 2013 16:12:00 -0000 1.3
+++ dolphin-emu.spec 23 Feb 2013 16:52:42 -0000 1.4
@@ -1,6 +1,6 @@
Name: dolphin-emu
-Version: 3.0
-Release: 12%{?dist}
+Version: 3.5
+Release: 1%{?dist}
Summary: Gamecube / Wii / Triforce Emulator
Url: http://www.dolphin-emulator.com/
@@ -17,9 +17,8 @@
Source1: %{name}-extra.tar.xz
#Kudos to Richard on this one (allows for shared clrun lib):
Patch0: %{name}-%{version}-clrun.patch
-#Build fix for gcc 4.7.0 (backwards compatible)
-#Note this is already fixed in the unstable version
-Patch1: %{name}-%{version}-gcc-4.7.patch
+#Allows for building with wxwidget 2.8.12, rather than 2.9.3
+Patch1: %{name}-%{version}-wx28.patch
# Dolphin only runs on Intel x86 archictures
ExclusiveArch: i686 x86_64
@@ -60,7 +59,7 @@
%prep
%setup -q -a 1
%patch0 -p1 -b .clrun
-%patch1 -p1 -b .gcc470
+%patch1 -p1 -b .wx28
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
#Remove all Bundled Libraries except Bochs:
@@ -98,8 +97,6 @@
%{name}-extra/%{name}.desktop
install -p -D -m 0644 %{name}-extra/%{name}.1 \
%{buildroot}/%{_mandir}/man1/%{name}.1
-#This zerolength file has no purpose and removed in the unstable version:
-rm -f %{buildroot}/%{_datadir}/%{name}/user/GameConfig/WBEEJV.ini
%find_lang %{name}
%files -f %{name}.lang
@@ -124,6 +121,10 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Feb 19 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-1
+- Updated to latest stable: removed GCC patch, updated CLRun patch
+- Added patch to build on wxwidgets 2.8 (temporary workaround)
+
* Sat Feb 16 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-12
- Removed patch for libav and disabled ffmpeg, caused rendering issues
- Minor consistency fixes to SPEC file
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Jul 2012 15:48:10 -0000 1.2
+++ sources 23 Feb 2013 16:52:42 -0000 1.3
@@ -1,2 +1,2 @@
-6fb4c50ddb22cd6413b24ac76bd2735f dolphin-emu-3.0.tar.xz
-9c4335d15000b73a81ee9b00202866e3 dolphin-emu-extra.tar.xz
+1e07d6c93da0f7bea95d3910540cf979 dolphin-emu-3.5.tar.xz
+f9cddcbc0e00e4d19465fc23542ac2bd dolphin-emu-extra.tar.xz
--- dolphin-emu-3.0-clrun.patch DELETED ---
--- dolphin-emu-3.0-gcc-4.7.patch DELETED ---
11 years, 1 month