Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19983
Modified Files:
ffmpeg.info libquicktime0.info
Log Message:
Fixed to work with 10.4 and liboss
Index: ffmpeg.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/ffmpeg.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ffmpeg.info 27 Apr 2005 03:25:45 -0000 1.1
+++ ffmpeg.info 3 May 2005 12:34:50 -0000 1.2
@@ -1,6 +1,6 @@
Package: ffmpeg
Version: 0.4.8
-Revision: 12
+Revision: 13
###
Depends: lame-shlibs, lame, libogg-shlibs, libvorbis0-shlibs, imlib2-shlibs,
libavcodec1-shlibs, libavformat1-shlibs, sdl-shlibs, a52dec, faad
BuildDepends: lame-dev, libogg, libvorbis0, imlib2, sdl, libfaad1-dev,
libmp4v21-dev, libpostproc1
@@ -10,53 +10,55 @@
###
PatchScript: <<
### Fix ffserver conf file location
- perl -pi.bak -e 's,/etc,%p/etc,g' ffserver.c
+ perl -pi -e 's,/etc,%p/etc,g' ffserver.c
### Enable ffserver on darwin
- perl -pi.bak -e 's,ffserver="no",ffserver="yes",g' configure
+ perl -pi -e 's,ffserver="no",ffserver="yes",g' configure
### Fix for Imlib2
- perl -pi.bak -e 's,-lImlib2,-I%p/include -L%p/lib -lImlib2,g' configure
+ perl -pi -e 's,-lImlib2,-I%p/include -L%p/lib -lImlib2,g' configure
### Lib version fix
- perl -pi.bak -e 's,dynamiclib,dynamiclib -compatibility_version 1
-current_version 1.4.8 -install_name %p/lib/\\\$(SLIB_INSTALL),g' configure
+ perl -pi -e 's,dynamiclib,dynamiclib -compatibility_version 1
-current_version 1.4.8 -install_name %p/lib/\\\$(SLIB_INSTALL),g' configure
### so -> dylib
- perl -pi.bak -e 's,SLIBSUF=".so",SLIBSUF=".dylib",g' configure
+ perl -pi -e 's,SLIBSUF=".so",SLIBSUF=".dylib",g' configure
### Fix dlopen filenames
- perl -pi.bak -e 's,liba52.so.0,%p/lib/liba52.0.dylib,g' libavcodec/a52dec.c
- perl -pi.bak -e 's,libfaad.so.0,%p/lib/libfaad.0.dylib,g' libavcodec/faad.c
+ perl -pi -e 's,liba52.so.0,%p/lib/liba52.0.dylib,g' libavcodec/a52dec.c
+ perl -pi -e 's,libfaad.so.0,%p/lib/libfaad.0.dylib,g' libavcodec/faad.c
### More fixes for dylib
- perl -pi.bak -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' Makefile
- perl -pi.bak -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' libavcodec/Makefile
- perl -pi.bak -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' libavformat/Makefile
- perl -pi.bak -e
's,SLIB=,SLIB_INSTALL=\$(SLIBPREF)avcodec.0\$(SLIBSUF)\nSLIB=,g'
libavcodec/Makefile
- perl -pi.bak -e
's,SLIB=,SLIB_INSTALL=\$(SLIBPREF)avformat.0\$(SLIBSUF)\nSLIB=,g'
libavformat/Makefile
- perl -pi.bak -e 's,\$\(CC\) \$\(SHFLAGS\) -o \$\@ \$\(OBJS\) \$\(EXTRALIBS\)
\$\(AMREXTRALIBS\),\$\(CC\) \$\(SHFLAGS\) -o \$\@ \$\(OBJS\) \$\(EXTRALIBS\)
\$\(AMREXTRALIBS\)\n\tln -sf \$\(SLIB\)
\$\(SLIBPREF\)avcodec.0\$\(SLIBSUF\)\n\tln -sf \$(SLIB\)
\$\(SLIBPREF\)avcodec\$\(SLIBSUF\),g' libavcodec/Makefile
+ perl -pi -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' Makefile
+ perl -pi -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' libavcodec/Makefile
+ perl -pi -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' libavformat/Makefile
+ perl -pi -e 's,SLIB=,SLIB_INSTALL=\$(SLIBPREF)avcodec.0\$(SLIBSUF)\nSLIB=,g'
libavcodec/Makefile
+ perl -pi -e
's,SLIB=,SLIB_INSTALL=\$(SLIBPREF)avformat.0\$(SLIBSUF)\nSLIB=,g'
libavformat/Makefile
+ perl -pi -e 's,\$\(CC\) \$\(SHFLAGS\) -o \$\@ \$\(OBJS\) \$\(EXTRALIBS\)
\$\(AMREXTRALIBS\),\$\(CC\) \$\(SHFLAGS\) -o \$\@ \$\(OBJS\) \$\(EXTRALIBS\)
\$\(AMREXTRALIBS\)\n\tln -sf \$\(SLIB\)
\$\(SLIBPREF\)avcodec.0\$\(SLIBSUF\)\n\tln -sf \$(SLIB\)
\$\(SLIBPREF\)avcodec\$\(SLIBSUF\),g' libavcodec/Makefile
perl -pi.bak -e 's,\$\(CC\) \$\(SHFLAGS\) -o (.*),\$\(CC\) \$\(SHFLAGS\) -o
$1\n\tln -sf \$\(SLIB\) \$\(SLIBPREF\)avformat.0\$\(SLIBSUF\)\n\tln -sf
\$(SLIB\) \$\(SLIBPREF\)avformat\$\(SLIBSUF\),g' libavformat/Makefile
### libsvformat shared lib linking
- perl -pi.bak -e 's,PPOBJS=,PPOBJS=\nLIBS+=-L../libavcodec
-lavcodec\nEXTRALIBS+=-lmp3lame -lvorbis -lvorbisenc -logg,g'
libavformat/Makefile
- perl -pi.bak -e 's,\$\(EXTRALIBS\),\$\(LIBS\) \$\(EXTRALIBS\),g'
libavformat/Makefile
+ perl -pi -e 's,PPOBJS=,PPOBJS=\nLIBS+=-L../libavcodec
-lavcodec\nEXTRALIBS+=-lmp3lame -lvorbis -lvorbisenc -logg,g'
libavformat/Makefile
+ perl -pi -e 's,\$\(EXTRALIBS\),\$\(LIBS\) \$\(EXTRALIBS\),g'
libavformat/Makefile
### Not sure why this is needed, but it is for now
### looks like the first endif, ends at the wrong place...should be before
### the second if.
- perl -pi.bak -e 's,-logg -lvorbis -lvorbisenc,-lmp3lame -logg -lvorbis
-lvorbisenc,g' Makefile
+ perl -pi -e 's,-logg -lvorbis -lvorbisenc,-lmp3lame -logg -lvorbis
-lvorbisenc,g' Makefile
### Fix vhook
- perl -pi.bak -e 's,\+=-bundle -flat_namespace -undefined suppress,=-bundle
-avoid-version,g' vhook/Makefile
- perl -pi.bak -e 's,\$<,\$< -L../libavcodec -lavcodec -L../libavformat
-lavformat -L%p/lib,g' vhook/Makefile
+ perl -pi -e 's,\+=-bundle -flat_namespace -undefined suppress,=-bundle
-avoid-version,g' vhook/Makefile
+ perl -pi -e 's,\$<,\$< -L../libavcodec -lavcodec -L../libavformat -lavformat
-L%p/lib,g' vhook/Makefile
### Can't strip libs with ref to dylibs
- perl -pi.bak -e 's,install -s,install,g' vhook/Makefile
- perl -pi.bak -e 's,install -s -m 755 \$\(SLIB\)
\$\(prefix\)/lib/libavcodec-\$\(VERSION\)\.so,install -m 755 \$\(SLIB\)
\$\(prefix\)/lib/\$\(SLIB\),g' libavcodec/Makefile
- perl -pi.bak -e 's,ln -sf libavcodec-\$\(VERSION\)\.so
\$\(prefix\)/lib/libavcodec\.so, ,g' libavcodec/Makefile
- perl -pi.bak -e 's,ldconfig \|\| true, ,g' libavcodec/Makefile
- perl -pi.bak -e 's,install -s -m 755 \$\(SLIB\)
\$\(prefix\)/lib/libavformat-\$\(VERSION\).so,install -m 755 \$\(SLIB\)
\$\(prefix\)/lib/\$\(SLIB\),g' libavformat/Makefile
- perl -pi.bak -e 's,ln -sf libavformat-\$\(VERSION\)\.so
\$\(prefix\)/lib/libavformat\.so, ,g' libavformat/Makefile
- perl -pi.bak -e 's,ldconfig \|\| true, ,g' libavformat/Makefile
+ perl -pi -e 's,install -s,install,g' vhook/Makefile
+ perl -pi -e 's,install -s -m 755 \$\(SLIB\)
\$\(prefix\)/lib/libavcodec-\$\(VERSION\)\.so,install -m 755 \$\(SLIB\)
\$\(prefix\)/lib/\$\(SLIB\),g' libavcodec/Makefile
+ perl -pi -e 's,ln -sf libavcodec-\$\(VERSION\)\.so
\$\(prefix\)/lib/libavcodec\.so, ,g' libavcodec/Makefile
+ perl -pi -e 's,ldconfig \|\| true, ,g' libavcodec/Makefile
+ perl -pi -e 's,install -s -m 755 \$\(SLIB\)
\$\(prefix\)/lib/libavformat-\$\(VERSION\).so,install -m 755 \$\(SLIB\)
\$\(prefix\)/lib/\$\(SLIB\),g' libavformat/Makefile
+ perl -pi -e 's,ln -sf libavformat-\$\(VERSION\)\.so
\$\(prefix\)/lib/libavformat\.so, ,g' libavformat/Makefile
+ perl -pi -e 's,ldconfig \|\| true, ,g' libavformat/Makefile
### Fix bin install
- perl -pi.bak -e 's,"\$\(bindir\)",\$\(prefix\)/bin,g' Makefile
+ perl -pi -e 's,"\$\(bindir\)",\$\(prefix\)/bin,g' Makefile
### Fixes for fink's ft2, I need to manually add the fink includes
- perl -pi.bak -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' Makefile
- perl -pi.bak -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' libavcodec/Makefile
- perl -pi.bak -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' libavformat/Makefile
- perl -pi.bak -e 's,\$\< (.*)?,\$\< $1 -I%p/include,g' vhook/Makefile
+ perl -pi -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' Makefile
+ perl -pi -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' libavcodec/Makefile
+ perl -pi -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' libavformat/Makefile
+ perl -pi -e 's,\$\< (.*)?,\$\< $1 -I%p/include,g' vhook/Makefile
### Fix for ffplay
- perl -pi.bak -e 's,-o \$\@ ffplay.o,-bind_at_load -o \$\@ ffplay.o,g'
Makefile
+ perl -pi -e 's,-o \$\@ ffplay.o,-bind_at_load -o \$\@ ffplay.o,g' Makefile
+ ### Fix for 10.4
+ perl -pi -e 's,APPLE,NOTAPPLE,g' libavformat/tcp.c
<<
###
GCC: 3.3
Index: libquicktime0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/libquicktime0.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libquicktime0.info 27 Apr 2005 03:25:46 -0000 1.1
+++ libquicktime0.info 3 May 2005 12:34:50 -0000 1.2
@@ -1,6 +1,6 @@
Package: libquicktime0
Version: 0.9.2rel
-Revision: 11
+Revision: 12
###
Source: mirror:sourceforge:libquicktime/libquicktime-0.9.2.tar.gz
Source-MD5: 1b42ca12966526647fa9a1b14fb947a1
@@ -17,6 +17,9 @@
### Fix oss sound
perl -pi -e 's,sys/soundcard.h,liboss/soundcard.h,g' utils/lqtplay.c
perl -pi -e 's,LIBS = [EMAIL PROTECTED]@,LIBS = [EMAIL PROTECTED]@ -loss,g'
utils/Makefile.in
+ perl -pi -e 's, open\(, libossopen\(,g' utils/lqtplay.c
+ perl -pi -e 's, write\(, libosswrite(,g' utils/lqtplay.c
+ perl -pi -e 's, ioctl\(, libossioctl\(,g' utils/lqtplay.c
### Fix bad naming in rtjpeg
perl -pi -e 's,RTjpeg.h,rtjpeg1.h,g' plugins/rtjpeg/Makefile.in
perl -pi -e 's,RTjpeg.c,rtjpeg1.c,g' plugins/rtjpeg/Makefile.in
@@ -31,6 +34,10 @@
perl -pi -e 's,hardcode_direct=yes,hardcode_direct=no,g' configure
### Fix for vorbis, needs ogg too
perl -pi -e 's, -lvorbis , -lvorbis -logg ,g' configure
+ ### Fix libjpeg, libpng, libavcodec
+ perl -pi -e 's,-ljpeg(.*),\"-L%p/lib -ljpeg$1\",g' configure
+ perl -pi -e 's,-lpng(.*),-L%p/lib -lpng$1,g' configure
+ # perl -pi -e 's,-lavcodec(.*),-L%p/lib -lavcodec$1,g' configure
### Remove 64 bit calls that are missing in stdio.h
perl -pi -e 's, fseeko64, fseeko,g' include/lqt_fseek.h
perl -pi -e 's, ftello64, ftello,g' include/lqt_fseek.h
@@ -38,7 +45,7 @@
###
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
-SetCFLAGS: -fno-common
+SetCPPFLAGS: -fno-common -DLIBOSS_IOCTL=libossioctl -DLIBOSS_OPEN=libossopen
-DLIBOSS_CLOSE=libossclose -DLIBOSS_WRITE=libosswrite
###
ConfigureParams: --with-vorbis-prefix=%p --mandir='${prefix}/share/man'
--with-dv --disable-mmx
###
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
