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

Wed Feb 5 23:57:04 CET 2014

Author: gbirchley

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

Modified Files:
	.cvsignore pcsx2.spec sources 
Added Files:
	pcsx2-1.2.0_fedora_cflags_opts.diff rebuild_pcsx2_tarball.sh 
Removed Files:
	pcsx2-1.1.0_fedora_cflags_opts.diff 
Log Message:


Updated to version 1.2 from upstream
Upstream source required some files with copyright issues to be removed
this had previously been done by upstream but this time I used a bash script to
perform the modifications that has been included in the srpm as Source1



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

--- NEW FILE pcsx2-1.2.0_fedora_cflags_opts.diff ---
#Alter optimisation cflags to strip out those already automatically specified
#by %%cmake rpm macro (which uses -o2) 
--- pcsx2-1.2.0/pcsx2/CMakeLists.txt
+++ pcsx2-1.2.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 rebuild_pcsx2_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
cd ~/pcsx2-1.2
wget https://github.com/PCSX2/pcsx2/archive/v1.2.tar.gz
tar xvfz v1.2.tar.gz
rm v1.2.tar.gz
 
mkdir -p temporary_pcsx2;
(   cp pcsx2-1.2/CMakeLists.txt temporary_pcsx2/CMakeLists.txt;
    cp -r pcsx2-1.2/common temporary_pcsx2/common;
    cp -r pcsx2-1.2/cmake temporary_pcsx2/cmake;
    cp -r pcsx2-1.2/locales temporary_pcsx2/locales;
    cp -r pcsx2-1.2/pcsx2 temporary_pcsx2/pcsx2;
    cp -r pcsx2-1.2/debian-unstable-upstream temporary_pcsx2/debian-unstable-upstream;
    cp -r pcsx2-1.2/linux_various temporary_pcsx2/linux_various;)

# separate bin to avoid retaining the .mo file
mkdir -p temporary_pcsx2/bin;
(   cp pcsx2-1.2/bin/GameIndex.dbf temporary_pcsx2/bin/GameIndex.dbf;
    cp pcsx2-1.2/bin/cheats_ws.zip temporary_pcsx2/bin/cheats_ws.zip;
    cp -r pcsx2-1.2/bin/cheats temporary_pcsx2/bin/cheats;
    cp -r pcsx2-1.2/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/plugins/CMakeLists.txt temporary_pcsx2/plugins/CMakeLists.txt;
    cp -r pcsx2-1.2/plugins/CDVDnull temporary_pcsx2/plugins/CDVDnull;
    # Potential copyright issue. Optional anyway
    cp -r pcsx2-1.2/plugins/onepad temporary_pcsx2/plugins/onepad;
    cp -r pcsx2-1.2/plugins/spu2-x temporary_pcsx2/plugins/spu2-x;
    cp -r pcsx2-1.2/plugins/zzogl-pg temporary_pcsx2/plugins/zzogl-pg;
    cp -r pcsx2-1.2/plugins/zzogl-pg-cg temporary_pcsx2/plugins/zzogl-pg-cg;
    cp -r pcsx2-1.2/plugins/GSdx temporary_pcsx2/plugins/GSdx;
    cp -r pcsx2-1.2/plugins/dev9null temporary_pcsx2/plugins/dev9null;
    cp -r pcsx2-1.2/plugins/FWnull temporary_pcsx2/plugins/FWnull;
    cp -r pcsx2-1.2/plugins/USBnull temporary_pcsx2/plugins/USBnull;)


## Installation
# Copy the dir
rm -fr pcsx2-1.2
cp -r temporary_pcsx2 pcsx2-1.2

echo "Remove .svn directories"
find pcsx2-1.2 -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 -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 -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null

echo "Remove useless files (copyright issues)"
rm -fr "pcsx2-1.2/plugins/zzogl-pg/opengl/ZeroGSShaders"
rm -fr "pcsx2-1.2/common/src/Utilities/x86/MemcpyFast.cpp"
rm -fr "pcsx2-1.2/plugins/GSdx/baseclasses"

## BUILD
echo "Build the tar.gz file"
tar -czf v1.2.tar.gz pcsx2-1.2

## Clean
rm -fr pcsx2-1.2
rm -fr temporary_pcsx2



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2013 19:02:43 -0000	1.2
+++ .cvsignore	5 Feb 2014 22:57:04 -0000	1.3
@@ -1 +1 @@
-pcsx2-1.1.0-r5674-lnx-sources.tar.bz2
+v1.2.tar.gz


Index: pcsx2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/devel/pcsx2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsx2.spec	30 Sep 2013 19:02:43 -0000	1.1
+++ pcsx2.spec	5 Feb 2014 22:57:04 -0000	1.2
@@ -1,11 +1,14 @@
 Name: pcsx2
-Version: 1.1.0
-Release: 5%{?dist}
+Version: 1.2.0
+Release: 1%{?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
+#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
 # PCSX2 does not support running as a 64 bit application.
 # http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux
 ExclusiveArch: i686
@@ -31,6 +34,7 @@
 BuildRequires: libX11-devel
 BuildRequires: libICE-devel
 BuildRequires: libaio-devel
+BuildRequires: mesa-libGLES
 
 Requires: joystick
 Requires: hicolor-icon-theme
@@ -42,15 +46,15 @@
 this emulator anyway.
 
 %prep
-%setup -q -n pcsx2.snapshot-5674
+%setup -q -n pcsx2-1.2
 %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
+chmod -x pcsx2/Docs/GPL.txt pcsx2/Docs/License.txt pcsx2/Docs/readme-Docs.txt pcsx2/Docs/PCSX2_FAQ.doc pcsx2/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
+sed -i 's/\r//' pcsx2/Docs/GPL.txt
+sed -i 's/\r//' pcsx2/Docs/License.txt
 
 %build
 
@@ -62,12 +66,12 @@
 # Extensive testing will is therefore needed. See rpmfusion bug #2455
 
 %cmake . -DPACKAGE_MODE=TRUE \
-         -DGLSL_SHADER_DIR=%{_libdir}/%{name} \
+         -DGLSL_SHADER_DIR=%{_libdir}/pcsx2 \
          -DBUILD_REPLAY_LOADERS=FALSE \
          -DXDG_STD=TRUE \
          -DGLSL_API=FALSE \
-         -DPLUGIN_DIR=%{_libdir}/%{name} \
-         -DGAMEINDEX_DIR=%{_datadir}/%{name} \
+         -DPLUGIN_DIR=%{_libdir}/pcsx2 \
+         -DGAMEINDEX_DIR=%{_datadir}/pcsx2 \
          -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
          -DFORCE_INTERNAL_SDL=FALSE \
          -DCMAKE_BUILD_STRIP=FALSE \
@@ -85,12 +89,12 @@
 
 # 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 -pm 644 %{_builddir}/%{name}-1.2/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
+%{_builddir}/%{name}-1.2/linux_various/pcsx2.desktop
 
 
 #strip extra copy of icon file, Wrong place for fedora
@@ -120,15 +124,20 @@
 
 %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}/
+%{_bindir}/pcsx2
+%{_libdir}/pcsx2/
+%{_datadir}/applications/pcsx2.desktop
+%{_datadir}/icons/hicolor/128x128/apps/pcsx2.xpm
+%{_mandir}/man1/pcsx2.*
+%{_datadir}/pcsx2/
 
 
 %changelog
+* Tue Feb 04 2014 Giles Birchley <gbirchey at blueyonder.co.uk> -1.2.0-1
+- Updated source to 1.2
+- Updated patch1
+- Source required modification to remove copyrighted files - added Source1
+
 * 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
@@ -181,6 +190,10 @@
 - 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
 
+* Tue Mar 05 2013 Giles Birchley <gbirchey at blueyonder.co.uk>
+- bleeding edge build, altered package name
+- added pcsx2 as a conflict
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2013 19:02:43 -0000	1.2
+++ sources	5 Feb 2014 22:57:04 -0000	1.3
@@ -1 +1 @@
-d999360dc0e142476aeccaf8b6cf767b  pcsx2-1.1.0-r5674-lnx-sources.tar.bz2
+da48624579902322c9417edb195ad5d9  v1.2.tar.gz


--- pcsx2-1.1.0_fedora_cflags_opts.diff DELETED ---
