* add libaio new dependency
* update create_pcsx2_tarball_from_svn_repository script to support svn 1.7


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5496 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2013-01-02 16:09:09 +00:00
parent 9421e105bd
commit 0046f4a6f7
2 changed files with 12 additions and 19 deletions

View File

@ -5,6 +5,7 @@ Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
Build-Depends: cmake (>= 2.8.5), Build-Depends: cmake (>= 2.8.5),
debhelper (>= 8.9), debhelper (>= 8.9),
dpkg-dev (>= 1.15.7), dpkg-dev (>= 1.15.7),
libaio-dev,
libasound2-dev, libasound2-dev,
libbz2-dev, libbz2-dev,
libgl1-mesa-dev, libgl1-mesa-dev,
@ -29,9 +30,11 @@ Homepage: http://pcsx2.net/
Package: pcsx2-unstable Package: pcsx2-unstable
Architecture: i386 Architecture: i386
# recommand libasound for alsa plugin for pulseaudio
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: libasound2-plugins # libasound => alsa plugin for pulseaudio
# libusb => ps3 controller (and probably others)
Recommends: libasound2-plugins,
libusb-0.1-4
Conflicts: pcsx2, Conflicts: pcsx2,
pcsx2-data-unstable, pcsx2-data-unstable,
pcsx2-l10n-unstable, pcsx2-l10n-unstable,

View File

@ -80,7 +80,7 @@ get_svn_dir()
echo " $directory" | sed -e 's/\//\ /g' echo " $directory" | sed -e 's/\//\ /g'
if [ -e `basename ${directory}` ] ; then if [ -e `basename ${directory}` ] ; then
# Directory already exist so only update # Directory already exist so only update
svn up --quiet ${SVN_TRUNK}/${directory} -r $SVN_CO_VERSION; svn up --quiet `basename ${directory}` -r $SVN_CO_VERSION;
else else
svn co --quiet ${SVN_TRUNK}/${directory} -r $SVN_CO_VERSION; svn co --quiet ${SVN_TRUNK}/${directory} -r $SVN_CO_VERSION;
fi fi
@ -92,7 +92,7 @@ get_svn_file()
for file in $* ; do for file in $* ; do
# Versioning information is not supported for a single file # Versioning information is not supported for a single file
# therefore you can't use svn co # therefore you can't use svn co
svn export --quiet ${SVN_TRUNK}/${file} -r $SVN_CO_VERSION; svn export --quiet ${SVN_TRUNK}/${file} --force -r $SVN_CO_VERSION;
done done
} }
@ -130,33 +130,23 @@ mkdir -p $ROOT_DIR/plugins
echo "Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ..."; echo "Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ...";
echo "Done") echo "Done")
## Download the internal sdl 1.3 for gsdx
# echo "Downloading 3rdpary SDL 1.3 (need by gsdx) revision ${SVN_CO_VERSION}"
# mkdir -p $ROOT_DIR/3rdparty
# (cd $ROOT_DIR/3rdparty/;
# get_svn_file 3rdparty/CMakeLists.txt;
# get_svn_dir 3rdparty/SDL-1.3.0-5387;)
# echo "Done"
## Installation ## Installation
echo "Copy the subversion repository to a temporary directory" echo "Copy the subversion repository to a temporary directory"
# Copy the dir # Copy the dir
rm -fr $NEW_DIR rm -fr $NEW_DIR
cp -r $ROOT_DIR $NEW_DIR cp -r $ROOT_DIR $NEW_DIR
echo "Remove .svn directories" echo "Remove windows files (useless & potential copyright issues)"
find $NEW_DIR -name ".svn" -type d -exec rm -fr {} \; 2> /dev/null # => pcsx2/windows
echo "Remove windows files (useless & copyright issues)" # Copyright header must be updated
find $NEW_DIR -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null find $NEW_DIR -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null
# => ./plugins/zzogl-pg*/opengl/Win32 (reduced to the current linux plugins)
find $NEW_DIR -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null find $NEW_DIR -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null
rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/Win32"
rm -fr "${NEW_DIR}/common/vsprops"
echo "Remove useless files (copyright issues)" echo "Remove useless files (copyright issues)"
rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders" rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders"
rm -fr "${NEW_DIR}/common/src/Utilities/x86/MemcpyFast.cpp" rm -fr "${NEW_DIR}/common/src/Utilities/x86/MemcpyFast.cpp"
rm -fr "${NEW_DIR}/plugins/GSdx/baseclasses" rm -fr "${NEW_DIR}/plugins/GSdx/baseclasses"
rm -fr "${NEW_DIR}/plugins/GSdx/vtune"
## BUILD ## BUILD
echo "Build the tar.gz file" echo "Build the tar.gz file"