[patch] proposed patch for installing with openal-20050504

blender-2.42-openal-freealut.patch (text/plain), 5.87 KB, created by Mike Nelson on 2006-07-22 07:23:29 UTC

diff -ruN /usr/portage/media-gfx/blender/Manifest /usr/local/portage/media-gfx/blender/Manifest
--- /usr/portage/media-gfx/blender/Manifest	2006-07-20 05:36:18.000000000 -0700
+++ /usr/local/portage/media-gfx/blender/Manifest	2006-07-22 06:39:18.000000000 -0700
@@ -10,6 +10,10 @@
 MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 files/blender.png 2119
 SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad files/blender.png 2119
+AUX openal-version.patch 834 RMD160 2ded54db571f2459ac14b5556917f227a860e96c SHA1 5a1d53667eecc1144a0ab10b71547b763466ac73 SHA256 2a5ae5f0d99f0fadb46226d7814412f66029bc8a8cb73cd3b754005cc18c029d
+MD5 4066536f8ae3c66aba2b58c42ce60a30 files/openal-version.patch 834
+RMD160 2ded54db571f2459ac14b5556917f227a860e96c files/openal-version.patch 834
+SHA256 2a5ae5f0d99f0fadb46226d7814412f66029bc8a8cb73cd3b754005cc18c029d files/openal-version.patch 834
 DIST blender-2.41.tar.gz 9464385 RMD160 7857eac2acda18ee24db4bb147bcf780025e2c12 SHA1 839dfece3b6efbf10694ac535d88e3745c3253ec SHA256 743a78648773619d3153a16c0a5b67f960b2fec026bcb75d0175e52e8e8aadd1
 DIST blender-2.42.tar.gz 12195054 RMD160 c3a1aa1080d122867f116dd05564c77d41d55194 SHA1 a8fa45b0f032d992b20762bada931da18b716368 SHA256 c0f5f0c3d9cfbf661bba153ebbcafed21bc34524c02096050626194c9345af93
 DIST blender-2.42_pre20060703.tar.bz2 10334584 RMD160 14167584240e553f9d546071b280394766add8c5 SHA1 5397175758b2b2662f4b77b77890199cddb9bf39 SHA256 90a5e714626b4bf9052a432bde591cb1af2a24f130c782f4ff48f479fdeb449f
@@ -21,14 +25,18 @@
 MD5 838fc96e6acd28ee12ef3b126bc7e633 blender-2.41.ebuild 3537
 RMD160 eea5f21e5e2ba761a16dfcae01b886d3b97f80bf blender-2.41.ebuild 3537
 SHA256 990ec64ec6e987e472dc0c479020fdf99cd56f6f80564bdd1eb02f518715fce7 blender-2.41.ebuild 3537
-EBUILD blender-2.42.ebuild 3136 RMD160 b09bbc17178b398de37e581692560f0a5be24a24 SHA1 2f91d068e2f850824232fc918a29c52460761f0d SHA256 e0a34a60add4314dbe93e4b4822de5341a38bfd0f972f3f2b58500c0acff16e7
-MD5 3c5901f27d691378995c755be03ab363 blender-2.42.ebuild 3136
-RMD160 b09bbc17178b398de37e581692560f0a5be24a24 blender-2.42.ebuild 3136
-SHA256 e0a34a60add4314dbe93e4b4822de5341a38bfd0f972f3f2b58500c0acff16e7 blender-2.42.ebuild 3136
+EBUILD blender-2.42.ebuild 3183 RMD160 ab663e724b1dd69982e0263d0b36f33fea286d3d SHA1 324cd62ca3a81be82609889f16af6543c3c01708 SHA256 4bced9d16c68ec68324b1eba9b1f6d2192fb0b42cad7645ed07fd8f85287a4f6
+MD5 e3d593caef1dd21589bbaabea881084c blender-2.42.ebuild 3183
+RMD160 ab663e724b1dd69982e0263d0b36f33fea286d3d blender-2.42.ebuild 3183
+SHA256 4bced9d16c68ec68324b1eba9b1f6d2192fb0b42cad7645ed07fd8f85287a4f6 blender-2.42.ebuild 3183
 EBUILD blender-2.42_pre20060703.ebuild 3110 RMD160 b3c9bd3eb21e5dd3052e0cbd706d7efd0e841111 SHA1 63c9b181607aee253452f3ff26f05f0c682b786e SHA256 ea10db41a3978a10c75513b2ccbe9cdda1c8fb5541ae80b48ca7cbec06d4c487
 MD5 bb6f28102c019b01adc9fc8cb4a28c5d blender-2.42_pre20060703.ebuild 3110
 RMD160 b3c9bd3eb21e5dd3052e0cbd706d7efd0e841111 blender-2.42_pre20060703.ebuild 3110
 SHA256 ea10db41a3978a10c75513b2ccbe9cdda1c8fb5541ae80b48ca7cbec06d4c487 blender-2.42_pre20060703.ebuild 3110
+MISC .blender-2.42.ebuild.swp 4096 RMD160 831db851e63bf0a981784d37692f776e1ee9b6ed SHA1 056b5593db92b54bb641e48a6e605e2719b53458 SHA256 47adbfa4c512e538db78ada8883f5260a9d9e1186d7135e77220ff5f074373d0
+MD5 84be112a04104ba59b2dd13a41877f5c .blender-2.42.ebuild.swp 4096
+RMD160 831db851e63bf0a981784d37692f776e1ee9b6ed .blender-2.42.ebuild.swp 4096
+SHA256 47adbfa4c512e538db78ada8883f5260a9d9e1186d7135e77220ff5f074373d0 .blender-2.42.ebuild.swp 4096
 MISC ChangeLog 12887 RMD160 0be2ec33d9df3c6e88cdd3383f425e77f8e15f2a SHA1 8fcbd56a5824f086676363994f7ab006b38a9909 SHA256 02a2063eadd85523e6b09c5cd24165956d5d5eb4ae33f7dd1be99d6f3df6b77f
 MD5 5e66bbc9ee768e97ad9272ebbc946b0f ChangeLog 12887
 RMD160 0be2ec33d9df3c6e88cdd3383f425e77f8e15f2a ChangeLog 12887
diff -ruN /usr/portage/media-gfx/blender/blender-2.42.ebuild /usr/local/portage/media-gfx/blender/blender-2.42.ebuild
--- /usr/portage/media-gfx/blender/blender-2.42.ebuild	2006-07-20 05:36:18.000000000 -0700
+++ /usr/local/portage/media-gfx/blender/blender-2.42.ebuild	2006-07-22 06:37:19.000000000 -0700
@@ -24,8 +24,8 @@
 	nls? ( >=media-libs/freetype-2.0
 			virtual/libintl )
 	iconv? ( virtual/libiconv )
-	openal? ( ~media-libs/openal-0.0.8
-			   media-libs/freealut )
+	openal? ||( media-libs/openal 
+                media-libs/freealut )
 	sdl? ( >=media-libs/libsdl-1.2 )
 	ffmpeg? ( media-video/ffmpeg )
 	>=dev-libs/openssl-0.9.6
@@ -64,6 +64,7 @@
 	cp -pPR ${S}/source/blender/blenpluginapi include
 	cd ${S}
 	epatch ${FILESDIR}/blender-2.37-dirs.patch
+	epatch ${FILESDIR}/openal-version.patch
 #	mkdir -p ${WORKDIR}/build/linux2/{extern,intern,source}
 }
 
diff -ruN /usr/portage/media-gfx/blender/files/openal-version.patch /usr/local/portage/media-gfx/blender/files/openal-version.patch
--- /usr/portage/media-gfx/blender/files/openal-version.patch	1969-12-31 16:00:00.000000000 -0800
+++ /usr/local/portage/media-gfx/blender/files/openal-version.patch	2006-07-21 08:14:34.000000000 -0700
@@ -0,0 +1,12 @@
+diff -u blender.orig/source/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp blender/source/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp 
+--- blender.orig/source/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2006-07-21 08:01:53.000000000 -0700
++++ blender/source/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2006-07-21 08:02:35.000000000 -0700
+@@ -432,7 +432,7 @@
+ #ifdef AL_VERSION_1_1					
+ 					alutLoadWAVMemory((ALbyte*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate, &loop);//	openal_2.14+
+ #else
+-					 alutLoadWAVMemory((signed char*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate, &loop);//  openal_2.14+
++					 alutLoadWAVMemory((ALbyte*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate, &loop);//  openal_2.14+
+ 					 
+ #endif 
+ #endif