From ee2a7a83e89c520d434ad8a58170fb6a7a766a3b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 19 Feb 2008 17:23:05 +0000 Subject: [PATCH 001/107] Initialize branch F-7 for vdrift --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From ef0d9201dbbe325c302af13926d2acc717a629f6 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 19 Feb 2008 18:58:24 +0000 Subject: [PATCH 002/107] Initial import. --- .cvsignore | 1 + sources | 1 + vdrift-20071226-gcc4.3.patch | 28 ++++++++ vdrift-20071226-jamfile.patch | 11 +++ vdrift-20071226-paths.patch | 13 ++++ vdrift-SConstruct.patch | 13 ++++ vdrift.desktop | 10 +++ vdrift.png | Bin 0 -> 455 bytes vdrift.spec | 130 ++++++++++++++++++++++++++++++++++ 9 files changed, 207 insertions(+) create mode 100644 vdrift-20071226-gcc4.3.patch create mode 100644 vdrift-20071226-jamfile.patch create mode 100644 vdrift-20071226-paths.patch create mode 100644 vdrift-SConstruct.patch create mode 100644 vdrift.desktop create mode 100644 vdrift.png create mode 100644 vdrift.spec diff --git a/.cvsignore b/.cvsignore index e69de29..795f007 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +vdrift-2007-12-26-src.tar.bz2 diff --git a/sources b/sources index e69de29..7748eb7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9fac2e17f550184f7338dd89cacb1b1f vdrift-2007-12-26-src.tar.bz2 diff --git a/vdrift-20071226-gcc4.3.patch b/vdrift-20071226-gcc4.3.patch new file mode 100644 index 0000000..df66354 --- /dev/null +++ b/vdrift-20071226-gcc4.3.patch @@ -0,0 +1,28 @@ +--- include/utility.h 2008-02-14 19:22:46.000000000 +0100 ++++ include/utility.h 2008-02-14 19:22:46.000000000 +0100 +@@ -100,7 +100,7 @@ public: + void SetBox(float x1, float y1, float x2, float y2, const TEXTURE_HANDLE * const texid, int texsize, float opacity); + void SetButton(float x1, float y1, float x2, float y2, float sidewidth, TEXTURE_HANDLE * texid, float opacity); + void SetEllipse( float center_x, float center_y, float radius_x, float radius_y, float color_r, float color_g, float color_b, float opacity ); +- void SetQuad( float x1, float y2, float x2, float y2, float x3, float y3, float x4, float y4, TEXTURE_HANDLE * texid, float opacity); ++ void SetQuad( float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, TEXTURE_HANDLE * texid, float opacity); + void SetRotation(float r) {rotation=r;} + + void SetDraw(const bool newdraw) {draw=newdraw;} +--- include/serialization.h 2008-02-14 19:30:02.000000000 +0100 ++++ include/serialization.h 2008-02-14 19:30:02.000000000 +0100 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include "simpletree.h" + +@@ -23,6 +24,7 @@ using std::ostream; + using std::ifstream; + using std::ofstream; + using std::pair; ++using std::memcmp; + + #define _GENERATEUID_(ptr,uidoutput) unsigned long long uidoutput = (size_t)ptr diff --git a/vdrift-20071226-jamfile.patch b/vdrift-20071226-jamfile.patch new file mode 100644 index 0000000..9823d41 --- /dev/null +++ b/vdrift-20071226-jamfile.patch @@ -0,0 +1,11 @@ +--- bullet-2.64/Jamfile.in 2008-02-15 06:55:36.000000000 -0600 ++++ bullet-2.64/Jamfile.in 2008-02-15 06:55:36.000000000 -0600 +@@ -60,7 +60,6 @@ + MsvcGenConfig GLEW.LIBS : glew32.lib ; + + SubInclude TOP src ; +-SubInclude TOP Extras ; +-SubInclude TOP Demos ; ++ + + Depends install_config : [ DoInstall bullet.pc : $(libdir)/pkgconfig ] ; diff --git a/vdrift-20071226-paths.patch b/vdrift-20071226-paths.patch new file mode 100644 index 0000000..384ea48 --- /dev/null +++ b/vdrift-20071226-paths.patch @@ -0,0 +1,13 @@ +--- SConstruct 2008-02-13 11:01:59.000000000 -0600 ++++ SConstruct 2008-02-13 11:01:59.000000000 -0600 +@@ -35,8 +35,8 @@ + cppdefines = [] + default_settingsdir = ".vdrift" + default_prefix = "/usr" +-default_datadir = "share/games/vdrift/data" +-default_bindir = "share/games/vdrift/bin" ++default_datadir = "/share/vdrift" ++default_bindir = "/bin" + + # convenience var for identifying a windows platform + diff --git a/vdrift-SConstruct.patch b/vdrift-SConstruct.patch new file mode 100644 index 0000000..1d7b368 --- /dev/null +++ b/vdrift-SConstruct.patch @@ -0,0 +1,13 @@ +--- SConstruct 2007-04-16 10:25:43.000000000 -0500 ++++ SConstruct 2007-04-16 10:28:02.000000000 -0500 +@@ -352,8 +352,8 @@ + # Subdirectories # + #----------------# + Export(['env', 'version', 'src_dir', 'bin_dir']) +-if 'install' in COMMAND_LINE_TARGETS: +- SConscript('data/SConscript') ++#if 'install' in COMMAND_LINE_TARGETS: ++# SConscript('data/SConscript') + + if 'src-package' in COMMAND_LINE_TARGETS: + SConscript('po/SConscript') diff --git a/vdrift.desktop b/vdrift.desktop new file mode 100644 index 0000000..95394dc --- /dev/null +++ b/vdrift.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=VDrift +GenericName=VDrift +Comment=Drift Racing Simulation +Exec=vdrift +Icon=vdrift +Terminal=false +StartupNotify=false +Type=Application +Categories=Game;SportsGame; diff --git a/vdrift.png b/vdrift.png new file mode 100644 index 0000000000000000000000000000000000000000..1c6d657981d352b57d2524d3b67525b6108aa15e GIT binary patch literal 455 zcmV;&0XY7NP)IV1s@6y7z$c{`giTX?@_U}yh7e*2yO%noDScLhNMFEF1_*TaseJH)kx zrzLzoH$_*1DQqQ%k9a#|u7#InOp5-vi_^paYk~*=x&%f4TQ1N}tX;sfJOQrN!I#AP zRl&nN0iqxHkXXNnm0Sd1A4mU_LUE(7&+xGVh2>lX;GhD9HNjk-0MU1RO7wYLwHJyZ z&pS9y^ja6p<_Qp;SLlUDc%F*@?BOKQZ$mJhQqZ_%?o!aiQi9(Mx|l5aGde6rys(XL zi4- - 20071226-3 +- Multiple fixes for the review. + +* Thu Feb 14 2008 Jon Ciesla - 20071226-2 +- Multiple package fixes. + +* Tue Feb 12 2008 Jon Ciesla - 20071226-1 +- Updated to current release. + +* Wed Apr 18 2007 Jon Ciesla - 20070323-4 +- Added patch to fix mouse driving from thelusiv@gmail.com. + +* Mon Apr 16 2007 Jon Ciesla - 20070323-3 +- Corrected patch to allow build without minimal data. +- Added release=1 to scons options. +- Passing compiler flags to scons. +- Turned off translations. + +* Mon Apr 04 2007 Jon Ciesla - 20070323-2 +- Split out minimal data. + +* Thu Mar 28 2007 Jon Ciesla - 20070323-1 +- Initial packaging From 3d3888ce2da193ca8545e339347578b6735d4076 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 19 Feb 2008 21:58:18 +0000 Subject: [PATCH 003/107] BR jam fix. --- vdrift.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdrift.spec b/vdrift.spec index 1f23ffb..5e52172 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -34,6 +34,7 @@ BuildRequires: scons BuildRequires: libGL-devel BuildRequires: openal-devel BuildRequires: freealut-devel +BuildRequires: jam Requires: vdrift-data = %{version} From 76962e77ba5e3f3e990dfd3dd594e5da5ef74e11 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 20 Feb 2008 01:48:25 +0000 Subject: [PATCH 004/107] libvorbis BR fix. --- vdrift.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdrift.spec b/vdrift.spec index 5e52172..980f3db 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -35,6 +35,7 @@ BuildRequires: libGL-devel BuildRequires: openal-devel BuildRequires: freealut-devel BuildRequires: jam +BuildRequires: libvorbis-devel Requires: vdrift-data = %{version} From 8266510b8ec7115b48d66834f4f8bf6c7d065464 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 20 Feb 2008 12:15:59 +0000 Subject: [PATCH 005/107] d-f-u BR fix. --- vdrift.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdrift.spec b/vdrift.spec index 980f3db..586b927 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -36,6 +36,7 @@ BuildRequires: openal-devel BuildRequires: freealut-devel BuildRequires: jam BuildRequires: libvorbis-devel +BuildRequires: desktop-file-utils Requires: vdrift-data = %{version} From 853874cd555bb3158a75b61f99e2529914441f9d Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 20 Feb 2008 16:18:04 +0000 Subject: [PATCH 006/107] Fix for bullet, ppc. --- vdrift-20071226-configure.patch | 10 ++++++++++ vdrift.spec | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 vdrift-20071226-configure.patch diff --git a/vdrift-20071226-configure.patch b/vdrift-20071226-configure.patch new file mode 100644 index 0000000..b8a3a6e --- /dev/null +++ b/vdrift-20071226-configure.patch @@ -0,0 +1,10 @@ +--- bullet-2.64/configure 2008-02-20 09:45:11.000000000 -0600 ++++ bullet-2.64/configure 2008-02-20 09:45:11.000000000 -0600 +@@ -5423,6 +5423,7 @@ + + case $host_cpu in + [Ii][3-9]86*|[Xx]86*) cs_host_cpu=x86 ;; ++ [ppc]*) cs_host_cpu=ppc ;; + *) cs_host_cpu=$host_cpu ;; + esac + cs_host_cpu_normalized="`echo "$cs_host_cpu" | $as_tr_cpp`" diff --git a/vdrift.spec b/vdrift.spec index 586b927..1b443a1 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -25,6 +25,7 @@ Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch Patch2: vdrift-20071226-gcc4.3.patch Patch3: vdrift-20071226-jamfile.patch +Patch4: vdrift-20071226-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -54,6 +55,7 @@ available for Linux, FreeBSD, Mac OS X and Windows (Cygwin). %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 /bin/chmod -x src/gamestate.cpp /bin/chmod -x src/logo.cpp From f93b95f72b8ab536b82101436b60bce06362f58f Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 20 Feb 2008 18:57:51 +0000 Subject: [PATCH 007/107] Possible bullet fix. --- vdrift.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 1b443a1..79d1f8e 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -25,7 +25,7 @@ Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch Patch2: vdrift-20071226-gcc4.3.patch Patch3: vdrift-20071226-jamfile.patch -Patch4: vdrift-20071226-configure.patch +#Patch4: vdrift-20071226-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -55,7 +55,7 @@ available for Linux, FreeBSD, Mac OS X and Windows (Cygwin). %patch1 -p0 %patch2 -p0 %patch3 -p0 -%patch4 -p0 +#%patch4 -p0 /bin/chmod -x src/gamestate.cpp /bin/chmod -x src/logo.cpp @@ -69,6 +69,9 @@ cd bullet-2.64 jam bulletcollision bulletmath cd .. +#hack for bullet on ppc +ln -s bullet-2.64/out/linuxx86 bullet-2.64/out/linuxppc + CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons destdir=%{buildroot} bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 %install From 9d80eecee5814aa226c23a1f9fad32ad30cbc257 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 20 Feb 2008 19:29:53 +0000 Subject: [PATCH 008/107] Hrm. . . --- vdrift.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 79d1f8e..95483de 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -70,7 +70,7 @@ jam bulletcollision bulletmath cd .. #hack for bullet on ppc -ln -s bullet-2.64/out/linuxx86 bullet-2.64/out/linuxppc +ln -s bullet-2.64/out/linuxppc bullet-2.64/out/linuxx86 CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons destdir=%{buildroot} bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 From b56396860a5d32d782608d67ebf4d2732d1e2a8e Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 20 Feb 2008 20:29:49 +0000 Subject: [PATCH 009/107] Possible fix. --- vdrift.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 95483de..6c714dc 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -51,6 +51,10 @@ available for Linux, FreeBSD, Mac OS X and Windows (Cygwin). %setup -qn vdrift +%ifarch ppc ppc64 +sed -i 's/linuxx86/linuxppc/' src/SConscript +%endif + %patch0 -p0 %patch1 -p0 %patch2 -p0 @@ -70,7 +74,7 @@ jam bulletcollision bulletmath cd .. #hack for bullet on ppc -ln -s bullet-2.64/out/linuxppc bullet-2.64/out/linuxx86 +#ln -s bullet-2.64/out/linuxppc bullet-2.64/out/linuxx86 CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons destdir=%{buildroot} bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 From 3502d6957a31d1600a7b518c83f531840a555fc9 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 21 Feb 2008 12:31:44 +0000 Subject: [PATCH 010/107] Spec cleanup. --- vdrift.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 6c714dc..efc25a1 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -25,7 +25,6 @@ Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch Patch2: vdrift-20071226-gcc4.3.patch Patch3: vdrift-20071226-jamfile.patch -#Patch4: vdrift-20071226-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -59,7 +58,6 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch1 -p0 %patch2 -p0 %patch3 -p0 -#%patch4 -p0 /bin/chmod -x src/gamestate.cpp /bin/chmod -x src/logo.cpp @@ -73,9 +71,6 @@ cd bullet-2.64 jam bulletcollision bulletmath cd .. -#hack for bullet on ppc -#ln -s bullet-2.64/out/linuxppc bullet-2.64/out/linuxx86 - CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons destdir=%{buildroot} bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 %install From 699fb7623a1d2f957889a57829598ac4d5146dfc Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 21 Feb 2008 13:12:29 +0000 Subject: [PATCH 011/107] Initial import. --- sources | 1 + vdrift-20071226-gcc4.3.patch | 28 +++++++ vdrift-20071226-jamfile.patch | 11 +++ vdrift-20071226-paths.patch | 13 ++++ vdrift-SConstruct.patch | 13 ++++ vdrift.desktop | 10 +++ vdrift.png | Bin 0 -> 455 bytes vdrift.spec | 137 ++++++++++++++++++++++++++++++++++ 8 files changed, 213 insertions(+) create mode 100644 vdrift-20071226-gcc4.3.patch create mode 100644 vdrift-20071226-jamfile.patch create mode 100644 vdrift-20071226-paths.patch create mode 100644 vdrift-SConstruct.patch create mode 100644 vdrift.desktop create mode 100644 vdrift.png create mode 100644 vdrift.spec diff --git a/sources b/sources index e69de29..7748eb7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9fac2e17f550184f7338dd89cacb1b1f vdrift-2007-12-26-src.tar.bz2 diff --git a/vdrift-20071226-gcc4.3.patch b/vdrift-20071226-gcc4.3.patch new file mode 100644 index 0000000..df66354 --- /dev/null +++ b/vdrift-20071226-gcc4.3.patch @@ -0,0 +1,28 @@ +--- include/utility.h 2008-02-14 19:22:46.000000000 +0100 ++++ include/utility.h 2008-02-14 19:22:46.000000000 +0100 +@@ -100,7 +100,7 @@ public: + void SetBox(float x1, float y1, float x2, float y2, const TEXTURE_HANDLE * const texid, int texsize, float opacity); + void SetButton(float x1, float y1, float x2, float y2, float sidewidth, TEXTURE_HANDLE * texid, float opacity); + void SetEllipse( float center_x, float center_y, float radius_x, float radius_y, float color_r, float color_g, float color_b, float opacity ); +- void SetQuad( float x1, float y2, float x2, float y2, float x3, float y3, float x4, float y4, TEXTURE_HANDLE * texid, float opacity); ++ void SetQuad( float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, TEXTURE_HANDLE * texid, float opacity); + void SetRotation(float r) {rotation=r;} + + void SetDraw(const bool newdraw) {draw=newdraw;} +--- include/serialization.h 2008-02-14 19:30:02.000000000 +0100 ++++ include/serialization.h 2008-02-14 19:30:02.000000000 +0100 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include "simpletree.h" + +@@ -23,6 +24,7 @@ using std::ostream; + using std::ifstream; + using std::ofstream; + using std::pair; ++using std::memcmp; + + #define _GENERATEUID_(ptr,uidoutput) unsigned long long uidoutput = (size_t)ptr diff --git a/vdrift-20071226-jamfile.patch b/vdrift-20071226-jamfile.patch new file mode 100644 index 0000000..9823d41 --- /dev/null +++ b/vdrift-20071226-jamfile.patch @@ -0,0 +1,11 @@ +--- bullet-2.64/Jamfile.in 2008-02-15 06:55:36.000000000 -0600 ++++ bullet-2.64/Jamfile.in 2008-02-15 06:55:36.000000000 -0600 +@@ -60,7 +60,6 @@ + MsvcGenConfig GLEW.LIBS : glew32.lib ; + + SubInclude TOP src ; +-SubInclude TOP Extras ; +-SubInclude TOP Demos ; ++ + + Depends install_config : [ DoInstall bullet.pc : $(libdir)/pkgconfig ] ; diff --git a/vdrift-20071226-paths.patch b/vdrift-20071226-paths.patch new file mode 100644 index 0000000..384ea48 --- /dev/null +++ b/vdrift-20071226-paths.patch @@ -0,0 +1,13 @@ +--- SConstruct 2008-02-13 11:01:59.000000000 -0600 ++++ SConstruct 2008-02-13 11:01:59.000000000 -0600 +@@ -35,8 +35,8 @@ + cppdefines = [] + default_settingsdir = ".vdrift" + default_prefix = "/usr" +-default_datadir = "share/games/vdrift/data" +-default_bindir = "share/games/vdrift/bin" ++default_datadir = "/share/vdrift" ++default_bindir = "/bin" + + # convenience var for identifying a windows platform + diff --git a/vdrift-SConstruct.patch b/vdrift-SConstruct.patch new file mode 100644 index 0000000..1d7b368 --- /dev/null +++ b/vdrift-SConstruct.patch @@ -0,0 +1,13 @@ +--- SConstruct 2007-04-16 10:25:43.000000000 -0500 ++++ SConstruct 2007-04-16 10:28:02.000000000 -0500 +@@ -352,8 +352,8 @@ + # Subdirectories # + #----------------# + Export(['env', 'version', 'src_dir', 'bin_dir']) +-if 'install' in COMMAND_LINE_TARGETS: +- SConscript('data/SConscript') ++#if 'install' in COMMAND_LINE_TARGETS: ++# SConscript('data/SConscript') + + if 'src-package' in COMMAND_LINE_TARGETS: + SConscript('po/SConscript') diff --git a/vdrift.desktop b/vdrift.desktop new file mode 100644 index 0000000..95394dc --- /dev/null +++ b/vdrift.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=VDrift +GenericName=VDrift +Comment=Drift Racing Simulation +Exec=vdrift +Icon=vdrift +Terminal=false +StartupNotify=false +Type=Application +Categories=Game;SportsGame; diff --git a/vdrift.png b/vdrift.png new file mode 100644 index 0000000000000000000000000000000000000000..1c6d657981d352b57d2524d3b67525b6108aa15e GIT binary patch literal 455 zcmV;&0XY7NP)IV1s@6y7z$c{`giTX?@_U}yh7e*2yO%noDScLhNMFEF1_*TaseJH)kx zrzLzoH$_*1DQqQ%k9a#|u7#InOp5-vi_^paYk~*=x&%f4TQ1N}tX;sfJOQrN!I#AP zRl&nN0iqxHkXXNnm0Sd1A4mU_LUE(7&+xGVh2>lX;GhD9HNjk-0MU1RO7wYLwHJyZ z&pS9y^ja6p<_Qp;SLlUDc%F*@?BOKQZ$mJhQqZ_%?o!aiQi9(Mx|l5aGde6rys(XL zi4- - 20071226-3 +- Multiple fixes for the review. + +* Thu Feb 14 2008 Jon Ciesla - 20071226-2 +- Multiple package fixes. + +* Tue Feb 12 2008 Jon Ciesla - 20071226-1 +- Updated to current release. + +* Wed Apr 18 2007 Jon Ciesla - 20070323-4 +- Added patch to fix mouse driving from thelusiv@gmail.com. + +* Mon Apr 16 2007 Jon Ciesla - 20070323-3 +- Corrected patch to allow build without minimal data. +- Added release=1 to scons options. +- Passing compiler flags to scons. +- Turned off translations. + +* Mon Apr 04 2007 Jon Ciesla - 20070323-2 +- Split out minimal data. + +* Thu Mar 28 2007 Jon Ciesla - 20070323-1 +- Initial packaging From c950fa03e61f1f656368dca7e3ad91612fb228b5 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 13 Aug 2008 15:54:13 +0000 Subject: [PATCH 012/107] New upstream. --- .cvsignore | 2 +- sources | 2 +- vdrift.spec | 32 +++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 795f007..6a56b08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vdrift-2007-12-26-src.tar.bz2 +vdrift-2008-08-05-src.tar.bz2 diff --git a/sources b/sources index 7748eb7..5f97618 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9fac2e17f550184f7338dd89cacb1b1f vdrift-2007-12-26-src.tar.bz2 +9e3e3c91960146354c2a9fb65da3bd97 vdrift-2008-08-05-src.tar.bz2 diff --git a/vdrift.spec b/vdrift.spec index efc25a1..5508c45 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,14 +1,14 @@ Name: vdrift -Version: 20071226 -Release: 3%{?dist} +Version: 20080805 +Release: 1%{?dist} Summary: VDrift is a cross-platform, open source driving/drift racing simulation Group: Amusements/Games License: GPLv2+ URL: http://vdrift.net -Source0: %{name}-2007-12-26-src.tar.bz2 +Source0: %{name}-2008-08-05-src.tar.bz2 #Original upstream: -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2007-12-26-src.tar.bz2 +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2008-08-05-src.tar.bz2 # Modified: # cd docs # rm HOW_TO_COMPILE.txt SConscript INSTALL @@ -23,8 +23,8 @@ Source1: vdrift.desktop Source2: vdrift.png Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch -Patch2: vdrift-20071226-gcc4.3.patch -Patch3: vdrift-20071226-jamfile.patch +#Patch2: vdrift-20071226-gcc4.3.patch +#Patch3: vdrift-20071226-jamfile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -38,7 +38,10 @@ BuildRequires: jam BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils -Requires: vdrift-data = %{version} +#Requires: vdrift-data = %{version} +Obsoletes: vdrift-data <= 20071226 +Provides: vdrift-data = %{version}-%{release} + %description VDrift is a cross-platform, open source driving simulation made with drift @@ -48,7 +51,7 @@ available for Linux, FreeBSD, Mac OS X and Windows (Cygwin). %prep -%setup -qn vdrift +%setup -qn vdrift-08-05-08 %ifarch ppc ppc64 sed -i 's/linuxx86/linuxppc/' src/SConscript @@ -56,8 +59,8 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch0 -p0 %patch1 -p0 -%patch2 -p0 -%patch3 -p0 +#%patch2 -p0 +#%patch3 -p0 /bin/chmod -x src/gamestate.cpp /bin/chmod -x src/logo.cpp @@ -65,8 +68,10 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript /bin/chmod -x src/main.cpp /bin/chmod -x src/game.cpp +/bin/chmod -x bullet-2.66/src/LinearMath/*.h + %build -cd bullet-2.64 +cd bullet-2.66 %configure jam bulletcollision bulletmath cd .. @@ -112,6 +117,11 @@ rm -rf %{buildroot} %changelog +* Tue Aug 12 2008 Jon Ciesla - 20080805-1 +- Update to new upstream. +- Dropped gcc4.3 and jamfile patches, applied upstream. +- Merged and obsolete/provided -data package, following upstream. + * Fri Feb 15 2008 Jon Ciesla - 20071226-3 - Multiple fixes for the review. From 9e516d389ba89fbc8b9ffa5e4b00794e80b6ff8f Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 13 Aug 2008 19:19:14 +0000 Subject: [PATCH 013/107] BR fix. --- vdrift.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vdrift.spec b/vdrift.spec index 5508c45..5c01d3c 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -37,6 +37,7 @@ BuildRequires: freealut-devel BuildRequires: jam BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils +BuildRequires: glew-devel #Requires: vdrift-data = %{version} Obsoletes: vdrift-data <= 20071226 @@ -121,6 +122,7 @@ rm -rf %{buildroot} - Update to new upstream. - Dropped gcc4.3 and jamfile patches, applied upstream. - Merged and obsolete/provided -data package, following upstream. +- Added glew-devel BR. * Fri Feb 15 2008 Jon Ciesla - 20071226-3 - Multiple fixes for the review. From 91594d27594db68adf5fb50cacc3745de2ef8915 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 21 Oct 2008 11:07:47 +0000 Subject: [PATCH 014/107] - Actually install the data now that its merged into the main package --- vdrift.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 5c01d3c..d61148e 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20080805 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VDrift is a cross-platform, open source driving/drift racing simulation Group: Amusements/Games @@ -77,12 +77,16 @@ cd bullet-2.66 jam bulletcollision bulletmath cd .. -CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons destdir=%{buildroot} bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 +CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 %install rm -rf %{buildroot} +# As described in the README scons install is broken so DIY install -d %{buildroot}%{_bindir} -CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons install destdir=%{buildroot} bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 +install -d %{buildroot}%{_datadir} +install -m 755 build/vdrift %{buildroot}%{_bindir} +cp -pr data %{buildroot}%{_datadir}/vdrift +rm `find %{buildroot}%{_datadir}/vdrift -name "SConscript*"` mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --vendor fedora \ @@ -111,13 +115,17 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%{_bindir}/vdrift %doc docs/* +%{_bindir}/vdrift +%{_datadir}/vdrift %{_datadir}/applications/fedora-vdrift.desktop %{_datadir}/icons/hicolor/32x32/apps/vdrift.png %changelog +* Tue Oct 21 2008 Hans de Goede - 20080805-2 +- Actually install the data now that its merged into the main package + * Tue Aug 12 2008 Jon Ciesla - 20080805-1 - Update to new upstream. - Dropped gcc4.3 and jamfile patches, applied upstream. From ec4fb8ee5134e01295cc58cb8a47b6dfb8a80e68 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 24 Nov 2008 16:31:22 +0000 Subject: [PATCH 015/107] Cleaned up summary. --- vdrift.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index d61148e..81d5862 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,7 +1,7 @@ Name: vdrift Version: 20080805 -Release: 2%{?dist} -Summary: VDrift is a cross-platform, open source driving/drift racing simulation +Release: 3%{?dist} +Summary: Driving/drift racing simulation Group: Amusements/Games License: GPLv2+ @@ -123,6 +123,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 24 2008 Jon Ciesla - 20080805-3 +- Cleaned up summary. + * Tue Oct 21 2008 Hans de Goede - 20080805-2 - Actually install the data now that its merged into the main package From 664d05722ed16fd216383d1ec816ed10509edb9d Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 23 Feb 2009 16:33:06 +0000 Subject: [PATCH 016/107] New upstream. --- .cvsignore | 2 +- sources | 2 +- vdrift.spec | 33 ++++++++++++++++++++------------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6a56b08..b74ab18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vdrift-2008-08-05-src.tar.bz2 +vdrift-2009-02-15-src.tar.bz2 diff --git a/sources b/sources index 5f97618..921223a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e3e3c91960146354c2a9fb65da3bd97 vdrift-2008-08-05-src.tar.bz2 +5960be8c966bcbde42c054ca667b46ef vdrift-2009-02-15-src.tar.bz2 diff --git a/vdrift.spec b/vdrift.spec index 81d5862..728082a 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,14 +1,14 @@ Name: vdrift -Version: 20080805 -Release: 3%{?dist} +Version: 20090215 +Release: 1%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games License: GPLv2+ URL: http://vdrift.net -Source0: %{name}-2008-08-05-src.tar.bz2 +Source0: %{name}-2009-02-15-src.tar.bz2 #Original upstream: -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2008-08-05-src.tar.bz2 +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-02-15-src.tar.bz2 # Modified: # cd docs # rm HOW_TO_COMPILE.txt SConscript INSTALL @@ -52,7 +52,7 @@ available for Linux, FreeBSD, Mac OS X and Windows (Cygwin). %prep -%setup -qn vdrift-08-05-08 +%setup -qn vdrift-2009-02-15 %ifarch ppc ppc64 sed -i 's/linuxx86/linuxppc/' src/SConscript @@ -63,19 +63,23 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript #%patch2 -p0 #%patch3 -p0 -/bin/chmod -x src/gamestate.cpp -/bin/chmod -x src/logo.cpp -/bin/chmod -x src/objects.cpp +#/bin/chmod -x src/gamestate.cpp +#/bin/chmod -x src/logo.cpp +#/bin/chmod -x src/objects.cpp /bin/chmod -x src/main.cpp /bin/chmod -x src/game.cpp -/bin/chmod -x bullet-2.66/src/LinearMath/*.h %build -cd bullet-2.66 -%configure -jam bulletcollision bulletmath -cd .. +tar -xzf bullet-2.73-sp1.tgz +/bin/chmod -x bullet-2.73/src/LinearMath/*.h +#cd bullet-2.73 +#./autogen.sh +#./configure +#jam bulletcollision bulletmath +#cmake . +#make +#cd .. CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 @@ -123,6 +127,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 19 2009 Jon Ciesla - 20090215-1 +- Update to 2009-02-15. + * Mon Nov 24 2008 Jon Ciesla - 20080805-3 - Cleaned up summary. From 4a823d47fb1549b4a4fea57962218c017ee8f787 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 23 Feb 2009 19:30:22 +0000 Subject: [PATCH 017/107] Patch. --- vdrift-20090215-joepack-includes.patch | 4 ++++ vdrift.spec | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 vdrift-20090215-joepack-includes.patch diff --git a/vdrift-20090215-joepack-includes.patch b/vdrift-20090215-joepack-includes.patch new file mode 100644 index 0000000..35b2f65 --- /dev/null +++ b/vdrift-20090215-joepack-includes.patch @@ -0,0 +1,4 @@ +--- src/joepack.cpp.orig 2009-02-23 11:49:13.000000000 -0600 ++++ src/joepack.cpp 2009-02-23 11:49:13.000000000 -0600 +@@ -12,0 +13 @@ ++#include diff --git a/vdrift.spec b/vdrift.spec index 728082a..86fae4f 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -25,6 +25,7 @@ Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch #Patch2: vdrift-20071226-gcc4.3.patch #Patch3: vdrift-20071226-jamfile.patch +Patch4: vdrift-20090215-joepack-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -62,6 +63,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch1 -p0 #%patch2 -p0 #%patch3 -p0 +%patch4 -p0 #/bin/chmod -x src/gamestate.cpp #/bin/chmod -x src/logo.cpp @@ -129,6 +131,7 @@ rm -rf %{buildroot} %changelog * Thu Feb 19 2009 Jon Ciesla - 20090215-1 - Update to 2009-02-15. +- Includes patch. * Mon Nov 24 2008 Jon Ciesla - 20080805-3 - Cleaned up summary. From 6e37442cd2e2eb820d9823be27e1ecf130a735ca Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 1 Jul 2009 17:43:08 +0000 Subject: [PATCH 018/107] - Update to 2009-06-15. - Split data into noarch subpackage, BZ 508079. --- .cvsignore | 2 +- sources | 2 +- vdrift.spec | 50 ++++++++++++++++++++++++++++++++++---------------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index b74ab18..3f57316 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vdrift-2009-02-15-src.tar.bz2 +vdrift-2009-06-15-src.tar.bz2 diff --git a/sources b/sources index 921223a..821c505 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5960be8c966bcbde42c054ca667b46ef vdrift-2009-02-15-src.tar.bz2 +bcb6ae8117134e954be00c8f074167eb vdrift-2009-06-15-src.tar.bz2 diff --git a/vdrift.spec b/vdrift.spec index 86fae4f..878734f 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,23 +1,19 @@ Name: vdrift -Version: 20090215 +Version: 20090615 Release: 1%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games License: GPLv2+ URL: http://vdrift.net -Source0: %{name}-2009-02-15-src.tar.bz2 +Source0: %{name}-2009-06-15-src.tar.bz2 #Original upstream: -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-02-15-src.tar.bz2 +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-06-15-src.tar.bz2 # Modified: # cd docs -# rm HOW_TO_COMPILE.txt SConscript INSTALL +# rm SConscript INSTALL # cd .. -# rm bullet-2.64/glew32.dll -# rm bullet-2.64/GLUT32.DLL -# rm -rf bullet-2.64/Glut -# rm -rf bullet-2.64/Extras -# rm -rf bullet-2.64/Demos +# rm -rf tools/win Source1: vdrift.desktop Source2: vdrift.png @@ -39,10 +35,12 @@ BuildRequires: jam BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: glew-devel +BuildRequires: boost-devel +BuildRequires: asio-devel -#Requires: vdrift-data = %{version} -Obsoletes: vdrift-data <= 20071226 -Provides: vdrift-data = %{version}-%{release} +Requires: vdrift-data = %{version} +#Obsoletes: vdrift-data <= 20071226 +#Provides: vdrift-data = %{version}-%{release} %description @@ -51,9 +49,23 @@ racing in mind. It's powered by the excellent Vamos physics engine. It is released under the GNU General Public License (GPL) v2. It is currently available for Linux, FreeBSD, Mac OS X and Windows (Cygwin). +%package data +Summary: Driving/drift racing simulation data +Group: Amusements/Games +Requires: vdrift = %{version} +BuildArch: noarch + +%description data +VDrift is a cross-platform, open source driving simulation made with drift +racing in mind. It's powered by the excellent Vamos physics engine. It is +released under the GNU General Public License (GPL) v2. It is currently +available for Linux, FreeBSD, Mac OS X and Windows (Cygwin). + +These are the data files. + %prep -%setup -qn vdrift-2009-02-15 +%setup -qn vdrift-2009-06-15 %ifarch ppc ppc64 sed -i 's/linuxx86/linuxppc/' src/SConscript @@ -73,8 +85,8 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %build -tar -xzf bullet-2.73-sp1.tgz -/bin/chmod -x bullet-2.73/src/LinearMath/*.h +#tar -xzf bullet-2.73-sp1.tgz +#/bin/chmod -x bullet-2.73/src/LinearMath/*.h #cd bullet-2.73 #./autogen.sh #./configure @@ -123,12 +135,18 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc docs/* %{_bindir}/vdrift -%{_datadir}/vdrift %{_datadir}/applications/fedora-vdrift.desktop %{_datadir}/icons/hicolor/32x32/apps/vdrift.png +%files data +%defattr(-,root,root,-) +%{_datadir}/vdrift %changelog +* Tue Jun 30 2009 Jon Ciesla - 20090615-1 +- Update to 2009-06-15. +- Split data into noarch subpackage, BZ 508079. + * Thu Feb 19 2009 Jon Ciesla - 20090215-1 - Update to 2009-02-15. - Includes patch. From 609247b13aaa65be7bdb2559abb3c0af2e21e748 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 1 Jul 2009 18:13:56 +0000 Subject: [PATCH 019/107] Whoops. --- vdrift-20071226-paths.patch | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/vdrift-20071226-paths.patch b/vdrift-20071226-paths.patch index 384ea48..552c8e4 100644 --- a/vdrift-20071226-paths.patch +++ b/vdrift-20071226-paths.patch @@ -1,13 +1,7 @@ ---- SConstruct 2008-02-13 11:01:59.000000000 -0600 -+++ SConstruct 2008-02-13 11:01:59.000000000 -0600 -@@ -35,8 +35,8 @@ - cppdefines = [] - default_settingsdir = ".vdrift" - default_prefix = "/usr" +--- SConstruct~ 2009-06-30 13:31:08.000000000 -0500 ++++ SConstruct 2009-06-30 13:37:08.000000000 -0500 +@@ -38,2 +38,2 @@ -default_datadir = "share/games/vdrift/data" --default_bindir = "share/games/vdrift/bin" +-default_bindir = "bin" +default_datadir = "/share/vdrift" +default_bindir = "/bin" - - # convenience var for identifying a windows platform - From 6e523d20430bd56fe66675e95c69c7446aadd956 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:48:47 +0000 Subject: [PATCH 020/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 878734f..780a526 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20090615 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -143,6 +143,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 20090615-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jun 30 2009 Jon Ciesla - 20090615-1 - Update to 2009-06-15. - Split data into noarch subpackage, BZ 508079. From e13be68313fdddcea8ada1124fc7985367708396 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 6 Aug 2009 16:55:04 +0000 Subject: [PATCH 021/107] Path fix. --- vdrift.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 780a526..d5e1b2b 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20090615 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -95,7 +95,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript #make #cd .. -CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 +CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin prefix=/usr use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 %install rm -rf %{buildroot} @@ -143,6 +143,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Thu Aug 06 2009 Jon Ciesla - 20090615-3 +- Path fix, BZ 515908. + * Sun Jul 26 2009 Fedora Release Engineering - 20090615-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 181470aff2355a21b6bff8ea61cf3d167c45f6fa Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:19 +0000 Subject: [PATCH 022/107] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e3fc5e..9f3498d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vdrift -# $Id$ +# $Id: Makefile,v 1.1 2008/02/19 17:22:35 kevin Exp $ NAME := vdrift SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e14ce0add4ef97265516a06dee54b0ba69c2b983 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:40 +0000 Subject: [PATCH 023/107] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e3fc5e..9f3498d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vdrift -# $Id$ +# $Id: Makefile,v 1.1 2008/02/19 17:22:35 kevin Exp $ NAME := vdrift SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9ad2220dcb2f5a1a3fd9b3808b95bd95a225a337 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 2 Jul 2010 12:11:28 +0000 Subject: [PATCH 024/107] FTBFS. --- vdrift-20090615-dsolink.patch | 11 +++++++++++ vdrift.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 vdrift-20090615-dsolink.patch diff --git a/vdrift-20090615-dsolink.patch b/vdrift-20090615-dsolink.patch new file mode 100644 index 0000000..b82afb7 --- /dev/null +++ b/vdrift-20090615-dsolink.patch @@ -0,0 +1,11 @@ +--- SConstruct~ 2010-07-01 16:07:10.000000000 -0500 ++++ SConstruct 2010-07-01 16:15:43.529291853 -0500 +@@ -138,7 +138,7 @@ + CPPPATH = ['#include', '#bullet'], + CCFLAGS = ['-Wall', '-Wextra', '-Wno-unused-parameter', '-pthread'], + LIBPATH = ['.', '#lib'], +- LINKFLAGS = ['-pthread'], ++ LINKFLAGS = ['-pthread','-lGLU','-lGL'], + CC = 'gcc', CXX = 'g++', + options = opts) + check_headers = ['asio.hpp', 'boost/bind.hpp', 'GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h'] diff --git a/vdrift.spec b/vdrift.spec index d5e1b2b..482c776 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20090615 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -22,6 +22,7 @@ Patch1: vdrift-20071226-paths.patch #Patch2: vdrift-20071226-gcc4.3.patch #Patch3: vdrift-20071226-jamfile.patch Patch4: vdrift-20090215-joepack-includes.patch +Patch5: vdrift-20090615-dsolink.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -76,6 +77,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript #%patch2 -p0 #%patch3 -p0 %patch4 -p0 +%patch5 -p0 #/bin/chmod -x src/gamestate.cpp #/bin/chmod -x src/logo.cpp @@ -143,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Mon Jun 28 2010 Jon Ciesla - 20090615-4 +- FTBFS fix, BZ 599767. + * Thu Aug 06 2009 Jon Ciesla - 20090615-3 - Path fix, BZ 515908. From 6378f24b671c2651ba01703c7cda921ef6435689 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:56:50 +0000 Subject: [PATCH 025/107] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9f3498d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdrift -# $Id: Makefile,v 1.1 2008/02/19 17:22:35 kevin Exp $ -NAME := vdrift -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7 From 5691c288e00225ed7998008c53ca4a8ba4c0062c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:56:53 +0000 Subject: [PATCH 026/107] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9f3498d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdrift -# $Id: Makefile,v 1.1 2008/02/19 17:22:35 kevin Exp $ -NAME := vdrift -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 47fcd4ea8103ae4bcea763e50783b5d9c04dd572 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 28 Oct 2010 10:06:20 -0500 Subject: [PATCH 027/107] New upstream. --- .gitignore | 1 + sources | 2 +- vdrift.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3f57316..87f17bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vdrift-2009-06-15-src.tar.bz2 +/vdrift-2010-06-30.tar.bz2 diff --git a/sources b/sources index 821c505..2231d6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcb6ae8117134e954be00c8f074167eb vdrift-2009-06-15-src.tar.bz2 +ddcaf90bb25f9ce9cc084d7f467d7b56 vdrift-2010-06-30.tar.bz2 diff --git a/vdrift.spec b/vdrift.spec index 482c776..8cf4c26 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,12 +1,12 @@ Name: vdrift -Version: 20090615 -Release: 4%{?dist} +Version: 20100630 +Release: 1%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games License: GPLv2+ URL: http://vdrift.net -Source0: %{name}-2009-06-15-src.tar.bz2 +Source0: %{name}-2010-06-30.tar.bz2 #Original upstream: #Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-06-15-src.tar.bz2 # Modified: @@ -66,7 +66,7 @@ These are the data files. %prep -%setup -qn vdrift-2009-06-15 +%setup -qn vdrift-2010-06-30 %ifarch ppc ppc64 sed -i 's/linuxx86/linuxppc/' src/SConscript @@ -145,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Thu Oct 28 2010 Jon Ciesla - 20100630-1 +- New upstream. + * Mon Jun 28 2010 Jon Ciesla - 20090615-4 - FTBFS fix, BZ 599767. From c0fab591c89a042906bd332471689a61551de314 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:14:01 -0600 Subject: [PATCH 028/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 8cf4c26..d861627 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20100630 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -145,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 20100630-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Oct 28 2010 Jon Ciesla - 20100630-1 - New upstream. From dfe225495c92b4c48d05b37dff60904938138d0b Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Sat, 19 Feb 2011 18:18:18 +0100 Subject: [PATCH 029/107] unbundle bullet --- vdrift-20071226-configure.patch | 10 --------- vdrift-20071226-gcc4.3.patch | 28 ----------------------- vdrift-20071226-jamfile.patch | 11 ---------- vdrift.spec | 39 ++++++++++++++++----------------- 4 files changed, 19 insertions(+), 69 deletions(-) delete mode 100644 vdrift-20071226-configure.patch delete mode 100644 vdrift-20071226-gcc4.3.patch delete mode 100644 vdrift-20071226-jamfile.patch diff --git a/vdrift-20071226-configure.patch b/vdrift-20071226-configure.patch deleted file mode 100644 index b8a3a6e..0000000 --- a/vdrift-20071226-configure.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- bullet-2.64/configure 2008-02-20 09:45:11.000000000 -0600 -+++ bullet-2.64/configure 2008-02-20 09:45:11.000000000 -0600 -@@ -5423,6 +5423,7 @@ - - case $host_cpu in - [Ii][3-9]86*|[Xx]86*) cs_host_cpu=x86 ;; -+ [ppc]*) cs_host_cpu=ppc ;; - *) cs_host_cpu=$host_cpu ;; - esac - cs_host_cpu_normalized="`echo "$cs_host_cpu" | $as_tr_cpp`" diff --git a/vdrift-20071226-gcc4.3.patch b/vdrift-20071226-gcc4.3.patch deleted file mode 100644 index df66354..0000000 --- a/vdrift-20071226-gcc4.3.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- include/utility.h 2008-02-14 19:22:46.000000000 +0100 -+++ include/utility.h 2008-02-14 19:22:46.000000000 +0100 -@@ -100,7 +100,7 @@ public: - void SetBox(float x1, float y1, float x2, float y2, const TEXTURE_HANDLE * const texid, int texsize, float opacity); - void SetButton(float x1, float y1, float x2, float y2, float sidewidth, TEXTURE_HANDLE * texid, float opacity); - void SetEllipse( float center_x, float center_y, float radius_x, float radius_y, float color_r, float color_g, float color_b, float opacity ); -- void SetQuad( float x1, float y2, float x2, float y2, float x3, float y3, float x4, float y4, TEXTURE_HANDLE * texid, float opacity); -+ void SetQuad( float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, TEXTURE_HANDLE * texid, float opacity); - void SetRotation(float r) {rotation=r;} - - void SetDraw(const bool newdraw) {draw=newdraw;} ---- include/serialization.h 2008-02-14 19:30:02.000000000 +0100 -+++ include/serialization.h 2008-02-14 19:30:02.000000000 +0100 -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - #include "simpletree.h" - -@@ -23,6 +24,7 @@ using std::ostream; - using std::ifstream; - using std::ofstream; - using std::pair; -+using std::memcmp; - - #define _GENERATEUID_(ptr,uidoutput) unsigned long long uidoutput = (size_t)ptr diff --git a/vdrift-20071226-jamfile.patch b/vdrift-20071226-jamfile.patch deleted file mode 100644 index 9823d41..0000000 --- a/vdrift-20071226-jamfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bullet-2.64/Jamfile.in 2008-02-15 06:55:36.000000000 -0600 -+++ bullet-2.64/Jamfile.in 2008-02-15 06:55:36.000000000 -0600 -@@ -60,7 +60,6 @@ - MsvcGenConfig GLEW.LIBS : glew32.lib ; - - SubInclude TOP src ; --SubInclude TOP Extras ; --SubInclude TOP Demos ; -+ - - Depends install_config : [ DoInstall bullet.pc : $(libdir)/pkgconfig ] ; diff --git a/vdrift.spec b/vdrift.spec index d861627..cff74fa 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20100630 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -19,20 +19,17 @@ Source1: vdrift.desktop Source2: vdrift.png Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch -#Patch2: vdrift-20071226-gcc4.3.patch -#Patch3: vdrift-20071226-jamfile.patch + Patch4: vdrift-20090215-joepack-includes.patch Patch5: vdrift-20090615-dsolink.patch +# patch to unbundle bullet, not upstreamable +Patch6: vdrift-2010-06-30-unbundle.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel -BuildRequires: SDL_net-devel BuildRequires: SDL_gfx-devel BuildRequires: scons BuildRequires: libGL-devel -BuildRequires: openal-devel -BuildRequires: freealut-devel -BuildRequires: jam BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: glew-devel @@ -67,6 +64,8 @@ These are the data files. %prep %setup -qn vdrift-2010-06-30 +# unbundling +rm -rf bullet %ifarch ppc ppc64 sed -i 's/linuxx86/linuxppc/' src/SConscript @@ -74,10 +73,10 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch0 -p0 %patch1 -p0 -#%patch2 -p0 -#%patch3 -p0 %patch4 -p0 %patch5 -p0 +%patch6 -p0 + #/bin/chmod -x src/gamestate.cpp #/bin/chmod -x src/logo.cpp @@ -87,17 +86,13 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %build -#tar -xzf bullet-2.73-sp1.tgz -#/bin/chmod -x bullet-2.73/src/LinearMath/*.h -#cd bullet-2.73 -#./autogen.sh -#./configure -#jam bulletcollision bulletmath -#cmake . -#make -#cd .. - -CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin prefix=/usr use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 +CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" \ + scons \ + bin=/bin prefix=/usr use_binreloc=0 \ + release=1 os_cc=1 os_cxx=1 os_cxxflags=1 \ + NLS=0 \ + verbose=1 \ + %{?_smp_mflags} %install rm -rf %{buildroot} @@ -145,6 +140,10 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Sat Feb 19 2011 Thomas Spura - 20100630-3 +- unbundle bullet (#621623) +- remove unneeded BR + * Mon Feb 07 2011 Fedora Release Engineering - 20100630-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 6f6a23f15b0d80429372327c0d0e79610ddef3f4 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Sat, 19 Feb 2011 18:23:02 +0100 Subject: [PATCH 030/107] add unbundling patch --- vdrift-2010-06-30-unbundle.patch | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 vdrift-2010-06-30-unbundle.patch diff --git a/vdrift-2010-06-30-unbundle.patch b/vdrift-2010-06-30-unbundle.patch new file mode 100644 index 0000000..38a32ab --- /dev/null +++ b/vdrift-2010-06-30-unbundle.patch @@ -0,0 +1,34 @@ +Index: include/cardynamics.h +=================================================================== +--- include/cardynamics.h ++++ include/cardynamics.h 2011-02-19 15:58:42.924055598 +0100 +@@ -20,6 +20,7 @@ + #include "collision_contact.h" + #include "cartelemetry.h" + #include "BulletDynamics/Dynamics/btActionInterface.h" ++#include "BulletDynamics/Dynamics/btRigidBody.h" + + class MODEL; + class CONFIGFILE; +--- src/SConscript.orig 2011-02-19 17:32:57.927061608 +0100 ++++ src/SConscript 2011-02-19 17:33:41.211055956 +0100 +@@ -233,7 +233,7 @@ + #--------------------------# + appdir = "" + vdrift_install = None +-common_libs = ['SDL_image', 'SDL_gfx', 'vorbisfile', 'vdriftbullet'] ++common_libs = ['SDL_image', 'SDL_gfx', 'vorbisfile'] + + if (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7') or (sys.platform == 'freebsd8'): + common_libs.append('libbulletcollision') +@@ -305,9 +305,8 @@ + # Compile Executable # + #--------------------# + #vdrift = local_env.Program(target='%s${EXECUTABLE_NAME}' % appdir, source=[src, vamosobjs, guiobjs]) +-vdriftbullet = local_env.Library('vdriftbullet', bullet_src); ++local_env.ParseConfig('pkg-config bullet --libs --cflags') + vdrift = local_env.Program(target='%s${EXECUTABLE_NAME}' % appdir, source=src) +-Depends(vdrift, vdriftbullet) + Default(Alias('vdrift', vdrift)) + + #---------# From 0742dd9ce2d701d5c6111142876b0aa8601a2b1f Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Sat, 19 Feb 2011 18:28:28 +0100 Subject: [PATCH 031/107] also require bullet, when unbundling it... --- vdrift.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdrift.spec b/vdrift.spec index cff74fa..455687c 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -35,6 +35,7 @@ BuildRequires: desktop-file-utils BuildRequires: glew-devel BuildRequires: boost-devel BuildRequires: asio-devel +BuildRequires: bullet-devel Requires: vdrift-data = %{version} #Obsoletes: vdrift-data <= 20071226 From 5085d1be95b5f84713bab16ff95f941a4856253e Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 12 May 2011 07:48:27 -0500 Subject: [PATCH 032/107] Bullet rebuild. --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 455687c..de120e7 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20100630 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -141,6 +141,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Thu May 12 2011 Jon Ciesla - 20100630-4 +- Rebuild for new bullet. + * Sat Feb 19 2011 Thomas Spura - 20100630-3 - unbundle bullet (#621623) - remove unneeded BR From 94a229ae6e0d4fe9a338b1e57efd79c0458fbf82 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 20 Jun 2011 20:59:41 -0400 Subject: [PATCH 033/107] Rebuild for new glew soname --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index de120e7..6dac6a2 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20100630 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -141,6 +141,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Mon Jun 20 2011 ajax@redhat.com - 20100630-5 +- Rebuild for new glew soname + * Thu May 12 2011 Jon Ciesla - 20100630-4 - Rebuild for new bullet. From cd93058f47049e29ccac9aedf6c24a87e2c0fe86 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 15 Jul 2011 08:18:35 -0500 Subject: [PATCH 034/107] SDL rebuild. --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 6dac6a2..0fe1ee6 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20100630 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -141,6 +141,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Fri Jul 15 2011 Jon Ciesla - 20100630-6 +- Bump and rebuild for new SDL. + * Mon Jun 20 2011 ajax@redhat.com - 20100630-5 - Rebuild for new glew soname From 313400b885b1bef7b762966dec70be1dec8f4bfa Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 19 Dec 2011 07:17:22 -0600 Subject: [PATCH 035/107] New bullet. --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 0fe1ee6..3c0b74f 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20100630 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -141,6 +141,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Mon Dec 19 2011 Jon Ciesla - 20100630-7 +- Bump and rebuild for new bullet.. + * Fri Jul 15 2011 Jon Ciesla - 20100630-6 - Bump and rebuild for new SDL. From 9e237b4690d979b93d86361a399383210bff441a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:49:30 -0600 Subject: [PATCH 036/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 3c0b74f..2b9582c 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20100630 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -141,6 +141,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 20100630-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Dec 19 2011 Jon Ciesla - 20100630-7 - Bump and rebuild for new bullet.. From 6c230aeb771f9cb617efa39f3fbe0c1c7a7dc748 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 19 Jan 2012 20:46:06 -0600 Subject: [PATCH 037/107] New upstream. --- .gitignore | 1 + sources | 2 +- vdrift-SConstruct.patch | 8 ++++---- vdrift.spec | 30 +++++++++++++++++++----------- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 87f17bd..2885f62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vdrift-2009-06-15-src.tar.bz2 /vdrift-2010-06-30.tar.bz2 +/vdrift-2011-10-22.tar.bz2 diff --git a/sources b/sources index 2231d6e..1b3d562 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddcaf90bb25f9ce9cc084d7f467d7b56 vdrift-2010-06-30.tar.bz2 +6f8806ab1be303e9e1e47522c9eee890 vdrift-2011-10-22.tar.bz2 diff --git a/vdrift-SConstruct.patch b/vdrift-SConstruct.patch index 1d7b368..30ef37a 100644 --- a/vdrift-SConstruct.patch +++ b/vdrift-SConstruct.patch @@ -1,6 +1,6 @@ ---- SConstruct 2007-04-16 10:25:43.000000000 -0500 -+++ SConstruct 2007-04-16 10:28:02.000000000 -0500 -@@ -352,8 +352,8 @@ +--- SConstruct~ 2011-09-01 04:22:58.000000000 -0500 ++++ SConstruct 2012-01-18 14:40:08.535239681 -0600 +@@ -507,8 +507,8 @@ # Subdirectories # #----------------# Export(['env', 'version', 'src_dir', 'bin_dir']) @@ -10,4 +10,4 @@ +# SConscript('data/SConscript') if 'src-package' in COMMAND_LINE_TARGETS: - SConscript('po/SConscript') + SConscript('tools/SConscript') diff --git a/vdrift.spec b/vdrift.spec index 2b9582c..cfac64f 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,12 +1,13 @@ Name: vdrift -Version: 20100630 -Release: 8%{?dist} +Version: 20111022 +Release: 1%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games -License: GPLv2+ +License: GPLv3+ URL: http://vdrift.net -Source0: %{name}-2010-06-30.tar.bz2 +#Source0: %{name}-2010-06-30.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-2011-10-22.tar.bz2 #Original upstream: #Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-06-15-src.tar.bz2 # Modified: @@ -21,9 +22,10 @@ Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch Patch4: vdrift-20090215-joepack-includes.patch -Patch5: vdrift-20090615-dsolink.patch +#Patch5: vdrift-20090615-dsolink.patch # patch to unbundle bullet, not upstreamable -Patch6: vdrift-2010-06-30-unbundle.patch +#Patch6: vdrift-2010-06-30-unbundle.patch +#Patch7: vdrift-2011-09-09-curl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -36,6 +38,8 @@ BuildRequires: glew-devel BuildRequires: boost-devel BuildRequires: asio-devel BuildRequires: bullet-devel +BuildRequires: libarchive-devel +BuildRequires: libcurl-devel Requires: vdrift-data = %{version} #Obsoletes: vdrift-data <= 20071226 @@ -64,7 +68,7 @@ These are the data files. %prep -%setup -qn vdrift-2010-06-30 +%setup -qn vdrift-2011-10-22 # unbundling rm -rf bullet @@ -75,9 +79,9 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch0 -p0 %patch1 -p0 %patch4 -p0 -%patch5 -p0 -%patch6 -p0 - +#%patch5 -p0 +#%patch6 -p0 +#%patch7 -p0 #/bin/chmod -x src/gamestate.cpp #/bin/chmod -x src/logo.cpp @@ -131,7 +135,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc docs/* +%doc README.md LICENSE %{_bindir}/vdrift %{_datadir}/applications/fedora-vdrift.desktop %{_datadir}/icons/hicolor/32x32/apps/vdrift.png @@ -141,6 +145,10 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Wed Jan 18 2012 Jon Ciesla - 20111022-1 +- New upstream. +- License changed to GPLv3+. + * Sat Jan 14 2012 Fedora Release Engineering - 20100630-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From f9c1f492e3519b4d3ea5dfb88c7b67c17884e54e Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 26 Jan 2012 13:39:25 +0100 Subject: [PATCH 038/107] Rebuilt for new libarchive --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index cfac64f..5b96aee 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20111022 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -145,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Thu Jan 26 2012 Tomas Bzatek - 20111022-2 +- Rebuilt for new libarchive + * Wed Jan 18 2012 Jon Ciesla - 20111022-1 - New upstream. - License changed to GPLv3+. From 1108411498413bde79dc1f81c53cc8534d2889a5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 14:30:10 -0600 Subject: [PATCH 039/107] - Rebuilt for c++ ABI breakage --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 5b96aee..2bffdf1 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20111022 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -145,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 20111022-3 +- Rebuilt for c++ ABI breakage + * Thu Jan 26 2012 Tomas Bzatek - 20111022-2 - Rebuilt for new libarchive From 2766a745958538b9e7a8fe5faafe7469d0956191 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 28 May 2012 15:39:55 -0400 Subject: [PATCH 040/107] Rebuild for bullet 2.80 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 2bffdf1..5834e9d 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20111022 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -145,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Mon May 28 2012 Rich Mattes - 20111022-4 +- Rebuild for bullet 2.80 + * Tue Feb 28 2012 Fedora Release Engineering - 20111022-3 - Rebuilt for c++ ABI breakage From f8b8b6b56f895610788c2288c92c737a4ecff27e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:31:15 -0500 Subject: [PATCH 041/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 5834e9d..f60a50f 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20111022 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -145,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 20111022-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon May 28 2012 Rich Mattes - 20111022-4 - Rebuild for bullet 2.80 From 2945a1e143831b7de286939b427afa95d5521629 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 26 Jul 2012 14:42:53 -0500 Subject: [PATCH 042/107] Boost rebuild. --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index f60a50f..47c5aab 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20111022 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -145,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Thu Jul 26 2012 Jon Ciesla - 20111022-6 +- Rebuilt for boost 1.50. + * Sun Jul 22 2012 Fedora Release Engineering - 20111022-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From be7048f9a4d71af72513b8f327dc0d7187e4c20a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 1 Aug 2012 10:01:27 -0400 Subject: [PATCH 043/107] Rebuild for new glew --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 47c5aab..199bd22 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20111022 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -145,6 +145,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Wed Aug 01 2012 Adam Jackson - 20111022-7 +- -Rebuild for new glew + * Thu Jul 26 2012 Jon Ciesla - 20111022-6 - Rebuilt for boost 1.50. From 0743232937df1b28a923513c9f515fb981504a51 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 9 Aug 2012 17:02:17 -0600 Subject: [PATCH 044/107] Fix changelog format typo --- vdrift.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 199bd22..231255d 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -146,7 +146,7 @@ rm -rf %{buildroot} %changelog * Wed Aug 01 2012 Adam Jackson - 20111022-7 -- -Rebuild for new glew +- Rebuild for new glew * Thu Jul 26 2012 Jon Ciesla - 20111022-6 - Rebuilt for boost 1.50. From 726c51f18cd10bc02b0af8222be30ceff0f4c1d4 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 13 Oct 2012 15:08:11 -0400 Subject: [PATCH 045/107] Rebuild for new bullet - Add fix for build error with new bullet --- vdrift-20111022-constfix.patch | 12 ++++++++++++ vdrift.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 vdrift-20111022-constfix.patch diff --git a/vdrift-20111022-constfix.patch b/vdrift-20111022-constfix.patch new file mode 100644 index 0000000..4ddafd4 --- /dev/null +++ b/vdrift-20111022-constfix.patch @@ -0,0 +1,12 @@ +diff -up ./src/dynamicsworld.cpp.bullet281 ./src/dynamicsworld.cpp +--- ./src/dynamicsworld.cpp.bullet281 2012-10-13 14:18:39.646677972 -0400 ++++ ./src/dynamicsworld.cpp 2012-10-13 14:18:52.874174967 -0400 +@@ -101,7 +101,7 @@ bool DynamicsWorld::castRay( + int patch_id = -1; + const BEZIER * b = 0; + const TRACKSURFACE * s = TRACKSURFACE::None(); +- btCollisionObject * c = 0; ++ const btCollisionObject * c = 0; + + MyRayResultCallback ray(origin, p, caster); + rayTest(origin, p, ray); diff --git a/vdrift.spec b/vdrift.spec index 231255d..451248e 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20111022 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -26,6 +26,7 @@ Patch4: vdrift-20090215-joepack-includes.patch # patch to unbundle bullet, not upstreamable #Patch6: vdrift-2010-06-30-unbundle.patch #Patch7: vdrift-2011-09-09-curl.patch +Patch8: vdrift-20111022-constfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -82,6 +83,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript #%patch5 -p0 #%patch6 -p0 #%patch7 -p0 +%patch8 -p0 #/bin/chmod -x src/gamestate.cpp #/bin/chmod -x src/logo.cpp @@ -145,6 +147,10 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Sat Oct 13 2012 Rich Mattes - 20111022-8 +- Rebuild for new bullet +- Add fix for build error with new bullet + * Wed Aug 01 2012 Adam Jackson - 20111022-7 - Rebuild for new glew From 252e822edd461203533489388a540481796707bd Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 24 Oct 2012 11:07:14 -0500 Subject: [PATCH 046/107] Latest upstream. --- .gitignore | 1 + sources | 2 +- vdrift-2012-07-22c_bullet281_patch.patch | 889 +++++++++++++++++++++++ vdrift.spec | 14 +- 4 files changed, 900 insertions(+), 6 deletions(-) create mode 100644 vdrift-2012-07-22c_bullet281_patch.patch diff --git a/.gitignore b/.gitignore index 2885f62..8395a82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vdrift-2009-06-15-src.tar.bz2 /vdrift-2010-06-30.tar.bz2 /vdrift-2011-10-22.tar.bz2 +/vdrift-2012-07-22.tar.bz2 diff --git a/sources b/sources index 1b3d562..3c09ddd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f8806ab1be303e9e1e47522c9eee890 vdrift-2011-10-22.tar.bz2 +fcfd6b65724d32dfe383df216d7afb74 vdrift-2012-07-22.tar.bz2 diff --git a/vdrift-2012-07-22c_bullet281_patch.patch b/vdrift-2012-07-22c_bullet281_patch.patch new file mode 100644 index 0000000..1f8a9ed --- /dev/null +++ b/vdrift-2012-07-22c_bullet281_patch.patch @@ -0,0 +1,889 @@ +--- data/skins/simple/menus/AssignControl Mon Jan 19 23:26:36 1970 ++++ data/skins/simple/menus/AssignControl Mon Jan 19 23:26:36 1970 +@@ -46,7 +46,7 @@ + image = white.png + color = 0.172, 0.161, 0.169 + alpha = 0.7 +-left = 0.2 +-right = 0.2 ++left = 0.1 ++right = 0.1 + top = 0.48 + height = 0.04 +--- data/skins/simple/menus/GuiControls Mon Jan 19 23:26:36 1970 ++++ data/skins/simple/menus/GuiControls Mon Jan 19 23:26:36 1970 +@@ -82,7 +82,7 @@ + onselect = controledit.string:gui_select:0 + onmoveleft = widget-01d + onmoveright = widget-01c +-onmoveup = widget-13b ++onmoveup = widget-08b + onmovedown = widget-02b + onfocus = widget-01b.sat:0.56 + onblur = widget-01b.sat:0.0 +@@ -101,7 +101,7 @@ + onselect = controledit.string:gui_select:1 + onmoveleft = widget-01b + onmoveright = widget-01d +-onmoveup = widget-13b ++onmoveup = widget-08b + onmovedown = widget-02c + onfocus = widget-01c.sat:0.56 + onblur = widget-01c.sat:0.0 +@@ -120,7 +120,7 @@ + onselect = controledit.string:gui_select:2 + onmoveleft = widget-01c + onmoveright = widget-01b +-onmoveup = widget-13b ++onmoveup = widget-08b + onmovedown = widget-02d + onfocus = widget-01d.sat:0.56 + onblur = widget-01d.sat:0.0 +--- data/skins/simple/menus/InGameMain Mon Jan 19 23:26:36 1970 ++++ data/skins/simple/menus/InGameMain Mon Jan 19 23:26:36 1970 +@@ -44,10 +44,10 @@ + + + [ widget-01 ] +-text = Return to Game ++text = Continue + fontsize = 0.035 + align = left +-tip = Leave the menu and unpause the game. ++tip = Leave the menu and continue the game. + onselect = ReturnToGame + onmoveup = widget-05 + onmovedown = widget-02 +@@ -72,7 +72,7 @@ + + + [ widget-02 ] +-text = Restart Game ++text = Restart + fontsize = 0.035 + align = left + tip = Restart this game using the same car and track settings. +@@ -100,7 +100,7 @@ + + + [ widget-03 ] +-text = Leave Game ++text = Abort + fontsize = 0.035 + align = left + tip = Leave game and return to the Main menu. +--- data/skins/simple/menus/InputDevice Mon Jan 19 23:26:36 1970 ++++ data/skins/simple/menus/InputDevice Mon Jan 19 23:26:36 1970 +@@ -82,7 +82,7 @@ + onselect = joystick.type.prev + onmoveleft = joystick.type.prev + onmoveright = joystick.type.next +-onmoveup = widget-13b ++onmoveup = widget-11b + onmovedown = widget-02b + onfocus = widget-01b.alpha:1 widget-01c.alpha:1 widget-01d.sat:0.56 + onblur = widget-01b.alpha:0 widget-01c.alpha:0 widget-01d.sat:0.0 +@@ -102,7 +102,7 @@ + onselect = joystick.type.next + onmoveleft = joystick.type.prev + onmoveright = joystick.type.next +-onmoveup = widget-13b ++onmoveup = widget-11b + onmovedown = widget-02b + onfocus = widget-01b.alpha:1 widget-01c.alpha:1 widget-01d.sat:0.56 + onblur = widget-01b.alpha:0 widget-01c.alpha:0 widget-01d.sat:0.0 +--- data/skins/simple/menus/SingleRace Mon Jan 19 23:26:36 1970 ++++ data/skins/simple/menus/SingleRace Mon Jan 19 23:26:36 1970 +@@ -860,7 +860,7 @@ + onmoveleft = game.vehicle_damage.prev + onmoveright = game.vehicle_damage.next + onmoveup = widget-14b +-onmovedown = widget-16 ++onmovedown = widget-16b + onfocus = widget-15b.alpha:1 widget-15c.alpha:1 widget-15d.sat:0.56 + onblur = widget-15b.alpha:0 widget-15c.alpha:0 widget-15d.sat:0.0 + focus = false +--- src/camera.h Mon Jan 19 23:26:36 1970 ++++ src/camera.h Mon Jan 19 23:26:36 1970 +@@ -16,7 +16,7 @@ + + const std::string & GetName() const { return name; } + +- void SetFOV(float value) { fov = std::max(40.0f, std::min(160.0f, value)); } ++ void SetFOV(float value) { fov = std::max(0.0f, std::min(120.0f, value)); } + + float GetFOV() const { return fov; } + +--- src/carcontrolmap_local.cpp Mon Jan 19 23:26:36 1970 ++++ src/carcontrolmap_local.cpp Mon Jan 19 23:26:36 1970 +@@ -830,16 +830,6 @@ + keycodes["y"] = SDLK_y; + keycodes["z"] = SDLK_z; + keycodes["DELETE"] = SDLK_DELETE; +- keycodes["KP0"] = SDLK_KP_0; +- keycodes["KP1"] = SDLK_KP_1; +- keycodes["KP2"] = SDLK_KP_2; +- keycodes["KP3"] = SDLK_KP_3; +- keycodes["KP4"] = SDLK_KP_4; +- keycodes["KP5"] = SDLK_KP_5; +- keycodes["KP6"] = SDLK_KP_6; +- keycodes["KP7"] = SDLK_KP_7; +- keycodes["KP8"] = SDLK_KP_8; +- keycodes["KP9"] = SDLK_KP_9; + keycodes["KP_PERIOD"] = SDLK_KP_PERIOD; + keycodes["KP_DIVIDE"] = SDLK_KP_DIVIDE; + keycodes["KP_MULTIPLY"] = SDLK_KP_MULTIPLY; +@@ -872,20 +862,50 @@ + keycodes["F14"] = SDLK_F14; + keycodes["F15"] = SDLK_F15; + keycodes["MENU"] = SDLK_MENU; +- keycodes["APPLICATION"] = SDLK_APPLICATION; +- keycodes["NUMLOCK"] = SDLK_NUMLOCKCLEAR; + keycodes["CAPSLOCK"] = SDLK_CAPSLOCK; +- keycodes["SCROLLLOCK"] = SDLK_SCROLLLOCK; + keycodes["RSHIFT"] = SDLK_RSHIFT; + keycodes["LSHIFT"] = SDLK_LSHIFT; + keycodes["RCTRL"] = SDLK_RCTRL; + keycodes["LCTRL"] = SDLK_LCTRL; + keycodes["RALT"] = SDLK_RALT; + keycodes["LALT"] = SDLK_LALT; ++#if SDL_VERSION_ATLEAST(2,0,0) ++ keycodes["KP0"] = SDLK_KP_0; ++ keycodes["KP1"] = SDLK_KP_1; ++ keycodes["KP2"] = SDLK_KP_2; ++ keycodes["KP3"] = SDLK_KP_3; ++ keycodes["KP4"] = SDLK_KP_4; ++ keycodes["KP5"] = SDLK_KP_5; ++ keycodes["KP6"] = SDLK_KP_6; ++ keycodes["KP7"] = SDLK_KP_7; ++ keycodes["KP8"] = SDLK_KP_8; ++ keycodes["KP9"] = SDLK_KP_9; ++ keycodes["COMPOSE"] = SDLK_APPLICATION; ++ keycodes["NUMLOCK"] = SDLK_NUMLOCKCLEAR; ++ keycodes["SCROLLLOCK"] = SDLK_SCROLLLOCK; + keycodes["RMETA"] = SDLK_RGUI; + keycodes["LMETA"] = SDLK_LGUI; + keycodes["LSUPER"] = SDLK_LGUI; + keycodes["RSUPER"] = SDLK_RGUI; ++#else ++ keycodes["KP0"] = SDLK_KP0; ++ keycodes["KP1"] = SDLK_KP1; ++ keycodes["KP2"] = SDLK_KP2; ++ keycodes["KP3"] = SDLK_KP3; ++ keycodes["KP4"] = SDLK_KP4; ++ keycodes["KP5"] = SDLK_KP5; ++ keycodes["KP6"] = SDLK_KP6; ++ keycodes["KP7"] = SDLK_KP7; ++ keycodes["KP8"] = SDLK_KP8; ++ keycodes["KP9"] = SDLK_KP9; ++ keycodes["COMPOSE"] = SDLK_COMPOSE; ++ keycodes["NUMLOCK"] = SDLK_NUMLOCK; ++ keycodes["SCROLLLOCK"] = SDLK_SCROLLOCK; ++ keycodes["LMETA"] = SDLK_LMETA; ++ keycodes["RMETA"] = SDLK_RMETA; ++ keycodes["LSUPER"] = SDLK_LSUPER; ++ keycodes["RSUPER"] = SDLK_RSUPER; ++#endif + return keycodes; + } + +--- src/game.cpp Mon Jan 19 23:26:36 1970 ++++ src/game.cpp Mon Jan 19 23:26:36 1970 +@@ -324,10 +324,6 @@ + + info_output << "Shutting down..." << std::endl; + +- // Stop the sound thread. +- if (sound.Enabled()) +- sound.Pause(true); +- + LeaveGame(); + + // Save settings first incase later deinits cause crashes. +@@ -499,16 +495,7 @@ + } + + // Connect game actions to gui options +- set_car_name.connect(gui.GetOption("game.car").signal_val); +- set_car_paint.connect(gui.GetOption("game.car_paint").signal_val); +- set_car_color_hue.connect(gui.GetOption("game.car_color_hue").signal_val); +- set_car_color_sat.connect(gui.GetOption("game.car_color_sat").signal_val); +- set_car_color_val.connect(gui.GetOption("game.car_color_val").signal_val); +- set_car_ai_type.connect(gui.GetOption("game.ai_type").signal_val); +- set_car_ai_level.connect(gui.GetOption("game.ai_level").signal_val); +- set_cars_num.connect(gui.GetOption("game.cars_num").signal_val); +- set_track_image.connect(gui.GetOption("game.track").signal_val); +- set_control.connect(gui.GetOption("controledit.string").signal_val); ++ BindActionsToGUI(); + + // Set options from game settings. + std::map optionmap; +@@ -531,7 +518,6 @@ + if (sound.Init(2048, info_output, error_output)) + { + sound.SetVolume(settings.GetSoundVolume()); +- //sound.Pause(false); + content.setSound(sound.GetDeviceInfo()); + } + else +@@ -932,22 +918,18 @@ + if (sound.Enabled()) + { + bool pause_sound = pause || gui.Active(); +- sound.Pause(pause_sound); +- if (!pause_sound) +- { +- PROFILER.beginBlock("sound"); +- MATHVECTOR pos; +- QUATERNION rot; +- if (active_camera) +- { +- pos = active_camera->GetPosition(); +- rot = active_camera->GetOrientation(); +- } +- sound.SetListenerPosition(pos[0], pos[1], pos[2]); +- sound.SetListenerRotation(rot[0], rot[1], rot[2], rot[3]); +- sound.Update(); +- PROFILER.endBlock("sound"); +- } ++ PROFILER.beginBlock("sound"); ++ MATHVECTOR pos; ++ QUATERNION rot; ++ if (active_camera) ++ { ++ pos = active_camera->GetPosition(); ++ rot = active_camera->GetOrientation(); ++ } ++ sound.SetListenerPosition(pos[0], pos[1], pos[2]); ++ sound.SetListenerRotation(rot[0], rot[1], rot[2], rot[3]); ++ sound.Update(pause_sound); ++ PROFILER.endBlock("sound"); + } + + //PROFILER.beginBlock("force-feedback"); +@@ -1798,9 +1780,12 @@ + // get car start position marker for camera setup + MATHVECTOR car_pos = track.GetStart(0).first; + +- // car setup ++ // clear previous car + cars.clear(); + ++ // remove previous car sounds ++ sound.Update(true); ++ + if (LoadCar( + cars_name[car_edit_id], + cars_paint[car_edit_id], +@@ -1808,14 +1793,13 @@ + car_pos, track.GetStart(0).second, + true, false)) + { +- // update car ++ // set car + CAR & car = cars.back(); + dynamics.update(timestep); + car.Update(timestep); + +- // process car sound sources +- // should they be loaded for garage car in the first place? +- sound.Update(); ++ // add car sounds ++ sound.Update(true); + + // use car shape center for camera setup + car_pos = car.GetPosition(); +@@ -1958,7 +1942,7 @@ + } + + if (numreplays == 0) +- replaylist.push_back(std::make_pair("", "None")); ++ replaylist.push_back(std::make_pair("none", "None")); + + settings.SetSelectedReplay(replaylist.begin()->first); + } +@@ -2411,6 +2395,7 @@ + + track.Clear(); + cars.clear(); ++ sound.Update(true); + hud.SetVisible(false); + inputgraph.Hide(); + trackmap.Unload(); +@@ -2419,7 +2404,6 @@ + pause = false; + race_laps = 0; + tire_smoke.Clear(); +- sound.Update(); + } + + void GAME::StartPractice() +@@ -2473,7 +2457,7 @@ + + void GAME::StartReplay() + { +- if (!settings.GetSelectedReplay().empty() && !NewGame(true)) ++ if (settings.GetSelectedReplay() != "none" && !NewGame(true)) + { + gui.ActivatePage("ReplayStartError", 0.25, error_output); + } +@@ -2855,6 +2839,19 @@ + EditControl(); + } + ++void GAME::BindActionsToGUI() ++{ ++ set_car_name.connect(gui.GetOption("game.car").signal_val); ++ set_car_paint.connect(gui.GetOption("game.car_paint").signal_val); ++ set_car_color_hue.connect(gui.GetOption("game.car_color_hue").signal_val); ++ set_car_color_sat.connect(gui.GetOption("game.car_color_sat").signal_val); ++ set_car_color_val.connect(gui.GetOption("game.car_color_val").signal_val); ++ set_car_ai_type.connect(gui.GetOption("game.ai_type").signal_val); ++ set_car_ai_level.connect(gui.GetOption("game.ai_level").signal_val); ++ set_cars_num.connect(gui.GetOption("game.cars_num").signal_val); ++ set_track_image.connect(gui.GetOption("game.track").signal_val); ++ set_control.connect(gui.GetOption("controledit.string").signal_val); ++} + + void GAME::RegisterActions() + { +--- src/game.h Mon Jan 19 23:26:36 1970 ++++ src/game.h Mon Jan 19 23:26:36 1970 +@@ -201,6 +201,7 @@ + void SetTrackImage(const std::string & value); + void SetControl(const std::string & value); + ++ void BindActionsToGUI(); + void RegisterActions(); + void InitActionMap(std::map & actionmap); + +--- src/sound.cpp Mon Jan 19 23:26:36 1970 ++++ src/sound.cpp Mon Jan 19 23:26:36 1970 +@@ -30,17 +30,20 @@ + } + + SOUND::SOUND() : ++ log_error(0), + deviceinfo(0, 0, 0, 0), ++ sound_volume(0), + initdone(false), + disable(false), +- paused(true), + sampler_lock(0), + source_lock(0), ++ set_pause(true), + max_active_sources(64), + sources_num(0), +- samplers_num(0) ++ sources_pause(true), ++ samplers_num(0), ++ samplers_pause(true) + { +- volume_filter.SetFilterOrder0(1.0); + sources.reserve(64); + samplers.reserve(64); + } +@@ -115,11 +118,13 @@ + } + + deviceinfo = SOUNDINFO(samples, frequency, channels, bytespersample); +- ++ log_error = &error_output; + initdone = true; +- + SetVolume(1.0); + ++ // enable sound, run callback ++ SDL_PauseAudio(false); ++ + return true; + } + +@@ -138,46 +143,21 @@ + disable = true; + } + +-void SOUND::Pause(bool value) +-{ +- if (paused != value) +- { +- SDL_PauseAudio(value); +- paused = value; +- } +-} +- +-void SOUND::Update() ++void SOUND::Update(bool pause) + { + if (disable) return; + ++ set_pause = pause; ++ + GetSourceChanges(); + + ProcessSourceStop(); + +- ProcessSourceRemove(); +- + ProcessSources(); + +- SetSamplerChanges(); +- +- // short circuit if paused(sound thread blocked) +- if (paused) +- { +- GetSamplerChanges(); +- +- ProcessSamplerAdd(); +- +- ProcessSamplerRemove(); +- +- SetSourceChanges(); +- +- GetSourceChanges(); +- +- ProcessSourceStop(); ++ ProcessSourceRemove(); + +- ProcessSourceRemove(); +- } ++ SetSamplerChanges(); + } + + void SOUND::SetMaxActiveSources(size_t value) +@@ -192,18 +172,24 @@ + size_t id = item_num; + if (id < items.size()) + { ++ // reuse free slot + size_t idn = items[id].id; + if (idn != id) + { +- // swap back redirected item ++ // free slot is redirecting to other item + assert(idn < id); ++ ++ // swap redirected item back + items[id] = items[idn]; ++ ++ // use now free slot + id = idn; + } + items[id] = item; + } + else + { ++ // add item to new slot + items.push_back(item); + } + items[id].id = id; +@@ -217,9 +203,14 @@ + inline void RemoveItem(size_t id, std::vector & items, size_t & item_num) + { + assert(id < items.size()); ++ ++ // get item true id + size_t idn = items[id].id; + assert(idn < item_num); ++ ++ // pop last item + --item_num; ++ + // swap last item with current + size_t idl = items[item_num].id; + if (idl != item_num) +@@ -270,14 +261,13 @@ + ns.id = -1; + sampler_add.getFirst().push_back(ns); + +- //std::cout << "Add sound source: " << id << " " << buffer->GetName() << std::endl; ++ //*log_error << "Add sound source: " << id << " " << buffer->GetName() << std::endl; + return id; + } + + void SOUND::RemoveSource(size_t id) + { +- // notify sound thread, it will notify main thread to remove the source +- //std::cout << "To be removed source: " << id << " " << sources[sources[id].id].buffer->GetName() << std::endl; ++ // notify sound and main thread to remove the source/sampler + sampler_remove.getFirst().push_back(id); + } + +@@ -343,14 +333,13 @@ + + void SOUND::SetVolume(float value) + { +- volume_filter.SetFilterOrder0(clamp(value, 0.f, 1.f)); ++ sound_volume = value; + } + + void SOUND::GetSourceChanges() + { + Lock(source_lock); + source_stop.swapFirst(); +- source_remove.swapFirst(); + Unlock(source_lock); + } + +@@ -368,17 +357,18 @@ + + void SOUND::ProcessSourceRemove() + { +- std::vector & sremove = source_remove.getFirst(); ++ std::vector & sremove = sampler_remove.getFirst(); + for (size_t i = 0; i < sremove.size(); ++i) + { + size_t id = sremove[i]; + assert(id < sources.size()); ++ + size_t idn = sources[id].id; + assert(idn < sources_num); +- //std::cout << "Remove sound source: " << id << " " << sources[idn].buffer->GetName() << std::endl; ++ //*log_error << "Remove sound source: " << id << " " << sources[idn].buffer->GetName() << std::endl; ++ + RemoveItem(id, sources, sources_num); + } +- sremove.clear(); + } + + void SOUND::ProcessSources() +@@ -436,8 +426,11 @@ + } + } + +- supdate[i].gain1 = gain1 * Sampler::denom; +- supdate[i].gain2 = gain2 * Sampler::denom; ++ // fade sound volume ++ float volume = set_pause ? 0 : sound_volume; ++ ++ supdate[i].gain1 = volume * gain1 * Sampler::denom; ++ supdate[i].gain2 = volume * gain2 * Sampler::denom; + supdate[i].pitch = src.pitch * Sampler::denom; + } + +@@ -471,6 +464,7 @@ + if (sampler_update.getFirst().size()) sampler_update.swapFirst(); + if (sampler_add.getFirst().size()) sampler_add.swapFirst(); + if (sampler_remove.getFirst().size()) sampler_remove.swapFirst(); ++ sources_pause = set_pause; + Unlock(sampler_lock); + } + +@@ -478,33 +472,41 @@ + { + Lock(sampler_lock); + sampler_update.swapLast(); +- sampler_remove.swapLast(); + sampler_add.swapLast(); ++ sampler_remove.swapLast(); ++ samplers_fade = samplers_pause != sources_pause; ++ samplers_pause = sources_pause; + Unlock(sampler_lock); + } + + void SOUND::ProcessSamplerUpdate() + { + std::vector & supdate = sampler_update.getLast(); +- if (samplers_num == supdate.size()) ++ if (supdate.empty()) return; ++ ++ assert(samplers_num == supdate.size()); ++ for (size_t i = 0; i < samplers_num; ++i) + { +- for (size_t i = 0; i < samplers_num; ++i) +- { +- samplers[i].gain1 = supdate[i].gain1; +- samplers[i].gain2 = supdate[i].gain2; +- samplers[i].pitch = supdate[i].pitch; +- } ++ samplers[i].gain1 = supdate[i].gain1; ++ samplers[i].gain2 = supdate[i].gain2; ++ samplers[i].pitch = supdate[i].pitch; + } + supdate.clear(); + } + + void SOUND::ProcessSamplers(unsigned char *stream, int len) + { +- // set buffers and clear stream ++ // clear stream ++ memset(stream, 0, len); ++ ++ // pause sampling ++ if (samplers_pause && !samplers_fade) ++ return; ++ ++ // init sampling buffers + int len4 = len / 4; + buffer1.resize(len4); + buffer2.resize(len4); +- memset(stream, 0, len); + + // run samplers + short * sstream = (short*)stream; +@@ -519,13 +521,17 @@ + { + SampleAndAdvanceWithPitch16bit(smp, &buffer1[0], &buffer2[0], len4); + +- volume_filter.Filter(&buffer1[0], &buffer2[0], len4); +- + for (int n = 0; n < len4; ++n) + { + int pos = n * 2; +- sstream[pos] = clamp(sstream[pos] + buffer1[n], -32768, 32767); +- sstream[pos + 1] = clamp(sstream[pos + 1] + buffer2[n], -32768, 32767); ++ int val1 = sstream[pos] + buffer1[n]; ++ int val2 = sstream[pos + 1] + buffer2[n]; ++ ++ val1 = clamp(val1, -32768, 32767); ++ val2 = clamp(val2, -32768, 32767); ++ ++ sstream[pos] = val1; ++ sstream[pos + 1] = val2; + } + } + else +@@ -541,17 +547,13 @@ + void SOUND::ProcessSamplerRemove() + { + std::vector & sremove = sampler_remove.getLast(); +- if (!sremove.empty()) ++ for (size_t i = 0; i < sremove.size(); ++i) + { +- for (size_t i = 0; i < sremove.size(); ++i) +- { +- size_t id = sremove[i]; +- assert(id < samplers.size()); +- RemoveItem(id, samplers, samplers_num); +- } +- source_remove.getLast() = sremove; +- sremove.clear(); ++ size_t id = sremove[i]; ++ assert(id < samplers.size()); ++ RemoveItem(id, samplers, samplers_num); + } ++ sremove.clear(); + } + + void SOUND::ProcessSamplerAdd() +@@ -589,7 +591,6 @@ + { + Lock(source_lock); + if (source_stop.getLast().size()) source_stop.swapLast(); +- if (source_remove.getLast().size()) source_remove.swapLast(); + Unlock(source_lock); + } + +@@ -600,12 +601,12 @@ + + GetSamplerChanges(); + ++ ProcessSamplerAdd(); ++ + ProcessSamplerUpdate(); + + ProcessSamplers(stream, len); + +- ProcessSamplerAdd(); +- + ProcessSamplerRemove(); + + SetSourceChanges(); +@@ -622,9 +623,10 @@ + assert(len > 0); + assert(sampler.buffer); + +- // if not playing, fill output buffers with silence, should not happen ++ // if not playing, fill output buffers with silence + if (!sampler.playing) + { ++ // should be dealt with before getting here + assert(0); + for (int i = 0; i < len; ++i) + { +--- src/sound.h Mon Jan 19 23:26:36 1970 ++++ src/sound.h Mon Jan 19 23:26:36 1970 +@@ -33,11 +33,8 @@ + // disable sound + void Disable(); + +- // pause sound +- void Pause(bool value); +- + // commit state changes +- void Update(); ++ void Update(bool pause); + + // active sources limit can be adjusted at runtime + void SetMaxActiveSources(size_t value); +@@ -69,14 +66,14 @@ + void SetVolume(float value); + + private: ++ std::ostream * log_error; + SOUNDINFO deviceinfo; +- SOUNDFILTER volume_filter; + MATHVECTOR listener_pos; + MATHVECTOR listener_vel; + QUATERNION listener_rot; ++ float sound_volume; + bool initdone; + bool disable; +- bool paused; + + // state structs + struct Source +@@ -95,8 +92,8 @@ + + struct Sampler + { +- static const int denom = 1 << 15; +- static const int max_gain_delta = (denom * 100) / 44100; ++ static const int denom = 32768; ++ static const int max_gain_delta = (denom * 173) / 44100; // 256 samples from min to max gain + const SOUNDBUFFER * buffer; + int samples_per_channel; + int sample_pos; +@@ -135,21 +132,24 @@ + TrippleBuffer sampler_update; + TrippleBuffer sampler_add; + TrippleBuffer sampler_remove; +- TrippleBuffer source_remove; + TrippleBuffer source_stop; + SDL_mutex * sampler_lock; + SDL_mutex * source_lock; ++ bool set_pause; + + // sound sources state + std::vector sources_active; + std::vector sources; + size_t max_active_sources; + size_t sources_num; ++ bool sources_pause; + + // sound thread state + std::vector buffer1, buffer2; + std::vector samplers; + size_t samplers_num; ++ bool samplers_pause; ++ bool samplers_fade; + + // main thread methods + void GetSourceChanges(); +--- src/texture.cpp Mon Jan 19 23:26:36 1970 ++++ src/texture.cpp Mon Jan 19 23:26:36 1970 +@@ -179,6 +179,7 @@ + else + { + error << "Error loading texture file: " + path << std::endl; ++ error << IMG_GetError(); + return false; + } + +@@ -303,6 +304,7 @@ + else + { + error << "Error loading texture file: " + path + " (" + cubefiles[i] + ")" << std::endl; ++ error << IMG_GetError(); + return false; + } + +@@ -477,6 +479,7 @@ + if (!orig_surface) + { + error << "Error loading texture file: " << path << std::endl; ++ error << IMG_GetError(); + return false; + } + } +--- src/cardynamics.cpp Mon Jan 19 23:26:36 1970 ++++ src/cardynamics.cpp Mon Jan 19 23:26:36 1970 +@@ -1791,23 +1791,29 @@ + + bool CARDYNAMICS::WheelContactCallback( + btManifoldPoint& cp, +- const btCollisionObject* colObj0, +- int partId0, ++ const btCollisionObjectWrapper* col0, ++ int part0, + int index0, +- const btCollisionObject* colObj1, +- int partId1, ++ const btCollisionObjectWrapper* col1, ++ int part1, + int index1) + { +- // cars are fracture bodies, wheel is a cylinder shape +- const btCollisionShape* shape = colObj0->getCollisionShape(); +- if ((colObj0->getInternalType() & CO_FRACTURE_TYPE) && ++#if (BT_BULLET_VERSION < 281) ++ const btCollisionObject* obj = col0; ++ const btCollisionShape* shape = obj->getCollisionShape(); ++ const btCollisionShape* rootshape = obj->getRootCollisionShape(); ++#else ++ const btCollisionObject* obj = col0->getCollisionObject(); ++ const btCollisionShape* shape = col0->getCollisionShape(); ++ const btCollisionShape* rootshape = obj->getCollisionShape(); ++#endif ++ if ((obj->getInternalType() & CO_FRACTURE_TYPE) && + (shape->getShapeType() == CYLINDER_SHAPE_PROXYTYPE)) + { +- // is contact within contact patch? +- const btCompoundShape* car = static_cast(colObj0->getRootCollisionShape()); +- const btCylinderShapeX* wheel = static_cast(shape); +- btVector3 contactPoint = cp.m_localPointA - car->getChildTransform(cp.m_index0).getOrigin(); +- if (-direction::up.dot(contactPoint) > 0.5 * wheel->getRadius()) ++ const btCompoundShape* carshape = static_cast(rootshape); ++ const btCylinderShapeX* wheelshape = static_cast(shape); ++ btVector3 contactPoint = cp.m_localPointA - carshape->getChildTransform(cp.m_index0).getOrigin(); ++ if (-direction::up.dot(contactPoint) > 0.5 * wheelshape->getRadius()) + { + // break contact (hack) + cp.m_normalWorldOnB = btVector3(0, 0, 0); +--- src/cardynamics.h Mon Jan 19 23:26:36 1970 ++++ src/cardynamics.h Mon Jan 19 23:26:36 1970 +@@ -25,6 +25,12 @@ + class FractureBody; + class PTree; + ++#if (BT_BULLET_VERSION < 281) ++#define btCollisionObjectWrapper btCollisionObject ++#else ++struct btCollisionObjectWrapper; ++#endif ++ + class CARDYNAMICS : public btActionInterface + { + friend class PERFORMANCE_TESTING; +@@ -151,11 +157,11 @@ + + static bool WheelContactCallback( + btManifoldPoint& cp, +- const btCollisionObject* colObj0, +- int partId0, ++ const btCollisionObjectWrapper* col0, ++ int part0, + int index0, +- const btCollisionObject* colObj1, +- int partId1, ++ const btCollisionObjectWrapper* col1, ++ int part1, + int index1); + + protected: +--- src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970 ++++ src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970 +@@ -221,6 +221,7 @@ + + void DynamicsWorld::fractureCallback() + { ++#if (BT_BULLET_VERSION < 281) + m_activeConnections.resize(0); + + int numManifolds = getDispatcher()->getNumManifolds(); +@@ -268,4 +269,5 @@ + btRigidBody* child = body->updateConnection(con_id); + if (child) addRigidBody(child); + } ++#endif + } diff --git a/vdrift.spec b/vdrift.spec index 451248e..f34352b 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,13 +1,13 @@ Name: vdrift -Version: 20111022 -Release: 8%{?dist} +Version: 20120722 +Release: 1%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games License: GPLv3+ URL: http://vdrift.net #Source0: %{name}-2010-06-30.tar.bz2 -Source0: http://downloads.sourceforge.net/%{name}/%{name}-2011-10-22.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-2012-07-22.tar.bz2 #Original upstream: #Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-06-15-src.tar.bz2 # Modified: @@ -20,13 +20,13 @@ Source1: vdrift.desktop Source2: vdrift.png Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch - Patch4: vdrift-20090215-joepack-includes.patch #Patch5: vdrift-20090615-dsolink.patch # patch to unbundle bullet, not upstreamable #Patch6: vdrift-2010-06-30-unbundle.patch #Patch7: vdrift-2011-09-09-curl.patch Patch8: vdrift-20111022-constfix.patch +Patch9: vdrift-2012-07-22c_bullet281_patch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -69,7 +69,7 @@ These are the data files. %prep -%setup -qn vdrift-2011-10-22 +%setup -qn VDrift # unbundling rm -rf bullet @@ -84,6 +84,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript #%patch6 -p0 #%patch7 -p0 %patch8 -p0 +%patch9 -p0 #/bin/chmod -x src/gamestate.cpp #/bin/chmod -x src/logo.cpp @@ -147,6 +148,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Wed Oct 24 2012 Jon Ciesla - 20120722-1 +- Latest upstream. + * Sat Oct 13 2012 Rich Mattes - 20111022-8 - Rebuild for new bullet - Add fix for build error with new bullet From 53e4fb7b414bb0820db04536752defe0a5ae1596 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 13 Dec 2012 13:43:17 -0500 Subject: [PATCH 047/107] Rebuild for glew 1.9.0 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index f34352b..9c73c35 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -148,6 +148,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Thu Dec 13 2012 Adam Jackson - 20120722-2 +- Rebuild for glew 1.9.0 + * Wed Oct 24 2012 Jon Ciesla - 20120722-1 - Latest upstream. From d630ffa9ffe633330fad80130ac0e7ba976b4308 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 17 Jan 2013 14:22:20 +0100 Subject: [PATCH 048/107] Rebuilt for new libarchive --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 9c73c35..109b071 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -148,6 +148,9 @@ rm -rf %{buildroot} %{_datadir}/vdrift %changelog +* Thu Jan 17 2013 Tomas Bzatek - 20120722-3 +- Rebuilt for new libarchive + * Thu Dec 13 2012 Adam Jackson - 20120722-2 - Rebuild for glew 1.9.0 From a7623d8fe55862785cc58ba3ca7a266e162fb1a5 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sat, 9 Feb 2013 21:45:16 +0530 Subject: [PATCH 049/107] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 --- vdrift.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 109b071..87b43a8 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -103,7 +103,6 @@ CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" \ %{?_smp_mflags} %install -rm -rf %{buildroot} # As described in the README scons install is broken so DIY install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_datadir} @@ -112,7 +111,7 @@ cp -pr data %{buildroot}%{_datadir}/vdrift rm `find %{buildroot}%{_datadir}/vdrift -name "SConscript*"` mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} @@ -132,22 +131,20 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %doc README.md LICENSE %{_bindir}/vdrift -%{_datadir}/applications/fedora-vdrift.desktop +%{_datadir}/applications/vdrift.desktop %{_datadir}/icons/hicolor/32x32/apps/vdrift.png %files data -%defattr(-,root,root,-) %{_datadir}/vdrift %changelog +* Sat Feb 09 2013 Parag Nemade - 20120722-4 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 + * Thu Jan 17 2013 Tomas Bzatek - 20120722-3 - Rebuilt for new libarchive From 44a47287d65f4467fffc175201cacce33caabeb7 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 30 Jul 2013 14:52:16 +0200 Subject: [PATCH 050/107] Rebuild for boost 1.54.0 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 87b43a8..ef2cf47 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Tue Jul 30 2013 Petr Machata - 20120722-5 +- Rebuild for boost 1.54.0 + * Sat Feb 09 2013 Parag Nemade - 20120722-4 - Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 From 54e7f71aa88b536c7a036ac484bed86f8f759c0a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:03:44 -0500 Subject: [PATCH 051/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index ef2cf47..f4d2ec9 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 20120722-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 30 2013 Petr Machata - 20120722-5 - Rebuild for boost 1.54.0 From f3ba85b7663bee10e5bf6858226d7fc9b51517fd Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 18 Nov 2013 10:52:55 +1000 Subject: [PATCH 052/107] rebuilt for GLEW 1.10 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index f4d2ec9..bdf04e3 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Mon Nov 18 2013 Dave Airlie - 20120722-7 +- rebuilt for GLEW 1.10 + * Sun Aug 04 2013 Fedora Release Engineering - 20120722-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d5bbcb9f1d9882619e5db9d429941853a1373854 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sun, 9 Feb 2014 15:05:00 -0500 Subject: [PATCH 053/107] Rebuild for bullet-2.82 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index bdf04e3..193b3f5 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Sun Feb 09 2014 Rich Mattes - 20120722-8 +- Rebuild for bullet-2.82 + * Mon Nov 18 2013 Dave Airlie - 20120722-7 - rebuilt for GLEW 1.10 From 3e45d9ebfdf4d66c96813d39806f578dfa9a9089 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 May 2014 13:47:55 +0200 Subject: [PATCH 054/107] Rebuild for boost 1.55.0 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 193b3f5..384ac0c 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Fri May 23 2014 Petr Machata - 20120722-9 +- Rebuild for boost 1.55.0 + * Sun Feb 09 2014 Rich Mattes - 20120722-8 - Rebuild for bullet-2.82 From 74eef0fafb34021048952ceed79b39df25b01456 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:29:43 -0500 Subject: [PATCH 055/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 384ac0c..112996c 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 20120722-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 Petr Machata - 20120722-9 - Rebuild for boost 1.55.0 From 30ca27c3e5864b87a016d2bc19edea6fbb07c41c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 13 Jun 2014 10:56:58 +0200 Subject: [PATCH 056/107] Rebuild for new SDL_gfx --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 112996c..465cb57 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Fri Jun 13 2014 Hans de Goede - 20120722-11 +- Rebuild for new SDL_gfx + * Sun Jun 08 2014 Fedora Release Engineering - 20120722-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From bca6e83ef0afc6123293704b4bd312bdead20279 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:45:32 +0000 Subject: [PATCH 057/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 465cb57..4f069cd 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 20120722-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 13 2014 Hans de Goede - 20120722-11 - Rebuild for new SDL_gfx From 1b959630faf93ef04d8a42717125c78b5a2bc96e Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 Jan 2015 07:11:40 +0100 Subject: [PATCH 058/107] Rebuild for boost 1.57.0 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 4f069cd..236e8e8 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -142,6 +142,9 @@ fi %{_datadir}/vdrift %changelog +* Tue Jan 27 2015 Petr Machata - 20120722-13 +- Rebuild for boost 1.57.0 + * Mon Aug 18 2014 Fedora Release Engineering - 20120722-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 6c38fac9759803e122e5181095e598758734d619 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 16:45:40 +0000 Subject: [PATCH 059/107] Add an AppData file for the software center --- vdrift.spec | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 236e8e8..c23fc71 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -119,6 +119,43 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps install -p -m 644 %{SOURCE2} \ %{buildroot}%{_datadir}/icons/hicolor/32x32/apps +# Register as an application to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < + + + + vdrift.desktop + CC0-1.0 + Drifting oriented racing simulation + +

+ VDrift is a racing simulation oriented to drifting. +

+

+ It features over 45 tracks based on famous real-world circuits and 45 cars + based on real-world vehicles. +

+ + http://vdrift.net + + + + + + +EOF + %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -135,6 +172,7 @@ fi %files %doc README.md LICENSE %{_bindir}/vdrift +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/vdrift.desktop %{_datadir}/icons/hicolor/32x32/apps/vdrift.png @@ -142,6 +180,9 @@ fi %{_datadir}/vdrift %changelog +* Thu Mar 26 2015 Richard Hughes - 20120722-14 +- Add an AppData file for the software center + * Tue Jan 27 2015 Petr Machata - 20120722-13 - Rebuild for boost 1.57.0 From 606c64d4c1ea589489b8bf189afe5b90d25df668 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:26:21 +0200 Subject: [PATCH 060/107] Rebuilt for GCC 5 C++11 ABI change --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index c23fc71..c62d4a7 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -180,6 +180,9 @@ fi %{_datadir}/vdrift %changelog +* Sat May 02 2015 Kalev Lember - 20120722-15 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Mar 26 2015 Richard Hughes - 20120722-14 - Add an AppData file for the software center From b25ad5b4ed66ce3e8af7215261d498af497db20c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:55:19 +0000 Subject: [PATCH 061/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index c62d4a7..c5eb49e 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20120722 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -180,6 +180,9 @@ fi %{_datadir}/vdrift %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 20120722-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 20120722-15 - Rebuilt for GCC 5 C++11 ABI change From 3114de553b4fc676e0bac9859bc09dadff50936e Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 29 Jun 2015 10:50:06 -0500 Subject: [PATCH 062/107] 2014-10-20 --- .gitignore | 1 + sources | 2 +- vdrift-20071226-paths.patch | 18 ++++++++++++------ vdrift.spec | 28 ++++++++++++++++------------ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 8395a82..4717a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ vdrift-2009-06-15-src.tar.bz2 /vdrift-2010-06-30.tar.bz2 /vdrift-2011-10-22.tar.bz2 /vdrift-2012-07-22.tar.bz2 +/vdrift-2014-10-20.tar.bz2 diff --git a/sources b/sources index 3c09ddd..f6538b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcfd6b65724d32dfe383df216d7afb74 vdrift-2012-07-22.tar.bz2 +524751fab341b36f59d0747ea52f0c41 vdrift-2014-10-20.tar.bz2 diff --git a/vdrift-20071226-paths.patch b/vdrift-20071226-paths.patch index 552c8e4..807f337 100644 --- a/vdrift-20071226-paths.patch +++ b/vdrift-20071226-paths.patch @@ -1,7 +1,13 @@ ---- SConstruct~ 2009-06-30 13:31:08.000000000 -0500 -+++ SConstruct 2009-06-30 13:37:08.000000000 -0500 -@@ -38,2 +38,2 @@ +--- SConstruct~ 2014-08-04 07:43:04.000000000 -0500 ++++ SConstruct 2015-06-29 06:29:31.549810839 -0500 +@@ -29,8 +29,8 @@ + # define a list of CPPDEFINES so they don't get mangled... + cppdefines = [] + default_settingsdir = ".vdrift" +-default_prefix = "/usr/local" -default_datadir = "share/games/vdrift/data" --default_bindir = "bin" -+default_datadir = "/share/vdrift" -+default_bindir = "/bin" ++default_prefix = "/usr" ++default_datadir = "share/vdrift" + default_localedir = "share/locale" + default_bindir = "bin" + diff --git a/vdrift.spec b/vdrift.spec index c5eb49e..cf0baad 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,13 +1,13 @@ Name: vdrift -Version: 20120722 -Release: 16%{?dist} +Version: 20141020 +Release: 1%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games License: GPLv3+ URL: http://vdrift.net #Source0: %{name}-2010-06-30.tar.bz2 -Source0: http://downloads.sourceforge.net/%{name}/%{name}-2012-07-22.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-2014-10-20.tar.bz2 #Original upstream: #Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-06-15-src.tar.bz2 # Modified: @@ -18,15 +18,15 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-2012-07-22.tar.bz2 Source1: vdrift.desktop Source2: vdrift.png -Patch0: vdrift-SConstruct.patch +#Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch Patch4: vdrift-20090215-joepack-includes.patch #Patch5: vdrift-20090615-dsolink.patch # patch to unbundle bullet, not upstreamable #Patch6: vdrift-2010-06-30-unbundle.patch #Patch7: vdrift-2011-09-09-curl.patch -Patch8: vdrift-20111022-constfix.patch -Patch9: vdrift-2012-07-22c_bullet281_patch.patch +#Patch8: vdrift-20111022-constfix.patch +#Patch9: vdrift-2012-07-22c_bullet281_patch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -69,7 +69,7 @@ These are the data files. %prep -%setup -qn VDrift +%setup -qn vdrift # unbundling rm -rf bullet @@ -77,14 +77,14 @@ rm -rf bullet sed -i 's/linuxx86/linuxppc/' src/SConscript %endif -%patch0 -p0 +#%patch0 -p0 %patch1 -p0 %patch4 -p0 #%patch5 -p0 #%patch6 -p0 #%patch7 -p0 -%patch8 -p0 -%patch9 -p0 +#%patch8 -p0 +#%patch9 -p0 #/bin/chmod -x src/gamestate.cpp #/bin/chmod -x src/logo.cpp @@ -180,6 +180,10 @@ fi %{_datadir}/vdrift %changelog +* Sun Jun 28 2015 Jon Ciesla - 20141020-1 +- Latest upstream. +- Fixed changelog dates. + * Fri Jun 19 2015 Fedora Release Engineering - 20120722-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -326,8 +330,8 @@ fi - Passing compiler flags to scons. - Turned off translations. -* Mon Apr 04 2007 Jon Ciesla - 20070323-2 +* Mon Apr 02 2007 Jon Ciesla - 20070323-2 - Split out minimal data. -* Thu Mar 28 2007 Jon Ciesla - 20070323-1 +* Thu Mar 29 2007 Jon Ciesla - 20070323-1 - Initial packaging From 9832c4361f186e750421fca43ed6ad49634880df Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 29 Jun 2015 11:12:20 -0500 Subject: [PATCH 063/107] BR fix. --- vdrift.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index cf0baad..9decc16 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -28,8 +28,8 @@ Patch4: vdrift-20090215-joepack-includes.patch #Patch8: vdrift-20111022-constfix.patch #Patch9: vdrift-2012-07-22c_bullet281_patch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) -BuildRequires: SDL-devel -BuildRequires: SDL_image-devel +BuildRequires: SDL2-devel +BuildRequires: SDL2_image-devel BuildRequires: SDL_gfx-devel BuildRequires: scons BuildRequires: libGL-devel From 0e0748a1c7af0e8608e6c9f7d9496466b6ce5de8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 19:43:42 +0200 Subject: [PATCH 064/107] rebuild for Boost 1.58 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 9decc16..a8b1eef 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -180,6 +180,9 @@ fi %{_datadir}/vdrift %changelog +* Wed Jul 22 2015 David Tardon - 20141020-2 +- rebuild for Boost 1.58 + * Sun Jun 28 2015 Jon Ciesla - 20141020-1 - Latest upstream. - Fixed changelog dates. From ee7da27d0f6fee0dc975a4a854b991d8f81f6c66 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 13:31:54 -0500 Subject: [PATCH 065/107] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index a8b1eef..68d1e0a 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -180,6 +180,9 @@ fi %{_datadir}/vdrift %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 20141020-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 20141020-2 - rebuild for Boost 1.58 From ee73d1b5cf2f130d9747e7b5d756c616d503ac0e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 16 Jan 2016 01:48:57 +0000 Subject: [PATCH 066/107] Rebuilt for Boost 1.60 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 68d1e0a..a5df839 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -180,6 +180,9 @@ fi %{_datadir}/vdrift %changelog +* Sat Jan 16 2016 Jonathan Wakely - 20141020-4 +- Rebuilt for Boost 1.60 + * Wed Jul 29 2015 Fedora Release Engineering - 20141020-3 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From 91cd4977889a817993e5f73b3a256194cb6a57a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:37:52 +0000 Subject: [PATCH 067/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index a5df839..ff35245 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -180,6 +180,9 @@ fi %{_datadir}/vdrift %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 20141020-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Jonathan Wakely - 20141020-4 - Rebuilt for Boost 1.60 From dfc2b94138898103c80cf6f800436e968ed04519 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Tue, 9 Feb 2016 19:16:07 -0500 Subject: [PATCH 068/107] Fix build error causing failures with gcc6 An ostream was being written to itself when logging an error message; from context it looks like the error message should have been logging a filename and writing the ostream to itself was an error. This commit adds a patch to fix the issue and allow the package to build under gcc6. --- vdrift-20141020-gcc6.patch | 12 ++++++++++++ vdrift.spec | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 vdrift-20141020-gcc6.patch diff --git a/vdrift-20141020-gcc6.patch b/vdrift-20141020-gcc6.patch new file mode 100644 index 0000000..0c846fd --- /dev/null +++ b/vdrift-20141020-gcc6.patch @@ -0,0 +1,12 @@ +diff -up ./src/graphics/model_obj.cpp.gcc6 ./src/graphics/model_obj.cpp +--- ./src/graphics/model_obj.cpp.gcc6 2016-02-09 19:02:50.282554264 -0500 ++++ ./src/graphics/model_obj.cpp 2016-02-09 19:03:10.566308088 -0500 +@@ -221,7 +221,7 @@ bool ModelObj::Save(const std::string & + std::ofstream f(strFileName.c_str()); + if (!f) + { +- error_output << "Error opening file for writing: " << error_output << endl; ++ error_output << "Error opening file for writing: " << strFileName << endl; + return false; + } + diff --git a/vdrift.spec b/vdrift.spec index ff35245..fa01f83 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -27,6 +27,9 @@ Patch4: vdrift-20090215-joepack-includes.patch #Patch7: vdrift-2011-09-09-curl.patch #Patch8: vdrift-20111022-constfix.patch #Patch9: vdrift-2012-07-22c_bullet281_patch.patch +# Fix bug where ostream was being written instead of filename to ostream +# Not submitted upstream +Patch10: vdrift-20141020-gcc6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL2-devel BuildRequires: SDL2_image-devel @@ -85,6 +88,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript #%patch7 -p0 #%patch8 -p0 #%patch9 -p0 +%patch10 -p0 -b .gcc6 #/bin/chmod -x src/gamestate.cpp #/bin/chmod -x src/logo.cpp From d47d6f57f67a32766d6174d05d6097e8e2200789 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Jan 2017 09:08:58 +0000 Subject: [PATCH 069/107] Rebuilt for Boost 1.63 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index fa01f83..258c249 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -184,6 +184,9 @@ fi %{_datadir}/vdrift %changelog +* Fri Jan 27 2017 Jonathan Wakely - 20141020-6 +- Rebuilt for Boost 1.63 + * Fri Feb 05 2016 Fedora Release Engineering - 20141020-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b788c1767ebbb93738985f52ed5601e9f06cbad5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:00:41 +0000 Subject: [PATCH 070/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 258c249..9effec2 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -184,6 +184,9 @@ fi %{_datadir}/vdrift %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 20141020-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Jonathan Wakely - 20141020-6 - Rebuilt for Boost 1.63 From 3e118c326aea1a5b7dc097611ef338e97776085e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:44:34 +0000 Subject: [PATCH 071/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 9effec2..686bb95 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -184,6 +184,9 @@ fi %{_datadir}/vdrift %changelog +* Mon May 15 2017 Fedora Release Engineering - 20141020-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 20141020-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1d66c1d5cd2ef9129959e04cad835eabab89c0c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:15:01 +0000 Subject: [PATCH 072/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 686bb95..0a84486 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -184,6 +184,9 @@ fi %{_datadir}/vdrift %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 20141020-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 15 2017 Fedora Release Engineering - 20141020-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From fd7ae3164fcb204887b3bf95ed008163e95f22fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:01:58 +0000 Subject: [PATCH 073/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 0a84486..e7d7692 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -184,6 +184,9 @@ fi %{_datadir}/vdrift %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 20141020-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 20141020-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From cbeb36b98100ba7699d8cb2813a045ea3373781c Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 18 Dec 2017 13:04:00 -0500 Subject: [PATCH 074/107] Rebuild for bullet-2.87 --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index e7d7692..7d29c35 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -184,6 +184,9 @@ fi %{_datadir}/vdrift %changelog +* Mon Dec 18 2017 Rich Mattes - 20141020-11 +- Rebuild for bullet-2.87 + * Thu Aug 03 2017 Fedora Release Engineering - 20141020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From f481b7a4a75a7588112d54d51f283d1f12a3c147 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 18 Dec 2017 13:22:11 -0500 Subject: [PATCH 075/107] Force scons to be run with python 2 --- vdrift.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 7d29c35..7168e5c 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -44,6 +44,7 @@ BuildRequires: asio-devel BuildRequires: bullet-devel BuildRequires: libarchive-devel BuildRequires: libcurl-devel +BuildRequires: python2 Requires: vdrift-data = %{version} #Obsoletes: vdrift-data <= 20071226 @@ -99,7 +100,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %build CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" \ - scons \ + python2 %{_bindir}/scons \ bin=/bin prefix=/usr use_binreloc=0 \ release=1 os_cc=1 os_cxx=1 os_cxxflags=1 \ NLS=0 \ @@ -186,6 +187,7 @@ fi %changelog * Mon Dec 18 2017 Rich Mattes - 20141020-11 - Rebuild for bullet-2.87 +- Force scons to run with python 2 * Thu Aug 03 2017 Fedora Release Engineering - 20141020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From d3b2d2a195894ba8abfe70d3b36e114a2ca203cb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:45:03 +0100 Subject: [PATCH 076/107] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- vdrift.spec | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 7168e5c..6702c4d 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -161,19 +161,6 @@ SentUpstream: 2014-09-25 EOF -%post -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - - %files %doc README.md LICENSE %{_bindir}/vdrift @@ -185,6 +172,9 @@ fi %{_datadir}/vdrift %changelog +* Thu Jan 18 2018 Igor Gnatenko - 20141020-12 +- Remove obsolete scriptlets + * Mon Dec 18 2017 Rich Mattes - 20141020-11 - Rebuild for bullet-2.87 - Force scons to run with python 2 From daa1261711ee3c5af96f7bcd865d6264018785b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:25:19 +0000 Subject: [PATCH 077/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 6702c4d..6ffb398 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -172,6 +172,9 @@ EOF %{_datadir}/vdrift %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 20141020-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 20141020-12 - Remove obsolete scriptlets From 7159bb6f1f84cb496e1d7fadd538f5db8c183076 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:47:25 +0100 Subject: [PATCH 078/107] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- vdrift.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 6ffb398..227e3b5 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -30,7 +30,6 @@ Patch4: vdrift-20090215-joepack-includes.patch # Fix bug where ostream was being written instead of filename to ostream # Not submitted upstream Patch10: vdrift-20141020-gcc6.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL2-devel BuildRequires: SDL2_image-devel BuildRequires: SDL_gfx-devel From eff7c80936d57d0a0bd4f5ce206d470a88a7505f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:28:53 +0000 Subject: [PATCH 079/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 227e3b5..3a60f81 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Driving/drift racing simulation Group: Amusements/Games @@ -171,6 +171,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 20141020-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 20141020-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a886ee252c894ec094540bfd7fd3abf11966c7c4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 21 Aug 2018 10:19:00 -0500 Subject: [PATCH 080/107] FTBFS work. --- vdrift.spec | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 3a60f81..0c94f74 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,33 +3,15 @@ Version: 20141020 Release: 14%{?dist} Summary: Driving/drift racing simulation -Group: Amusements/Games License: GPLv3+ URL: http://vdrift.net -#Source0: %{name}-2010-06-30.tar.bz2 Source0: http://downloads.sourceforge.net/%{name}/%{name}-2014-10-20.tar.bz2 -#Original upstream: -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-06-15-src.tar.bz2 -# Modified: -# cd docs -# rm SConscript INSTALL -# cd .. -# rm -rf tools/win - Source1: vdrift.desktop Source2: vdrift.png -#Patch0: vdrift-SConstruct.patch Patch1: vdrift-20071226-paths.patch Patch4: vdrift-20090215-joepack-includes.patch -#Patch5: vdrift-20090615-dsolink.patch -# patch to unbundle bullet, not upstreamable -#Patch6: vdrift-2010-06-30-unbundle.patch -#Patch7: vdrift-2011-09-09-curl.patch -#Patch8: vdrift-20111022-constfix.patch -#Patch9: vdrift-2012-07-22c_bullet281_patch.patch -# Fix bug where ostream was being written instead of filename to ostream -# Not submitted upstream Patch10: vdrift-20141020-gcc6.patch +BuildRequires: mesa-libGL-devel BuildRequires: SDL2-devel BuildRequires: SDL2_image-devel BuildRequires: SDL_gfx-devel @@ -44,11 +26,9 @@ BuildRequires: bullet-devel BuildRequires: libarchive-devel BuildRequires: libcurl-devel BuildRequires: python2 +BuildRequires: gcc Requires: vdrift-data = %{version} -#Obsoletes: vdrift-data <= 20071226 -#Provides: vdrift-data = %{version}-%{release} - %description VDrift is a cross-platform, open source driving simulation made with drift @@ -58,7 +38,6 @@ available for Linux, FreeBSD, Mac OS X and Windows (Cygwin). %package data Summary: Driving/drift racing simulation data -Group: Amusements/Games Requires: vdrift = %{version} BuildArch: noarch @@ -80,19 +59,10 @@ rm -rf bullet sed -i 's/linuxx86/linuxppc/' src/SConscript %endif -#%patch0 -p0 %patch1 -p0 %patch4 -p0 -#%patch5 -p0 -#%patch6 -p0 -#%patch7 -p0 -#%patch8 -p0 -#%patch9 -p0 %patch10 -p0 -b .gcc6 -#/bin/chmod -x src/gamestate.cpp -#/bin/chmod -x src/logo.cpp -#/bin/chmod -x src/objects.cpp /bin/chmod -x src/main.cpp /bin/chmod -x src/game.cpp From 2ff375f69de5779bfb6df57cc2d1960faa5e0541 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 21 Aug 2018 12:40:48 -0500 Subject: [PATCH 081/107] Fix FTBFS. --- vdrift.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 0c94f74..58a5518 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -16,7 +16,6 @@ BuildRequires: SDL2-devel BuildRequires: SDL2_image-devel BuildRequires: SDL_gfx-devel BuildRequires: scons -BuildRequires: libGL-devel BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: glew-devel @@ -26,7 +25,7 @@ BuildRequires: bullet-devel BuildRequires: libarchive-devel BuildRequires: libcurl-devel BuildRequires: python2 -BuildRequires: gcc +BuildRequires: gcc-c++ Requires: vdrift-data = %{version} From cd7bf3177c63b1526a794d40a08d52056606fd7e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 11 Sep 2018 08:01:02 -0500 Subject: [PATCH 082/107] Fix shebang handling. --- vdrift.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 58a5518..f3f18ef 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -24,7 +24,7 @@ BuildRequires: asio-devel BuildRequires: bullet-devel BuildRequires: libarchive-devel BuildRequires: libcurl-devel -BuildRequires: python2 +BuildRequires: python2-devel /usr/bin/pathfix.py BuildRequires: gcc-c++ Requires: vdrift-data = %{version} @@ -61,6 +61,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch1 -p0 %patch4 -p0 %patch10 -p0 -b .gcc6 +pathfix.py -pni "%{__python2} %{py2_shbang_opts}" . /bin/chmod -x src/main.cpp /bin/chmod -x src/game.cpp @@ -130,7 +131,8 @@ SentUpstream: 2014-09-25 EOF %files -%doc README.md LICENSE +%license LICENSE +%doc README.md %{_bindir}/vdrift %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/vdrift.desktop @@ -140,6 +142,9 @@ EOF %{_datadir}/vdrift %changelog +* Mon Sep 10 2018 Gwyn Ciesla - 20171020-15 +- Fix shebang. + * Sat Jul 14 2018 Fedora Release Engineering - 20141020-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 91bfb6394e324f71412f5ea45483ad5cdc1b4ec1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:11:42 +0000 Subject: [PATCH 083/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index f3f18ef..5a0a784 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -142,6 +142,9 @@ EOF %{_datadir}/vdrift %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 20141020-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Sep 10 2018 Gwyn Ciesla - 20171020-15 - Fix shebang. From e9a08b351faf1c8c79533bcf6b1c6d80100f169a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:53:27 +0000 Subject: [PATCH 084/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 5a0a784..dadd7cb 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -142,6 +142,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 20141020-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 20141020-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f6a085689859d52df31e78561c5469d6e9cb4c02 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sat, 3 Aug 2019 12:46:15 -0500 Subject: [PATCH 085/107] Fix FTBFS. --- vdrift-python3.patch | 83 ++++++++++++++++++++++++++++++++++++++++++++ vdrift.spec | 16 ++++++--- 2 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 vdrift-python3.patch diff --git a/vdrift-python3.patch b/vdrift-python3.patch new file mode 100644 index 0000000..7e81fe0 --- /dev/null +++ b/vdrift-python3.patch @@ -0,0 +1,83 @@ +--- SConstruct~ 2019-08-02 16:20:27.000000000 -0500 ++++ SConstruct 2019-08-02 16:20:59.703964106 -0500 +@@ -518,7 +518,7 @@ + Export(['env', 'version', 'src_dir', 'bin_dir']) + if 'install' in COMMAND_LINE_TARGETS: + if not os.path.isfile('data/SConscript'): +- raise 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' ++ print 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' + SConscript('data/SConscript') + # desktop appdata installation + install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop') +--- SConstruct.bak 2019-08-02 16:25:00.652707553 -0500 ++++ SConstruct 2019-08-02 16:25:21.205679013 -0500 +@@ -92,9 +92,9 @@ + + for a in env['universal']: + if not sdk_path: +- print 'Building a universal binary require access to an ' + \ ++ print('Building a universal binary require access to an ' + \ + 'SDK that has universal \nbinary support.If you know ' + \ +- 'the location of such an SDK, specify it using the \n"SDK" option' ++ 'the location of such an SDK, specify it using the \n"SDK" option') + Exit(1) + env.Append( CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a] ) + +@@ -141,11 +141,11 @@ + CC = 'gcc', CXX = 'g++', + options = opts) + # Take environment variables into account +- if os.environ.has_key('CXX'): ++ if 'CXX' in os.environ: + env['CXX'] = os.environ['CXX'] +- if os.environ.has_key('CXXFLAGS'): ++ if 'CXXFLAGS' in os.environ: + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +- if os.environ.has_key('LDFLAGS'): ++ if 'LDFLAGS' in os.environ: + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'curl/curl.h', 'bullet/btBulletCollisionCommon.h', 'bullet/btBulletDynamicsCommon.h'] + check_libs = [] +@@ -232,7 +232,7 @@ + def tarballer (target, source, env): + cmd = 'tar -jcf "%s" -C "%s" .' % ( str(target[0]), str(source[0]) ) + #cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~' " +- print 'running ', cmd, ' ... ' ++ print('running ', cmd, ' ... ') + p = os.popen (cmd) + return p.close () + +@@ -362,11 +362,11 @@ + conf = Configure(env) + for header in check_headers: + if not conf.CheckCXXHeader(header): +- print 'You do not have the %s headers installed. Exiting.' % header ++ print('You do not have the %s headers installed. Exiting.' % header) + Exit(1) + for lib in check_libs: + if not conf.CheckLibWithHeader(lib[0], lib[1], 'C', lib[2]): +- print lib[3] ++ print(lib[3]) + Exit(1) + + env = conf.Finish() +@@ -518,7 +518,7 @@ + Export(['env', 'version', 'src_dir', 'bin_dir']) + if 'install' in COMMAND_LINE_TARGETS: + if not os.path.isfile('data/SConscript'): +- print 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' ++ print('VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.') + SConscript('data/SConscript') + # desktop appdata installation + install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop') +--- src/SConscript~ 2014-09-04 15:06:21.000000000 -0500 ++++ src/SConscript 2019-08-03 09:51:18.019800029 -0500 +@@ -151,7 +151,7 @@ + utils.cpp + window.cpp""") + +-src.sort(lambda x, y: cmp(x.lower(),y.lower())) ++#src.sort(lambda x, y: cmp(x.lower(),y.lower())) + + #------------------------# + # Copy Build Environment # diff --git a/vdrift.spec b/vdrift.spec index dadd7cb..160b4a6 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -11,11 +11,12 @@ Source2: vdrift.png Patch1: vdrift-20071226-paths.patch Patch4: vdrift-20090215-joepack-includes.patch Patch10: vdrift-20141020-gcc6.patch +Patch11: vdrift-python3.patch BuildRequires: mesa-libGL-devel BuildRequires: SDL2-devel BuildRequires: SDL2_image-devel BuildRequires: SDL_gfx-devel -BuildRequires: scons +BuildRequires: python3-scons BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: glew-devel @@ -24,8 +25,9 @@ BuildRequires: asio-devel BuildRequires: bullet-devel BuildRequires: libarchive-devel BuildRequires: libcurl-devel -BuildRequires: python2-devel /usr/bin/pathfix.py +BuildRequires: python3-devel /usr/bin/pathfix.py BuildRequires: gcc-c++ +BuildRequires: subversion Requires: vdrift-data = %{version} @@ -61,7 +63,8 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch1 -p0 %patch4 -p0 %patch10 -p0 -b .gcc6 -pathfix.py -pni "%{__python2} %{py2_shbang_opts}" . +%patch11 -p0 +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . /bin/chmod -x src/main.cpp /bin/chmod -x src/game.cpp @@ -69,7 +72,7 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" . %build CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" \ - python2 %{_bindir}/scons \ + python3 %{_bindir}/scons \ bin=/bin prefix=/usr use_binreloc=0 \ release=1 os_cc=1 os_cxx=1 os_cxxflags=1 \ NLS=0 \ @@ -142,6 +145,9 @@ EOF %{_datadir}/vdrift %changelog +* Fri Aug 02 2019 Gwyn Ciesla - 20141020-18 +- Fix FTBFS. + * Sat Jul 27 2019 Fedora Release Engineering - 20141020-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 78d732562903db967d47d2caeaa5d7ef496d2743 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 09:55:00 -0500 Subject: [PATCH 086/107] Adjust for flatpak --- vdrift.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 160b4a6..ba3ddd1 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -25,7 +25,7 @@ BuildRequires: asio-devel BuildRequires: bullet-devel BuildRequires: libarchive-devel BuildRequires: libcurl-devel -BuildRequires: python3-devel /usr/bin/pathfix.py +BuildRequires: python3-devel BuildRequires: gcc-c++ BuildRequires: subversion @@ -73,7 +73,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . %build CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" \ python3 %{_bindir}/scons \ - bin=/bin prefix=/usr use_binreloc=0 \ + bin=/bin prefix=%{_prefix} use_binreloc=0 \ release=1 os_cc=1 os_cxx=1 os_cxxflags=1 \ NLS=0 \ verbose=1 \ From dff7d07a25fcb444c1b8367b6726f6a95e9d3768 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 10:26:31 -0500 Subject: [PATCH 087/107] Another path fix. --- vdrift.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index ba3ddd1..b5226e6 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -72,7 +72,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . %build CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" \ - python3 %{_bindir}/scons \ + scons \ bin=/bin prefix=%{_prefix} use_binreloc=0 \ release=1 os_cc=1 os_cxx=1 os_cxxflags=1 \ NLS=0 \ From bb7a2f68f698159f1821f6a6ae309230302a2192 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 10:44:01 -0500 Subject: [PATCH 088/107] Ugh. --- vdrift.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index b5226e6..3d10789 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -72,7 +72,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . %build CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" \ - scons \ + scons-3 \ bin=/bin prefix=%{_prefix} use_binreloc=0 \ release=1 os_cc=1 os_cxx=1 os_cxxflags=1 \ NLS=0 \ From f4a5ce258b10d6a728aa63658d6f9eb750bee023 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:03:01 +0000 Subject: [PATCH 089/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 3d10789..3ea3c8d 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -145,6 +145,9 @@ EOF %{_datadir}/vdrift %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 20141020-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Gwyn Ciesla - 20141020-18 - Fix FTBFS. From 3f5bbdda3a0111f965b39d7d425e9a0980bdd6c7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 23 Mar 2020 11:33:27 -0500 Subject: [PATCH 090/107] Fix crash. --- vdrift-20090615-dsolink.patch | 11 - vdrift-2010-06-30-unbundle.patch | 34 - vdrift-20111022-constfix.patch | 12 - vdrift-2012-07-22c_bullet281_patch.patch | 889 ----------------------- vdrift-SConstruct.patch | 13 - vdrift.spec | 13 +- 6 files changed, 5 insertions(+), 967 deletions(-) delete mode 100644 vdrift-20090615-dsolink.patch delete mode 100644 vdrift-2010-06-30-unbundle.patch delete mode 100644 vdrift-20111022-constfix.patch delete mode 100644 vdrift-2012-07-22c_bullet281_patch.patch delete mode 100644 vdrift-SConstruct.patch diff --git a/vdrift-20090615-dsolink.patch b/vdrift-20090615-dsolink.patch deleted file mode 100644 index b82afb7..0000000 --- a/vdrift-20090615-dsolink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SConstruct~ 2010-07-01 16:07:10.000000000 -0500 -+++ SConstruct 2010-07-01 16:15:43.529291853 -0500 -@@ -138,7 +138,7 @@ - CPPPATH = ['#include', '#bullet'], - CCFLAGS = ['-Wall', '-Wextra', '-Wno-unused-parameter', '-pthread'], - LIBPATH = ['.', '#lib'], -- LINKFLAGS = ['-pthread'], -+ LINKFLAGS = ['-pthread','-lGLU','-lGL'], - CC = 'gcc', CXX = 'g++', - options = opts) - check_headers = ['asio.hpp', 'boost/bind.hpp', 'GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h'] diff --git a/vdrift-2010-06-30-unbundle.patch b/vdrift-2010-06-30-unbundle.patch deleted file mode 100644 index 38a32ab..0000000 --- a/vdrift-2010-06-30-unbundle.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: include/cardynamics.h -=================================================================== ---- include/cardynamics.h -+++ include/cardynamics.h 2011-02-19 15:58:42.924055598 +0100 -@@ -20,6 +20,7 @@ - #include "collision_contact.h" - #include "cartelemetry.h" - #include "BulletDynamics/Dynamics/btActionInterface.h" -+#include "BulletDynamics/Dynamics/btRigidBody.h" - - class MODEL; - class CONFIGFILE; ---- src/SConscript.orig 2011-02-19 17:32:57.927061608 +0100 -+++ src/SConscript 2011-02-19 17:33:41.211055956 +0100 -@@ -233,7 +233,7 @@ - #--------------------------# - appdir = "" - vdrift_install = None --common_libs = ['SDL_image', 'SDL_gfx', 'vorbisfile', 'vdriftbullet'] -+common_libs = ['SDL_image', 'SDL_gfx', 'vorbisfile'] - - if (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7') or (sys.platform == 'freebsd8'): - common_libs.append('libbulletcollision') -@@ -305,9 +305,8 @@ - # Compile Executable # - #--------------------# - #vdrift = local_env.Program(target='%s${EXECUTABLE_NAME}' % appdir, source=[src, vamosobjs, guiobjs]) --vdriftbullet = local_env.Library('vdriftbullet', bullet_src); -+local_env.ParseConfig('pkg-config bullet --libs --cflags') - vdrift = local_env.Program(target='%s${EXECUTABLE_NAME}' % appdir, source=src) --Depends(vdrift, vdriftbullet) - Default(Alias('vdrift', vdrift)) - - #---------# diff --git a/vdrift-20111022-constfix.patch b/vdrift-20111022-constfix.patch deleted file mode 100644 index 4ddafd4..0000000 --- a/vdrift-20111022-constfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./src/dynamicsworld.cpp.bullet281 ./src/dynamicsworld.cpp ---- ./src/dynamicsworld.cpp.bullet281 2012-10-13 14:18:39.646677972 -0400 -+++ ./src/dynamicsworld.cpp 2012-10-13 14:18:52.874174967 -0400 -@@ -101,7 +101,7 @@ bool DynamicsWorld::castRay( - int patch_id = -1; - const BEZIER * b = 0; - const TRACKSURFACE * s = TRACKSURFACE::None(); -- btCollisionObject * c = 0; -+ const btCollisionObject * c = 0; - - MyRayResultCallback ray(origin, p, caster); - rayTest(origin, p, ray); diff --git a/vdrift-2012-07-22c_bullet281_patch.patch b/vdrift-2012-07-22c_bullet281_patch.patch deleted file mode 100644 index 1f8a9ed..0000000 --- a/vdrift-2012-07-22c_bullet281_patch.patch +++ /dev/null @@ -1,889 +0,0 @@ ---- data/skins/simple/menus/AssignControl Mon Jan 19 23:26:36 1970 -+++ data/skins/simple/menus/AssignControl Mon Jan 19 23:26:36 1970 -@@ -46,7 +46,7 @@ - image = white.png - color = 0.172, 0.161, 0.169 - alpha = 0.7 --left = 0.2 --right = 0.2 -+left = 0.1 -+right = 0.1 - top = 0.48 - height = 0.04 ---- data/skins/simple/menus/GuiControls Mon Jan 19 23:26:36 1970 -+++ data/skins/simple/menus/GuiControls Mon Jan 19 23:26:36 1970 -@@ -82,7 +82,7 @@ - onselect = controledit.string:gui_select:0 - onmoveleft = widget-01d - onmoveright = widget-01c --onmoveup = widget-13b -+onmoveup = widget-08b - onmovedown = widget-02b - onfocus = widget-01b.sat:0.56 - onblur = widget-01b.sat:0.0 -@@ -101,7 +101,7 @@ - onselect = controledit.string:gui_select:1 - onmoveleft = widget-01b - onmoveright = widget-01d --onmoveup = widget-13b -+onmoveup = widget-08b - onmovedown = widget-02c - onfocus = widget-01c.sat:0.56 - onblur = widget-01c.sat:0.0 -@@ -120,7 +120,7 @@ - onselect = controledit.string:gui_select:2 - onmoveleft = widget-01c - onmoveright = widget-01b --onmoveup = widget-13b -+onmoveup = widget-08b - onmovedown = widget-02d - onfocus = widget-01d.sat:0.56 - onblur = widget-01d.sat:0.0 ---- data/skins/simple/menus/InGameMain Mon Jan 19 23:26:36 1970 -+++ data/skins/simple/menus/InGameMain Mon Jan 19 23:26:36 1970 -@@ -44,10 +44,10 @@ - - - [ widget-01 ] --text = Return to Game -+text = Continue - fontsize = 0.035 - align = left --tip = Leave the menu and unpause the game. -+tip = Leave the menu and continue the game. - onselect = ReturnToGame - onmoveup = widget-05 - onmovedown = widget-02 -@@ -72,7 +72,7 @@ - - - [ widget-02 ] --text = Restart Game -+text = Restart - fontsize = 0.035 - align = left - tip = Restart this game using the same car and track settings. -@@ -100,7 +100,7 @@ - - - [ widget-03 ] --text = Leave Game -+text = Abort - fontsize = 0.035 - align = left - tip = Leave game and return to the Main menu. ---- data/skins/simple/menus/InputDevice Mon Jan 19 23:26:36 1970 -+++ data/skins/simple/menus/InputDevice Mon Jan 19 23:26:36 1970 -@@ -82,7 +82,7 @@ - onselect = joystick.type.prev - onmoveleft = joystick.type.prev - onmoveright = joystick.type.next --onmoveup = widget-13b -+onmoveup = widget-11b - onmovedown = widget-02b - onfocus = widget-01b.alpha:1 widget-01c.alpha:1 widget-01d.sat:0.56 - onblur = widget-01b.alpha:0 widget-01c.alpha:0 widget-01d.sat:0.0 -@@ -102,7 +102,7 @@ - onselect = joystick.type.next - onmoveleft = joystick.type.prev - onmoveright = joystick.type.next --onmoveup = widget-13b -+onmoveup = widget-11b - onmovedown = widget-02b - onfocus = widget-01b.alpha:1 widget-01c.alpha:1 widget-01d.sat:0.56 - onblur = widget-01b.alpha:0 widget-01c.alpha:0 widget-01d.sat:0.0 ---- data/skins/simple/menus/SingleRace Mon Jan 19 23:26:36 1970 -+++ data/skins/simple/menus/SingleRace Mon Jan 19 23:26:36 1970 -@@ -860,7 +860,7 @@ - onmoveleft = game.vehicle_damage.prev - onmoveright = game.vehicle_damage.next - onmoveup = widget-14b --onmovedown = widget-16 -+onmovedown = widget-16b - onfocus = widget-15b.alpha:1 widget-15c.alpha:1 widget-15d.sat:0.56 - onblur = widget-15b.alpha:0 widget-15c.alpha:0 widget-15d.sat:0.0 - focus = false ---- src/camera.h Mon Jan 19 23:26:36 1970 -+++ src/camera.h Mon Jan 19 23:26:36 1970 -@@ -16,7 +16,7 @@ - - const std::string & GetName() const { return name; } - -- void SetFOV(float value) { fov = std::max(40.0f, std::min(160.0f, value)); } -+ void SetFOV(float value) { fov = std::max(0.0f, std::min(120.0f, value)); } - - float GetFOV() const { return fov; } - ---- src/carcontrolmap_local.cpp Mon Jan 19 23:26:36 1970 -+++ src/carcontrolmap_local.cpp Mon Jan 19 23:26:36 1970 -@@ -830,16 +830,6 @@ - keycodes["y"] = SDLK_y; - keycodes["z"] = SDLK_z; - keycodes["DELETE"] = SDLK_DELETE; -- keycodes["KP0"] = SDLK_KP_0; -- keycodes["KP1"] = SDLK_KP_1; -- keycodes["KP2"] = SDLK_KP_2; -- keycodes["KP3"] = SDLK_KP_3; -- keycodes["KP4"] = SDLK_KP_4; -- keycodes["KP5"] = SDLK_KP_5; -- keycodes["KP6"] = SDLK_KP_6; -- keycodes["KP7"] = SDLK_KP_7; -- keycodes["KP8"] = SDLK_KP_8; -- keycodes["KP9"] = SDLK_KP_9; - keycodes["KP_PERIOD"] = SDLK_KP_PERIOD; - keycodes["KP_DIVIDE"] = SDLK_KP_DIVIDE; - keycodes["KP_MULTIPLY"] = SDLK_KP_MULTIPLY; -@@ -872,20 +862,50 @@ - keycodes["F14"] = SDLK_F14; - keycodes["F15"] = SDLK_F15; - keycodes["MENU"] = SDLK_MENU; -- keycodes["APPLICATION"] = SDLK_APPLICATION; -- keycodes["NUMLOCK"] = SDLK_NUMLOCKCLEAR; - keycodes["CAPSLOCK"] = SDLK_CAPSLOCK; -- keycodes["SCROLLLOCK"] = SDLK_SCROLLLOCK; - keycodes["RSHIFT"] = SDLK_RSHIFT; - keycodes["LSHIFT"] = SDLK_LSHIFT; - keycodes["RCTRL"] = SDLK_RCTRL; - keycodes["LCTRL"] = SDLK_LCTRL; - keycodes["RALT"] = SDLK_RALT; - keycodes["LALT"] = SDLK_LALT; -+#if SDL_VERSION_ATLEAST(2,0,0) -+ keycodes["KP0"] = SDLK_KP_0; -+ keycodes["KP1"] = SDLK_KP_1; -+ keycodes["KP2"] = SDLK_KP_2; -+ keycodes["KP3"] = SDLK_KP_3; -+ keycodes["KP4"] = SDLK_KP_4; -+ keycodes["KP5"] = SDLK_KP_5; -+ keycodes["KP6"] = SDLK_KP_6; -+ keycodes["KP7"] = SDLK_KP_7; -+ keycodes["KP8"] = SDLK_KP_8; -+ keycodes["KP9"] = SDLK_KP_9; -+ keycodes["COMPOSE"] = SDLK_APPLICATION; -+ keycodes["NUMLOCK"] = SDLK_NUMLOCKCLEAR; -+ keycodes["SCROLLLOCK"] = SDLK_SCROLLLOCK; - keycodes["RMETA"] = SDLK_RGUI; - keycodes["LMETA"] = SDLK_LGUI; - keycodes["LSUPER"] = SDLK_LGUI; - keycodes["RSUPER"] = SDLK_RGUI; -+#else -+ keycodes["KP0"] = SDLK_KP0; -+ keycodes["KP1"] = SDLK_KP1; -+ keycodes["KP2"] = SDLK_KP2; -+ keycodes["KP3"] = SDLK_KP3; -+ keycodes["KP4"] = SDLK_KP4; -+ keycodes["KP5"] = SDLK_KP5; -+ keycodes["KP6"] = SDLK_KP6; -+ keycodes["KP7"] = SDLK_KP7; -+ keycodes["KP8"] = SDLK_KP8; -+ keycodes["KP9"] = SDLK_KP9; -+ keycodes["COMPOSE"] = SDLK_COMPOSE; -+ keycodes["NUMLOCK"] = SDLK_NUMLOCK; -+ keycodes["SCROLLLOCK"] = SDLK_SCROLLOCK; -+ keycodes["LMETA"] = SDLK_LMETA; -+ keycodes["RMETA"] = SDLK_RMETA; -+ keycodes["LSUPER"] = SDLK_LSUPER; -+ keycodes["RSUPER"] = SDLK_RSUPER; -+#endif - return keycodes; - } - ---- src/game.cpp Mon Jan 19 23:26:36 1970 -+++ src/game.cpp Mon Jan 19 23:26:36 1970 -@@ -324,10 +324,6 @@ - - info_output << "Shutting down..." << std::endl; - -- // Stop the sound thread. -- if (sound.Enabled()) -- sound.Pause(true); -- - LeaveGame(); - - // Save settings first incase later deinits cause crashes. -@@ -499,16 +495,7 @@ - } - - // Connect game actions to gui options -- set_car_name.connect(gui.GetOption("game.car").signal_val); -- set_car_paint.connect(gui.GetOption("game.car_paint").signal_val); -- set_car_color_hue.connect(gui.GetOption("game.car_color_hue").signal_val); -- set_car_color_sat.connect(gui.GetOption("game.car_color_sat").signal_val); -- set_car_color_val.connect(gui.GetOption("game.car_color_val").signal_val); -- set_car_ai_type.connect(gui.GetOption("game.ai_type").signal_val); -- set_car_ai_level.connect(gui.GetOption("game.ai_level").signal_val); -- set_cars_num.connect(gui.GetOption("game.cars_num").signal_val); -- set_track_image.connect(gui.GetOption("game.track").signal_val); -- set_control.connect(gui.GetOption("controledit.string").signal_val); -+ BindActionsToGUI(); - - // Set options from game settings. - std::map optionmap; -@@ -531,7 +518,6 @@ - if (sound.Init(2048, info_output, error_output)) - { - sound.SetVolume(settings.GetSoundVolume()); -- //sound.Pause(false); - content.setSound(sound.GetDeviceInfo()); - } - else -@@ -932,22 +918,18 @@ - if (sound.Enabled()) - { - bool pause_sound = pause || gui.Active(); -- sound.Pause(pause_sound); -- if (!pause_sound) -- { -- PROFILER.beginBlock("sound"); -- MATHVECTOR pos; -- QUATERNION rot; -- if (active_camera) -- { -- pos = active_camera->GetPosition(); -- rot = active_camera->GetOrientation(); -- } -- sound.SetListenerPosition(pos[0], pos[1], pos[2]); -- sound.SetListenerRotation(rot[0], rot[1], rot[2], rot[3]); -- sound.Update(); -- PROFILER.endBlock("sound"); -- } -+ PROFILER.beginBlock("sound"); -+ MATHVECTOR pos; -+ QUATERNION rot; -+ if (active_camera) -+ { -+ pos = active_camera->GetPosition(); -+ rot = active_camera->GetOrientation(); -+ } -+ sound.SetListenerPosition(pos[0], pos[1], pos[2]); -+ sound.SetListenerRotation(rot[0], rot[1], rot[2], rot[3]); -+ sound.Update(pause_sound); -+ PROFILER.endBlock("sound"); - } - - //PROFILER.beginBlock("force-feedback"); -@@ -1798,9 +1780,12 @@ - // get car start position marker for camera setup - MATHVECTOR car_pos = track.GetStart(0).first; - -- // car setup -+ // clear previous car - cars.clear(); - -+ // remove previous car sounds -+ sound.Update(true); -+ - if (LoadCar( - cars_name[car_edit_id], - cars_paint[car_edit_id], -@@ -1808,14 +1793,13 @@ - car_pos, track.GetStart(0).second, - true, false)) - { -- // update car -+ // set car - CAR & car = cars.back(); - dynamics.update(timestep); - car.Update(timestep); - -- // process car sound sources -- // should they be loaded for garage car in the first place? -- sound.Update(); -+ // add car sounds -+ sound.Update(true); - - // use car shape center for camera setup - car_pos = car.GetPosition(); -@@ -1958,7 +1942,7 @@ - } - - if (numreplays == 0) -- replaylist.push_back(std::make_pair("", "None")); -+ replaylist.push_back(std::make_pair("none", "None")); - - settings.SetSelectedReplay(replaylist.begin()->first); - } -@@ -2411,6 +2395,7 @@ - - track.Clear(); - cars.clear(); -+ sound.Update(true); - hud.SetVisible(false); - inputgraph.Hide(); - trackmap.Unload(); -@@ -2419,7 +2404,6 @@ - pause = false; - race_laps = 0; - tire_smoke.Clear(); -- sound.Update(); - } - - void GAME::StartPractice() -@@ -2473,7 +2457,7 @@ - - void GAME::StartReplay() - { -- if (!settings.GetSelectedReplay().empty() && !NewGame(true)) -+ if (settings.GetSelectedReplay() != "none" && !NewGame(true)) - { - gui.ActivatePage("ReplayStartError", 0.25, error_output); - } -@@ -2855,6 +2839,19 @@ - EditControl(); - } - -+void GAME::BindActionsToGUI() -+{ -+ set_car_name.connect(gui.GetOption("game.car").signal_val); -+ set_car_paint.connect(gui.GetOption("game.car_paint").signal_val); -+ set_car_color_hue.connect(gui.GetOption("game.car_color_hue").signal_val); -+ set_car_color_sat.connect(gui.GetOption("game.car_color_sat").signal_val); -+ set_car_color_val.connect(gui.GetOption("game.car_color_val").signal_val); -+ set_car_ai_type.connect(gui.GetOption("game.ai_type").signal_val); -+ set_car_ai_level.connect(gui.GetOption("game.ai_level").signal_val); -+ set_cars_num.connect(gui.GetOption("game.cars_num").signal_val); -+ set_track_image.connect(gui.GetOption("game.track").signal_val); -+ set_control.connect(gui.GetOption("controledit.string").signal_val); -+} - - void GAME::RegisterActions() - { ---- src/game.h Mon Jan 19 23:26:36 1970 -+++ src/game.h Mon Jan 19 23:26:36 1970 -@@ -201,6 +201,7 @@ - void SetTrackImage(const std::string & value); - void SetControl(const std::string & value); - -+ void BindActionsToGUI(); - void RegisterActions(); - void InitActionMap(std::map & actionmap); - ---- src/sound.cpp Mon Jan 19 23:26:36 1970 -+++ src/sound.cpp Mon Jan 19 23:26:36 1970 -@@ -30,17 +30,20 @@ - } - - SOUND::SOUND() : -+ log_error(0), - deviceinfo(0, 0, 0, 0), -+ sound_volume(0), - initdone(false), - disable(false), -- paused(true), - sampler_lock(0), - source_lock(0), -+ set_pause(true), - max_active_sources(64), - sources_num(0), -- samplers_num(0) -+ sources_pause(true), -+ samplers_num(0), -+ samplers_pause(true) - { -- volume_filter.SetFilterOrder0(1.0); - sources.reserve(64); - samplers.reserve(64); - } -@@ -115,11 +118,13 @@ - } - - deviceinfo = SOUNDINFO(samples, frequency, channels, bytespersample); -- -+ log_error = &error_output; - initdone = true; -- - SetVolume(1.0); - -+ // enable sound, run callback -+ SDL_PauseAudio(false); -+ - return true; - } - -@@ -138,46 +143,21 @@ - disable = true; - } - --void SOUND::Pause(bool value) --{ -- if (paused != value) -- { -- SDL_PauseAudio(value); -- paused = value; -- } --} -- --void SOUND::Update() -+void SOUND::Update(bool pause) - { - if (disable) return; - -+ set_pause = pause; -+ - GetSourceChanges(); - - ProcessSourceStop(); - -- ProcessSourceRemove(); -- - ProcessSources(); - -- SetSamplerChanges(); -- -- // short circuit if paused(sound thread blocked) -- if (paused) -- { -- GetSamplerChanges(); -- -- ProcessSamplerAdd(); -- -- ProcessSamplerRemove(); -- -- SetSourceChanges(); -- -- GetSourceChanges(); -- -- ProcessSourceStop(); -+ ProcessSourceRemove(); - -- ProcessSourceRemove(); -- } -+ SetSamplerChanges(); - } - - void SOUND::SetMaxActiveSources(size_t value) -@@ -192,18 +172,24 @@ - size_t id = item_num; - if (id < items.size()) - { -+ // reuse free slot - size_t idn = items[id].id; - if (idn != id) - { -- // swap back redirected item -+ // free slot is redirecting to other item - assert(idn < id); -+ -+ // swap redirected item back - items[id] = items[idn]; -+ -+ // use now free slot - id = idn; - } - items[id] = item; - } - else - { -+ // add item to new slot - items.push_back(item); - } - items[id].id = id; -@@ -217,9 +203,14 @@ - inline void RemoveItem(size_t id, std::vector & items, size_t & item_num) - { - assert(id < items.size()); -+ -+ // get item true id - size_t idn = items[id].id; - assert(idn < item_num); -+ -+ // pop last item - --item_num; -+ - // swap last item with current - size_t idl = items[item_num].id; - if (idl != item_num) -@@ -270,14 +261,13 @@ - ns.id = -1; - sampler_add.getFirst().push_back(ns); - -- //std::cout << "Add sound source: " << id << " " << buffer->GetName() << std::endl; -+ //*log_error << "Add sound source: " << id << " " << buffer->GetName() << std::endl; - return id; - } - - void SOUND::RemoveSource(size_t id) - { -- // notify sound thread, it will notify main thread to remove the source -- //std::cout << "To be removed source: " << id << " " << sources[sources[id].id].buffer->GetName() << std::endl; -+ // notify sound and main thread to remove the source/sampler - sampler_remove.getFirst().push_back(id); - } - -@@ -343,14 +333,13 @@ - - void SOUND::SetVolume(float value) - { -- volume_filter.SetFilterOrder0(clamp(value, 0.f, 1.f)); -+ sound_volume = value; - } - - void SOUND::GetSourceChanges() - { - Lock(source_lock); - source_stop.swapFirst(); -- source_remove.swapFirst(); - Unlock(source_lock); - } - -@@ -368,17 +357,18 @@ - - void SOUND::ProcessSourceRemove() - { -- std::vector & sremove = source_remove.getFirst(); -+ std::vector & sremove = sampler_remove.getFirst(); - for (size_t i = 0; i < sremove.size(); ++i) - { - size_t id = sremove[i]; - assert(id < sources.size()); -+ - size_t idn = sources[id].id; - assert(idn < sources_num); -- //std::cout << "Remove sound source: " << id << " " << sources[idn].buffer->GetName() << std::endl; -+ //*log_error << "Remove sound source: " << id << " " << sources[idn].buffer->GetName() << std::endl; -+ - RemoveItem(id, sources, sources_num); - } -- sremove.clear(); - } - - void SOUND::ProcessSources() -@@ -436,8 +426,11 @@ - } - } - -- supdate[i].gain1 = gain1 * Sampler::denom; -- supdate[i].gain2 = gain2 * Sampler::denom; -+ // fade sound volume -+ float volume = set_pause ? 0 : sound_volume; -+ -+ supdate[i].gain1 = volume * gain1 * Sampler::denom; -+ supdate[i].gain2 = volume * gain2 * Sampler::denom; - supdate[i].pitch = src.pitch * Sampler::denom; - } - -@@ -471,6 +464,7 @@ - if (sampler_update.getFirst().size()) sampler_update.swapFirst(); - if (sampler_add.getFirst().size()) sampler_add.swapFirst(); - if (sampler_remove.getFirst().size()) sampler_remove.swapFirst(); -+ sources_pause = set_pause; - Unlock(sampler_lock); - } - -@@ -478,33 +472,41 @@ - { - Lock(sampler_lock); - sampler_update.swapLast(); -- sampler_remove.swapLast(); - sampler_add.swapLast(); -+ sampler_remove.swapLast(); -+ samplers_fade = samplers_pause != sources_pause; -+ samplers_pause = sources_pause; - Unlock(sampler_lock); - } - - void SOUND::ProcessSamplerUpdate() - { - std::vector & supdate = sampler_update.getLast(); -- if (samplers_num == supdate.size()) -+ if (supdate.empty()) return; -+ -+ assert(samplers_num == supdate.size()); -+ for (size_t i = 0; i < samplers_num; ++i) - { -- for (size_t i = 0; i < samplers_num; ++i) -- { -- samplers[i].gain1 = supdate[i].gain1; -- samplers[i].gain2 = supdate[i].gain2; -- samplers[i].pitch = supdate[i].pitch; -- } -+ samplers[i].gain1 = supdate[i].gain1; -+ samplers[i].gain2 = supdate[i].gain2; -+ samplers[i].pitch = supdate[i].pitch; - } - supdate.clear(); - } - - void SOUND::ProcessSamplers(unsigned char *stream, int len) - { -- // set buffers and clear stream -+ // clear stream -+ memset(stream, 0, len); -+ -+ // pause sampling -+ if (samplers_pause && !samplers_fade) -+ return; -+ -+ // init sampling buffers - int len4 = len / 4; - buffer1.resize(len4); - buffer2.resize(len4); -- memset(stream, 0, len); - - // run samplers - short * sstream = (short*)stream; -@@ -519,13 +521,17 @@ - { - SampleAndAdvanceWithPitch16bit(smp, &buffer1[0], &buffer2[0], len4); - -- volume_filter.Filter(&buffer1[0], &buffer2[0], len4); -- - for (int n = 0; n < len4; ++n) - { - int pos = n * 2; -- sstream[pos] = clamp(sstream[pos] + buffer1[n], -32768, 32767); -- sstream[pos + 1] = clamp(sstream[pos + 1] + buffer2[n], -32768, 32767); -+ int val1 = sstream[pos] + buffer1[n]; -+ int val2 = sstream[pos + 1] + buffer2[n]; -+ -+ val1 = clamp(val1, -32768, 32767); -+ val2 = clamp(val2, -32768, 32767); -+ -+ sstream[pos] = val1; -+ sstream[pos + 1] = val2; - } - } - else -@@ -541,17 +547,13 @@ - void SOUND::ProcessSamplerRemove() - { - std::vector & sremove = sampler_remove.getLast(); -- if (!sremove.empty()) -+ for (size_t i = 0; i < sremove.size(); ++i) - { -- for (size_t i = 0; i < sremove.size(); ++i) -- { -- size_t id = sremove[i]; -- assert(id < samplers.size()); -- RemoveItem(id, samplers, samplers_num); -- } -- source_remove.getLast() = sremove; -- sremove.clear(); -+ size_t id = sremove[i]; -+ assert(id < samplers.size()); -+ RemoveItem(id, samplers, samplers_num); - } -+ sremove.clear(); - } - - void SOUND::ProcessSamplerAdd() -@@ -589,7 +591,6 @@ - { - Lock(source_lock); - if (source_stop.getLast().size()) source_stop.swapLast(); -- if (source_remove.getLast().size()) source_remove.swapLast(); - Unlock(source_lock); - } - -@@ -600,12 +601,12 @@ - - GetSamplerChanges(); - -+ ProcessSamplerAdd(); -+ - ProcessSamplerUpdate(); - - ProcessSamplers(stream, len); - -- ProcessSamplerAdd(); -- - ProcessSamplerRemove(); - - SetSourceChanges(); -@@ -622,9 +623,10 @@ - assert(len > 0); - assert(sampler.buffer); - -- // if not playing, fill output buffers with silence, should not happen -+ // if not playing, fill output buffers with silence - if (!sampler.playing) - { -+ // should be dealt with before getting here - assert(0); - for (int i = 0; i < len; ++i) - { ---- src/sound.h Mon Jan 19 23:26:36 1970 -+++ src/sound.h Mon Jan 19 23:26:36 1970 -@@ -33,11 +33,8 @@ - // disable sound - void Disable(); - -- // pause sound -- void Pause(bool value); -- - // commit state changes -- void Update(); -+ void Update(bool pause); - - // active sources limit can be adjusted at runtime - void SetMaxActiveSources(size_t value); -@@ -69,14 +66,14 @@ - void SetVolume(float value); - - private: -+ std::ostream * log_error; - SOUNDINFO deviceinfo; -- SOUNDFILTER volume_filter; - MATHVECTOR listener_pos; - MATHVECTOR listener_vel; - QUATERNION listener_rot; -+ float sound_volume; - bool initdone; - bool disable; -- bool paused; - - // state structs - struct Source -@@ -95,8 +92,8 @@ - - struct Sampler - { -- static const int denom = 1 << 15; -- static const int max_gain_delta = (denom * 100) / 44100; -+ static const int denom = 32768; -+ static const int max_gain_delta = (denom * 173) / 44100; // 256 samples from min to max gain - const SOUNDBUFFER * buffer; - int samples_per_channel; - int sample_pos; -@@ -135,21 +132,24 @@ - TrippleBuffer sampler_update; - TrippleBuffer sampler_add; - TrippleBuffer sampler_remove; -- TrippleBuffer source_remove; - TrippleBuffer source_stop; - SDL_mutex * sampler_lock; - SDL_mutex * source_lock; -+ bool set_pause; - - // sound sources state - std::vector sources_active; - std::vector sources; - size_t max_active_sources; - size_t sources_num; -+ bool sources_pause; - - // sound thread state - std::vector buffer1, buffer2; - std::vector samplers; - size_t samplers_num; -+ bool samplers_pause; -+ bool samplers_fade; - - // main thread methods - void GetSourceChanges(); ---- src/texture.cpp Mon Jan 19 23:26:36 1970 -+++ src/texture.cpp Mon Jan 19 23:26:36 1970 -@@ -179,6 +179,7 @@ - else - { - error << "Error loading texture file: " + path << std::endl; -+ error << IMG_GetError(); - return false; - } - -@@ -303,6 +304,7 @@ - else - { - error << "Error loading texture file: " + path + " (" + cubefiles[i] + ")" << std::endl; -+ error << IMG_GetError(); - return false; - } - -@@ -477,6 +479,7 @@ - if (!orig_surface) - { - error << "Error loading texture file: " << path << std::endl; -+ error << IMG_GetError(); - return false; - } - } ---- src/cardynamics.cpp Mon Jan 19 23:26:36 1970 -+++ src/cardynamics.cpp Mon Jan 19 23:26:36 1970 -@@ -1791,23 +1791,29 @@ - - bool CARDYNAMICS::WheelContactCallback( - btManifoldPoint& cp, -- const btCollisionObject* colObj0, -- int partId0, -+ const btCollisionObjectWrapper* col0, -+ int part0, - int index0, -- const btCollisionObject* colObj1, -- int partId1, -+ const btCollisionObjectWrapper* col1, -+ int part1, - int index1) - { -- // cars are fracture bodies, wheel is a cylinder shape -- const btCollisionShape* shape = colObj0->getCollisionShape(); -- if ((colObj0->getInternalType() & CO_FRACTURE_TYPE) && -+#if (BT_BULLET_VERSION < 281) -+ const btCollisionObject* obj = col0; -+ const btCollisionShape* shape = obj->getCollisionShape(); -+ const btCollisionShape* rootshape = obj->getRootCollisionShape(); -+#else -+ const btCollisionObject* obj = col0->getCollisionObject(); -+ const btCollisionShape* shape = col0->getCollisionShape(); -+ const btCollisionShape* rootshape = obj->getCollisionShape(); -+#endif -+ if ((obj->getInternalType() & CO_FRACTURE_TYPE) && - (shape->getShapeType() == CYLINDER_SHAPE_PROXYTYPE)) - { -- // is contact within contact patch? -- const btCompoundShape* car = static_cast(colObj0->getRootCollisionShape()); -- const btCylinderShapeX* wheel = static_cast(shape); -- btVector3 contactPoint = cp.m_localPointA - car->getChildTransform(cp.m_index0).getOrigin(); -- if (-direction::up.dot(contactPoint) > 0.5 * wheel->getRadius()) -+ const btCompoundShape* carshape = static_cast(rootshape); -+ const btCylinderShapeX* wheelshape = static_cast(shape); -+ btVector3 contactPoint = cp.m_localPointA - carshape->getChildTransform(cp.m_index0).getOrigin(); -+ if (-direction::up.dot(contactPoint) > 0.5 * wheelshape->getRadius()) - { - // break contact (hack) - cp.m_normalWorldOnB = btVector3(0, 0, 0); ---- src/cardynamics.h Mon Jan 19 23:26:36 1970 -+++ src/cardynamics.h Mon Jan 19 23:26:36 1970 -@@ -25,6 +25,12 @@ - class FractureBody; - class PTree; - -+#if (BT_BULLET_VERSION < 281) -+#define btCollisionObjectWrapper btCollisionObject -+#else -+struct btCollisionObjectWrapper; -+#endif -+ - class CARDYNAMICS : public btActionInterface - { - friend class PERFORMANCE_TESTING; -@@ -151,11 +157,11 @@ - - static bool WheelContactCallback( - btManifoldPoint& cp, -- const btCollisionObject* colObj0, -- int partId0, -+ const btCollisionObjectWrapper* col0, -+ int part0, - int index0, -- const btCollisionObject* colObj1, -- int partId1, -+ const btCollisionObjectWrapper* col1, -+ int part1, - int index1); - - protected: ---- src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970 -+++ src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970 -@@ -221,6 +221,7 @@ - - void DynamicsWorld::fractureCallback() - { -+#if (BT_BULLET_VERSION < 281) - m_activeConnections.resize(0); - - int numManifolds = getDispatcher()->getNumManifolds(); -@@ -268,4 +269,5 @@ - btRigidBody* child = body->updateConnection(con_id); - if (child) addRigidBody(child); - } -+#endif - } diff --git a/vdrift-SConstruct.patch b/vdrift-SConstruct.patch deleted file mode 100644 index 30ef37a..0000000 --- a/vdrift-SConstruct.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- SConstruct~ 2011-09-01 04:22:58.000000000 -0500 -+++ SConstruct 2012-01-18 14:40:08.535239681 -0600 -@@ -507,8 +507,8 @@ - # Subdirectories # - #----------------# - Export(['env', 'version', 'src_dir', 'bin_dir']) --if 'install' in COMMAND_LINE_TARGETS: -- SConscript('data/SConscript') -+#if 'install' in COMMAND_LINE_TARGETS: -+# SConscript('data/SConscript') - - if 'src-package' in COMMAND_LINE_TARGETS: - SConscript('tools/SConscript') diff --git a/vdrift.spec b/vdrift.spec index 3ea3c8d..5c4092d 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -71,13 +71,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . %build -CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" \ - scons-3 \ - bin=/bin prefix=%{_prefix} use_binreloc=0 \ - release=1 os_cc=1 os_cxx=1 os_cxxflags=1 \ - NLS=0 \ - verbose=1 \ - %{?_smp_mflags} +scons-3 %{?_smp_mflags} %install # As described in the README scons install is broken so DIY @@ -145,6 +139,9 @@ EOF %{_datadir}/vdrift %changelog +* Mon Mar 23 2020 Gwyn Ciesla - 2014-1020-21 +- Change build options to fix crash. + * Fri Jan 31 2020 Fedora Release Engineering - 20141020-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f4faf3a5280270be9bf3192a737f8e6dbceabed8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:37:57 +0000 Subject: [PATCH 091/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 5c4092d..543b2f4 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -139,6 +139,9 @@ EOF %{_datadir}/vdrift %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 20141020-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Mar 23 2020 Gwyn Ciesla - 2014-1020-21 - Change build options to fix crash. From ba043190bc2d2415227c42693fcfad7614f4e99b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:59:27 +0000 Subject: [PATCH 092/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 543b2f4..64a24fe 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,6 +1,6 @@ Name: vdrift Version: 20141020 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -139,6 +139,9 @@ EOF %{_datadir}/vdrift %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 20141020-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 20141020-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3d47c56b011b6681519987d1948f7dde3ae26dc8 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Fri, 12 Feb 2021 09:05:38 -0500 Subject: [PATCH 093/107] update code and data, rebuild --- .gitignore | 2 + sources | 3 +- vdrift-20141020-gcc6.patch | 12 ------ vdrift-python3.patch | 83 -------------------------------------- vdrift.spec | 23 +++++++---- 5 files changed, 20 insertions(+), 103 deletions(-) delete mode 100644 vdrift-20141020-gcc6.patch delete mode 100644 vdrift-python3.patch diff --git a/.gitignore b/.gitignore index 4717a8d..cb59829 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ vdrift-2009-06-15-src.tar.bz2 /vdrift-2011-10-22.tar.bz2 /vdrift-2012-07-22.tar.bz2 /vdrift-2014-10-20.tar.bz2 +/vdrift-5ae309f.tar.gz +/vdrift-data-20210211.tar.xz diff --git a/sources b/sources index f6538b7..42561eb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -524751fab341b36f59d0747ea52f0c41 vdrift-2014-10-20.tar.bz2 +SHA512 (vdrift-5ae309f.tar.gz) = 54f578e70ef6a9b8d8697ad842b803adfff77230a392bb4e069469422f472571f2b47a6a87aecb46bf17f3d2cafce2a3989857fda43030ad67e5b6d9a8c13953 +SHA512 (vdrift-data-20210211.tar.xz) = d7beece201129b7be8cdca4d1d4e84c9656f2d6a03650f6576dad29d8231367402e7d32d4e24df22cbce2af842c930b8ed9492e4a1e7e480fe7569acdd992cf5 diff --git a/vdrift-20141020-gcc6.patch b/vdrift-20141020-gcc6.patch deleted file mode 100644 index 0c846fd..0000000 --- a/vdrift-20141020-gcc6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./src/graphics/model_obj.cpp.gcc6 ./src/graphics/model_obj.cpp ---- ./src/graphics/model_obj.cpp.gcc6 2016-02-09 19:02:50.282554264 -0500 -+++ ./src/graphics/model_obj.cpp 2016-02-09 19:03:10.566308088 -0500 -@@ -221,7 +221,7 @@ bool ModelObj::Save(const std::string & - std::ofstream f(strFileName.c_str()); - if (!f) - { -- error_output << "Error opening file for writing: " << error_output << endl; -+ error_output << "Error opening file for writing: " << strFileName << endl; - return false; - } - diff --git a/vdrift-python3.patch b/vdrift-python3.patch deleted file mode 100644 index 7e81fe0..0000000 --- a/vdrift-python3.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- SConstruct~ 2019-08-02 16:20:27.000000000 -0500 -+++ SConstruct 2019-08-02 16:20:59.703964106 -0500 -@@ -518,7 +518,7 @@ - Export(['env', 'version', 'src_dir', 'bin_dir']) - if 'install' in COMMAND_LINE_TARGETS: - if not os.path.isfile('data/SConscript'): -- raise 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' -+ print 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' - SConscript('data/SConscript') - # desktop appdata installation - install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop') ---- SConstruct.bak 2019-08-02 16:25:00.652707553 -0500 -+++ SConstruct 2019-08-02 16:25:21.205679013 -0500 -@@ -92,9 +92,9 @@ - - for a in env['universal']: - if not sdk_path: -- print 'Building a universal binary require access to an ' + \ -+ print('Building a universal binary require access to an ' + \ - 'SDK that has universal \nbinary support.If you know ' + \ -- 'the location of such an SDK, specify it using the \n"SDK" option' -+ 'the location of such an SDK, specify it using the \n"SDK" option') - Exit(1) - env.Append( CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a] ) - -@@ -141,11 +141,11 @@ - CC = 'gcc', CXX = 'g++', - options = opts) - # Take environment variables into account -- if os.environ.has_key('CXX'): -+ if 'CXX' in os.environ: - env['CXX'] = os.environ['CXX'] -- if os.environ.has_key('CXXFLAGS'): -+ if 'CXXFLAGS' in os.environ: - env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) -- if os.environ.has_key('LDFLAGS'): -+ if 'LDFLAGS' in os.environ: - env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) - check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'curl/curl.h', 'bullet/btBulletCollisionCommon.h', 'bullet/btBulletDynamicsCommon.h'] - check_libs = [] -@@ -232,7 +232,7 @@ - def tarballer (target, source, env): - cmd = 'tar -jcf "%s" -C "%s" .' % ( str(target[0]), str(source[0]) ) - #cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~' " -- print 'running ', cmd, ' ... ' -+ print('running ', cmd, ' ... ') - p = os.popen (cmd) - return p.close () - -@@ -362,11 +362,11 @@ - conf = Configure(env) - for header in check_headers: - if not conf.CheckCXXHeader(header): -- print 'You do not have the %s headers installed. Exiting.' % header -+ print('You do not have the %s headers installed. Exiting.' % header) - Exit(1) - for lib in check_libs: - if not conf.CheckLibWithHeader(lib[0], lib[1], 'C', lib[2]): -- print lib[3] -+ print(lib[3]) - Exit(1) - - env = conf.Finish() -@@ -518,7 +518,7 @@ - Export(['env', 'version', 'src_dir', 'bin_dir']) - if 'install' in COMMAND_LINE_TARGETS: - if not os.path.isfile('data/SConscript'): -- print 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' -+ print('VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.') - SConscript('data/SConscript') - # desktop appdata installation - install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop') ---- src/SConscript~ 2014-09-04 15:06:21.000000000 -0500 -+++ src/SConscript 2019-08-03 09:51:18.019800029 -0500 -@@ -151,7 +151,7 @@ - utils.cpp - window.cpp""") - --src.sort(lambda x, y: cmp(x.lower(),y.lower())) -+#src.sort(lambda x, y: cmp(x.lower(),y.lower())) - - #------------------------# - # Copy Build Environment # diff --git a/vdrift.spec b/vdrift.spec index 64a24fe..4744ac7 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -1,17 +1,24 @@ +%global commit 5ae309f1048c863f4745cd50c8cd81f98340b1d4 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: vdrift Version: 20141020 -Release: 23%{?dist} +Release: 24.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ URL: http://vdrift.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-2014-10-20.tar.bz2 +Source0: https://github.com/VDrift/vdrift/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: vdrift.desktop Source2: vdrift.png +# Data +# svn checkout https://svn.code.sf.net/p/vdrift/code/ vdrift-code +# mv vdrift-code/vdrift-data data +# tar cvfJ vdrift-data-20210211.tar.xz data +Source3: vdrift-data-20210211.tar.xz + Patch1: vdrift-20071226-paths.patch Patch4: vdrift-20090215-joepack-includes.patch -Patch10: vdrift-20141020-gcc6.patch -Patch11: vdrift-python3.patch BuildRequires: mesa-libGL-devel BuildRequires: SDL2-devel BuildRequires: SDL2_image-devel @@ -52,7 +59,7 @@ These are the data files. %prep -%setup -qn vdrift +%setup -qn vdrift-%{commit} -a 3 # unbundling rm -rf bullet @@ -62,8 +69,6 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch1 -p0 %patch4 -p0 -%patch10 -p0 -b .gcc6 -%patch11 -p0 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . /bin/chmod -x src/main.cpp @@ -139,6 +144,10 @@ EOF %{_datadir}/vdrift %changelog +* Thu Feb 11 2021 Tom Callaway - 20141020-24.git5ae309f +- update code to latest git +- update data from latest svn + * Wed Jan 27 2021 Fedora Release Engineering - 20141020-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 5e344ba1df6e5ab7aa7b374c1dfc90ce27804d7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:23:19 +0000 Subject: [PATCH 094/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 4744ac7..bf24c87 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 24.git%{shortcommit}%{?dist} +Release: 25.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 20141020-25.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Feb 11 2021 Tom Callaway - 20141020-24.git5ae309f - update code to latest git - update data from latest svn From 0da11c751c17de73c24eee4aa030611bace187d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:53:32 +0000 Subject: [PATCH 095/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index bf24c87..663d423 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 25.git%{shortcommit}%{?dist} +Release: 26.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 20141020-26.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 20141020-25.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7b72879535884911c08e36555d104a4cbfc3fc7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:47:34 +0000 Subject: [PATCH 096/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 663d423..e151409 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 26.git%{shortcommit}%{?dist} +Release: 27.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 20141020-27.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 20141020-26.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 30d292cec35b8ae02a6411525eed8b3bad78ad04 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 1 Nov 2022 07:20:50 +0100 Subject: [PATCH 097/107] Switch from pathfix.py to %py3_shebang_fix For more info see https://fedoraproject.org/wiki/Changes/Python3.12#pathfix.py_tool_will_be_removed --- vdrift.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index e151409..e50afaf 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -69,7 +69,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %patch1 -p0 %patch4 -p0 -pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . +%py3_shebang_fix . /bin/chmod -x src/main.cpp /bin/chmod -x src/game.cpp From 88eabdee269bb82d2c421c36896ce7408051b23a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:12:51 +0000 Subject: [PATCH 098/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index e50afaf..0954efc 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 27.git%{shortcommit}%{?dist} +Release: 28.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPLv3+ @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 20141020-28.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 20141020-27.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e0a3446465be0846fbdef200038ee7f60fc1ba55 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sat, 4 Mar 2023 17:00:55 -0600 Subject: [PATCH 099/107] migrated to SPDX license --- vdrift.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 0954efc..5fbc312 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,10 +3,10 @@ Name: vdrift Version: 20141020 -Release: 28.git%{shortcommit}%{?dist} +Release: 29.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation -License: GPLv3+ +License: GPL-3.0-or-later URL: http://vdrift.net Source0: https://github.com/VDrift/vdrift/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: vdrift.desktop @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Mar 04 2023 Gwyn Ciesla - 20141020-29.git5ae309f +- migrated to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 20141020-28.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 790e9f3aa2358e7501b02dd106859b623c162ed4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:32:20 +0000 Subject: [PATCH 100/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 5fbc312..8447822 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 29.git%{shortcommit}%{?dist} +Release: 30.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPL-3.0-or-later @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 20141020-30.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Mar 04 2023 Gwyn Ciesla - 20141020-29.git5ae309f - migrated to SPDX license From 8c262a3ef958f6e1380c1ccd83ff8000430789cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:35:37 +0000 Subject: [PATCH 101/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 8447822..76cac36 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 30.git%{shortcommit}%{?dist} +Release: 31.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPL-3.0-or-later @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 20141020-31.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 20141020-30.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 6c9fe122f4083c9e88cd6e7d0ef35804f35fcce7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 6 Feb 2024 15:01:23 -0600 Subject: [PATCH 102/107] Fix FTBFS --- vdrift.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vdrift.spec b/vdrift.spec index 76cac36..9af4535 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -67,8 +67,8 @@ rm -rf bullet sed -i 's/linuxx86/linuxppc/' src/SConscript %endif -%patch1 -p0 -%patch4 -p0 +%patch -P 1 -p0 +%patch -P 4 -p0 %py3_shebang_fix . /bin/chmod -x src/main.cpp @@ -76,7 +76,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript %build -scons-3 %{?_smp_mflags} +scons %{?_smp_mflags} %install # As described in the README scons install is broken so DIY From fc786dfa740f4bfdb1f9909c290cdc31dd8dfca0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:41:18 +0000 Subject: [PATCH 103/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 9af4535..0acc321 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 31.git%{shortcommit}%{?dist} +Release: 32.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPL-3.0-or-later @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 20141020-32.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 20141020-31.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5db265cd5160b9753da13783dfd252518f98f973 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:14:36 +0000 Subject: [PATCH 104/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 0acc321..78021eb 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 32.git%{shortcommit}%{?dist} +Release: 33.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPL-3.0-or-later @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 20141020-33.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 20141020-32.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From cc1371337c0a0ab0ab3e1f67311d5a7f828b6e1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:02:15 +0000 Subject: [PATCH 105/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 78021eb..85ec9a1 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 33.git%{shortcommit}%{?dist} +Release: 34.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPL-3.0-or-later @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 20141020-34.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 20141020-33.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7b46880dec7bbc5c87501575a0cc00f87640788e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:51:27 +0000 Subject: [PATCH 106/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index 85ec9a1..d032fe1 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 34.git%{shortcommit}%{?dist} +Release: 35.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPL-3.0-or-later @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 20141020-35.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 20141020-34.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5110f7b0d383abf50d0def8a48ab38e9bbacb2b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:26:08 +0000 Subject: [PATCH 107/107] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vdrift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdrift.spec b/vdrift.spec index d032fe1..fa6efb3 100644 --- a/vdrift.spec +++ b/vdrift.spec @@ -3,7 +3,7 @@ Name: vdrift Version: 20141020 -Release: 35.git%{shortcommit}%{?dist} +Release: 36.git%{shortcommit}%{?dist} Summary: Driving/drift racing simulation License: GPL-3.0-or-later @@ -144,6 +144,9 @@ EOF %{_datadir}/vdrift %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 20141020-36.git5ae309f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 20141020-35.git5ae309f - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild