1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00

- Add some missing things to patch-openal.c

- Fixes problems with empty directories on games/el-data

Approved by:	garga (mentor)
This commit is contained in:
Jose Alonso Cardenas Marquez 2006-08-21 20:18:05 +00:00
parent 41ae245f16
commit 2625c1ff19
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=171129
4 changed files with 34 additions and 6 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= data
PORTVERSION= 130
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.other-life.com/el/:data \
http://www.eternalmusik.org/music/:sound \
@ -41,6 +42,9 @@ post-extract:
@${FIND} ${WRKSRC} -type f -name "*.exe" -print0 | \
${XARGS} -0 ${RM} -R
@${RM} ${WRKSRC}/el-130.*
.for DIRE in languages/po/books languages/po/strings languages/tr/strings
@${RMDIR} ${WRKSRC}/${DIRE}
.endfor
do-install:
${MKDIR} ${DATADIR}

View File

@ -3238,15 +3238,12 @@
@dirrm %%DATADIR%%/languages/fr/Encyclopedia
@dirrm %%DATADIR%%/languages/fr/strings
@dirrm %%DATADIR%%/languages/fr
@dirrm %%DATADIR%%/languages/po/books
@dirrm %%DATADIR%%/languages/po/Encyclopedia
@dirrm %%DATADIR%%/languages/po/strings
@dirrm %%DATADIR%%/languages/po
@dirrm %%DATADIR%%/languages/si/Encyclopedia/images
@dirrm %%DATADIR%%/languages/si/Encyclopedia
@dirrm %%DATADIR%%/languages/si
@dirrm %%DATADIR%%/languages/tr/Encyclopedia
@dirrm %%DATADIR%%/languages/tr/strings
@dirrm %%DATADIR%%/languages/tr
@dirrm %%DATADIR%%/languages
@dirrm %%DATADIR%%/mapeditor

View File

@ -7,6 +7,7 @@
PORTNAME= el
PORTVERSION= 130
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= acm/${PORTNAME}

View File

@ -1,5 +1,5 @@
--- sound.c Fri Aug 18 12:54:36 2006
+++ sound.c Fri Aug 18 11:33:35 2006
--- sound.c Mon Aug 21 11:20:53 2006
+++ sound.c Mon Aug 21 11:25:49 2006
@@ -313,10 +313,11 @@
ALuint get_loaded_buffer(int i)
{
@ -24,7 +24,33 @@
- alBufferData(sound_buffer[i],format,data,size,freq);
- alutUnloadWAV(format,data,size,freq);
+ alBufferData(sound_buffer[i],format,data,size,(int)freq);
+// alutUnloadWAV(format,data,size,freq);
+ free(data);
}
return sound_buffer[i];
}
@@ -377,14 +378,14 @@
#ifndef OSX
alutLoadWAVFile(szPath,&pSample->format,&data,&pSample->size,&pSample->freq,&loop);
#else
- alutLoadWAVFile(szPath,&pSample->format,&data,&pSample->size,&pSample->freq);
+ data = alutLoadMemoryFromFile(szPath, &pSample->format, &pSample->size, &pSample->freq);
#endif
if(!data)
{//couldn't load the file
#ifdef ELC
LOG_ERROR("%s: %s",snd_buff_error, "NO SOUND DATA");
#else
- printf("ensure_sample_loaded : alutLoadWAVFile(%s) = %s\n",
+ printf("ensure_sample_loaded : alutLoadMemoryFromFile(%s) = %s\n",
szPath, "NO SOUND DATA");
#endif
return 1;
@@ -420,7 +421,7 @@
pSample->length = (pSample->size*1000) / ((pSample->bits >> 3)*pSample->channels*pSample->freq);
//get rid of the temporary data
- alutUnloadWAV(pSample->format,data,pSample->size,pSample->freq);
+ free(data);
}
pSample->loaded_status = 1;