Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26412
Modified Files:
caca.info
Added Files:
caca.patch
Log Message:
libcaca flag updates from 10.4/dmacks
--- NEW FILE: caca.patch ---
diff -Nurd -x'*~' libcaca-0.99.beta18.orig/configure
libcaca-0.99.beta18/configure
--- libcaca-0.99.beta18.orig/configure 2012-04-06 16:48:32.000000000 -0400
+++ libcaca-0.99.beta18/configure 2013-03-21 22:04:13.000000000 -0400
@@ -17393,7 +17393,7 @@
$as_echo "#define USE_GL 1" >>confdefs.h
- GL_LIBS="${GL_LIBS} -lGL -lGLU -lglut"
+ GL_LIBS="${GL_LIBS} -lGL -lGLU -lglut -L/usr/X11R6/lib"
CACA_DRIVERS="${CACA_DRIVERS} gl"
elif test "${enable_gl}" = "yes"; then
as_fn_error $? "cannot find OpenGL+FreeGLUT development files" "$LINENO" 5
Index: caca.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/caca.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- caca.info 21 Mar 2013 15:00:32 -0000 1.3
+++ caca.info 22 Mar 2013 14:34:32 -0000 1.4
@@ -1,6 +1,6 @@
Package: caca
Version: 0.99.beta18
-Revision: 4
+Revision: 5
###
Depends: <<
libcaca-shlibs (>= %v-%r),
@@ -13,9 +13,9 @@
doxygen,
expat1,
fink-package-precedence,
- fontconfig2-dev (>= 2.8.0-4),
+ fontconfig2-dev (>= 2.10.0-1),
freeglut,
- freetype219 (>= 2.3.12-1),
+ freetype219 (>= 2.4.11-1),
glib2-dev (>= 2.22.0-1),
imlib2,
libncursesw5 (>= 5.4-20041023-1001),
@@ -25,13 +25,21 @@
tetex-base,
x11-dev
<<
+# libftgl2 # detected but not used
GCC: 4.0
###
Source: http://caca.zoy.org/files/libcaca/libcaca-%v.tar.gz
Source-MD5: 93d35dbdb0527d4c94df3e9a02e865cc
###
+PatchFile: %n.patch
+PatchFile-MD5: 4fa8ee8dd00a9448f933d583445af566
PatchScript: <<
- perl -pi -e 's,ifndef __intptr_t_defined,if !defined(__intptr_t_defined) &&
!defined(_UINTPTR_T),' src/mygetopt.c
+ %{default_script}
+
+# file renamed to getopt.c but apparently no damage from not having
+# this tweak not applied to it, so omitting
+# perl -pi -e 's,ifndef __intptr_t_defined,if !defined(__intptr_t_defined) &&
!defined(_UINTPTR_T),' src/mygetopt.c
+
# Get rid of the SDK stuff
perl -pi -e 's, \${MACOSX_SDK_[A-Z]*},,; s/-syslibroot,\${MACOSX_SDK},//; s,
*\${ARCH} *,,' configure
@@ -49,24 +57,24 @@
<<
###
SetCFLAGS: -DREAL_UNIX_SYSTEM -fno-common
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/include -I/usr/X11/lib -I/usr/X11R6/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib -L/usr/X11/lib -L/usr/X11R6/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+SetLDFLAGS:
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
###
-ConfigureParams: --enable-shared --disable-static --with-pic
--mandir=%p/share/man --infodir=%p/share/info --libexecdir=%p/lib --with-x
--enable-cxx --enable-plugins --disable-cocoa --disable-csharp --disable-ruby
--disable-java --disable-python --enable-dependency-tracking
+ConfigureParams: --enable-shared --disable-static --with-pic
--mandir=%p/share/man --infodir=%p/share/info --libexecdir=%p/lib --with-x
--enable-cxx --enable-plugins --disable-cocoa --disable-csharp --disable-ruby
--disable-java --disable-python --enable-dependency-tracking --disable-zzuf
###
DocFiles: AUTHORS COPYING ChangeLog NEWS NOTES README THANKS
###
CompileScript: <<
#!/bin/sh -ev
- export
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
%{default_script}
fink-package-precedence --prohibit-bdep=libcaca-dev .
<<
InfoTest: <<
+ TestDepends: <<
+ cppunit1.12.1
+ <<
TestScript: <<
- make -j1 check || exit
+ make -j1 check || exit 2
<<
<<
InstallScript: <<
@@ -108,12 +116,10 @@
DescPort: <<
We disable ruby to avoid the mess of /usr/bin/ruby vs. %p/bin/ruby.
- freeglut needs X11-supplied headers but ./configure glut test
- forgets to propagate x11 compiler flags in the test. Pass 'em in
- CPPFLAGS/LDFLAGS (easier than hacking X_CFLAGS/X_LIBS into the test)
- but still give fink's precedence
+ library-suffix detection is incorrect but LT_SUFFIX result is only used
+ for caca-sharp, which is disabled.
- library-suffix detection is incorrect but LT_SUFFIX result not used.
+ zzuf isn't used, so don't even bother detecting it.
<<
###
License: LGPL
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
