diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2007-11-02 14:24:16 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2007-11-02 14:24:16 +0000 |
| commit | 9e2bfbf50c36f61ac95e0b3c4a008f88a16d49d0 (patch) | |
| tree | ccdb9d87f56716ce038b5296bdeb52cc8dbf8b9a /media-libs/libprojectm/files | |
| parent | amd64 stable, bug 194959 (diff) | |
| download | gentoo-2-9e2bfbf50c36f61ac95e0b3c4a008f88a16d49d0.tar.gz gentoo-2-9e2bfbf50c36f61ac95e0b3c4a008f88a16d49d0.tar.bz2 gentoo-2-9e2bfbf50c36f61ac95e0b3c4a008f88a16d49d0.zip | |
Add SONAME and 64bit fixes, thanks to William Pitcock.
(Portage version: 2.1.3.16)
Diffstat (limited to 'media-libs/libprojectm/files')
3 files changed, 63 insertions, 0 deletions
diff --git a/media-libs/libprojectm/files/digest-libprojectm-1.01-r1 b/media-libs/libprojectm/files/digest-libprojectm-1.01-r1 new file mode 100644 index 000000000000..75e921c0155e --- /dev/null +++ b/media-libs/libprojectm/files/digest-libprojectm-1.01-r1 @@ -0,0 +1,3 @@ +MD5 2570446daf58421aa81181dc0964c3f5 libprojectM-1.01.tar.bz2 536349 +RMD160 d612868ca85a5d4ea5e6b520dab592f412426ee2 libprojectM-1.01.tar.bz2 536349 +SHA256 2b321dacba21593b2886c9f61c186620dacb0d8fe48488a5793ddf022008de59 libprojectM-1.01.tar.bz2 536349 diff --git a/media-libs/libprojectm/files/libprojectm-1.01-cmake_soname.patch b/media-libs/libprojectm/files/libprojectm-1.01-cmake_soname.patch new file mode 100644 index 000000000000..47e13614e3a3 --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-1.01-cmake_soname.patch @@ -0,0 +1,11 @@ +diff -ur libprojectM-1.01.orig/CMakeLists.txt libprojectM-1.01/CMakeLists.txt +--- libprojectM-1.01.orig/CMakeLists.txt 2007-10-10 17:47:14.000000000 +0300 ++++ libprojectM-1.01/CMakeLists.txt 2007-11-02 16:05:18.000000000 +0200 +@@ -6,6 +6,7 @@ + BuiltinFuncs.cpp BuiltinParams.cpp Renderer.cpp + PresetLoader.cpp PresetChooser.cpp PresetFrameIO.cpp PresetMerge.cpp + ConfigFile.cpp IdlePreset.cpp TextureManager.cpp MoodBar.cpp image_DXT.c image_helper.c SOIL.c stb_image.c ) ++SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 1.0.0 SOVERSION 1) + + OPTION(USE_FTGL "Use FTGL for on-screen fonts" ON) + diff --git a/media-libs/libprojectm/files/libprojectm-1.01-soil_64bit_fixes.patch b/media-libs/libprojectm/files/libprojectm-1.01-soil_64bit_fixes.patch new file mode 100644 index 000000000000..43fcd7ba4bf8 --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-1.01-soil_64bit_fixes.patch @@ -0,0 +1,49 @@ +diff -ur libprojectM-1.01.orig/SOIL.c libprojectM-1.01/SOIL.c +--- libprojectM-1.01.orig/SOIL.c 2007-10-10 17:47:14.000000000 +0300 ++++ libprojectM-1.01/SOIL.c 2007-11-02 16:03:53.000000000 +0200 +@@ -1389,12 +1389,10 @@ + } else
+ {
+ /* and find the address of the extension function */
+- void *ext_addr = NULL;
++ P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC ext_addr = NULL;
+ #ifdef WIN32
+- ext_addr = (void*)wglGetProcAddress
+- (
+- "glCompressedTexImage2DARB"
+- );
++ ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)
++ wglGetProcAddress("glCompressedTexImage2DARB");
+ #elif defined(__APPLE__) || defined(__APPLE_CC__)
+ /* I can't test this Apple stuff! */
+ CFBundleRef bundle;
+@@ -1411,16 +1409,14 @@ + kCFStringEncodingASCII );
+ bundle = CFBundleCreate( kCFAllocatorDefault, bundleURL );
+ assert( bundle != NULL );
+- ext_addr = CFBundleGetFunctionPointerForName(
+- bundle, extensionName );
++ ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)
++ CFBundleGetFunctionPointerForName( bundle, extensionName );
+ CFRelease( bundleURL );
+ CFRelease( functionName );
+ CFRelease( bundle );
+ #else
+- ext_addr = (void*)glXGetProcAddressARB
+- (
+- (const GLubyte *)"glCompressedTexImage2DARB"
+- );
++ ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)
++ glXGetProcAddress((const GLubyte *)"glCompressedTexImage2DARB");
+ #endif
+ /* Flag it so no checks needed later */
+ if( NULL == ext_addr )
+@@ -1435,7 +1431,7 @@ + } else
+ {
+ /* all's well! */
+- soilGlCompressedTexImage2D = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)ext_addr;
++ soilGlCompressedTexImage2D = ext_addr;
+ has_DXT_capability = SOIL_DXT_DIRECT_UPLOAD;
+ }
+ }
|