Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15182
Modified Files:
Tag: pangocairo-branch
vice.info vice.patch
Log Message:
new version, now GNOME2
Index: vice.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/vice.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- vice.patch 14 Apr 2006 02:20:58 -0000 1.2
+++ vice.patch 25 Mar 2008 15:40:42 -0000 1.2.2.1
@@ -1,99 +1,1049 @@
-diff -Nurd -x'*~' vice-1.19.orig/configure vice-1.19/configure
---- vice-1.19.orig/configure 2006-01-08 15:31:51.000000000 -0500
-+++ vice-1.19/configure 2006-04-13 22:08:36.000000000 -0400
-@@ -5647,15 +5647,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- INTLLIBS=-lintl gt_cv_func_gettext_libintl=yes
-+ gt_cv_func_gettext_libintl=yes
- else
- echo "$as_me: failed program was:" >&5
[...1091 lines suppressed...]
++ @ARCH_INCLUDES@
+
+ noinst_LIBRARIES = libvicii.a
+ libvicii_a_SOURCES = \
+diff -Nurd -x'*~' vice-1.22.orig/src/video/Makefile.in
vice-1.22/src/video/Makefile.in
+--- vice-1.22.orig/src/video/Makefile.in 2007-08-05 16:45:38.000000000
-0400
++++ vice-1.22/src/video/Makefile.in 2008-03-24 01:52:57.000000000 -0400
+@@ -308,10 +308,10 @@
+ xplus4_LDFLAGS = @xplus4_LDFLAGS@
+ xvic_LDFLAGS = @xvic_LDFLAGS@
+ INCLUDES = \
+- @ARCH_INCLUDES@ \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+- -I$(top_srcdir)/src/raster
++ -I$(top_srcdir)/src/raster \
++ @ARCH_INCLUDES@
+
+ noinst_LIBRARIES = libvideo.a
+ libvideo_a_SOURCES = \
Index: vice.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/vice.info,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -d -r1.3.2.6 -r1.3.2.7
--- vice.info 7 Oct 2007 20:32:52 -0000 1.3.2.6
+++ vice.info 25 Mar 2008 15:40:42 -0000 1.3.2.7
@@ -1,24 +1,90 @@
Package: vice
-Version: 1.19
-Revision: 1003
+Version: 1.22
+Revision: 1
Maintainer: None <[EMAIL PROTECTED]>
GCC: 4.0
-BuildDepends: libjpeg, libpng3, audiofile, esound, glib, gtk+, giflib, imlib,
gnome-libs-dev, readline5 (>= 5.0-1004), libgettext3-dev, gettext-bin,
gettext-tools, libnet1.1 (>= 1.1.2.1-3), libpcap, x11-dev, fink (>= 0.24.12-1)
-Depends: libjpeg-shlibs, libpng3-shlibs, audiofile-shlibs, esound-shlibs,
glib-shlibs, gtk+-shlibs, giflib-shlibs, imlib-shlibs, gnome-libs,
readline5-shlibs (>= 5.0-1004), libgettext3-shlibs, libnet1.1-shlibs (>=
1.1.2.1-3), libpcap-shlibs, x11
+BuildDepends: <<
+ atk1 (>= 1.20.0-1),
+ cairo (>= 1.2-1),
+ esound (>= 0.2.38-1),
+ expat1,
+ fink (>= 0.24.12-1),
+ fontconfig2-dev (>= 2.4.1-1),
+ freetype219 (>= 2.3.5-1),
+ gettext-bin,
+ gettext-tools,
+ giflib,
+ glib2-dev (>= 2.14.0-1),
+ glitz,
+ lame-dev,
+ libgettext3-dev,
+ libiconv-dev,
+ libjpeg,
+ libnet1.0,
+ libpcap,
+ libpng3 (>= 1.2.5-4),
+ pango1-xft2-ft219-dev (>= 1.18.2-1),
+ pkgconfig (>= 0.21-1),
+ readline5,
+ x11-dev,
+ xft2-dev
+<<
+Depends: <<
+ atk1-shlibs (>= 1.20.0-1),
+ cairo-shlibs (>= 1.2-1),
+ esound-shlibs (>= 0.2.38-1),
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.5-1),
+ giflib-shlibs,
+ glib2-shlibs (>= 2.14.0-1),
+ glitz-shlibs,
+ lame-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libjpeg-shlibs,
+ libnet1.0-shlibs,
+ libpcap-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
+ pango1-xft2-ft219-shlibs (>= 1.18.2-1),
+ readline5-shlibs,
+ x11-shlibs
+<<
#Source: ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/%n-%v.tar.gz
Source:
http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/%n-%v.tar.gz
-Source-MD5: 92f828f29e05f57d7a498a861d3dab6a
+Source-MD5: 33204acbb74bafb12594d39b55888626
+Source2:
http://developer.apple.com/samplecode/HID_Utilities_Source/HID_Utilities_Source.zip
+Source2-MD5: 78ba0e81baccda79839fef8252c4f5c9
+Source2ExtractDir: %n-%v
DocFiles: AUTHORS COPYING ChangeLog FEEDBACK README
PatchFile: %n.patch
-PatchFile-MD5: 2051704212943146798c6399dd1256ea
-ConfigureParams: --infodir=%p/share/info --mandir=%p/share/man
--enable-gnomeui --enable-ethernet --disable-dependency-tracking
+PatchFile-MD5: 656d00379ddc76f91372377f55cabb6c
+PatchScript: <<
+ %{default_script}
+ mv "HID Utilities Source" HID-Utilities-Source
+<<
+ConfigureParams: --infodir=%p/share/info --mandir=%p/share/man
--enable-gnomeui --enable-ethernet --disable-dependency-tracking
--disable-bundle
+SetCPPFLAGS: -I%b/HID-Utilities-Source -I%p/lib/fontconfig2/include
-I%p/lib/freetype219/include
+SetLDFLAGS: -L%b/HID-Utilities-Source -L%p/lib/fontconfig2/lib
-L%p/lib/freetype219/lib -lintl
CompileScript: <<
- #!/bin/sh -ev
- [ %m == i386 ] && export ac_cv_header_CoreAudio_CoreAudio_h=no
- RANLIB="ranlib -c -s" ac_cv_lib_ungif_EGifPutLine=no ./configure %c
- make
+#!/bin/sh -ex
+
+ pushd HID-Utilities-Source
+ # dist has ppc-only binary...nuke and build one for local system
+ rm -f build/*
+ for src in HID_Config_Utilities HID_Error_Handler
HID_Name_Lookup HID_Queue_Utilities HID_Transaction_Utilities HID_Utilities
+ do
+ gcc -O3 -W -c $src.c
+ ar cr libHIDUtilities.a $src.o
+ done
+ ranlib libHIDUtilities.a
+ popd
+
+ export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
+ [ %m == i386 ] && export ac_cv_header_CoreAudio_CoreAudio_h=no
+ ./configure %c
+ make
<<
-InstallScript: make install DESTDIR=%d docdir=%p/share/doc/vice
+InstallScript: make install DESTDIR=%d
InfoDocs: vice.info
Description: Versatile Commodore Emulator
DescDetail: <<
@@ -27,23 +93,23 @@
System.
<<
DescPort: <<
-Apple's ld complains if we don't use ranlib -s to sort libs.
-The -c flag to ranlib is needed to avoid undefined symbols errors.
+ Propagate $INTLLIBS for other NLS tests (configure seems to
+ assume that if gettext exists, it is in libc).
-Don't throw away -lintl for remainder of ./configure if it is found to
-be a desireable flag. Otherwise gettext catalogs wind up in lib/
-instead of share/
+ #Multiple games required to pass docdir for various usages.
-Multiple games required to pass docdir for various usages.
+ soundcoreaudio.c contains asm that does not compile on i386,
+ so disable CoreAudio on i386 machines.
-soundcoreaudio.c contains asm that does not compile on i386, so disable
-CoreAudio on i386 machines.
+ Need auto-determined X_CFLAGS in order to get -I for GL/*.h
-Use -lesd as a linker flag only, not a dependency
+ Shut up about the bad prototypes:
+ gtk+2's gtkitemfactory.h: gtk+2 will not be fixing it
+ vice's uimenu.h: doesn't seem to break anything, so not
touching it
<<
DescPackaging: <<
- Force use of giflib (ungiflib would be detected first, but it may or
- may not really be a link to giflib, so no way to write a dependency).
+ Fink doesn't have HID Utilities package, so download and build
+ it internally (flag-ordering problem if fink ever gets it:(
<<
License: GPL
Homepage: http://www.viceteam.org/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
