Add SONAME and 64bit fixes, thanks to William Pitcock.

(Portage version: 2.1.3.16)

5 files changed, 126 insertions, 1 deletions

diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog
index 2eb2156f610b..472ada5276ce 100644
--- a/media-libs/libprojectm/ChangeLog
+++ b/media-libs/libprojectm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libprojectm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.17 2007/10/24 15:38:28 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.18 2007/11/02 14:24:16 drac Exp $
+
+*libprojectm-1.01-r1 (02 Nov 2007)
+
+  02 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  +files/libprojectm-1.01-cmake_soname.patch,
+  +files/libprojectm-1.01-soil_64bit_fixes.patch,
+  +libprojectm-1.01-r1.ebuild:
+  Add SONAME and 64bit fixes, thanks to William Pitcock.
 
   24 Oct 2007; Joe Peterson <lavajoe@gentoo.org>
   -files/libprojectm-1.01-freebsd.patch,
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;

+ 			}

+ 		}

diff --git a/media-libs/libprojectm/libprojectm-1.01-r1.ebuild b/media-libs/libprojectm/libprojectm-1.01-r1.ebuild
new file mode 100644
index 000000000000..0a0b0693dd6f
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-1.01-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-1.01-r1.ebuild,v 1.1 2007/11/02 14:24:16 drac Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=${P/m/M}
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="http://projectm.sourceforge.net"
+SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/ftgl
+	media-libs/freetype
+	media-libs/glew
+	virtual/opengl
+	media-libs/glew
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/cmake"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-malloc.patch
+	epatch "${FILESDIR}"/${P}-soil_64bit_fixes.patch
+	epatch "${FILESDIR}"/${P}-cmake_soname.patch
+}
+
+src_compile() {
+	cmake \
+		-DCMAKE_VERBOSE_MAKEFILE="ON" \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		-DCMAKE_C_COMPILER="$(type -P $(tc-getCC))" \
+		-DCMAKE_CXX_COMPILER="$(type -P $(tc-getCXX))" \
+		-DCMAKE_C_FLAGS="${CFLAGS}" \
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+		-DCMAKE_LD_FLAGS="${LDFLAGS}" \
+		. || die "cmake failed."
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+}