Author: gbirchley Update of /cvs/nonfree/rpms/pcsx2/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6796/devel Modified Files: .cvsignore sources Added Files: download_pcsx2_1.4_tarball.sh pcsx2-1.4.spec Removed Files: pcsx2-1.2.1_fedora_cflags_opts.diff pcsx2-1.2.1_rebuild_tarball.sh pcsx2.spec Log Message: --- NEW FILE download_pcsx2_1.4_tarball.sh --- #!/bin/sh # copyright (c) 2011-2014 Gregory Hainaut # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This package is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>;. # Modified by Giles Birchley <gbirchey(a)blueyonder.co.uk&gt; 11 Feb 2016 # Modified to download only branch 1.4 ###################################################################### # Global Parameters ###################################################################### # Default value GIT_SHA1=0; BRANCH="1.4.x" # Directory TMP_DIR=/tmp/pcsx2_git mkdir -p $TMP_DIR REMOTE_REPO="https://github.com/PCSX2/pcsx2.git" LOCAL_REPO="$TMP_DIR/pcsx2" ###################################################################### # Basic functions ###################################################################### date= version= release= get_pcsx2_version() { local major=`grep -o "VersionHi.*" $LOCAL_REPO/pcsx2/SysForwardDefs.h | grep -o "[0-9]*"` local mid=`grep -o "VersionMid.*" $LOCAL_REPO/pcsx2/SysForwardDefs.h | grep -o "[0-9]*"` local minor=`grep -o "VersionLo.*" $LOCAL_REPO/pcsx2/SysForwardDefs.h | grep -o "[0-9]*"` release=`grep -o "isReleaseVersion.*" $LOCAL_REPO/pcsx2/SysForwardDefs.h | grep -o "[0-9]*"` version="$major.$mid.$minor" } get_git_version() { date=`git -C $LOCAL_REPO show -s --format=%ci HEAD | sed -e 's/[\:\-]//g' -e 's/ /./' -e 's/ .*//'` } download_orig() { (cd $TMP_DIR && git clone --branch $1 $REMOTE_REPO pcsx2) if [ "$SVN_CO_VERSION" = "1" ] ; then (cd $TMP_DIR/pcsx2 && git checkout $GIT_SHA1) fi } remove_3rdparty() { echo "Remove 3rdparty code" rm -fr $LOCAL_REPO/3rdparty rm -fr $LOCAL_REPO/fps2bios rm -fr $LOCAL_REPO/tools } remove_not_yet_free_plugin() { echo "Remove non free plugins" # remove also deprecated plugins for plugin in CDVDiso CDVDisoEFP CDVDlinuz CDVDolio CDVDpeops dev9ghzdrk PeopsSPU2 SSSPSXPAD USBqemu xpad zerogs zerospu2 do rm -fr $LOCAL_REPO/plugins/$plugin done } remove_remaining_non_free_file() { echo "Remove remaining non free file. TODO UPSTREAM" rm -fr $LOCAL_REPO/unfree rm -fr $LOCAL_REPO/plugins/GSdx/baseclasses rm -f $LOCAL_REPO/plugins/zzogl-pg/opengl/Win32/aviUtil.h rm -f $LOCAL_REPO/common/src/Utilities/x86/MemcpyFast.cpp } remove_dot_git() { # To save 66% of the package size rm -fr $LOCAL_REPO/.git } ###################################################################### # Main script ###################################################################### download_orig 1.4.x remove_3rdparty remove_not_yet_free_plugin remove_remaining_non_free_file get_git_version get_pcsx2_version # must be done after getting the git version remove_dot_git # Debian name of package and tarball PKG_NAME="pcsx2-1.4" TAR_NAME="pcsx2.1.4.tar" NEW_DIR=${TMP_DIR}/$PKG_NAME rm -fr $NEW_DIR mv $LOCAL_REPO $NEW_DIR echo "Build the tar.gz file" tar -C $TMP_DIR -cJf ${TAR_NAME}.gz $PKG_NAME ## Clean rm -fr $TMP_DIR exit 0 --- NEW FILE pcsx2-1.4.spec --- Name: pcsx2 Version: 1.4 Release: 1%{?dist} Summary: A Sony Playstation2 emulator License: GPLv3 URL: https://code.google.com/p/pcsx2/ #github source contains copyrighted material, so downloaded and modified with #script download_pcsx2_1.4_tarball.sh contained in Source1 Source0: pcsx2.1.4.tar.gz Source1: download_pcsx2_1.4_tarball.sh # 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: cmake BuildRequires: glew-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: libXrandr-devel BuildRequires: freetype-devel BuildRequires: gettext BuildRequires: libGL-devel BuildRequires: libGLU-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 BuildRequires: lzma-devel BuildRequires: mesa-libGLES 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 horsepower to run this emulator anyway. %prep %setup -q -n pcsx2-1.4 # To remove executable bits from man, doc and icon files 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//' pcsx2/Docs/GPL.txt sed -i 's/\r//' pcsx2/Docs/License.txt #Remove fedora incompatible values sed -i 's/@PCSX2_MENU_CATEGORIES@/Game;Emulator;GTK;/g' linux_various/PCSX2.desktop.in %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}/pcsx2 \ -DBUILD_REPLAY_LOADERS=FALSE \ -DXDG_STD=TRUE \ -DGLSL_API=FALSE \ -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \ -DFORCE_INTERNAL_SDL=FALSE \ -DPLUGIN_DIR=%{_libdir}/pcsx2 \ -DGAMEINDEX_DIR=%{_datadir}/pcsx2 \ -DCMAKE_BUILD_STRIP=FALSE \ -DGTK3_API=FALSE \ -DWX28_API=TRUE \ -DDISABLE_ADVANCE_SIMD=TRUE \ -DEXTRA_PLUGINS=FALSE \ -DSDL2_API=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}-%{version}/linux_various/PCSX2.xpm %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/ # Install Desktop file mv %{_builddir}/%{name}-%{version}/linux_various/PCSX2.desktop.in %{_builddir}/%{name}-%{version}/linux_various/PCSX2.desktop desktop-file-install \ --dir=%{buildroot}/%{_datadir}/applications \ %{_builddir}/%{name}-%{version}/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}/PCSX2 %{_bindir}/PCSX2-linux.sh %{_libdir}/pcsx2/ %{_datadir}/applications/PCSX2.desktop %{_datadir}/icons/hicolor/128x128/apps/PCSX2.xpm %{_mandir}/man1/PCSX2.* %{_datadir}/pcsx2/ %changelog * Thu Feb 11 2016 Giles Birchley <gbirchley(a)blueyonder.co.uk&gt; -1.4-1 - Build for new release 1.4 - Drop patch pcsx2-1.3.1_fedora_cflags_opts.diff - cflag options now streamlined upstream - Add dependency for lzma-devel - Add dependency for libICE-devel - Remove dependency for Cg - Remove dependency for libjpeg-turbo-devel - Remove dependency for package glew-devel - Add build option to retain WxWidget 2.8 -DWX28_API=TRUE - Add build option -DGTK3_API=FALSE - Add build option -DSDL2_API=FALSE - Add build option -DDISABLE_ADVANCE_SIMD=TRUE - For now, avoided specifying crosscompile (-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake) as not sure of rpmfusion guideline on this - Binary name has been altered to PCSX2 upstream; renamed PCSX2.desktop.in, PCSX2.xpm and PCSX2.1 - Added new launcher script PCSX2-linux.sh * Tue Feb 04 2014 Giles Birchley <gbirchey(a)blueyonder.co.uk&gt; -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(a)blueyonder.co.uk&gt; - 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(a)blueyonder.co.uk&gt; - 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(a)blueyonder.co.uk&gt; - 1.1.0-3 - made some minor changes suggested in rpmfusion review (#2455) - fix URL * Tue Jun 25 2013 Giles Birchley <gbirchey(a)blueyonder.co.uk&gt; - 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(a)blueyonder.co.uk&gt; - 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(a)blueyonder.co.uk&gt; - 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 * Tue Mar 05 2013 Giles Birchley <gbirchey(a)blueyonder.co.uk&gt; - bleeding edge build, altered package name - added pcsx2 as a conflict * Mon Oct 15 2012 Giles Birchley <gbirchey(a)blueyonder.co.uk&gt; - 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Feb 2014 20:00:38 -0000 1.4 +++ .cvsignore 11 Feb 2016 23:20:09 -0000 1.5 @@ -1 +1 @@ -v1.2.1.tar.gz +pcsx2.1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/pcsx2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Feb 2014 20:00:38 -0000 1.4 +++ sources 11 Feb 2016 23:20:09 -0000 1.5 @@ -1 +1 @@ -7b1ecd6397da3095581eb788603925c0 v1.2.1.tar.gz +778691a471d900a3b0cb00c28be66cbc pcsx2.1.4.tar.gz --- pcsx2-1.2.1_fedora_cflags_opts.diff DELETED --- --- pcsx2-1.2.1_rebuild_tarball.sh DELETED --- --- pcsx2.spec DELETED ---