Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods
In directory sc8-pr-cvs17:/tmp/cvs-serv5264/main/finkinfo/libs/rubymods
Added Files:
Tag: pangocairo-branch
opengl-mac-rb18.info opengl-mac-rb18.patch
qtruby-mac-rb18.info qtruby-mac-rb18.patch
Log Message:
merge from HEAD (pangocairo-root-29)
--- NEW FILE: qtruby-mac-rb18.patch ---
# do not version the ruby extensions
diff -ur qtruby-1.0.13/qtruby/rubylib/designer/uilib/Makefile.am
qtruby-1.0.13.2/qtruby/rubylib/designer/uilib/Makefile.am
--- qtruby-1.0.13/qtruby/rubylib/designer/uilib/Makefile.am 2006-09-19
17:49:58.000000000 +0200
+++ qtruby-1.0.13.2/qtruby/rubylib/designer/uilib/Makefile.am 2007-04-26
20:18:37.000000000 +0200
@@ -3,5 +3,5 @@
rubylibdir = $(RUBY_SITEARCHDIR)
rubylib_LTLIBRARIES = qui.la
qui_la_SOURCES = qui.cpp
-qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
-qui_la_LIBADD = -lqui
\ No newline at end of file
+qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -avoid-version
+qui_la_LIBADD = -lqui
Only in qtruby-1.0.13.2/qtruby/rubylib/designer/uilib: Makefile.am~
diff -ur qtruby-1.0.13/qtruby/rubylib/designer/uilib/Makefile.in
qtruby-1.0.13.2/qtruby/rubylib/designer/uilib/Makefile.in
--- qtruby-1.0.13/qtruby/rubylib/designer/uilib/Makefile.in 2006-09-19
17:58:46.000000000 +0200
+++ qtruby-1.0.13.2/qtruby/rubylib/designer/uilib/Makefile.in 2007-04-26
20:18:51.000000000 +0200
@@ -225,7 +225,7 @@
rubylibdir = $(RUBY_SITEARCHDIR)
rubylib_LTLIBRARIES = qui.la
qui_la_SOURCES = qui.cpp
-qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
+qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -avoid-version
qui_la_LIBADD = -lqui
subdir = qtruby/rubylib/designer/uilib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Only in qtruby-1.0.13.2/qtruby/rubylib/designer/uilib: Makefile.in~
diff -ur qtruby-1.0.13/qtruby/rubylib/qtruby/Makefile.am
qtruby-1.0.13.2/qtruby/rubylib/qtruby/Makefile.am
--- qtruby-1.0.13/qtruby/rubylib/qtruby/Makefile.am 2006-09-19
17:50:04.000000000 +0200
+++ qtruby-1.0.13.2/qtruby/rubylib/qtruby/Makefile.am 2007-04-26
20:13:19.000000000 +0200
@@ -9,7 +9,7 @@
rubylibdir = $(RUBY_SITEARCHDIR)
rubylib_LTLIBRARIES = qtruby.la
qtruby_la_SOURCES =
-qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
+qtruby_la_LDFLAGS = -module $(all_libraries) -avoid-version
qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT)
$(top_builddir)/smoke/qt/libsmokeqt.la
SUBDIRS = lib
#touch qtruby-1.0.13/qtruby/rubylib/qtruby/Makefile.am
# include OpenGL
diff -ur qtruby-1.0.13/smoke/qt/generate.pl.in
qtruby-1.0.13.2/smoke/qt/generate.pl.in
--- qtruby-1.0.13/smoke/qt/generate.pl.in 2006-09-19 17:54:39.000000000
+0200
+++ qtruby-1.0.13.2/smoke/qt/generate.pl.in 2007-04-26 19:32:32.000000000
+0200
@@ -61,8 +61,8 @@
'qxt.h' => 1, # Xt
'qxtwidget.h' => 1, # Xt
'qdns.h' => 1, # internal
- 'qgl.h' => 1, # OpenGL
- 'qglcolormap.h' => 1, # OpenGL
+ #'qgl.h' => 1, # OpenGL
+ #'qglcolormap.h' => 1, # OpenGL
'qnp.h' => 1, # NSPlugin
'qttableview.h' => 1, # Not in Qt anymore...
'qtmultilineedit.h' => 1, # Not in Qt anymore...
Only in qtruby-1.0.13.2/smoke/qt: generate.pl.in~
--- NEW FILE: qtruby-mac-rb18.info ---
Package: qtruby-mac-rb18
Version: 1.0.13
Revision: 1
Maintainer: Michal Suchanek <[EMAIL PROTECTED]>
License: GPL
Description: Qt bindings for ruby
Homepage: http://rubyforge.org/projects/korundum/
Depends: ruby18-shlibs, qt3mac-shlibs, smokeqt3mac-shlibs (= %v-%r),
opengl-mac-rb18, libpng3-shlibs
BuildDepends: ruby (>> 1.8.6), ruby (<< 1.9), qt3mac (>> 3.1), automake1.7,
libpng3
GCC: 4.0
Source: http://rubyforge.org/frs/download.php/13265/qtruby-%v.tgz
Source-MD5: 0d5853a2a6626828a06b43f3e19f8095
Patch: %n.patch
PatchScript: touch -c qtruby/rubylib/qtruby/Makefile.am
NoSetLDFLAGS: true
ConfigureParams: '--prefix=%p' '--with-extra-includes=%p/include'
'--with-extra-libs=%p/lib' '--enable-mac' '--with-qt-dir=%p/lib/qt3mac'
InstallScript: <<
make install DESTDIR=%d
find %i -name \*.so | while read x ; do ln -s `basename $x` `dirname
$x`/`basename $x .so`.bundle ; done
<<
DocFiles: qtruby/INSTALL qtruby/AUTHORS COPYING COPYING.LIB qtruby/ChangeLog
NEWS qtruby/README qtruby/README.1st qtruby/TODO qtruby/rubylib/examples
qtruby/rubylib/tutorial
SplitOff:<<
Package: smokeqt3mac
Depends: smokeqt3mac-shlibs (= %v-%r)
BuildDependsOnly: true
Description: qt bindings library
DocFiles: AUTHORS COPYING COPYING.LIB ChangeLog README
Files:<<
lib/libsmokeqt.dylib
lib/libsmokeqt.la
include
<<
<<
SplitOff2: <<
Package: smokeqt3mac-shlibs
Depends: qt3mac-shlibs
Description: qt bindings library
Shlibs: %p/lib/libsmokeqt.1.dylib 4.0.0 %n (>= 1.0.13-1)
DocFiles: AUTHORS COPYING COPYING.LIB ChangeLog README
Files: <<
lib/libsmoke*
<<
<<
--- NEW FILE: opengl-mac-rb18.patch ---
diff -ru opengl-0.32g-orig/extconf.rb opengl-0.32g/extconf.rb
--- opengl-0.32g-orig/extconf.rb 2005-10-16 23:21:26.000000000 -0700
+++ opengl-0.32g/extconf.rb 2005-10-16 23:22:05.000000000 -0700
@@ -99,7 +99,10 @@
install: #{modules}
#{"[EMAIL PROTECTED](MAKE) -f Makefile.ogl install" if (ogl_flg)}
#{"[EMAIL PROTECTED](MAKE) -f Makefile.glut install" if (glut_flg)}
-
+ mkdir -p ${prefix}/share/doc/opengl-rb18/sample
+ rm sample/aaindex.rb sample/aapoly.rb
+ cp sample/*.rb ${prefix}/share/doc/opengl-rb18/sample
+
site-install: #{modules}
#{"[EMAIL PROTECTED](MAKE) -f Makefile.ogl site-install" if (ogl_flg)}
#{"[EMAIL PROTECTED](MAKE) -f Makefile.glut site-install" if (glut_flg)}
Only in opengl-0.32g: extconf.rb.orig
diff -ru opengl-0.32g-orig/sample/accanti.rb opengl-0.32g/sample/accanti.rb
--- opengl-0.32g-orig/sample/accanti.rb 2005-10-16 23:21:26.000000000 -0700
+++ opengl-0.32g/sample/accanti.rb 2005-10-16 23:21:43.000000000 -0700
@@ -42,6 +42,7 @@
require "opengl"
require "glut"
$LOAD_PATH.push(File.dirname($0)) # Find jitter in script directory
+require "jitter"
#/* Initialize lighting and other values.
# */
diff -ru opengl-0.32g-orig/sample/accpersp.rb opengl-0.32g/sample/accpersp.rb
--- opengl-0.32g-orig/sample/accpersp.rb 2005-10-16 23:21:26.000000000
-0700
+++ opengl-0.32g/sample/accpersp.rb 2005-10-16 23:23:21.000000000 -0700
@@ -44,6 +44,7 @@
require "glut"
$LOAD_PATH.push(File.dirname($0)) # Find jitter in script directory
+require "jitter"
PI_=3.14159265358979323846
diff -ur opengl-0.32g/extconf.rb opengl-0.32g.new/extconf.rb
--- opengl-0.32g/extconf.rb 2005-08-26 18:04:19.000000000 +0200
+++ opengl-0.32g.new/extconf.rb 2007-04-26 14:17:07.000000000 +0200
@@ -5,9 +5,9 @@
require "mkmf"
-gl_libname = ""
-glu_libname = ""
-glut_libname = ""
+gl_libname = nil
+glu_libname = nil
+glut_libname = nil
modules = ""
ogl_flg = false
@@ -33,6 +33,12 @@
glut_libname = "glut32"
else
$CPPFLAGS += " -I."
+ if (File.exist? "/System/Library/Frameworks/OpenGL.framework/OpenGL") #looks
Applish
+ #FIXME sometimes it is desirable to compile for X11 even on Apple
+ $INCFLAGS = "-FOpenGL -FGLUT " + $INCFLAGS
+ $LDFLAGS = "-framework OpenGL -framework GLUT " + $LDFLAGS
+ $CPPFLAGS += " -DAPPLE"
+ else
idir, ldir = dir_config("x11", "/usr/X11R6")
@@ -43,9 +49,13 @@
gl_libname = "GL"
glu_libname = "GLU"
glut_libname = "glut"
+ end
end
+
+if gl_libname
dir_config("opengl", idir, ldir)
dir_config("glut", idir, ldir)
+end
def have_ogl_library(lib, func = 'main')
have_library(lib, func) || have_library("Mesa"+lib, func)
@@ -53,7 +63,7 @@
$objs = ["glu.o", "ogl.o", "rbogl.o"]
#have_library("pthread", "pthread_create")
-if have_ogl_library(gl_libname) && have_ogl_library(glu_libname)
+if !gl_libname || have_ogl_library(gl_libname) && have_ogl_library(glu_libname)
create_makefile("opengl")
File.rename("Makefile", "Makefile.ogl")
modules = modules + "opengl.#{CONFIG['DLEXT']}"
@@ -64,7 +74,7 @@
end
$objs = ["glut.o"]
-if have_library(glut_libname)
+if !gl_libname || have_library(glut_libname)
create_makefile("glut")
File.rename("Makefile", "Makefile.glut")
modules = "glut.#{CONFIG['DLEXT']} " + modules
diff -ur opengl-0.32g/glu.c opengl-0.32g.new/glu.c
--- opengl-0.32g/glu.c 2005-08-26 18:04:19.000000000 +0200
+++ opengl-0.32g.new/glu.c 2007-04-26 14:27:55.000000000 +0200
@@ -5,8 +5,13 @@
#if defined(WIN32)
# include "windows.h"
#endif
-#include "GL/gl.h"
-#include "GL/glu.h"
+#if defined (APPLE)
+# include "OpenGL/gl.h"
+# include "OpenGL/glu.h"
+#else
+# include "GL/gl.h"
+# include "GL/glu.h"
+#endif
#include "rbogl.h"
#ifdef WIN32
diff -ur opengl-0.32g/glut.c opengl-0.32g.new/glut.c
--- opengl-0.32g/glut.c 2005-08-26 18:04:19.000000000 +0200
+++ opengl-0.32g.new/glut.c 2007-04-26 14:23:53.000000000 +0200
@@ -5,7 +5,11 @@
#if defined(WIN32)
# include "windows.h"
#endif
-#include "GL/glut.h"
+#if defined(APPLE)
+# include "GLUT/glut.h"
+#else
+# include "GL/glut.h"
+#endif
#include "ruby.h"
static int callId; /* 'call' method id */
diff -ur opengl-0.32g/ogl.c opengl-0.32g.new/ogl.c
--- opengl-0.32g/ogl.c 2005-08-26 18:04:19.000000000 +0200
+++ opengl-0.32g.new/ogl.c 2007-04-26 14:26:23.000000000 +0200
@@ -5,7 +5,11 @@
#if defined (WIN32)
# include "windows.h"
#endif
-#include "GL/gl.h"
+#if defined (APPLE)
+# include "OpenGL/gl.h"
+#else
+# include "GL/gl.h"
+#endif
#include "rbogl.h"
#if defined __CYGWIN__
diff -ur opengl-0.32g/rbogl.c opengl-0.32g.new/rbogl.c
--- opengl-0.32g/rbogl.c 2005-08-26 18:04:19.000000000 +0200
+++ opengl-0.32g.new/rbogl.c 2007-04-26 14:29:01.000000000 +0200
@@ -5,8 +5,12 @@
#if defined (WIN32)
# include "windows.h"
#endif
+#if defined (APPLE)
+# include "OpenGL/gl.h"
+#else
+# include "GL/gl.h"
+#endif
#include "rbogl.h"
-#include "GL/gl.h"
#ifdef _NO_NUM2DBL_
extern double
--- NEW FILE: opengl-mac-rb18.info ---
Package: opengl-mac-rb18
Version: 0.32g
Revision: 1
Depends: ruby18-shlibs
BuildDepends: ruby18-dev
Conflicts: opengl-rb18
Source: http://www2.giganet.net/~yoshi/rbogl-%v.tar.gz
Source-MD5: 0832d08a87ebb16f6d4e30459a5019f0
SourceDirectory: opengl-%v
Patch: %n.patch
Type: ruby 1.8
DocFiles: MANIFEST ChangeLog README.EUC
License: BSD
Description: Ruby interface to OpenGL, GLU, and GLUT
Maintainer: Michal Suchanek <[EMAIL PROTECTED]>
Homepage: http://www2.giganet.net/~yoshi
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
