debian:

* drop build on 64 bits. It will be supported through multiarch
* switch to SDL1.3, allow to build GSdx


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4869 96395faa-99c1-11dd-bbfe-3dabce05a288

debian-unstable-upstream/control

@@ -5,38 +5,31 @@ Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
 # WARNING we need dpkg-dev 1.15.7 to support dpkg-buildflags but ubunutu 10.04 have only 1.15.5.6...
 # WARNING Natty need at least cmake 2.8.5 (multiarch issue)
 Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
-    gcc-multilib [amd64], g++-multilib [amd64],
     locales|locales-all,
-    zlib1g-dev (>= 1:1.2.3.3) | lib32z1-dev (>= 1.2.3.3) [amd64],
+    zlib1g-dev (>= 1:1.2.3.3),
     libbz2-dev,
     libsdl1.2-dev,
     libjpeg-dev,
     libwxbase2.8-dev,
     libwxgtk2.8-dev,
     libgtk2.0-dev (>= 2.16),
-    libasound2-dev | lib32asound2-dev [amd64],
+    libasound2-dev,
     portaudio19-dev,
-# 1.5 is in debian experimental, rename to libsoundtouch0 (yeah...). Keep 1.3 for the moment
+# Virtual package must be enough for all
-    libsoundtouch0-dev | lib32soundtouch0-dev [amd64] | libsoundtouch1-dev (>= 1.3),
+#    libsoundtouch-dev | libsoundtouch1-dev | libsoundtouch0-dev,
+    libsoundtouch-dev,
     libsparsehash-dev,
     libx11-dev,
     libglew1.5-dev,
     libgl1-mesa-dev,
     libglu1-mesa-dev,
-    ia32-libs-dev [amd64],
+# Note lucid need nvidia-cg-toolkit-pcsx2 to be compatible with ppa   
-# I hope they create this package too
+    nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 3)
-# ia32-libs-gtk-dev [amd64],
-    ia32-libs-gtk [amd64],
-    lib32bz2-dev [amd64],
-# my nmu: add missing 32bits packages
-    # ia32-libs-extra-pcsx2 [amd64],
-    nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64]
 Standards-Version: 3.9.1
 Homepage: http://pcsx2.net/
 
 Package: pcsx2-unstable
-# Warning amd64 need additional ia32libs
+Architecture: i386
-Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends},
     pcsx2-plugins-unstable (>= ${binary:Version})
 Conflicts: pcsx2,
@@ -52,11 +45,10 @@ Description: Playstation 2 emulator
  This package includes the main binary file.
 
 Package: pcsx2-plugins-unstable
-# Warning amd64 need additional ia32libs
+Architecture: i386
-Architecture: i386 amd64
 # manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files)
 Depends: ${shlibs:Depends}, ${misc:Depends},
-    nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64]
+    nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1)
 Recommends: pcsx2-unstable (>= ${binary:Version}),
 Conflicts: pcsx2-plugins,
     pcsx2-data-unstable
@@ -73,8 +65,7 @@ Description: Various plugins for pcsx2
 Package: pcsx2-unstable-dbg
 Section: debug
 Priority: extra
-# Warning amd64 need additional ia32libs
+Architecture: i386
-Architecture: i386 amd64
 Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version})
 Conflicts: pcsx2-dbg
 Description: Debug symbols for pcsx2
@@ -89,8 +80,7 @@ Description: Debug symbols for pcsx2
 Package: pcsx2-plugins-unstable-dbg
 Section: debug
 Priority: extra
-# Warning amd64 need additional ia32libs
+Architecture: i386
-Architecture: i386 amd64
 Depends: ${misc:Depends}, pcsx2-plugins-unstable (= ${binary:Version})
 Conflicts: pcsx2-plugins-dbg
 Description: Debug symbols of the pcsx2-plugins
@@ -105,7 +95,6 @@ Description: Debug symbols of the pcsx2-plugins
 Package: pcsx2-l10n-unstable
 Section: localization
 Priority: optional
-# Warning amd64 need additional ia32libs
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: pcsx2-unstable (>= ${source:Version})

debian-unstable-upstream/control_ppa

@@ -1,120 +0,0 @@
-Source: pcsx2.snapshot
-Section: games
-Priority: optional
-Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
-# WARNING we need dpkg-dev 1.15.7 to support dpkg-buildflags but ubunutu 10.04 have only 1.15.5.6...
-# WARNING Natty need at least cmake 2.8.5
-Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
-    locales|locales-all,
-    zlib1g-dev (>= 1:1.2.3.3),
-    libbz2-dev,
-    libsdl1.2-dev,
-    libjpeg-dev,
-    libwxbase2.8-dev,
-    libwxgtk2.8-dev,
-    libgtk2.0-dev (>= 2.16),
-    libasound2-dev,
-    portaudio19-dev,
-# 1.5 is in debian experimental, rename to libsoundtouch0 (yeah...). Keep 1.3 for the moment
-    libsoundtouch0-dev | libsoundtouch1-dev (>= 1.3),
-    libsparsehash-dev,
-    libx11-dev,
-    libglew1.5-dev,
-    libgl1-mesa-dev,
-    libglu1-mesa-dev,
-    nvidia-cg-toolkit-pcsx2
-Standards-Version: 3.9.1
-Homepage: http://pcsx2.net/
-
-Package: pcsx2-unstable
-Architecture: i386
-Depends: ${shlibs:Depends}, ${misc:Depends},
-    pcsx2-data-unstable (>= ${source:Version}),
-    pcsx2-plugins-unstable (>= ${binary:Version})
-Conflicts: pcsx2
-Description: Playstation 2 emulator
- PCSX2 is a PlayStation 2 emulator for Windows and Linux.
- .
- 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.
- .
- This package includes the main binary file.
-
-Package: pcsx2-data-unstable
-Architecture: all 
-Depends: ${misc:Depends}
-Recommends: pcsx2-unstable (>= ${source:Version}), pcsx2-plugins-unstable (>= ${source:Version})
-Conflicts: pcsx2-data
-Description: data for pcsx2
- PCSX2 is a PlayStation 2 emulator for Windows and Linux.
- .
- 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.
- .
- This package includes data files.
-
-Package: pcsx2-plugins-unstable
-Architecture: i386
-# manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
-Depends: ${shlibs:Depends}, ${misc:Depends},
-    nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1)
-Recommends: pcsx2-unstable (>= ${binary:Version}),
-    pcsx2-data-unstable (>= ${source:Version})
-Conflicts: pcsx2-plugins
-Description: Various plugins for pcsx2
- PCSX2 is a PlayStation 2 emulator for Windows and Linux.
- .
- 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.
- .
- This package includes the plugins for PCSX2.
-
-Package: pcsx2-unstable-dbg
-Section: debug
-Priority: extra
-Architecture: i386
-Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version})
-Conflicts: pcsx2-dbg
-Description: Debug symbols for pcsx2
- PCSX2 is a PlayStation 2 emulator for Windows and Linux.
- .
- 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.
- .
- This package contains the debug symbol of pcsx2.
-
-Package: pcsx2-plugins-unstable-dbg
-Section: debug
-Priority: extra
-Architecture: i386
-Depends: ${misc:Depends}, pcsx2-plugins-unstable (= ${binary:Version})
-Conflicts: pcsx2-plugins-dbg
-Description: Debug symbols of the pcsx2-plugins
- PCSX2 is a PlayStation 2 emulator for Windows and Linux.
- .
- 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.
- .
- This package contains the debug symbols of the pcsx2 plugins.
-
-Package: pcsx2-l10n-unstable
-Section: localization
-Priority: optional
-# Warning amd64 need additional ia32libs
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: pcsx2-unstable (>= ${source:Version})
-Conflicts: pcsx2-l10n
-Description: Languages package for PCSX2
- PCSX2 is a PlayStation 2 emulator for Windows and Linux.
- .
- 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.
- .
- This package contains the localization of the emulator in various languages.

debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# copyright (c) 2010 Gregory Hainaut
+# copyright (c) 2011 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
@@ -105,30 +105,40 @@ echo "Downloading pcsx2 source revision ${SVN_CO_VERSION}"
 mkdir -p $ROOT_DIR;
 (cd $ROOT_DIR; 
     get_svn_file CMakeLists.txt;
-    get_svn_dir bin common cmake locales pcsx2 tools;
+    get_svn_dir common cmake locales pcsx2 tools;
     get_svn_dir debian-unstable-upstream;
 echo "Done")
 
-echo "Downloading Linux compatible plugins for revision ${SVN_CO_VERSION}"
+# separate bin to avoid downloading the .mo file
+mkdir -p $ROOT_DIR/bin;
+(cd $ROOT_DIR/bin;
+    get_svn_file bin/GameIndex.dbf;
+    get_svn_dir  bin/docs;)
+
+echo "Downloading Linux compatible plugins revision ${SVN_CO_VERSION}"
 # Note: Other plugins exist but they are not 100% copyright free.
 mkdir -p $ROOT_DIR/plugins
 (cd $ROOT_DIR/plugins; 
     get_svn_file plugins/CMakeLists.txt;
-    # DVD
     get_svn_dir plugins/CDVDnull;
-    # Copyright issue
+    # Potential copyrigh issue. Optional anyway
     # get_svn_dir plugins/CDVDnull plugins/CDVDiso;
-    # PAD
     get_svn_dir plugins/PadNull plugins/onepad;
-    # AUDIO
+    get_svn_dir plugins/SPU2null plugins/spu2-x;
-    get_svn_dir plugins/SPU2null plugins/spu2-x plugins/zerospu2;
+    get_svn_dir plugins/GSnull plugins/zzogl-pg plugins/GSdx;
-    # Graphics
-    get_svn_dir plugins/GSnull plugins/zzogl-pg;
-    # Misc
     get_svn_dir plugins/dev9null plugins/FWnull plugins/USBnull;
 echo "Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ...";
 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
 echo "Copy the subversion repository to a temporary directory"
 # Copy the dir
@@ -155,6 +165,8 @@ echo "Remove useless files (copyright issues)"
 rm -fr "${NEW_DIR}/pcsx2/3rdparty" # useless link which annoy me
 rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders"
 rm -fr "${NEW_DIR}/common/src/Utilities/x86/MemcpyFast.cpp"
+rm -fr "${NEW_DIR}/plugins/GSdx/baseclasses"
+rm -fr "${NEW_DIR}/plugins/GSdx/vtune"
 
 ## BUILD
 echo "Build the tar.gz file"

debian-unstable-upstream/rules

@@ -16,6 +16,7 @@ override_dh_auto_configure:
 		-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
 		-DCMAKE_BUILD_STRIP=FALSE \
 		-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
+		-DFORCE_INTERNAL_SDL=TRUE \
 		-DPACKAGE_MODE=TRUE
 
 clean:
@@ -23,11 +24,12 @@ clean:
 	dh_testroot
 
 	dh_auto_clean
-	rm -fr obj-* # Remove cmake stuff in case auto_clean does not do its jobs properly
+	rm -fr obj-* # cmake stuff is not always removed (fixed in debhelper 0.9.4)
 
 	dh_clean
 
-## Uncomment this, if fglrx driver is installed
+## Uncomment this, if fglrx driver is installed.
+## Need a confirmation but I think it is useless in recent system
 #override_dh_shlibdeps:
 #	dh_shlibdeps -- --ignore-missing-info