rpms/meka/devel meka-0.80-format-strings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 meka.spec, 1.8, 1.9 sources, 1.4, 1.5 meka-0.80-pointer.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/meka/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4408
Modified Files:
.cvsignore meka.spec sources
Added Files:
meka-0.80-format-strings.patch
Removed Files:
meka-0.80-pointer.patch
Log Message:
* Sun Oct 05 2014 Andrea Musuruane <musuruan(a)gmail.com> - 0.80-0.7.20141005svn
- Updated to a new upstream preview of version 0.80
- Made a patch to fix format strings
- Dropped cleaning at the beginning of %install
- Spec file clean up
meka-0.80-format-strings.patch:
inputs.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
--- NEW FILE meka-0.80-format-strings.patch ---
diff -durN meka.orig/srcs/inputs.c meka/srcs/inputs.c
--- meka.orig/srcs/inputs.c 2014-10-02 14:21:42.000000000 +0200
+++ meka/srcs/inputs.c 2014-10-05 21:19:01.924936497 +0200
@@ -248,8 +248,8 @@
void Inputs_Switch_Joypad()
{
Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_JOYPAD);
- Msg(MSGT_USER, Msg_Get(MSG_Inputs_Joypad));
- Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Digital));
+ Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_Joypad));
+ Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Digital));
gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
}
@@ -258,8 +258,8 @@
void Inputs_Switch_LightPhaser()
{
Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_LIGHTPHASER);
- Msg(MSGT_USER, Msg_Get(MSG_Inputs_LightPhaser));
- Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Mouse));
+ Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_LightPhaser));
+ Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Mouse));
gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
}
@@ -268,9 +268,9 @@
void Inputs_Switch_PaddleControl()
{
Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_PADDLECONTROL);
- Msg(MSGT_USER, Msg_Get(MSG_Inputs_PaddleControl));
- Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Mouse));
- Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Digital_Unrecommended));
+ Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_PaddleControl));
+ Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Mouse));
+ Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Digital_Unrecommended));
gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
}
@@ -278,8 +278,8 @@
void Inputs_Switch_SportsPad()
{
Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_SPORTSPAD);
- Msg(MSGT_USER, Msg_Get(MSG_Inputs_SportsPad));
- Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Mouse));
+ Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_SportsPad));
+ Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Mouse));
gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
}
@@ -287,8 +287,8 @@
void Inputs_Switch_GraphicBoard()
{
Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_GRAPHICBOARD);
- Msg(MSGT_USER, Msg_Get(MSG_Inputs_GraphicBoard));
- Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Pen));
+ Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_GraphicBoard));
+ Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Pen));
gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
}
@@ -296,8 +296,8 @@
void Inputs_Switch_GraphicBoardV2()
{
Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_GRAPHICBOARD_V2);
- Msg(MSGT_USER, Msg_Get(MSG_Inputs_GraphicBoardV2));
- Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Pen));
+ Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_GraphicBoardV2));
+ Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Pen));
gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
}
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/meka/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 23 Aug 2013 15:13:44 -0000 1.4
+++ .cvsignore 5 Oct 2014 21:12:06 -0000 1.5
@@ -1 +1 @@
-meka-2013-07-25-srcs.zip
+meka-2014-10-05-srcs.zip
Index: meka.spec
===================================================================
RCS file: /cvs/nonfree/rpms/meka/devel/meka.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- meka.spec 31 Aug 2014 20:43:13 -0000 1.8
+++ meka.spec 5 Oct 2014 21:12:06 -0000 1.9
@@ -1,23 +1,22 @@
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%global pkgdate 2013-07-25
+%global pkgdate 2014-10-05
Name: meka
Version: 0.80
-Release: 0.6.20130725svn%{?dist}
+Release: 0.7.20141005svn%{?dist}
Summary: Sega 8-bit machine emulator
License: MEKA and non-commercial
URL: http://www.smspower.org/meka/
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# svn export -r 435 svn://svn.smspower.org/meka/trunk/meka meka-r435
-# cd meka-r435/
-# zip -ro ../meka-2013-07-25-srcs.zip *
+# svn export -r 496 svn://svn.smspower.org/meka/trunk/meka meka-r496
+# cd meka-r496/
+# zip -ro ../meka-2014-10-05-srcs.zip *
Source0: %{name}-%{pkgdate}-srcs.zip
Source1: %{name}.sh
Source2: %{name}.desktop
-# Fix pointer cast
-Patch0: %{name}-0.80-pointer.patch
+# Fix format strings
+Patch0: %{name}-0.80-format-strings.patch
# This is package contains ix86 asm code
ExclusiveArch: i686 x86_64
@@ -49,7 +48,7 @@
And if you are, I doubt you will want to play Nintendo games. So forget it.
%prep
-%setup -q -c
+%setup -q -c
%patch0 -p1
# Remove boundled libs
@@ -64,9 +63,6 @@
mv $i.utf8 $i
done
-# Use unversioned docdir
-sed -i 's!/usr/share/doc/$GAME-$VERSION!%{_pkgdocdir}!' %{SOURCE1}
-
# Compile for unix
sed -i 's/SYSTEM = macosx/# SYSTEM = macosx/' srcs/Makefile
sed -i 's/# SYSTEM = unix/SYSTEM = unix/' srcs/Makefile
@@ -80,8 +76,6 @@
%install
-rm -rf %{buildroot}
-
install -d %{buildroot}/%{_bindir}
install -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/meka
install -d %{buildroot}/%{_libexecdir}/meka
@@ -134,6 +128,12 @@
%changelog
+* Sun Oct 05 2014 Andrea Musuruane <musuruan(a)gmail.com> - 0.80-0.7.20141005svn
+- Updated to a new upstream preview of version 0.80
+- Made a patch to fix format strings
+- Dropped cleaning at the beginning of %%install
+- Spec file clean up
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.80-0.6.20130725svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/meka/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 23 Aug 2013 15:13:44 -0000 1.4
+++ sources 5 Oct 2014 21:12:06 -0000 1.5
@@ -1 +1 @@
-4e9951cec65777c96c3028388ed12b9d meka-2013-07-25-srcs.zip
+ee9171bb0d19aeb90ca14626dc436e6d meka-2014-10-05-srcs.zip
--- meka-0.80-pointer.patch DELETED ---
9 years, 6 months
rpms/mpd/devel mpd-0.18.16.tar.xz.sig, NONE, 1.1 .cvsignore, 1.20, 1.21 mpd.spec, 1.42, 1.43 sources, 1.20, 1.21 mpd-0.18.11.tar.xz.sig, 1.1, NONE
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28089/devel
Modified Files:
.cvsignore mpd.spec sources
Added Files:
mpd-0.18.16.tar.xz.sig
Removed Files:
mpd-0.18.11.tar.xz.sig
Log Message:
Update to upstream release 0.18.16
--- NEW FILE mpd-0.18.16.tar.xz.sig ---
9 years, 6 months
rpms/qarte/F-19 qarte.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Milan Bouchet-Valat
Author: nalimilan
Update of /cvs/free/rpms/qarte/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29740/F-19
Modified Files:
.cvsignore sources
Added Files:
qarte.spec
Log Message:
New package
--- NEW FILE qarte.spec ---
Name: qarte
Version: 2.2.0
Release: 3%{dist}
License: GPLv3+
URL: https://launchpad.net/qarte
Source0: http://oqapy.eu/releases/%{name}-%{version}.tar.gz
Group: Applications/Multimedia
Summary: A browser for arte.tv web site
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: python2-devel
Requires: PyQt4
Requires: rtmpdump
BuildArch: noarch
%description
Qarte allows browsing the archive of arte+7 & arteLiveWeb sites
and recording videos.
%prep
%setup -q
%build
%install
install -D %{name} %{buildroot}%{_bindir}/%{name}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications q_arte.desktop
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/
cp -p %{name}.png %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
mkdir -p %{buildroot}%{_mandir}/man1/
cp -p %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
mkdir %{buildroot}%{_datadir}/%{name}
cp -p *.py* %{buildroot}%{_datadir}/%{name}
chmod 755 %{buildroot}%{_datadir}/%{name}/%{name}.py
cp -pR medias %{buildroot}%{_datadir}/%{name}
cp -pR VWidgets %{buildroot}%{_datadir}/%{name}
cp -pR commonwidgets %{buildroot}%{_datadir}/%{name}
cp -pR crontab %{buildroot}%{_datadir}/%{name}
cp -pR locale %{buildroot}%{_datadir}
%find_lang %{name}
%files -f %{name}.lang
%doc README
%{_bindir}/%{name}
%{_datadir}/applications/q_arte.desktop
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sat Sep 20 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-3
- Add back %%{dist} to Release.
* Thu Sep 18 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-2
- Add desktop-file-utils to BuildRequires.
- Fix license to GPLv3+.
- Remove %%{dist} from Release.
* Mon Sep 15 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-1
- New upstream release.
* Sun Jan 19 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> 1.9.0-1
- Adapt Mageia package to RPMfusion.
* Tue Oct 22 2013 umeabot <umeabot> 1.8.5-4.mga4
+ Revision: 546102
- Mageia 4 Mass Rebuild
* Fri Oct 18 2013 zezinho <zezinho> 1.8.5-3.mga4
+ Revision: 520908
- fix l10n
* Thu Oct 17 2013 zezinho <zezinho> 1.8.5-2.mga4
+ Revision: 502167
- add manpage
- fix requires
* Wed Oct 16 2013 zezinho <zezinho> 1.8.5-1.mga4
+ Revision: 501750
- fix desktop file
- imported package qarte
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qarte/F-19/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Sep 2014 14:50:32 -0000 1.1
+++ .cvsignore 4 Oct 2014 20:12:56 -0000 1.2
@@ -0,0 +1 @@
+qarte-2.2.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qarte/F-19/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Sep 2014 14:50:32 -0000 1.1
+++ sources 4 Oct 2014 20:12:56 -0000 1.2
@@ -0,0 +1 @@
+0f24f6a4d1bd8b270645660a0071371f qarte-2.2.0.tar.gz
9 years, 6 months
rpms/qarte/F-20 qarte.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Milan Bouchet-Valat
Author: nalimilan
Update of /cvs/free/rpms/qarte/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29553/F-20
Modified Files:
.cvsignore sources
Added Files:
qarte.spec
Log Message:
New package
--- NEW FILE qarte.spec ---
Name: qarte
Version: 2.2.0
Release: 3%{dist}
License: GPLv3+
URL: https://launchpad.net/qarte
Source0: http://oqapy.eu/releases/%{name}-%{version}.tar.gz
Group: Applications/Multimedia
Summary: A browser for arte.tv web site
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: python2-devel
Requires: PyQt4
Requires: rtmpdump
BuildArch: noarch
%description
Qarte allows browsing the archive of arte+7 & arteLiveWeb sites
and recording videos.
%prep
%setup -q
%build
%install
install -D %{name} %{buildroot}%{_bindir}/%{name}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications q_arte.desktop
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/
cp -p %{name}.png %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
mkdir -p %{buildroot}%{_mandir}/man1/
cp -p %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
mkdir %{buildroot}%{_datadir}/%{name}
cp -p *.py* %{buildroot}%{_datadir}/%{name}
chmod 755 %{buildroot}%{_datadir}/%{name}/%{name}.py
cp -pR medias %{buildroot}%{_datadir}/%{name}
cp -pR VWidgets %{buildroot}%{_datadir}/%{name}
cp -pR commonwidgets %{buildroot}%{_datadir}/%{name}
cp -pR crontab %{buildroot}%{_datadir}/%{name}
cp -pR locale %{buildroot}%{_datadir}
%find_lang %{name}
%files -f %{name}.lang
%doc README
%{_bindir}/%{name}
%{_datadir}/applications/q_arte.desktop
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sat Sep 20 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-3
- Add back %%{dist} to Release.
* Thu Sep 18 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-2
- Add desktop-file-utils to BuildRequires.
- Fix license to GPLv3+.
- Remove %%{dist} from Release.
* Mon Sep 15 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-1
- New upstream release.
* Sun Jan 19 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> 1.9.0-1
- Adapt Mageia package to RPMfusion.
* Tue Oct 22 2013 umeabot <umeabot> 1.8.5-4.mga4
+ Revision: 546102
- Mageia 4 Mass Rebuild
* Fri Oct 18 2013 zezinho <zezinho> 1.8.5-3.mga4
+ Revision: 520908
- fix l10n
* Thu Oct 17 2013 zezinho <zezinho> 1.8.5-2.mga4
+ Revision: 502167
- add manpage
- fix requires
* Wed Oct 16 2013 zezinho <zezinho> 1.8.5-1.mga4
+ Revision: 501750
- fix desktop file
- imported package qarte
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qarte/F-20/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Sep 2014 14:50:32 -0000 1.1
+++ .cvsignore 4 Oct 2014 20:12:12 -0000 1.2
@@ -0,0 +1 @@
+qarte-2.2.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qarte/F-20/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Sep 2014 14:50:32 -0000 1.1
+++ sources 4 Oct 2014 20:12:12 -0000 1.2
@@ -0,0 +1 @@
+0f24f6a4d1bd8b270645660a0071371f qarte-2.2.0.tar.gz
9 years, 6 months
rpms/qarte/devel qarte.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Milan Bouchet-Valat
Author: nalimilan
Update of /cvs/free/rpms/qarte/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29237/devel
Modified Files:
.cvsignore sources
Added Files:
qarte.spec
Log Message:
New package
--- NEW FILE qarte.spec ---
Name: qarte
Version: 2.2.0
Release: 3%{dist}
License: GPLv3+
URL: https://launchpad.net/qarte
Source0: http://oqapy.eu/releases/%{name}-%{version}.tar.gz
Group: Applications/Multimedia
Summary: A browser for arte.tv web site
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: python2-devel
Requires: PyQt4
Requires: rtmpdump
BuildArch: noarch
%description
Qarte allows browsing the archive of arte+7 & arteLiveWeb sites
and recording videos.
%prep
%setup -q
%build
%install
install -D %{name} %{buildroot}%{_bindir}/%{name}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications q_arte.desktop
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/
cp -p %{name}.png %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
mkdir -p %{buildroot}%{_mandir}/man1/
cp -p %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
mkdir %{buildroot}%{_datadir}/%{name}
cp -p *.py* %{buildroot}%{_datadir}/%{name}
chmod 755 %{buildroot}%{_datadir}/%{name}/%{name}.py
cp -pR medias %{buildroot}%{_datadir}/%{name}
cp -pR VWidgets %{buildroot}%{_datadir}/%{name}
cp -pR commonwidgets %{buildroot}%{_datadir}/%{name}
cp -pR crontab %{buildroot}%{_datadir}/%{name}
cp -pR locale %{buildroot}%{_datadir}
%find_lang %{name}
%files -f %{name}.lang
%doc README
%{_bindir}/%{name}
%{_datadir}/applications/q_arte.desktop
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sat Sep 20 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-3
- Add back %%{dist} to Release.
* Thu Sep 18 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-2
- Add desktop-file-utils to BuildRequires.
- Fix license to GPLv3+.
- Remove %%{dist} from Release.
* Mon Sep 15 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> - 2.2.0-1
- New upstream release.
* Sun Jan 19 2014 Milan Bouchet-Valat <nalimilan(a)club.fr> 1.9.0-1
- Adapt Mageia package to RPMfusion.
* Tue Oct 22 2013 umeabot <umeabot> 1.8.5-4.mga4
+ Revision: 546102
- Mageia 4 Mass Rebuild
* Fri Oct 18 2013 zezinho <zezinho> 1.8.5-3.mga4
+ Revision: 520908
- fix l10n
* Thu Oct 17 2013 zezinho <zezinho> 1.8.5-2.mga4
+ Revision: 502167
- add manpage
- fix requires
* Wed Oct 16 2013 zezinho <zezinho> 1.8.5-1.mga4
+ Revision: 501750
- fix desktop file
- imported package qarte
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qarte/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Sep 2014 14:50:32 -0000 1.1
+++ .cvsignore 4 Oct 2014 20:01:33 -0000 1.2
@@ -0,0 +1 @@
+qarte-2.2.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qarte/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Sep 2014 14:50:32 -0000 1.1
+++ sources 4 Oct 2014 20:01:33 -0000 1.2
@@ -0,0 +1 @@
+0f24f6a4d1bd8b270645660a0071371f qarte-2.2.0.tar.gz
9 years, 6 months
rpms/wl-kmod/F-20 wl-kmod-006_kernel_3.17.patch, NONE, 1.1 wl-kmod.spec, 1.126, 1.127
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3056
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-006_kernel_3.17.patch
Log Message:
* Fri Oct 03 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.248-3
- Added patch to build for kernel >= 3.17
wl-kmod-006_kernel_3.17.patch:
wl_linux.c | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE wl-kmod-006_kernel_3.17.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c 2014-07-15 17:27:12.550312000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c 2014-10-03 22:02:07.746840461 +0200
@@ -1313,7 +1313,12 @@
dev->priv = priv_link;
#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
+#else
+ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN,
+ ether_setup);
+#endif
if (!dev) {
WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- wl-kmod.spec 19 Sep 2014 11:06:41 -0000 1.126
+++ wl-kmod.spec 3 Oct 2014 20:56:27 -0000 1.127
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: wl-kmod
Version: 6.30.223.248
-Release: 2%{?dist}.2
+Release: 3%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,6 +20,7 @@
Patch2: wl-kmod-003_kernel_3.8.patch
Patch3: wl-kmod-004_kernel_3.15.patch
Patch4: wl-kmod-005_kernel_3.16.patch
+Patch5: wl-kmod-006_kernel_3.17.patch
BuildRequires: %{_bindir}/kmodtool
@@ -63,6 +64,7 @@
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.15
%patch4 -p1 -b .kernel-3.16
+%patch5 -p1 -b .kernel-3.17
popd
for kernel_version in %{?kernel_versions} ; do
@@ -92,6 +94,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Oct 03 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.248-3
+- Added patch to build for kernel >= 3.17
+
* Fri Sep 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-2.2
- Rebuilt for kernel
9 years, 6 months
rpms/wl-kmod/devel wl-kmod-007_kernel_3.17.patch, NONE, 1.1 wl-kmod.spec, 1.86, 1.87
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2783
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-007_kernel_3.17.patch
Log Message:
* Fri Oct 03 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.248-3
- Added patch to build for kernel >= 3.17
wl-kmod-007_kernel_3.17.patch:
wl_linux.c | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE wl-kmod-007_kernel_3.17.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c 2014-07-15 17:27:12.550312000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c 2014-10-03 22:02:07.746840461 +0200
@@ -1313,7 +1313,12 @@
dev->priv = priv_link;
#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
+#else
+ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN,
+ ether_setup);
+#endif
if (!dev) {
WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- wl-kmod.spec 10 Sep 2014 17:58:39 -0000 1.86
+++ wl-kmod.spec 3 Oct 2014 20:52:52 -0000 1.87
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.248
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,6 +21,7 @@
Patch3: wl-kmod-004_kernel_3.15.patch
Patch4: wl-kmod-005_gcc_4.9.patch
Patch5: wl-kmod-006_kernel_3.16.patch
+Patch6: wl-kmod-007_kernel_3.17.patch
BuildRequires: %{_bindir}/kmodtool
@@ -65,6 +66,7 @@
%patch3 -p1 -b .kernel-3.15
%patch4 -p1 -b .gcc-4.9
%patch5 -p1 -b .kernel-3.16
+%patch6 -p1 -b .kernel-3.17
popd
for kernel_version in %{?kernel_versions} ; do
@@ -94,6 +96,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Oct 03 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.248-3
+- Added patch to build for kernel >= 3.17
+
* Wed Sep 10 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.248-2
- Added patch to build for kernel >= 3.16
9 years, 6 months
rpms/ffmpeg/devel .cvsignore, 1.62, 1.63 ffmpeg.spec, 1.118, 1.119 sources, 1.63, 1.64
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28469
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Fri Oct 03 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.3.4-1
- Updated to 2.3.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore 25 Sep 2014 05:21:44 -0000 1.62
+++ .cvsignore 3 Oct 2014 05:46:20 -0000 1.63
@@ -1 +1 @@
-ffmpeg-2.4.1.tar.bz2
+ffmpeg-2.3.4.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ffmpeg.spec 27 Sep 2014 08:43:52 -0000 1.118
+++ ffmpeg.spec 3 Oct 2014 05:46:20 -0000 1.119
@@ -12,8 +12,8 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 2.3.3
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 2.3.4
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -281,6 +281,9 @@
%changelog
+* Fri Oct 03 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.3.4-1
+- Updated to 2.3.4
+
* Sat Sep 27 2014 kwizart <kwizart(a)gmail.com> - 2.3.3-3
- Rebuild back to ffmpeg 2.3x
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources 27 Sep 2014 08:43:07 -0000 1.63
+++ sources 3 Oct 2014 05:46:20 -0000 1.64
@@ -1 +1 @@
-72361d3b8717b6db3ad2b9da8df7af5e ffmpeg-2.3.3.tar.bz2
+d6a0c7f0827a2446ca2bed11ac9bf608 ffmpeg-2.3.4.tar.bz2
9 years, 6 months
rpms/dolphin-emu/devel dolphin-emu-4.0-clrun.patch, NONE, 1.1 dolphin-emu-4.0-compat-SFML16.patch, NONE, 1.1 dolphin-emu-4.0-gtk3.patch, NONE, 1.1 dolphin-emu-4.0-polarssl13.patch, NONE, 1.1 dolphin-emu.1, NONE, 1.1 .cvsignore, 1.3, 1.4 dolphin-emu.spec, 1.7, 1.8 sources, 1.3, 1.4 dolphin-emu-3.5-clrun.patch, 1.1, NONE dolphin-emu-3.5-compat-SFML16.patch, 1.1, NONE dolphin-emu-3.5-wx28.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-serv25267/devel
Modified Files:
.cvsignore dolphin-emu.spec sources
Added Files:
dolphin-emu-4.0-clrun.patch
dolphin-emu-4.0-compat-SFML16.patch dolphin-emu-4.0-gtk3.patch
dolphin-emu-4.0-polarssl13.patch dolphin-emu.1
Removed Files:
dolphin-emu-3.5-clrun.patch
dolphin-emu-3.5-compat-SFML16.patch dolphin-emu-3.5-wx28.patch
Log Message:
Update to 4.0
dolphin-emu-4.0-clrun.patch:
CMakeLists.txt | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
--- NEW FILE dolphin-emu-4.0-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
@@ -663,10 +663,21 @@
add_subdirectory(Externals/libiconv-1.14)
endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
- 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" AND NOT ANDROID) #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-4.0-compat-SFML16.patch:
CMakeLists.txt | 1 +
CMakeTests/FindSFML.cmake | 6 +++---
Source/Core/Core/CMakeLists.txt | 2 +-
Source/Core/DolphinWX/CMakeLists.txt | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
--- NEW FILE dolphin-emu-4.0-compat-SFML16.patch ---
diff -up dolphin-emu-3.5/CMakeTests/FindSFML.cmake~ dolphin-emu-3.5/CMakeTests/FindSFML.cmake
--- dolphin-emu-3.5/CMakeTests/FindSFML.cmake~ 2013-02-20 00:38:34.000000000 +0100
+++ dolphin-emu-3.5/CMakeTests/FindSFML.cmake 2013-11-18 11:57:56.150949832 +0100
@@ -24,7 +24,7 @@ endif()
# find the SFML include directory
find_path(SFML_INCLUDE_DIR SFML/Config.hpp
- PATH_SUFFIXES include
+ PATH_SUFFIXES include/sfml1
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -87,11 +87,11 @@ set(FIND_SFML_LIB_PATHS ~/Library/Framew
foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
- set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
+ set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX}-1.6)
# no suffix for sfml-main, it is always a static library
if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
- set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+ set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}-1.6)
endif()
# debug library
diff -up dolphin-emu-3.5/CMakeLists.txt~ dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5/CMakeLists.txt~ 2013-11-18 11:58:43.000000000 +0100
+++ dolphin-emu-3.5/CMakeLists.txt 2013-11-18 12:00:41.120408310 +0100
@@ -581,6 +581,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar
endif()
if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
message("Using shared SFML")
+ include_directories( /usr/include/sfml1 )
else()
message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
add_subdirectory(Externals/SFML)
diff -up dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt~ dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt
--- dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt~ 2013-02-20 00:38:35.000000000 +0100
+++ dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt 2013-11-18 12:14:15.844970552 +0100
@@ -220,7 +220,7 @@ set(SRCS Src/ActionReplay.cpp
Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp)
endif()
-set(LIBS bdisasm inputcommon videosoftware sfml-network)
+set(LIBS bdisasm inputcommon videosoftware sfml-network-1.6)
if(NOT USE_GLES OR USE_GLES3)
set(LIBS ${LIBS} videoogl)
diff -up dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt~ dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt
--- dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt~ 2013-02-20 00:38:35.000000000 +0100
+++ dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt 2013-11-18 12:14:11.445091807 +0100
@@ -10,7 +10,7 @@ set(LIBS core
common
audiocommon
z
- sfml-network
+ sfml-network-1.6
${GTK2_LIBRARIES})
if(NOT ANDROID)
dolphin-emu-4.0-gtk3.patch:
CMakeLists.txt | 10 ++++------
Source/Core/DolphinWX/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
--- NEW FILE dolphin-emu-4.0-gtk3.patch ---
diff -rupN dolphin-emu-2879cbd2b564-orig/CMakeLists.txt dolphin-emu-2879cbd2b564/CMakeLists.txt
--- dolphin-emu-2879cbd2b564-orig/CMakeLists.txt 2014-03-07 20:10:55.185158971 -0500
+++ dolphin-emu-2879cbd2b564/CMakeLists.txt 2014-03-07 20:16:00.388691555 -0500
@@ -707,13 +707,11 @@ if(NOT DISABLE_WX AND NOT ANDROID)
OUTPUT_VARIABLE DIST_NAME
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
- VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
- check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED)
+ VERSION_EQUAL 2.8.12 OR "${DIST_NAME}" STREQUAL "natty")
+ check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED)
else()
- include(FindGTK2)
- if(GTK2_FOUND)
- include_directories(${GTK2_INCLUDE_DIRS})
- endif()
+ include(FindGTK)
+ include_directories(${GTK3_INCLUDE_DIRS})
endif()
endif()
diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/DolphinWX/CMakeLists.txt dolphin-emu-2879cbd2b564/Source/Core/DolphinWX/CMakeLists.txt
--- dolphin-emu-2879cbd2b564-orig/Source/Core/DolphinWX/CMakeLists.txt 2014-03-07 20:10:55.186158963 -0500
+++ dolphin-emu-2879cbd2b564/Source/Core/DolphinWX/CMakeLists.txt 2014-03-07 20:18:55.977272101 -0500
@@ -11,7 +11,7 @@ set(LIBS core
audiocommon
z
sfml-network-1.6
- ${GTK2_LIBRARIES})
+ ${GTK3_LIBRARIES})
if(NOT ANDROID)
if(USE_X11)
dolphin-emu-4.0-polarssl13.patch:
CMakeTests/FindPolarSSL.cmake | 68 ++++++++----
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp | 49 ++++----
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h | 10 -
3 files changed, 75 insertions(+), 52 deletions(-)
--- NEW FILE dolphin-emu-4.0-polarssl13.patch ---
diff -rupN dolphin-emu-2879cbd2b564-orig/CMakeTests/FindPolarSSL.cmake dolphin-emu-2879cbd2b564/CMakeTests/FindPolarSSL.cmake
--- dolphin-emu-2879cbd2b564-orig/CMakeTests/FindPolarSSL.cmake 1979-11-29 23:00:00.000000000 -0500
+++ dolphin-emu-2879cbd2b564/CMakeTests/FindPolarSSL.cmake 2014-10-02 10:02:00.688266601 -0400
@@ -6,14 +6,20 @@
# POLARSSL_WORKS, this is true if polarssl is found and contains the methods
# needed by dolphin-emu
-if(POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
- # Already in cache, be silent
+# validate cached values (but use them as hints)
+set(POLARSSL_INCLUDE_DIR_HINT POLARSSL_INCLUDE_DIR)
+set(POLARSSL_LIBRARY_HINT POLARSSL_LIBRARY)
+unset(POLARSSL_INCLUDE_DIR CACHE)
+unset(POLARSSL_LIBRARY CACHE)
+find_path(POLARSSL_INCLUDE_DIR polarssl/ssl.h HINTS ${POLARSSL_INCLUDE_DIR_HINT})
+find_library(POLARSSL_LIBRARY polarssl HINTS ${POLARSSL_LIBRARY_HINT})
+
+if(POLARSSL_INCLUDE_DIR STREQUAL POLARSSL_INCLUDE_DIR_HINT AND
+ POLARSSL_LIBRARY STREQUAL POLARSSL_LIBRARY_HINT)
+ # using cached values, be silent
set(POLARSSL_FIND_QUIETLY TRUE)
endif()
-find_path(POLARSSL_INCLUDE_DIR polarssl/ssl.h)
-find_library(POLARSSL_LIBRARY polarssl)
-
if (POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
set (POLARSSL_FOUND TRUE)
endif ()
@@ -24,30 +30,48 @@ if (POLARSSL_FOUND)
message (STATUS "Found the polarssl headers at ${POLARSSL_INCLUDE_DIR}")
endif (NOT POLARSSL_FIND_QUIETLY)
- message(STATUS "Checking to see if system version contains necessary methods")
-
set(CMAKE_REQUIRED_INCLUDES ${POLARSSL_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${POLARSSL_LIBRARY})
+ unset(POLARSSL_WORKS CACHE)
check_cxx_source_compiles("
+ #include <polarssl/ctr_drbg.h>
+ #include <polarssl/entropy.h>
#include <polarssl/net.h>
#include <polarssl/ssl.h>
- #include <polarssl/havege.h>
+ #include <polarssl/version.h>
+
+ #if POLARSSL_VERSION_NUMBER < 0x01030000
+ #error \"Shared PolarSSL version is too old\"
+ #endif
+
int main()
{
- ssl_context ctx;
- ssl_session session;
- havege_state hs;
-
- ssl_init(&ctx);
- havege_init(&hs);
- ssl_set_rng(&ctx, havege_random, &hs);
- ssl_set_session(&ctx, &session);
-
- ssl_close_notify(&ctx);
- ssl_session_free(&session);
- ssl_free(&ctx);
+ ssl_context ctx;
+ ssl_session session;
+ entropy_context entropy;
+ ctr_drbg_context ctr_drbg;
+ x509_crt cacert;
+ x509_crt clicert;
+ pk_context pk;
+
+ ssl_init(&ctx);
+ entropy_init(&entropy);
+
+ const char* pers = \"dolphin-emu\";
+ ctr_drbg_init(&ctr_drbg, entropy_func,
+ &entropy,
+ (const unsigned char*)pers,
+ strlen(pers));
+
+ ssl_set_rng(&ctx, ctr_drbg_random, &ctr_drbg);
+ ssl_set_session(&ctx, &session);
+
+ ssl_close_notify(&ctx);
+ ssl_session_free(&session);
+ ssl_free(&ctx);
+ entropy_free(&entropy);
- return 0;
+ return 0;
}"
POLARSSL_WORKS)
@@ -55,5 +79,5 @@ else ()
message (STATUS "Could not find polarssl")
endif ()
-MARK_AS_ADVANCED(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
+mark_as_advanced(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
--- dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp 1979-11-29 23:00:00.000000000 -0500
+++ dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp 2014-10-02 09:54:33.831914493 -0400
@@ -28,12 +28,12 @@ CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_H
ssl_session_free(&_SSL[i].session);
ssl_free(&_SSL[i].ctx);
- x509_free(&_SSL[i].cacert);
- x509_free(&_SSL[i].clicert);
+ x509_crt_free(&_SSL[i].cacert);
+ x509_crt_free(&_SSL[i].clicert);
memset(&_SSL[i].ctx, 0, sizeof(ssl_context));
memset(&_SSL[i].session, 0, sizeof(ssl_session));
- memset(&_SSL[i].hs, 0, sizeof(havege_state));
+ memset(&_SSL[i].entropy, 0, sizeof(entropy_context));
memset(_SSL[i].hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
_SSL[i].active = false;
@@ -147,13 +147,12 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV
goto _SSL_NEW_ERROR;
}
- havege_init(&_SSL[sslID].hs);
- ssl_set_rng(&_SSL[sslID].ctx, havege_random, &_SSL[sslID].hs);
+ entropy_init(&_SSL[sslID].entropy);
+ ssl_set_rng(&_SSL[sslID].ctx, entropy_func, &_SSL[sslID].hs);
// For some reason we can't use TLSv1.2, v1.1 and below are fine!
ssl_set_max_version(&_SSL[sslID].ctx, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_2);
- ssl_set_ciphersuites(&_SSL[sslID].ctx, ssl_default_ciphersuites);
ssl_set_session(&_SSL[sslID].ctx, &_SSL[sslID].session);
ssl_set_endpoint(&_SSL[sslID].ctx, SSL_IS_CLIENT);
@@ -192,12 +191,12 @@ _SSL_NEW_ERROR:
ssl_session_free(&_SSL[sslID].session);
ssl_free(&_SSL[sslID].ctx);
- x509_free(&_SSL[sslID].cacert);
- x509_free(&_SSL[sslID].clicert);
+ x509_crt_free(&_SSL[sslID].cacert);
+ x509_crt_free(&_SSL[sslID].clicert);
memset(&_SSL[sslID].ctx, 0, sizeof(ssl_context));
memset(&_SSL[sslID].session, 0, sizeof(ssl_session));
- memset(&_SSL[sslID].hs, 0, sizeof(havege_state));
+ memset(&_SSL[sslID].entropy, 0, sizeof(entropy_context));
memset(_SSL[sslID].hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
_SSL[sslID].active = false;
@@ -231,7 +230,7 @@ _SSL_NEW_ERROR:
int sslID = Memory::Read_U32(BufferOut) - 1;
if (SSLID_VALID(sslID))
{
- int ret = x509parse_crt_der(
+ int ret = x509_crt_parse_der(
&_SSL[sslID].cacert,
Memory::GetPointer(BufferOut2),
BufferOutSize2);
@@ -268,23 +267,23 @@ _SSL_NEW_ERROR:
if (SSLID_VALID(sslID))
{
std::string cert_base_path(File::GetUserPath(D_WIIUSER_IDX));
- int ret = x509parse_crtfile(&_SSL[sslID].clicert, (cert_base_path + "clientca.pem").c_str());
- int rsa_ret = x509parse_keyfile(&_SSL[sslID].rsa, (cert_base_path + "clientcakey.pem").c_str(), NULL);
- if (ret || rsa_ret)
+ int ret = x509_crt_parse_file(&_SSL[sslID].clicert, (cert_base_path + "clientca.pem").c_str());
+ int pk_ret = pk_parse_keyfile(&_SSL[sslID].pk, (cert_base_path + "clientcakey.pem").c_str(), NULL);
+ if (ret || pk_ret)
{
- x509_free(&_SSL[sslID].clicert);
- rsa_free(&_SSL[sslID].rsa);
- memset(&_SSL[sslID].clicert, 0, sizeof(x509_cert));
- memset(&_SSL[sslID].rsa, 0, sizeof(rsa_context));
+ x509_crt_free(&_SSL[sslID].clicert);
+ pk_free(&_SSL[sslID].pk);
+ memset(&_SSL[sslID].clicert, 0, sizeof(x509_crt));
+ memset(&_SSL[sslID].pk, 0, sizeof(pk_context));
Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
}
else
{
- ssl_set_own_cert(&_SSL[sslID].ctx, &_SSL[sslID].clicert, &_SSL[sslID].rsa);
+ ssl_set_own_cert(&_SSL[sslID].ctx, &_SSL[sslID].clicert, &_SSL[sslID].pk);
Memory::Write_U32(SSL_OK, _BufferIn);
}
- INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT = (%d, %d)", ret, rsa_ret);
+ INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT = (%d, %d)", ret, pk_ret);
}
else
{
@@ -306,10 +305,10 @@ _SSL_NEW_ERROR:
int sslID = Memory::Read_U32(BufferOut) - 1;
if (SSLID_VALID(sslID))
{
- x509_free(&_SSL[sslID].clicert);
- rsa_free(&_SSL[sslID].rsa);
- memset(&_SSL[sslID].clicert, 0, sizeof(x509_cert));
- memset(&_SSL[sslID].rsa, 0, sizeof(rsa_context));
+ x509_crt_free(&_SSL[sslID].clicert);
+ pk_free(&_SSL[sslID].pk);
+ memset(&_SSL[sslID].clicert, 0, sizeof(x509_crt));
+ memset(&_SSL[sslID].pk, 0, sizeof(pk_context));
ssl_set_own_cert(&_SSL[sslID].ctx, NULL, NULL);
Memory::Write_U32(SSL_OK, _BufferIn);
@@ -328,10 +327,10 @@ _SSL_NEW_ERROR:
{
std::string cert_base_path(File::GetUserPath(D_WIIUSER_IDX));
- int ret = x509parse_crtfile(&_SSL[sslID].cacert, (cert_base_path + "rootca.pem").c_str());
+ int ret = x509_crt_parse_file(&_SSL[sslID].cacert, (cert_base_path + "rootca.pem").c_str());
if (ret)
{
- x509_free(&_SSL[sslID].clicert);
+ x509_crt_free(&_SSL[sslID].clicert);
Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
}
else
diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
--- dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h 1979-11-29 23:00:00.000000000 -0500
+++ dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h 2014-10-02 09:55:32.057502719 -0400
@@ -9,7 +9,7 @@
#include <polarssl/net.h>
#include <polarssl/ssl.h>
-#include <polarssl/havege.h>
+#include <polarssl/entropy.h>
#define NET_SSL_MAX_HOSTNAME_LEN 256
#define NET_SSL_MAXINSTANCES 4
@@ -57,10 +57,10 @@ enum SSL_IOCTL
typedef struct {
ssl_context ctx;
ssl_session session;
- havege_state hs;
- x509_cert cacert;
- x509_cert clicert;
- rsa_context rsa;
+ entropy_context entropy;
+ x509_crt cacert;
+ x509_crt clicert;
+ pk_context pk;
int sockfd;
char hostname[NET_SSL_MAX_HOSTNAME_LEN];
bool active;
--- NEW FILE dolphin-emu.1 ---
.TH DOLPHIN-EMU 1 "December 10, 2010"
.SH NAME
dolphin-emu \- A Gamecube, Wii and Triforce (the arcade machine based on the
Gamecube) emulator.
.SH SYNOPSIS
.B dolphin-emu
.RI [ options ]
.SH DESCRIPTION
.B dolphin-emu
is a Gamecube, Wii and Triforce (the arcade machine based on the
Gamecube) emulator.
.P
Gamecube compatibility is okay - lots of games work, many games don't work.
.P
Wii compatibility is also good - a lot of games do work. Wii emulation
generally requires a bit more computing power than Gamecube emulation, though.
.P
Triforce compatibility is not really known yet, but at least one game runs,
with minor glitches.
.SH OPTIONS
.TP
.BI "\-A, \-\-audio-plugin="plugin
Specify an audio plugin
.TP
.B \-b, \-\-batch
Exit application when emulator closes
.TP
.B \-d, \-\-debugger
Open the debugger
.TP
.BI "\-e, \-\-exec="file
Loads the specified file (DOL, ELF, WAD, GCM, ISO)
.TP
.B \-l, \-\-logger
Open the logger
.TP
.BI "\-V, \-\-video-plugin="plugin
Specify a video plugin
.SH AUTHOR
This manual page was written by Glenn Rice <glennricster(a)gmail.com>,
for the Debian system (but may be used by others).
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 23 Feb 2013 16:53:32 -0000 1.3
+++ .cvsignore 2 Oct 2014 14:33:50 -0000 1.4
@@ -1,2 +1 @@
-dolphin-emu-3.5.tar.xz
-dolphin-emu-extra.tar.xz
+dolphin-emu-2879cbd2b564.zip
Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dolphin-emu.spec 1 Sep 2014 11:26:18 -0000 1.7
+++ dolphin-emu.spec 2 Oct 2014 14:33:51 -0000 1.8
@@ -1,29 +1,25 @@
Name: dolphin-emu
-Version: 3.5
-Release: 6%{?dist}
+Version: 4.0
+Release: 3%{?dist}
Summary: Gamecube / Wii / Triforce Emulator
-Url: http://www.dolphin-emulator.com/
-#A license breakdown is included in copyright from Source1
-License: GPLv2 and BSD and OpenSSL and Public Domain
-##Source can be grabbed using the script in Source1:
-#get-source-from-git.sh
-Source0: %{name}-%{version}.tar.xz
-#Source1 just contains various missing files from the source
-#Most of it can be grabbed here:
-#https://github.com/chenxiaolong/Fedora-SRPMS/tree/master/dolphin-emu
-#The copyright file is from here:
-#http://ppa.launchpad.net/glennric/dolphin-emu/ubuntu/pool/main/d/dolphin-emu/dolphin-emu_3.0-0ubuntu2~lucid.debian.tar.gz
-Source1: %{name}-extra.tar.xz
+Url: http://dolphin-emu.org/
+License: GPLv2 and BSD and Public Domain
+#Download here: https://dolphin-emu.googlecode.com/archive/4.0.2.zip
+Source0: %{name}-2879cbd2b564.zip
+#Manpage from Ubuntu package
+Source1: %{name}.1
#Kudos to Richard on this one (allows for shared clrun lib):
Patch0: %{name}-%{version}-clrun.patch
-#Allows for building with wxwidget 2.8.12, rather than 2.9.3
-Patch1: %{name}-%{version}-wx28.patch
#Kudos to Hans de Goede (updates paths for compat-SFML16-devel):
-Patch2: %{name}-%{version}-compat-SFML16.patch
-
-# Dolphin only runs on Intel x86 archictures
-ExclusiveArch: i686 x86_64
+Patch1: %{name}-%{version}-compat-SFML16.patch
+#GTK3 patch, bug: https://code.google.com/p/dolphin-emu/issues/detail?id=7069
+Patch2: %{name}-%{version}-gtk3.patch
+#Use polarssl 1.3, workaround for fedora bug:
+#https://bugzilla.redhat.com/show_bug.cgi?id=1069394
+#Also see rpmfusion bug for details:
+#https://bugzilla.rpmfusion.org/show_bug.cgi?id=2995
+Patch3: %{name}-%{version}-polarssl13.patch
BuildRequires: alsa-lib-devel
BuildRequires: bluez-libs-devel
@@ -39,8 +35,9 @@
BuildRequires: openal-soft-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: portaudio-devel
-BuildRequires: SDL-devel
-BuildRequires: wxGTK-devel
+BuildRequires: SDL2-devel
+BuildRequires: wxGTK3-devel
+BuildRequires: gtk3-devel
BuildRequires: zlib-devel
BuildRequires: Cg
BuildRequires: scons
@@ -50,6 +47,11 @@
BuildRequires: desktop-file-utils
BuildRequires: bochs-devel
BuildRequires: opencl-utils-devel
+BuildRequires: soundtouch-devel
+BuildRequires: polarssl-devel >= 1.3.0
+BuildRequires: miniupnpc-devel
+BuildRequires: libusb-devel
+
Requires: hicolor-icon-theme
%description
@@ -59,18 +61,19 @@
present on the original consoles.
%prep
-%setup -q -a 1
+%setup -q -n %{name}-2879cbd2b564
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
-#Patch for GCC 4.8
-sed -i 's/_rot/__rot/g' Externals/Bochs_disasm/PowerPCDisasm.cpp Externals/wxWidgets3/include/wx/image.h Externals/wxWidgets3/src/generic/graphicc.cpp Externals/wxWidgets3/src/common/cairo.cpp Externals/wxWidgets3/src/common/image.cpp Externals/wxWidgets3/src/gtk/gnome/gprint.cpp Externals/wxWidgets3/src/gtk/dcclient.cpp Externals/wxWidgets3/src/gtk/print.cpp Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp Source/Core/Core/Src/ARDecrypt.cpp Source/Core/Common/Src/CommonFuncs.h Source/Core/Common/Src/Hash.cpp
-#Various CMAKE fixes
+###CMAKE fixes
+#Allow building with cmake macro
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
-sed -i 's/ AND NOT SFML_VERSION_MAJOR//g' CMakeLists.txt
+#This is a typo: https://code.google.com/p/dolphin-emu/issues/detail?id=7074
+sed -i 's/soundtouch.h/SoundTouch.h/g' CMakeLists.txt
-#Remove all Bundled Libraries except Bochs:
+###Remove all Bundled Libraries except Bochs:
cd Externals
rm -f -r `ls | grep -v 'Bochs_disasm'`
#Remove Bundled Bochs source and replace with links:
@@ -84,37 +87,37 @@
ln -s /usr/include/bochs/disasm/*.h ./
%build
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%cmake \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_SHARED_LIBS=FALSE \
-DENCODE_FRAMEDUMPS=FALSE \
-DUSE_EXTERNAL_CLRUN=TRUE \
-DCLRUN_INCLUDE_PATH=%{_includedir}/opencl-utils/include \
+ -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-config-3.0 \
.
+
make %{?_smp_mflags}
%install
make %{?_smp_mflags} install DESTDIR=%{buildroot}
-#Install extras from source1:
-for size in 16 32 48 128 256; do
- dim="${size}x${size}"
- install -p -D -m 0644 %{name}-extra/%{name}$size.png \
- %{buildroot}%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
-done
-desktop-file-install --dir %{buildroot}%{_datadir}/applications \
- %{name}-extra/%{name}.desktop
-install -p -D -m 0644 %{name}-extra/%{name}.1 \
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+
+#Install manpage:
+install -p -D -m 0644 %{SOURCE1} \
%{buildroot}/%{_mandir}/man1/%{name}.1
+
%find_lang %{name}
%files -f %{name}.lang
-%doc license.txt Readme.txt docs/ActionReplay/CodeTypesGuide.txt
-%doc docs/ActionReplay/GCNCodeTypes.txt %{name}-extra/copyright
+%doc license.txt Readme.txt docs/*
+%doc docs/ActionReplay/GCNCodeTypes.txt
%{_datadir}/%{name}
%{_bindir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.*
+%{_datadir}/pixmaps/%{name}.xpm
+%{_libdir}/*.a
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -129,17 +132,30 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
-* Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com> - 3.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+* Thu Oct 2 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 4.0-3
+- Use polarssl 1.3 (fedora 21+) to avoid bundling
+- patch to use entropy functionality in SSL instead of havege
+
+* Thu Oct 2 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 4.0-2
+- Bundle polarssl (temporary fix, only for F19/20)
+
+* Mon Mar 3 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 4.0-1
+- Update to dolphin 4.0.2
+- Removed any unnecessary patches
+- Added new and updated some old patches
+- Removed exclusive arch, now builds on arm
+
+* Wed Jan 1 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-6
+- Build for SDL2 (Adds vibration support)
* Mon Nov 18 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-5
- Added patch for SFML, thanks to Hans de Goede
* Sat Jul 27 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-4
-- Updated for SFML 2.0 update
+- Updated for SFML compat
* Fri Jul 26 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-3
-- GCC 4.8 Fix (Fedora 19 and onwards)
+-3 GCC 4.8 Fix (Fedora 19 and onwards)
* Tue Feb 19 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-2
- Fixed date typos in SPEC
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 23 Feb 2013 16:53:34 -0000 1.3
+++ sources 2 Oct 2014 14:33:51 -0000 1.4
@@ -1,2 +1 @@
-1e07d6c93da0f7bea95d3910540cf979 dolphin-emu-3.5.tar.xz
-f9cddcbc0e00e4d19465fc23542ac2bd dolphin-emu-extra.tar.xz
+8ba4a24cfa135a33400dd908e467b7c6 dolphin-emu-2879cbd2b564.zip
--- dolphin-emu-3.5-clrun.patch DELETED ---
--- dolphin-emu-3.5-compat-SFML16.patch DELETED ---
--- dolphin-emu-3.5-wx28.patch DELETED ---
9 years, 6 months
rpms/dolphin-emu/F-20 dolphin-emu-4.0-clrun.patch, NONE, 1.1 dolphin-emu-4.0-compat-SFML16.patch, NONE, 1.1 dolphin-emu-4.0-gtk3.patch, NONE, 1.1 dolphin-emu.1, NONE, 1.1 .cvsignore, 1.3, 1.4 dolphin-emu.spec, 1.6, 1.7 sources, 1.3, 1.4 dolphin-emu-3.5-clrun.patch, 1.1, NONE dolphin-emu-3.5-compat-SFML16.patch, 1.1, NONE dolphin-emu-3.5-wx28.patch, 1.1, NONE
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/dolphin-emu/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24784/F-20
Modified Files:
.cvsignore dolphin-emu.spec sources
Added Files:
dolphin-emu-4.0-clrun.patch
dolphin-emu-4.0-compat-SFML16.patch dolphin-emu-4.0-gtk3.patch
dolphin-emu.1
Removed Files:
dolphin-emu-3.5-clrun.patch
dolphin-emu-3.5-compat-SFML16.patch dolphin-emu-3.5-wx28.patch
Log Message:
Update to 4.0
dolphin-emu-4.0-clrun.patch:
CMakeLists.txt | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
--- NEW FILE dolphin-emu-4.0-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
@@ -663,10 +663,21 @@
add_subdirectory(Externals/libiconv-1.14)
endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
- 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" AND NOT ANDROID) #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-4.0-compat-SFML16.patch:
CMakeLists.txt | 1 +
CMakeTests/FindSFML.cmake | 6 +++---
Source/Core/Core/CMakeLists.txt | 2 +-
Source/Core/DolphinWX/CMakeLists.txt | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
--- NEW FILE dolphin-emu-4.0-compat-SFML16.patch ---
diff -up dolphin-emu-3.5/CMakeTests/FindSFML.cmake~ dolphin-emu-3.5/CMakeTests/FindSFML.cmake
--- dolphin-emu-3.5/CMakeTests/FindSFML.cmake~ 2013-02-20 00:38:34.000000000 +0100
+++ dolphin-emu-3.5/CMakeTests/FindSFML.cmake 2013-11-18 11:57:56.150949832 +0100
@@ -24,7 +24,7 @@ endif()
# find the SFML include directory
find_path(SFML_INCLUDE_DIR SFML/Config.hpp
- PATH_SUFFIXES include
+ PATH_SUFFIXES include/sfml1
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -87,11 +87,11 @@ set(FIND_SFML_LIB_PATHS ~/Library/Framew
foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
- set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
+ set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX}-1.6)
# no suffix for sfml-main, it is always a static library
if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
- set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+ set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}-1.6)
endif()
# debug library
diff -up dolphin-emu-3.5/CMakeLists.txt~ dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5/CMakeLists.txt~ 2013-11-18 11:58:43.000000000 +0100
+++ dolphin-emu-3.5/CMakeLists.txt 2013-11-18 12:00:41.120408310 +0100
@@ -581,6 +581,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar
endif()
if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
message("Using shared SFML")
+ include_directories( /usr/include/sfml1 )
else()
message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
add_subdirectory(Externals/SFML)
diff -up dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt~ dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt
--- dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt~ 2013-02-20 00:38:35.000000000 +0100
+++ dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt 2013-11-18 12:14:15.844970552 +0100
@@ -220,7 +220,7 @@ set(SRCS Src/ActionReplay.cpp
Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp)
endif()
-set(LIBS bdisasm inputcommon videosoftware sfml-network)
+set(LIBS bdisasm inputcommon videosoftware sfml-network-1.6)
if(NOT USE_GLES OR USE_GLES3)
set(LIBS ${LIBS} videoogl)
diff -up dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt~ dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt
--- dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt~ 2013-02-20 00:38:35.000000000 +0100
+++ dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt 2013-11-18 12:14:11.445091807 +0100
@@ -10,7 +10,7 @@ set(LIBS core
common
audiocommon
z
- sfml-network
+ sfml-network-1.6
${GTK2_LIBRARIES})
if(NOT ANDROID)
dolphin-emu-4.0-gtk3.patch:
CMakeLists.txt | 10 ++++------
Source/Core/DolphinWX/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
--- NEW FILE dolphin-emu-4.0-gtk3.patch ---
diff -rupN dolphin-emu-2879cbd2b564-orig/CMakeLists.txt dolphin-emu-2879cbd2b564/CMakeLists.txt
--- dolphin-emu-2879cbd2b564-orig/CMakeLists.txt 2014-03-07 20:10:55.185158971 -0500
+++ dolphin-emu-2879cbd2b564/CMakeLists.txt 2014-03-07 20:16:00.388691555 -0500
@@ -707,13 +707,11 @@ if(NOT DISABLE_WX AND NOT ANDROID)
OUTPUT_VARIABLE DIST_NAME
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
- VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
- check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED)
+ VERSION_EQUAL 2.8.12 OR "${DIST_NAME}" STREQUAL "natty")
+ check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED)
else()
- include(FindGTK2)
- if(GTK2_FOUND)
- include_directories(${GTK2_INCLUDE_DIRS})
- endif()
+ include(FindGTK)
+ include_directories(${GTK3_INCLUDE_DIRS})
endif()
endif()
diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/DolphinWX/CMakeLists.txt dolphin-emu-2879cbd2b564/Source/Core/DolphinWX/CMakeLists.txt
--- dolphin-emu-2879cbd2b564-orig/Source/Core/DolphinWX/CMakeLists.txt 2014-03-07 20:10:55.186158963 -0500
+++ dolphin-emu-2879cbd2b564/Source/Core/DolphinWX/CMakeLists.txt 2014-03-07 20:18:55.977272101 -0500
@@ -11,7 +11,7 @@ set(LIBS core
audiocommon
z
sfml-network-1.6
- ${GTK2_LIBRARIES})
+ ${GTK3_LIBRARIES})
if(NOT ANDROID)
if(USE_X11)
--- NEW FILE dolphin-emu.1 ---
.TH DOLPHIN-EMU 1 "December 10, 2010"
.SH NAME
dolphin-emu \- A Gamecube, Wii and Triforce (the arcade machine based on the
Gamecube) emulator.
.SH SYNOPSIS
.B dolphin-emu
.RI [ options ]
.SH DESCRIPTION
.B dolphin-emu
is a Gamecube, Wii and Triforce (the arcade machine based on the
Gamecube) emulator.
.P
Gamecube compatibility is okay - lots of games work, many games don't work.
.P
Wii compatibility is also good - a lot of games do work. Wii emulation
generally requires a bit more computing power than Gamecube emulation, though.
.P
Triforce compatibility is not really known yet, but at least one game runs,
with minor glitches.
.SH OPTIONS
.TP
.BI "\-A, \-\-audio-plugin="plugin
Specify an audio plugin
.TP
.B \-b, \-\-batch
Exit application when emulator closes
.TP
.B \-d, \-\-debugger
Open the debugger
.TP
.BI "\-e, \-\-exec="file
Loads the specified file (DOL, ELF, WAD, GCM, ISO)
.TP
.B \-l, \-\-logger
Open the logger
.TP
.BI "\-V, \-\-video-plugin="plugin
Specify a video plugin
.SH AUTHOR
This manual page was written by Glenn Rice <glennricster(a)gmail.com>,
for the Debian system (but may be used by others).
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-20/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 23 Feb 2013 16:53:32 -0000 1.3
+++ .cvsignore 2 Oct 2014 14:32:30 -0000 1.4
@@ -1,2 +1 @@
-dolphin-emu-3.5.tar.xz
-dolphin-emu-extra.tar.xz
+dolphin-emu-2879cbd2b564.zip
Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-20/dolphin-emu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dolphin-emu.spec 18 Nov 2013 13:09:02 -0000 1.6
+++ dolphin-emu.spec 2 Oct 2014 14:32:30 -0000 1.7
@@ -1,29 +1,20 @@
Name: dolphin-emu
-Version: 3.5
-Release: 5%{?dist}
+Version: 4.0
+Release: 2%{?dist}
Summary: Gamecube / Wii / Triforce Emulator
-Url: http://www.dolphin-emulator.com/
-#A license breakdown is included in copyright from Source1
-License: GPLv2 and BSD and OpenSSL and Public Domain
-##Source can be grabbed using the script in Source1:
-#get-source-from-git.sh
-Source0: %{name}-%{version}.tar.xz
-#Source1 just contains various missing files from the source
-#Most of it can be grabbed here:
-#https://github.com/chenxiaolong/Fedora-SRPMS/tree/master/dolphin-emu
-#The copyright file is from here:
-#http://ppa.launchpad.net/glennric/dolphin-emu/ubuntu/pool/main/d/dolphin-emu/dolphin-emu_3.0-0ubuntu2~lucid.debian.tar.gz
-Source1: %{name}-extra.tar.xz
+Url: http://dolphin-emu.org/
+License: GPLv2 and BSD and Public Domain
+#Download here: https://dolphin-emu.googlecode.com/archive/4.0.2.zip
+Source0: %{name}-2879cbd2b564.zip
+#Manpage from Ubuntu package
+Source1: %{name}.1
#Kudos to Richard on this one (allows for shared clrun lib):
Patch0: %{name}-%{version}-clrun.patch
-#Allows for building with wxwidget 2.8.12, rather than 2.9.3
-Patch1: %{name}-%{version}-wx28.patch
#Kudos to Hans de Goede (updates paths for compat-SFML16-devel):
-Patch2: %{name}-%{version}-compat-SFML16.patch
-
-# Dolphin only runs on Intel x86 archictures
-ExclusiveArch: i686 x86_64
+Patch1: %{name}-%{version}-compat-SFML16.patch
+#GTK3 patch, bug: https://code.google.com/p/dolphin-emu/issues/detail?id=7069
+Patch2: %{name}-%{version}-gtk3.patch
BuildRequires: alsa-lib-devel
BuildRequires: bluez-libs-devel
@@ -39,8 +30,9 @@
BuildRequires: openal-soft-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: portaudio-devel
-BuildRequires: SDL-devel
-BuildRequires: wxGTK-devel
+BuildRequires: SDL2-devel
+BuildRequires: wxGTK3-devel
+BuildRequires: gtk3-devel
BuildRequires: zlib-devel
BuildRequires: Cg
BuildRequires: scons
@@ -50,6 +42,15 @@
BuildRequires: desktop-file-utils
BuildRequires: bochs-devel
BuildRequires: opencl-utils-devel
+BuildRequires: soundtouch-devel
+#BuildRequires: polarssl-devel
+BuildRequires: miniupnpc-devel
+BuildRequires: libusb-devel
+
+#Bug in fedora, not an issue for polarssl 1.3 in F21:
+#https://bugzilla.redhat.com/show_bug.cgi?id=1069394
+Provides: bundled(polarssl) = 1.2.8
+
Requires: hicolor-icon-theme
%description
@@ -59,20 +60,20 @@
present on the original consoles.
%prep
-%setup -q -a 1
+%setup -q -n %{name}-2879cbd2b564
%patch0 -p1
%patch1 -p1
%patch2 -p1
-#Patch for GCC 4.8
-sed -i 's/_rot/__rot/g' Externals/Bochs_disasm/PowerPCDisasm.cpp Externals/wxWidgets3/include/wx/image.h Externals/wxWidgets3/src/generic/graphicc.cpp Externals/wxWidgets3/src/common/cairo.cpp Externals/wxWidgets3/src/common/image.cpp Externals/wxWidgets3/src/gtk/gnome/gprint.cpp Externals/wxWidgets3/src/gtk/dcclient.cpp Externals/wxWidgets3/src/gtk/print.cpp Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp Source/Core/Core/Src/ARDecrypt.cpp Source/Core/Common/Src/CommonFuncs.h Source/Core/Common/Src/Hash.cpp
-#Various CMAKE fixes
+###CMAKE fixes
+#Allow building with cmake macro
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
-sed -i 's/ AND NOT SFML_VERSION_MAJOR//g' CMakeLists.txt
+#This is a typo: https://code.google.com/p/dolphin-emu/issues/detail?id=7074
+sed -i 's/soundtouch.h/SoundTouch.h/g' CMakeLists.txt
-#Remove all Bundled Libraries except Bochs:
+###Remove all Bundled Libraries except Bochs and polarssl:
cd Externals
-rm -f -r `ls | grep -v 'Bochs_disasm'`
+rm -f -r `ls | grep -v 'Bochs_disasm' | grep -v 'polarssl'`
#Remove Bundled Bochs source and replace with links:
cd Bochs_disasm
rm -f -r `ls | grep -v 'PowerPC*' | grep -v 'CMakeLists.txt'`
@@ -84,37 +85,37 @@
ln -s /usr/include/bochs/disasm/*.h ./
%build
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%cmake \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_SHARED_LIBS=FALSE \
-DENCODE_FRAMEDUMPS=FALSE \
-DUSE_EXTERNAL_CLRUN=TRUE \
-DCLRUN_INCLUDE_PATH=%{_includedir}/opencl-utils/include \
+ -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-config-3.0 \
.
+
make %{?_smp_mflags}
%install
make %{?_smp_mflags} install DESTDIR=%{buildroot}
-#Install extras from source1:
-for size in 16 32 48 128 256; do
- dim="${size}x${size}"
- install -p -D -m 0644 %{name}-extra/%{name}$size.png \
- %{buildroot}%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
-done
-desktop-file-install --dir %{buildroot}%{_datadir}/applications \
- %{name}-extra/%{name}.desktop
-install -p -D -m 0644 %{name}-extra/%{name}.1 \
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+
+#Install manpage:
+install -p -D -m 0644 %{SOURCE1} \
%{buildroot}/%{_mandir}/man1/%{name}.1
+
%find_lang %{name}
%files -f %{name}.lang
-%doc license.txt Readme.txt docs/ActionReplay/CodeTypesGuide.txt
-%doc docs/ActionReplay/GCNCodeTypes.txt %{name}-extra/copyright
+%doc license.txt Readme.txt docs/*
+%doc docs/ActionReplay/GCNCodeTypes.txt
%{_datadir}/%{name}
%{_bindir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.*
+%{_datadir}/pixmaps/%{name}.xpm
+%{_libdir}/*.a
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -129,14 +130,26 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Oct 2 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 4.0-2
+- Bundle polarssl (temporary fix, only for F19/20)
+
+* Mon Mar 3 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 4.0-1
+- Update to dolphin 4.0.2
+- Removed any unnecessary patches
+- Added new and updated some old patches
+- Removed exclusive arch, now builds on arm
+
+* Wed Jan 1 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-6
+- Build for SDL2 (Adds vibration support)
+
* Mon Nov 18 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-5
- Added patch for SFML, thanks to Hans de Goede
* Sat Jul 27 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-4
-- Updated for SFML 2.0 update
+- Updated for SFML compat
* Fri Jul 26 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-3
-- GCC 4.8 Fix (Fedora 19 and onwards)
+-3 GCC 4.8 Fix (Fedora 19 and onwards)
* Tue Feb 19 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-2
- Fixed date typos in SPEC
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-20/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 23 Feb 2013 16:53:34 -0000 1.3
+++ sources 2 Oct 2014 14:32:30 -0000 1.4
@@ -1,2 +1 @@
-1e07d6c93da0f7bea95d3910540cf979 dolphin-emu-3.5.tar.xz
-f9cddcbc0e00e4d19465fc23542ac2bd dolphin-emu-extra.tar.xz
+8ba4a24cfa135a33400dd908e467b7c6 dolphin-emu-2879cbd2b564.zip
--- dolphin-emu-3.5-clrun.patch DELETED ---
--- dolphin-emu-3.5-compat-SFML16.patch DELETED ---
--- dolphin-emu-3.5-wx28.patch DELETED ---
9 years, 6 months
