| 1 |
drac 07/11/02 14:24:17 |
| 2 |
|
| 3 |
Added: libprojectm-1.01-cmake_soname.patch |
| 4 |
libprojectm-1.01-soil_64bit_fixes.patch |
| 5 |
digest-libprojectm-1.01-r1 |
| 6 |
Log: |
| 7 |
Add SONAME and 64bit fixes, thanks to William Pitcock. |
| 8 |
(Portage version: 2.1.3.16) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-libs/libprojectm/files/libprojectm-1.01-cmake_soname.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libprojectm/files/libprojectm-1.01-cmake_soname.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libprojectm/files/libprojectm-1.01-cmake_soname.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: libprojectm-1.01-cmake_soname.patch |
| 17 |
=================================================================== |
| 18 |
diff -ur libprojectM-1.01.orig/CMakeLists.txt libprojectM-1.01/CMakeLists.txt |
| 19 |
--- libprojectM-1.01.orig/CMakeLists.txt 2007-10-10 17:47:14.000000000 +0300 |
| 20 |
+++ libprojectM-1.01/CMakeLists.txt 2007-11-02 16:05:18.000000000 +0200 |
| 21 |
@@ -6,6 +6,7 @@ |
| 22 |
BuiltinFuncs.cpp BuiltinParams.cpp Renderer.cpp |
| 23 |
PresetLoader.cpp PresetChooser.cpp PresetFrameIO.cpp PresetMerge.cpp |
| 24 |
ConfigFile.cpp IdlePreset.cpp TextureManager.cpp MoodBar.cpp image_DXT.c image_helper.c SOIL.c stb_image.c ) |
| 25 |
+SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 1.0.0 SOVERSION 1) |
| 26 |
|
| 27 |
OPTION(USE_FTGL "Use FTGL for on-screen fonts" ON) |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 media-libs/libprojectm/files/libprojectm-1.01-soil_64bit_fixes.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libprojectm/files/libprojectm-1.01-soil_64bit_fixes.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libprojectm/files/libprojectm-1.01-soil_64bit_fixes.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: libprojectm-1.01-soil_64bit_fixes.patch |
| 38 |
=================================================================== |
| 39 |
diff -ur libprojectM-1.01.orig/SOIL.c libprojectM-1.01/SOIL.c |
| 40 |
--- libprojectM-1.01.orig/SOIL.c 2007-10-10 17:47:14.000000000 +0300 |
| 41 |
+++ libprojectM-1.01/SOIL.c 2007-11-02 16:03:53.000000000 +0200 |
| 42 |
@@ -1389,12 +1389,10 @@ |
| 43 |
} else |
| 44 |
{ |
| 45 |
/* and find the address of the extension function */ |
| 46 |
- void *ext_addr = NULL; |
| 47 |
+ P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC ext_addr = NULL; |
| 48 |
#ifdef WIN32 |
| 49 |
- ext_addr = (void*)wglGetProcAddress |
| 50 |
- ( |
| 51 |
- "glCompressedTexImage2DARB" |
| 52 |
- ); |
| 53 |
+ ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC) |
| 54 |
+ wglGetProcAddress("glCompressedTexImage2DARB"); |
| 55 |
#elif defined(__APPLE__) || defined(__APPLE_CC__) |
| 56 |
/* I can't test this Apple stuff! */ |
| 57 |
CFBundleRef bundle; |
| 58 |
@@ -1411,16 +1409,14 @@ |
| 59 |
kCFStringEncodingASCII ); |
| 60 |
bundle = CFBundleCreate( kCFAllocatorDefault, bundleURL ); |
| 61 |
assert( bundle != NULL ); |
| 62 |
- ext_addr = CFBundleGetFunctionPointerForName( |
| 63 |
- bundle, extensionName ); |
| 64 |
+ ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC) |
| 65 |
+ CFBundleGetFunctionPointerForName( bundle, extensionName ); |
| 66 |
CFRelease( bundleURL ); |
| 67 |
CFRelease( functionName ); |
| 68 |
CFRelease( bundle ); |
| 69 |
#else |
| 70 |
- ext_addr = (void*)glXGetProcAddressARB |
| 71 |
- ( |
| 72 |
- (const GLubyte *)"glCompressedTexImage2DARB" |
| 73 |
- ); |
| 74 |
+ ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC) |
| 75 |
+ glXGetProcAddress((const GLubyte *)"glCompressedTexImage2DARB"); |
| 76 |
#endif |
| 77 |
/* Flag it so no checks needed later */ |
| 78 |
if( NULL == ext_addr ) |
| 79 |
@@ -1435,7 +1431,7 @@ |
| 80 |
} else |
| 81 |
{ |
| 82 |
/* all's well! */ |
| 83 |
- soilGlCompressedTexImage2D = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)ext_addr; |
| 84 |
+ soilGlCompressedTexImage2D = ext_addr; |
| 85 |
has_DXT_capability = SOIL_DXT_DIRECT_UPLOAD; |
| 86 |
} |
| 87 |
} |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
1.1 media-libs/libprojectm/files/digest-libprojectm-1.01-r1 |
| 92 |
|
| 93 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libprojectm/files/digest-libprojectm-1.01-r1?rev=1.1&view=markup |
| 94 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libprojectm/files/digest-libprojectm-1.01-r1?rev=1.1&content-type=text/plain |
| 95 |
|
| 96 |
Index: digest-libprojectm-1.01-r1 |
| 97 |
=================================================================== |
| 98 |
MD5 2570446daf58421aa81181dc0964c3f5 libprojectM-1.01.tar.bz2 536349 |
| 99 |
RMD160 d612868ca85a5d4ea5e6b520dab592f412426ee2 libprojectM-1.01.tar.bz2 536349 |
| 100 |
SHA256 2b321dacba21593b2886c9f61c186620dacb0d8fe48488a5793ddf022008de59 libprojectM-1.01.tar.bz2 536349 |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
-- |
| 105 |
gentoo-commits@g.o mailing list |
Archives