Date: Saturday, July 10, 2010 @ 22:23:37 Author: eric Revision: 85242
upgpkg: foobillard 3.0a-6 Fixed hang after a draw in snooker (close FS#18631), Removed unneeded libxaw and libxi depends Added: foobillard/trunk/snooker_draw.patch Modified: foobillard/trunk/ChangeLog foobillard/trunk/PKGBUILD --------------------+ ChangeLog | 6 ++++++ PKGBUILD | 49 ++++++++++++++++++++++++++++--------------------- snooker_draw.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 21 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2010-07-10 22:24:23 UTC (rev 85241) +++ ChangeLog 2010-07-11 02:23:37 UTC (rev 85242) @@ -1,3 +1,9 @@ +2010-07-10 Eric Belanger <e...@archlinux.org> + + * foobillard 3.0a-6 + * Fixed hang after a draw in snooker (close FS#18631) + * Removed unneeded libxaw and libxi depends + 2010-01-18 Eric Belanger <e...@archlinux.org> * foobillard 3.0a-4 Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-07-10 22:24:23 UTC (rev 85241) +++ PKGBUILD 2010-07-11 02:23:37 UTC (rev 85242) @@ -4,36 +4,43 @@ pkgname=foobillard pkgver=3.0a -pkgrel=5 +pkgrel=6 pkgdesc="An OpenGL billiard game for Linux" arch=('i686' 'x86_64') url="http://foobillard.sourceforge.net/" license=('GPL2' 'custom') -depends=('sdl' 'freetype2' 'libpng' 'libxaw' 'mesa' 'libxi') +depends=('sdl' 'freetype2' 'libpng' 'mesa') +changelog=ChangeLog source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz \ - 03_bugfixes 05_foul_explanation 06_show_ball_to_hit \ - foobillard.desktop foobillard.png snooker_reset.patch) -md5sums=('c2d92edeaaf8bfb18aa26f1c79931b7d' '4400c87674b8a442c0cbbd619e118cd3'\ + foobillard.desktop foobillard.png 03_bugfixes 05_foul_explanation \ + 06_show_ball_to_hit snooker_reset.patch snooker_draw.patch) +md5sums=('c2d92edeaaf8bfb18aa26f1c79931b7d' '436f76ad44910a2524a38ff158bc32fc'\ + '4bb47566197a252388bf49583536dd4d' '4400c87674b8a442c0cbbd619e118cd3'\ '0b79b9b71bebd7e0e1584f0593cc348d' 'eed13569ab099054619137eabce96045'\ - '436f76ad44910a2524a38ff158bc32fc' '4bb47566197a252388bf49583536dd4d'\ - '329ddc735af17f33df99c5fe7ff672b9') -sha1sums=('1caa51a201b55883640b5c5b1e9fde20fc71a095' '119aa2bfcfb2b074e0d9b441441808c22eacf625'\ + '329ddc735af17f33df99c5fe7ff672b9' '97f04be3ad4a0f78c6d7a8b658099a5d') +sha1sums=('1caa51a201b55883640b5c5b1e9fde20fc71a095' '7e820e047497eae5f3d495cc8c61870d7b438a2e'\ + '67db7b2a96784ff3baaeca9610414376210e5c49' '119aa2bfcfb2b074e0d9b441441808c22eacf625'\ '347535e3db4b04caab2f040779576229b2ce71ac' '11cff3e62fccd101cc85d58cc0d0eb4a1b99670f'\ - '7e820e047497eae5f3d495cc8c61870d7b438a2e' '67db7b2a96784ff3baaeca9610414376210e5c49'\ - '405a64db7e92e7ba046dd9007d4bf1433914ef79') + '405a64db7e92e7ba046dd9007d4bf1433914ef79' 'a3151458667488117524ce8948b0d101657ad425') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../03_bugfixes || return 1 - patch -p1 < ../05_foul_explanation || return 1 - patch -p1 < ../06_show_ball_to_hit || return 1 - patch -p0 < ../snooker_reset.patch || return 1 + sed -i -e 's/-lXaw//' -e 's/-lXi//' src/Makefile.in + patch -p1 < ../03_bugfixes + patch -p1 < ../05_foul_explanation + patch -p1 < ../06_show_ball_to_hit + patch -p0 < ../snooker_reset.patch + patch -p0 < ../snooker_draw.patch - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 foobillard.6 "${pkgdir}/usr/share/man/man6/foobillard.6" || return 1 - install -D -m644 README.FONTS "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.FONTS" || return 1 - install -D -m644 ../foobillard.desktop "${pkgdir}/usr/share/applications/foobillard.desktop" || return 1 - install -D -m644 ../foobillard.png "${pkgdir}/usr/share/pixmaps/foobillard.png" || return 1 + ./configure --prefix=/usr + make } + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 foobillard.6 "${pkgdir}/usr/share/man/man6/foobillard.6" + install -D -m644 README.FONTS "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.FONTS" + install -D -m644 ../foobillard.desktop "${pkgdir}/usr/share/applications/foobillard.desktop" + install -D -m644 ../foobillard.png "${pkgdir}/usr/share/pixmaps/foobillard.png" +} Added: snooker_draw.patch =================================================================== --- snooker_draw.patch (rev 0) +++ snooker_draw.patch 2010-07-11 02:23:37 UTC (rev 85242) @@ -0,0 +1,48 @@ +Index: src/evaluate_move.c +=================================================================== +--- src/evaluate_move.c (revision 6) ++++ src/evaluate_move.c (working copy) +@@ -602,6 +602,11 @@ + player[act_player].winner=0; + player[other_player].winner=1; + } ++ if(player[act_player].score==player[other_player].score) { ++ player[act_player].winner=1; ++ player[other_player].winner=1; ++ } ++ + } + + printf("EVAL done\n"); +Index: src/billard3d.c +=================================================================== +--- src/billard3d.c (revision 6) ++++ src/billard3d.c (working copy) +@@ -1760,8 +1760,17 @@ + options_gamemode==options_gamemode_tournament && + (player[0].winner || player[1].winner) ) + { +- tournament_evaluate_last_match( &tournament_state ); +- tournament_state.wait_for_next_match=1; ++ if ( player[0].winner == player[1].winner ) ++ { // Draw ++ restart_game_common(); ++ player[act_player].winner=0; ++ player[other_player].winner=0; ++ } ++ else ++ { ++ tournament_evaluate_last_match( &tournament_state ); ++ tournament_state.wait_for_next_match=1; ++ } + } + } else { + int old_cueball_ind; +@@ -3654,6 +3663,7 @@ + create_walls( &walls ); + create_scene( &balls ); + g_shot_due=1; ++ snooker_state.to_play=SN_PLAY_RED; + } + +