rpms/pcsx2/devel pcsx2-1.1.0_fedora_cflags_opts.diff, NONE, 1.1 pcsx2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Giles Birchley]

Author: gbirchley

Update of /cvs/nonfree/rpms/pcsx2/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31021/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pcsx2-1.1.0_fedora_cflags_opts.diff pcsx2.spec 
Log Message:


pcsx2-1.1.0_fedora_cflags_opts.diff:
 CMakeLists.txt |   40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

--- NEW FILE pcsx2-1.1.0_fedora_cflags_opts.diff ---
#Alter optimisation cflags to strip out those already automatically specified
#by %%cmake rpm macro (which uses -o2) 
--- pcsx2-1.1.0/pcsx2/CMakeLists.txt
+++ pcsx2-1.1.0/pcsx2/CMakeLists.txt
@@ -32,45 +32,7 @@ set(DebugFlags
 	-g)
 
 # set optimization flags
-set(OptimizationFlags
-	-falign-functions
-	-falign-jumps
-	-falign-labels
-	-falign-loops
-	-fcaller-saves
-	-fcprop-registers
-	-fcrossjumping
-	-fcse-follow-jumps
-	-fcse-skip-blocks
-	-fdefer-pop
-	-fdelete-null-pointer-checks
-	-fgcse
-	-fgcse-lm
-	-fif-conversion
-	-fif-conversion2
-	-fmerge-constants
-	-foptimize-sibling-calls
-	-fpeephole2
-	-fregmove
-	-freorder-blocks
-	-freorder-functions 
-	-frerun-cse-after-loop
-	-fsched-interblock
-	-fsched-spec
-	-fstrict-overflow
-	-fthread-jumps
-	-ftree-ccp
-	-ftree-ch
-	-ftree-copyrename
-	-ftree-dce
-	-ftree-dominator-opts
-	-ftree-fre
-	-ftree-lrs
-	-ftree-pre
-	-ftree-sra
-	-ftree-ter
-	-ftree-vrp
-	-funit-at-a-time)
+set(OptimizationFlags)
 
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)


--- NEW FILE pcsx2.spec ---
Name: pcsx2
Version: 1.1.0
Release: 5%{?dist}
Summary: A Sony Playstation2 emulator
License: GPLv3
URL: https://code.google.com/p/pcsx2/
Source0: https://pcsx2.googlecode.com/files/%{name}-%{version}-r5674-lnx-sources.tar.bz2
Patch1: %{name}-1.1.0_fedora_cflags_opts.diff
# PCSX2 does not support running as a 64 bit application.
# http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux
ExclusiveArch: i686
BuildRequires: desktop-file-utils
BuildRequires: Cg
BuildRequires: cmake
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: libXrandr-devel
BuildRequires: freetype-devel
BuildRequires: glew-devel
BuildRequires: gettext
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libjpeg-turbo-devel
BuildRequires: alsa-lib-devel
BuildRequires: SDL-devel
BuildRequires: gtk2-devel
BuildRequires: portaudio-devel
BuildRequires: sparsehash-devel
BuildRequires: wxGTK-devel
BuildRequires: soundtouch-devel
BuildRequires: libX11-devel
BuildRequires: libICE-devel
BuildRequires: libaio-devel

Requires: joystick
Requires: hicolor-icon-theme

%description
A Playstation 2 emulator. Requires a dump of a real PS2 BIOS (not included)
WARNING: It requires a CPU with SSE2 instructions. If your CPU does not
support this instruction set, it does not have enough horse power to run
this emulator anyway.

%prep
%setup -q -n pcsx2.snapshot-5674
%patch1 -p1

# To remove executable bits from man, doc and icon files
chmod -x %{name}/Docs/GPL.txt %{name}/Docs/License.txt %{name}/Docs/readme-Docs.txt %{name}/Docs/PCSX2_FAQ.doc %{name}/Docs/PCSX2_Readme.doc bin/docs/pcsx2.1 linux_various/pcsx2.xpm

# Remove DOS encoding errors in txt files
sed -i 's/\r//' %{name}/Docs/GPL.txt
sed -i 's/\r//' %{name}/Docs/License.txt

%build

# pcsx2 contains cflags that override Fedora cflags, however
# a conservative approach has been taken because to quote upsteam "PCSX2 is not
# an ordinary sofware. Most of the code executed are self-generated by PCSX2
# itself (aka dynamic recompiler/virtual machine). That means 1/ gcc flags
# have no much impact on speed 2/ some gcc flags (used to) crash PCSX2"
# Extensive testing will is therefore needed. See rpmfusion bug #2455

%cmake . -DPACKAGE_MODE=TRUE \
         -DGLSL_SHADER_DIR=%{_libdir}/%{name} \
         -DBUILD_REPLAY_LOADERS=FALSE \
         -DXDG_STD=TRUE \
         -DGLSL_API=FALSE \
         -DPLUGIN_DIR=%{_libdir}/%{name} \
         -DGAMEINDEX_DIR=%{_datadir}/%{name} \
         -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
         -DFORCE_INTERNAL_SDL=FALSE \
         -DCMAKE_BUILD_STRIP=FALSE \
         -DCMAKE_BUILD_TYPE=Release

make %{?_smp_mflags} VERBOSE=1


%install

make install DESTDIR=%{buildroot}

# strip extra copies of pdf files, which are now in /doc/pcsx2
rm -rf %{buildroot}/usr/share/doc/pcsx2

# Install icon
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/
install -pm 644 %{_builddir}/%{name}.snapshot-5674/linux_various/pcsx2.xpm %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/

# Install Desktop file
desktop-file-install                                    \
--dir=%{buildroot}/%{_datadir}/applications              \
%{_builddir}/%{name}.snapshot-5674/linux_various/pcsx2.desktop


#strip extra copy of icon file, Wrong place for fedora
rm -rf %{buildroot}/usr/share/pixmaps

# Install man page
mkdir -p %{buildroot}/%{_mandir}/man1
install -p -D -m 644 bin/docs/pcsx2.1 %{buildroot}/%{_mandir}/man1

%find_lang pcsx2_Iconized
%find_lang pcsx2_Main

%post
/sbin/ldconfig
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :


%files -f pcsx2_Iconized.lang -f pcsx2_Main.lang
%doc bin/docs/PCSX2_Readme.pdf bin/docs/PCSX2_FAQ.pdf 
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/128x128/apps/%{name}.xpm
%{_mandir}/man1/%{name}.*
%{_datadir}/%{name}/


%changelog
* Sat Jul 27 2013 Giles Birchley <gbirchey at blueyonder.co.uk> - 1.1.0-5
- made overlooked change suggested in rpmfusion review (#2455)
- changed requires from libGL-devel/libGLU-devel instead of mesa-libGL-devel

* Sun Jun 30 2013 Giles Birchley <gbirchey at blueyonder.co.uk> - 1.1.0-4
- made some minor changes suggested in rpmfusion review (#2455)
- removed backslash in cmake command
- removed pcsx2-1.1.0-fedora_cflags.diff
- replaced patch with pcsx2-1.1.0-fedora_cflags_opts.diff

* Tue Jun 25 2013 Giles Birchley <gbirchey at blueyonder.co.uk> - 1.1.0-3
- made some minor changes suggested in rpmfusion review (#2455)
- fix URL

* Tue Jun 25 2013 Giles Birchley <gbirchey at blueyonder.co.uk> - 1.1.0-2
- made some minor changes suggested in rpmfusion review (#2455):
- changed icon install permissions
- changed URL
- changed description line length
- reintroduced %%{version} macro to source0
- removed extra backslash from %%cmake
- changed line indentations so all are single space
- removed -DDOC_DIR from %%cmake
- removed extraneous remove lines

* Sun Jun 09 2013 Giles Birchley <gbirchey at blueyonder.co.uk> - 1.1.0-1
- changes following rpmfusion review (#2455).
- removed Group tag.
- updated source to v1.1 (linux fixes) 
- removed pcsx2-1.0.0_helpfile.diff (no longer needed).
- removed pcsx2-1.0.0_fedora_cmake.diff (Fedora<16 is no longer supported).
- removed pcsx2-1.1.0_fedora_gcc.diff as this patch is now applied in 1.1.0 source
- added Requires: hicolor-icon-theme (icons in %%{_datadir}/icons/hicolor/).
- added BuildRequires: libaio-devel (needed for 1.1.0).
- added warning about SSE2 to %%description.
- comment about 64 bit status shortened.
- version from names of docs removed (unversioned in 1.1.0).
- fixed omissions in pcsx2.xpm shebang (fix rpmlint error)
- Use %%{_docdir} instead of %%{_defaultdocdir}.
- removed some docs that were either misplaced or should not be packaged.
- removed specification of CMAKE_INSTALL_PREFIX and CMAKE_VERBOSE_MAKEFILE (%%cmake macro already sets them).
- moved %%find_lang macro to end of %%install.
- moved shell invocation to line following %%post %%postun (fix rpmlint error)

* Mon May 27 2013 Giles Birchley <gbirchey at blueyonder.co.uk> - 1.0.0-2
- further changes to comply with rpmfusion review (#2455):
- libGL-devel/libGLU-devel instead of mesa-libGL-devel
- Remove BuildRequires: libCg (redundant with Cg)
- Use %%{_prefix} instead of /usr for CMAKE install prefix
- add Gregory Hainaut's patch to fix issue with gcc 4.8, for Fedora 19 build
- Changed cmake option of DBUILD_REPLAY_LOADERS to false and changed %%files accrdingly

* Mon Oct 15 2012 Giles Birchley <gbirchey at blueyonder.co.uk> - 1.0.0-1
- Build of official 1.0.0 Release
- Significant modifications to script to comply with Fedora/RPMFusion packaging requirements
- Removed redundant BuildRequires
- Added upstream source
- Added Patch to make CFLAGS compliant
- Changed DCMAKE_BUILD_STRIP to FALSE to allow rpm debug package to be created
- Changed document destination in cmake by specifying DDOC_DIR=
- Changed language detection
- Changed icon and desktop file installation

* Tue Aug 09 2011 Danger Boy <Danger[dot] Boy [at]necac.tv.idl> - 0.9.8.4851-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2013 10:49:05 -0000	1.1
+++ .cvsignore	30 Sep 2013 19:02:43 -0000	1.2
@@ -0,0 +1 @@
+pcsx2-1.1.0-r5674-lnx-sources.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2013 10:49:06 -0000	1.1
+++ sources	30 Sep 2013 19:02:43 -0000	1.2
@@ -0,0 +1 @@
+d999360dc0e142476aeccaf8b6cf767b  pcsx2-1.1.0-r5674-lnx-sources.tar.bz2