Author: gbirchley Update of /cvs/nonfree/rpms/pcsx2/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11679/devel Modified Files: .cvsignore pcsx2.spec sources Added Files: pcsx2-1.2.1_fedora_cflags_opts.diff pcsx2-1.2.1_rebuild_tarball.sh Removed Files: pcsx2-1.2.0_fedora_cflags_opts.diff rebuild_pcsx2_tarball.sh Log Message: pcsx2-1.2.1_fedora_cflags_opts.diff: CMakeLists.txt | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) --- NEW FILE pcsx2-1.2.1_fedora_cflags_opts.diff --- #Alter optimisation cflags to strip out those already automatically specified #by %%cmake rpm macro (which uses -o2) --- pcsx2-1.2.1/pcsx2/CMakeLists.txt +++ pcsx2-1.2.1/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-1.2.1_rebuild_tarball.sh --- #!/bin/sh #This is a Modification of a script by Gregory Hainaut #Purpose is to strip any copyrighted etc. material #from the publicly available tarball so make suitable for linux distribution mkdir ~/pcsx2-1.2.1 cd ~/pcsx2-1.2.1 wget https://github.com/PCSX2/pcsx2/archive/v1.2.1.tar.gz tar xvfz v1.2.1.tar.gz rm v1.2.1.tar.gz mkdir -p temporary_pcsx2; ( cp pcsx2-1.2.1/CMakeLists.txt temporary_pcsx2/CMakeLists.txt; cp -r pcsx2-1.2.1/common temporary_pcsx2/common; cp -r pcsx2-1.2.1/cmake temporary_pcsx2/cmake; cp -r pcsx2-1.2.1/locales temporary_pcsx2/locales; cp -r pcsx2-1.2.1/pcsx2 temporary_pcsx2/pcsx2; cp -r pcsx2-1.2.1/debian-unstable-upstream temporary_pcsx2/debian-unstable-upstream; cp -r pcsx2-1.2.1/linux_various temporary_pcsx2/linux_various;) # separate bin to avoid retaining the .mo file mkdir -p temporary_pcsx2/bin; ( cp pcsx2-1.2.1/bin/GameIndex.dbf temporary_pcsx2/bin/GameIndex.dbf; cp pcsx2-1.2.1/bin/cheats_ws.zip temporary_pcsx2/bin/cheats_ws.zip; cp -r pcsx2-1.2.1/bin/cheats temporary_pcsx2/bin/cheats; cp -r pcsx2-1.2.1/bin/docs temporary_pcsx2/bin/docs;) # Note: Other plugins exist but they are not 100% copyright free, so remove them. # Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ..."; mkdir -p temporary_pcsx2/plugins; ( cp pcsx2-1.2.1/plugins/CMakeLists.txt temporary_pcsx2/plugins/CMakeLists.txt; cp -r pcsx2-1.2.1/plugins/CDVDnull temporary_pcsx2/plugins/CDVDnull; # Potential copyright issue. Optional anyway cp -r pcsx2-1.2.1/plugins/onepad temporary_pcsx2/plugins/onepad; cp -r pcsx2-1.2.1/plugins/spu2-x temporary_pcsx2/plugins/spu2-x; cp -r pcsx2-1.2.1/plugins/zzogl-pg temporary_pcsx2/plugins/zzogl-pg; cp -r pcsx2-1.2.1/plugins/zzogl-pg-cg temporary_pcsx2/plugins/zzogl-pg-cg; cp -r pcsx2-1.2.1/plugins/GSdx temporary_pcsx2/plugins/GSdx; cp -r pcsx2-1.2.1/plugins/dev9null temporary_pcsx2/plugins/dev9null; cp -r pcsx2-1.2.1/plugins/FWnull temporary_pcsx2/plugins/FWnull; cp -r pcsx2-1.2.1/plugins/USBnull temporary_pcsx2/plugins/USBnull;) ## Installation # Copy the dir rm -fr pcsx2-1.2.1 cp -r temporary_pcsx2 pcsx2-1.2.1 echo "Remove .svn directories" find pcsx2-1.2.1 -name ".svn" -type d -exec rm -fr {} \; 2> /dev/null echo "Remove windows files (useless & potential copyright issues)" # => pcsx2/windows # Copyright header must be updated find pcsx2-1.2.1 -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null # => ./plugins/zzogl-pg*/opengl/Win32 (reduced to the current linux plugins) find pcsx2-1.2.1 -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null echo "Remove useless files (copyright issues)" rm -fr "pcsx2-1.2.1/plugins/zzogl-pg/opengl/ZeroGSShaders" rm -fr "pcsx2-1.2.1/common/src/Utilities/x86/MemcpyFast.cpp" rm -fr "pcsx2-1.2.1/plugins/GSdx/baseclasses" ## BUILD echo "Build the tar.gz file" tar -czf v1.2.1.tar.gz pcsx2-1.2.1 ## Clean rm -fr pcsx2-1.2.1 rm -fr temporary_pcsx2 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/pcsx2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Feb 2014 22:57:04 -0000 1.3 +++ .cvsignore 7 Feb 2014 20:00:38 -0000 1.4 @@ -1 +1 @@ -v1.2.tar.gz +v1.2.1.tar.gz Index: pcsx2.spec =================================================================== RCS file: /cvs/nonfree/rpms/pcsx2/devel/pcsx2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pcsx2.spec 5 Feb 2014 22:57:04 -0000 1.2 +++ pcsx2.spec 7 Feb 2014 20:00:38 -0000 1.3 @@ -1,14 +1,14 @@ Name: pcsx2 -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: A Sony Playstation2 emulator License: GPLv3 URL: https://code.google.com/p/pcsx2/ #github source contains copyrighted material, so modified with #script used was rebuild_pcsx2_tarball contained in Source1 -Source0: https://github.com/PCSX2/pcsx2/archive/v1.2.tar.gz -Source1: rebuild_pcsx2_tarball.sh -Patch1: %{name}-1.2.0_fedora_cflags_opts.diff +Source0: https://github.com/PCSX2/pcsx2/archive/v1.2.1.tar.gz +Source1: pcsx2-1.2.1_rebuild_tarball.sh +Patch1: %{name}-1.2.1_fedora_cflags_opts.diff # PCSX2 does not support running as a 64 bit application. # http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux ExclusiveArch: i686 @@ -46,7 +46,7 @@ this emulator anyway. %prep -%setup -q -n pcsx2-1.2 +%setup -q -n pcsx2-1.2.1 %patch1 -p1 # To remove executable bits from man, doc and icon files @@ -89,12 +89,12 @@ # Install icon mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/ -install -pm 644 %{_builddir}/%{name}-1.2/linux_various/pcsx2.xpm %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/ +install -pm 644 %{_builddir}/%{name}-1.2.1/linux_various/pcsx2.xpm %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/ # Install Desktop file desktop-file-install \ --dir=%{buildroot}/%{_datadir}/applications \ -%{_builddir}/%{name}-1.2/linux_various/pcsx2.desktop +%{_builddir}/%{name}-1.2.1/linux_various/pcsx2.desktop #strip extra copy of icon file, Wrong place for fedora @@ -133,6 +133,11 @@ %changelog +* Tue Feb 04 2014 Giles Birchley <gbirchey(a)blueyonder.co.uk&gt; -1.2.1-1 +- Updated source to 1.2.1 +- Updated patch1 permissions +- Source required modification to remove copyrighted files - added Source1 + * Tue Feb 04 2014 Giles Birchley <gbirchey(a)blueyonder.co.uk&gt; -1.2.0-1 - Updated source to 1.2 - Updated patch1 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/pcsx2/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Feb 2014 22:57:04 -0000 1.3 +++ sources 7 Feb 2014 20:00:38 -0000 1.4 @@ -1 +1 @@ -da48624579902322c9417edb195ad5d9 v1.2.tar.gz +7b1ecd6397da3095581eb788603925c0 v1.2.1.tar.gz --- pcsx2-1.2.0_fedora_cflags_opts.diff DELETED --- --- rebuild_pcsx2_tarball.sh DELETED ---