Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820
Modified Files:
ffmpeg.info libquicktime0.info
Log Message:
Updates for both libquicktime and ffmpeg, enabling more features in both
Index: ffmpeg.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/ffmpeg.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ffmpeg.info 3 May 2005 12:34:50 -0000 1.2
+++ ffmpeg.info 4 May 2005 01:16:37 -0000 1.3
@@ -1,35 +1,40 @@
Package: ffmpeg
-Version: 0.4.8
-Revision: 13
+Version: 0.4.9-pre1
+Revision: 10
###
-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
+BuildDepends: a52dec-dev, imlib2, lame-dev, libfaad1-dev, libmp4v21-dev,
libogg, libpostproc1, libvorbis0, sdl
+Depends: a52dec, faad, lame, a52dec-shlibs, imlib2-shlibs, lame-shlibs,
libavcodec1-shlibs, libavformat1-shlibs, libogg-shlibs, libvorbis0-shlibs,
sdl-shlibs
###
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: e00d47614ba1afd99ad2ea387e782dd9
+Source-MD5: ea5587e3c66d50b1503b82ac4179c303
###
PatchScript: <<
+ ### WTF and YUCK
+ perl -pi -e 's,LDFLAGS=\"-Wl\,-d\",LDFLAGS=\"\",g' configure
+ perl -pi -e 's,\#define printf please_use_av_log,\/\/\#define printf
please_use_av_log,g' libavcodec/common.h
+ perl -pi -e 's,\#define fprintf please_use_av_log,\/\/\#define fprintf
please_use_av_log,g' libavcodec/common.h
+ perl -pi -e 's,\#define fprintf please_use_av_log,\/\/\#define fprintf
please_use_av_log,g' libavcodec/utils.c
+ perl -pi -e 's,\#undef fprintf,\/\/\#undef fprintf,g' libavcodec/utils.c
+ perl -pi -e 's,\#define time
time_is_forbidden_due_to_security_issues,\/\/\#define time
time_is_forbidden_due_to_security_issues,g' libavcodec/common.h
### Fix ffserver conf file location
perl -pi -e 's,/etc,%p/etc,g' ffserver.c
### Enable ffserver on darwin
perl -pi -e 's,ffserver="no",ffserver="yes",g' configure
### Fix for Imlib2
perl -pi -e 's,-lImlib2,-I%p/include -L%p/lib -lImlib2,g' configure
- ### Lib version fix
- 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 -e 's,SLIBSUF=".so",SLIBSUF=".dylib",g' configure
+ ### Lib version fix & so -> dylib
+ perl -pi -e 's,dynamiclib\",dynamiclib -undefined dynamic_lookup
-compatibility_version 1 -current_version 1.4.8.1 -install_name
%p/lib/\\\$(SLIB_INSTALL)\"\nSLIBSUF=\".dylib\",g' configure
### Fix dlopen filenames
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 -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,\$\(SLIBSUF\),.0.4.8.1\$\(SLIBSUF\),g' Makefile
+ perl -pi -e 's,\$\(SLIBSUF\),.0.4.8.1\$\(SLIBSUF\),g' libavcodec/Makefile
+ perl -pi -e 's,\$\(SLIBSUF\),.0.4.8.1\$\(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
+ perl -pi -e 's,\$\(CC\) \$\(SHFLAGS\) -o (.*),\$\(CC\) \$\(SHFLAGS\) -o
$1\n\tln -sf \$\(SLIB\) \$\(SLIBPREF\)avcodec.0\$\(SLIBSUF\)\n\tln -sf
\$(SLIB\) \$\(SLIBPREF\)avcodec\$\(SLIBSUF\),g' libavcodec/Makefile
+ perl -pi -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 -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
@@ -38,7 +43,7 @@
### the second if.
perl -pi -e 's,-logg -lvorbis -lvorbisenc,-lmp3lame -logg -lvorbis
-lvorbisenc,g' Makefile
### Fix vhook
- perl -pi -e 's,\+=-bundle -flat_namespace -undefined suppress,=-bundle
-avoid-version,g' vhook/Makefile
+ perl -pi -e 's,\+=-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 -e 's,install -s,install,g' vhook/Makefile
@@ -65,7 +70,7 @@
###
DocFiles: COPYING CREDITS Changelog INSTALL README doc/*.html doc/*.txt
###
-ConfigureParams: --cc=gcc --extra-libs="-L%p/lib"
--extra-cflags="-no-cpp-precomp -fomit-frame-pointer -force_cpusubtype_ALL
-faltivec -fno-common" --enable-mp3lame --enable-vorbis --enable-pp
--enable-shared-pp --enable-faad --enable-faadbin --enable-a52 --enable-a52bin
--enable-shared --mandir=%p/share/man
+ConfigureParams: --cc=gcc --extra-libs="-L%p/lib -la52"
--extra-cflags="-force_cpusubtype_ALL -Wno-sign-compare -maltivec -fno-common"
--enable-gpl --enable-mp3lame --enable-vorbis --enable-pp --enable-shared-pp
--powerpc-perf-enable --disable-faac --enable-faad --enable-faadbin
--enable-a52 --enable-a52bin --enable-shared --mandir=%p/share/man
--disable-mmx --disable-audio-beos --disable-v4l --disable-dv1394
###
InstallScript: <<
make install prefix=%i
@@ -75,25 +80,25 @@
install -m 664 doc/ffserver.1 %i/share/man/man1
install -m 664 doc/ffplay.1 %i/share/man/man1
install -m 664 doc/ffmpeg.1 %i/share/man/man1
- ln -sf libavcodec.0.4.8.dylib %i/lib/libavcodec.0.dylib
- ln -sf libavcodec.0.4.8.dylib %i/lib/libavcodec.dylib
- ln -sf libavformat.0.4.8.dylib %i/lib/libavformat.0.dylib
- ln -sf libavformat.0.4.8.dylib %i/lib/libavformat.dylib
+ ln -sf libavcodec.0.4.8.1.dylib %i/lib/libavcodec.0.dylib
+ ln -sf libavcodec.0.4.8.1.dylib %i/lib/libavcodec.dylib
+ ln -sf libavformat.0.4.8.1.dylib %i/lib/libavformat.0.dylib
+ ln -sf libavformat.0.4.8.1.dylib %i/lib/libavformat.dylib
<<
###
SplitOff: <<
Package: libavcodec1-shlibs
- Depends: lame-shlibs, libvorbis0-shlibs, libpostproc1-shlibs
+ Depends: a52dec-shlibs, lame-shlibs, libpostproc1-shlibs, libvorbis0-shlibs
Conflicts: ffmpeg (<< 0.4.6-1)
Replaces: ffmpeg (<< 0.4.6-1)
Files: <<
lib/libavcodec.*.dylib
<<
Shlibs: <<
- %p/lib/libavcodec.0.dylib 1.0.0 libavcodec1-shlibs (>= 0.4.6-1)
+ %p/lib/libavcodec.0.dylib 1.0.0 %n (>= 0.4.6-1)
<<
DocFiles: COPYING
- Description: FFmpeg audio/video encoders and decoders libs
+ Description: Audio/video encoders and decoders libs
<<
SplitOff2: <<
Package: libavcodec1-dev
@@ -106,16 +111,16 @@
lib/libavcodec.dylib
<<
DocFiles: COPYING
- Description: FFmpeg audio/video encoders and decoders dev files
+ Description: Audio/video encoders and decoders dev files
<<
SplitOff3: <<
Package: libavformat1-shlibs
- Depends: lame-shlibs, libvorbis0-shlibs, libogg-shlibs, libavcodec1-shlibs
+ Depends: a52dec-shlibs, lame-shlibs, libavcodec1-shlibs, libogg-shlibs,
libvorbis0-shlibs
Files: <<
lib/libavformat.*.dylib
<<
Shlibs: <<
- %p/lib/libavformat.0.dylib 1.0.0 libformat1-shlibs (>= 0.4.8-1)
+ %p/lib/libavformat.0.dylib 1.0.0 %n (>= 0.4.8-1)
<<
DocFiles: COPYING
Description: Parsers and generators for all common audio/video formats libs
@@ -135,14 +140,14 @@
Package: %N-dev
BuildDependsOnly: true
Files: <<
- include/
+ include
<<
DocFiles: COPYING
Description: FFmpeg developement files
<<
SplitOff6: <<
Package: %N-server
- Depends: lame-shlibs, libogg-shlibs, libvorbis0-shlibs, libavcodec1-shlibs,
libavformat1-shlibs, %N, daemonic, a52dec, faad
+ Depends: %N, daemonic, a52dec, faad, a52dec-shlibs, lame-shlibs,
libavcodec1-shlibs, libavformat1-shlibs, libogg-shlibs, libvorbis0-shlibs
Conflicts: ffmpeg (<< 0.4.6-1)
Replaces: ffmpeg (<< 0.4.6-1)
ConfFiles: %p/etc/ffserver.conf
@@ -181,7 +186,7 @@
<<
<<
###
-Description: Tool to convert one video file format to another and SDL player
+Description: Tool to convert video file formats
DescDetail: <<
FFMpeg is a complete and free Internet live audio and video broadcasting
solution for Linux/Unix. It also includes a digital VCR. It can encode in
Index: libquicktime0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/libquicktime0.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libquicktime0.info 3 May 2005 12:34:50 -0000 1.2
+++ libquicktime0.info 4 May 2005 01:16:37 -0000 1.3
@@ -1,55 +1,54 @@
Package: libquicktime0
-Version: 0.9.2rel
-Revision: 12
+Version: 0.9.4
+Revision: 10
###
-Source: mirror:sourceforge:libquicktime/libquicktime-0.9.2.tar.gz
-Source-MD5: 1b42ca12966526647fa9a1b14fb947a1
+Source: mirror:sourceforge:libquicktime/libquicktime-%v.tar.gz
+Source-MD5: 8d93e4e3393942edc35511dd2e51a32d
###
-Depends: sdl-shlibs, gtk+-shlibs, libjpeg-shlibs, libpng3-shlibs,
libdv4-shlibs, libvorbis0-shlibs, libogg-shlibs, liboss1-shlibs, %N-shlibs (=
%v-%r), %N-bin
-BuildDepends: glib, audiofile, esound, sdl, gtk+, libjpeg, libpng3, libdv4,
libvorbis0, libogg, gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
liboss1
+BuildDepends: audiofile, esound, gettext-dev, glib, gtk+, lame-dev,
libavcodec1-dev (>= 0.4.9-pre1-1), libdv4, libiconv-dev, libjpeg, libogg,
liboss1, libpng3, libvorbis0, sdl, x11-dev
+Depends: %N-shlibs (>= %v-%r)
BuildDependsOnly: True
###
TarFilesRename: plugins/rtjpeg/RTjpeg.c:plugins/rtjpeg/rtjpeg1.c
plugins/rtjpeg/RTjpeg.h:plugins/rtjpeg/rtjpeg1.h
###
PatchScript: <<
- ### Relink Patch
- perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
### Fix oss sound
- perl -pi -e 's,sys/soundcard.h,liboss/soundcard.h,g' utils/lqtplay.c
+ perl -pi -e 's,\#undef HAVE_SYS_SOUNDCARD_H,\#define HAVE_SYS_SOUNDCARD_H
1,g' config.h.in
+ perl -pi -e 's,sys/soundcard.h,liboss/soundcard.h,g' configure
+ 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
+ perl -pi -e 's, open\(, liboss_open\(,g' utils/lqtplay.c
+ perl -pi -e 's, write\(, liboss_write(,g' utils/lqtplay.c
+ perl -pi -e 's, ioctl\(, liboss_ioctl\(,g' utils/lqtplay.c
+ perl -pi -e 's, close\(, liboss_close\(,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
- perl -pi -e 's,RTjpeg.h,rtjpeg1.h,g' plugins/rtjpeg/rtjpeg.h
perl -pi -e 's,RTjpeg.h,rtjpeg1.h,g' plugins/rtjpeg/rtjpeg1.h
- perl -pi -e 's,RTjpeg.h,rtjpeg1.h,g' plugins/rtjpeg/rtjpeg.c
perl -pi -e 's,RTjpeg.h,rtjpeg1.h,g' plugins/rtjpeg/rtjpeg1.c
+ perl -pi -e 's,RTjpeg.h,rtjpeg1.h,g' plugins/rtjpeg/rtjpeg_codec.h
perl -pi -e 's,RTjpeg,rtjpeg1,g' plugins/rtjpeg/Makefile.in
- ### 10.3 fix for two level namespace
- perl -pi -e 's,-flat_namespace -undefined suppress,-undefined
dynamic_lookup,g' configure
- perl -pi -e 's,-all_load \$convenience,-all_load,g' configure
- 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
+ ### Fix libjpeg, libpng
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
+ ### Fix avcodec
+ perl -pi -e 's,AVCODEC_BUILD="4734",AVCODEC_BUILD="4718",g' configure
<<
###
NoSetLDFLAGS: true
+SetLDFLAGS: -bind_at_load
SetLIBS: -L%p/lib
-SetCPPFLAGS: -fno-common -DLIBOSS_IOCTL=libossioctl -DLIBOSS_OPEN=libossopen
-DLIBOSS_CLOSE=libossclose -DLIBOSS_WRITE=libosswrite
+SetCPPFLAGS: -DLIBOSS_INTERNAL
###
-ConfigureParams: --with-vorbis-prefix=%p --mandir='${prefix}/share/man'
--with-dv --disable-mmx
+ConfigureParams: --with-avcodec=%p --with-vorbis=%p
--disable-dependency-tracking --with-pic --enable-static --enable-shared
--mandir='${prefix}/share/man' --with-dv --disable-mmx --disable-firewire
###
-InstallScript: make install DESTDIR=%d
+InstallScript: <<
+ make install DESTDIR=%d
+ rm -rf %i/lib/libquicktime/*.a
+ rm -rf %i/lib/libquicktime/*.la
+<<
###
DocFiles: README COPYING
License: LGPL
@@ -65,9 +64,10 @@
<<
SplitOff2: <<
Package: libquicktime0-bin
+ Depends: audiofile-shlibs, esound-shlibs, gettext, glib-shlibs,
gtk+-shlibs, lame-shlibs, libavcodec1-shlibs (>= 0.4.9-pre1-1), libdv4-shlibs,
libiconv, libjpeg-shlibs, libogg-shlibs, liboss1-shlibs, libpng3-shlibs (>=
1.2.5-4), libquicktime0-shlibs (>= %v-%r), libvorbis0-shlibs
+ Replaces: libquicktime0 (<< 0.9.4-1)
Description: Various commands using quicktime4linux library
- Depends: %N-shlibs (= %v-%r)
- Files: bin
+ Files: bin lib/libquicktime share/man
DocFiles: README COPYING
<<
###
-------------------------------------------------------
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
