Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=6fceb2589b03968af452a83b91c71f3ff7e88383
commit 6fceb2589b03968af452a83b91c71f3ff7e88383 Author: crazy <[email protected]> Date: Tue Jan 5 09:02:15 2016 +0100 freeglut-3.0.0-1-x86_64 * Version bump * new m8r * depends() fix * switch to cmake build diff --git a/source/xlib/freeglut/FrugalBuild b/source/xlib/freeglut/FrugalBuild index ab7322a..46ecc1e 100644 --- a/source/xlib/freeglut/FrugalBuild +++ b/source/xlib/freeglut/FrugalBuild @@ -1,21 +1,20 @@ # Compiling Time: 0.21 SBU -# Maintainer: Frugalware Dev Team +# Maintainer: crazy <[email protected]> pkgname=freeglut -pkgver=2.4.0 -pkgrel=3 +pkgver=3.0.0 +pkgrel=1 pkgdesc="The free OpenGL utility toolkit, alternative to the GLUT library" groups=('xlib') archs=('i686' 'x86_64' 'arm') -depends=('mesa>=7.4.2' 'libstdc++') -makedepends=('libx11>=1.2.1' 'libxext>=1.0.5-3') +depends=('libgl>=11.1.0-3' 'libxi>=1.7.6') +makedepends=('x11-protos' 'mesa>=11.1.0-3' 'libglu>=9.0.0-2') _F_archive_grepv="rc" -Finclude sourceforge +Finclude sourceforge cmake url="http://freeglut.sourceforge.net"; -source=(${source[@]} freeglut_cursor.c.diff) -Fconfopts+=" --disable-warnings" -sha1sums=('91a528aa72758b7288a0d69a964b1b7e3f322a12' \ - '9353d7b811fdfd6f0c5766f0e93924ca63e9d6a9') +_F_cmake_confopts+=" -DFREEGLUT_BUILD_DEMOS=OFF -DFREEGLUT_BUILD_SHARED_LIBS=ON \ + -DFREEGLUT_BUILD_STATIC_LIBS=OFF -DFREEGLUT_REPLACE_GLUT=ON" +sha1sums=('fca52242f9344627a30f11487ee42002e6b0dacd') diff --git a/source/xlib/freeglut/freeglut_cursor.c.diff b/source/xlib/freeglut/freeglut_cursor.c.diff deleted file mode 100644 index b56a37c..0000000 --- a/source/xlib/freeglut/freeglut_cursor.c.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- freeglut-2.4.0.orig/src/freeglut_cursor.c -+++ freeglut-2.4.0/src/freeglut_cursor.c -@@ -130,7 +130,9 @@ - XCreateFontCursor( fgDisplay.Display, entry->cursorShape ); - } - cursor = entry->cachedCursor; -- } else { -+ if (cursor == None) -+ fgError( "Failed to create cursor" ); -+ } else { - switch( cursorIDToUse ) - { - case GLUT_CURSOR_NONE: -@@ -147,9 +149,6 @@ - } - } - -- if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) { -- fgError( "Failed to create cursor" ); -- } - XDefineCursor( fgDisplay.Display, - window->Window.Handle, cursor ); - } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
