Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv24138/graphics
Added Files:
ffmpeg-0.4.20071217.info ffmpeg-0.4.20071217.patch
Removed Files:
ffmpeg.info ffmpeg.patch
Log Message:
prepare for stabilization
--- NEW FILE: ffmpeg-0.4.20071217.patch ---
diff -Nurd ffmpeg-0.4.20071217.orig/Makefile ffmpeg-0.4.20071217/Makefile
--- ffmpeg-0.4.20071217.orig/Makefile 2007-12-17 14:50:53.000000000 -0500
+++ ffmpeg-0.4.20071217/Makefile 2008-03-20 14:49:54.000000000 -0400
@@ -6,9 +6,10 @@
VPATH=$(SRC_PATH_BARE)
-CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+CFLAGS= -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
-I$(SRC_PATH)/libswscale \
-I$(SRC_PATH)/libavdevice \
+ $(OPTFLAGS) \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
-DHAVE_AV_CONFIG_H
LDFLAGS+= -g
@@ -61,12 +62,10 @@
VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
-LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat
-L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
-EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF)
-lavutil$(BUILDSUF) $(EXTRALIBS)
+EXTRALIBS := $(BUILD_ROOT)/libavdevice/libavdevice$(BUILDSUF).dylib
$(BUILD_ROOT)/libavformat/libavformat$(BUILDSUF).dylib
$(BUILD_ROOT)/libavcodec/libavcodec$(BUILDSUF).dylib
$(BUILD_ROOT)/libavutil/libavutil$(BUILDSUF).dylib $(EXTRALIBS)
ifeq ($(CONFIG_SWSCALER),yes)
-LDFLAGS+=-L$(BUILD_ROOT)/libswscale
-EXTRALIBS+=-lswscale$(BUILDSUF)
+EXTRALIBS+=$(BUILD_ROOT)/libswscale/libswscale$(BUILDSUF).dylib
endif
all: lib $(PROGS) $(ALL_TARGETS-yes)
diff -Nurd ffmpeg-0.4.20071217.orig/libavcodec/Makefile
ffmpeg-0.4.20071217/libavcodec/Makefile
--- ffmpeg-0.4.20071217.orig/libavcodec/Makefile 2007-12-17
14:50:33.000000000 -0500
+++ ffmpeg-0.4.20071217/libavcodec/Makefile 2008-03-20 13:34:50.000000000
-0400
@@ -442,7 +442,7 @@
bfin/idct_bfin.o \
bfin/vp3_idct_bfin.o \
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+EXTRALIBS := $(BUILD_ROOT)/libavutil/libavutil$(BUILDSUF).dylib $(EXTRALIBS)
NAME=avcodec
LIBVERSION=$(LAVCVERSION)
diff -Nurd ffmpeg-0.4.20071217.orig/libavdevice/Makefile
ffmpeg-0.4.20071217/libavdevice/Makefile
--- ffmpeg-0.4.20071217.orig/libavdevice/Makefile 2007-12-17
14:50:53.000000000 -0500
+++ ffmpeg-0.4.20071217/libavdevice/Makefile 2008-03-20 13:34:37.000000000
-0400
@@ -4,9 +4,9 @@
LIBVERSION=$(LAVDVERSION)
LIBMAJOR=$(LAVDMAJOR)
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
- -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
- -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS)
+EXTRALIBS := $(BUILD_ROOT)/libavutil/libavutil$(BUILDSUF).dylib \
+ $(BUILD_ROOT)/libavcodec/libavcodec$(BUILDSUF).dylib \
+ $(BUILD_ROOT)/libavformat/libavformat$(BUILDSUF).dylib
$(EXTRALIBS)
CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
diff -Nurd ffmpeg-0.4.20071217.orig/libavformat/Makefile
ffmpeg-0.4.20071217/libavformat/Makefile
--- ffmpeg-0.4.20071217.orig/libavformat/Makefile 2007-12-17
14:50:52.000000000 -0500
+++ ffmpeg-0.4.20071217/libavformat/Makefile 2008-03-20 13:34:10.000000000
-0400
@@ -156,8 +156,8 @@
OBJS-$(CONFIG_VHOOK) += framehook.o
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
- -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) $(EXTRALIBS)
+EXTRALIBS := $(BUILD_ROOT)/libavutil/libavutil$(BUILDSUF).dylib \
+ $(BUILD_ROOT)/libavcodec/libavcodec$(BUILDSUF).dylib $(EXTRALIBS)
# protocols I/O
OBJS+= avio.o aviobuf.o
diff -Nurd ffmpeg-0.4.20071217.orig/libpostproc/Makefile
ffmpeg-0.4.20071217/libpostproc/Makefile
--- ffmpeg-0.4.20071217.orig/libpostproc/Makefile 2007-12-17
14:50:42.000000000 -0500
+++ ffmpeg-0.4.20071217/libpostproc/Makefile 2008-03-20 13:33:45.000000000
-0400
@@ -4,7 +4,7 @@
# Overload incdir, postproc include files go in a different directory.
INCDIR=$(prefix)/include/postproc
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+EXTRALIBS := $(BUILD_ROOT)/libavutil/libavutil$(BUILDSUF).dylib $(EXTRALIBS)
NAME=postproc
LIBVERSION=$(SPPVERSION)
diff -Nurd ffmpeg-0.4.20071217.orig/libswscale/Makefile
ffmpeg-0.4.20071217/libswscale/Makefile
--- ffmpeg-0.4.20071217.orig/libswscale/Makefile 2007-12-17
14:51:01.000000000 -0500
+++ ffmpeg-0.4.20071217/libswscale/Makefile 2008-03-20 13:36:18.000000000
-0400
@@ -5,7 +5,7 @@
LIBVERSION=$(SWSVERSION)
LIBMAJOR=$(SWSMAJOR)
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+EXTRALIBS := $(BUILD_ROOT)/libavutil/libavutil$(BUILDSUF).dylib $(EXTRALIBS)
OBJS = rgb2rgb.o swscale.o
--- ffmpeg.info DELETED ---
--- NEW FILE: ffmpeg-0.4.20071217.info ---
Package: ffmpeg
Version: 0.4.20071217
Revision: 12
###
BuildDepends: a52dec-dev, amrnb-dev, faac-dev, freetype219, gsm, imlib2,
lame-dev, libfaad1-dev, libogg, libtheora0, libvorbis0, libx264-dev, pkgconfig,
sdl, xvidcore, fink (>= 0.28)
Depends: a52dec, amrnb, faac, faad, lame, a52dec-shlibs, amrnb-shlibs,
faac-shlibs, freetype219-shlibs, imlib2-shlibs, lame-shlibs,
libavdevice52-shlibs, libavcodec51-shlibs, libavformat52-shlibs,
libavutil49-shlibs, libfaad1-shlibs, libogg-shlibs, libswscale0-shlibs,
libtheora0-shlibs, libvorbis0-shlibs, libx264-57-shlibs, sdl-shlibs,
xvidcore-shlibs
#BuildConflicts: libavcodec1-dev, libpostproc1, libavformat1-dev
###
Source: mirror:sourceforge:fink/%n-%v.tar.gz
Source-MD5: a214c8629ba0e8648bea743eb1f2dcc3
###
# link directly to build-dir lib files instead of mis-ordering local -L flags
# make sure global -I come after local ones too
PatchFile: %n-%v.patch
PatchFile-MD5: 4f7322c02bb0e6dc319974313bd3612d
PatchScript: <<
%{default_script}
### Link to proper shlibs
perl -pi -e
's;-install_name,\$\(SHLIBDIR\)/\$\(SLIBNAME\);-install_name,\$\(SHLIBDIR\)/\$\(SLIBNAME_WITH_MAJOR\);g'
configure
### Fix for 10.5 ASM problem with ld: absolute addressing (perhaps
-mdynamic-no-pic) used in _rgb24tobgr24_MMX from rgb2rgb.o not allowed in
slidable image
perl -pi -e 's,defined\(ARCH_X86\) \&\&
defined\(CONFIG_GPL\),defined\(ARCH_X86\) \&\& defined\(CONFIG_GPL\) \&\&
\!defined\(__APPLE__\),g' libswscale/rgb2rgb.c
### Fix for "warning: cast from pointer to integer of different size" with
gcc-4.2
perl -pi -e 's|(\(int\))|$1 (uintptr_t)|g' libavcodec/cabac.h
### Fix for selecting x86_32 in spite of --arch=x86_64
perl -pi -e '$c++ if m,arch="x86_32",; s,arch="x86_32",arch="x86_64", if
$c==2' configure
### Fix for x264.h requiring stdint.h first
perl -pi -e 's,^enabled libx264.*$,enabled libx264 \&\& require2 x264
"stdint.h x264.h" x264_encoder_open -lx264,' configure
<<
###
DocFiles: COPYING.GPL COPYING.LGPL CREDITS Changelog INSTALL README doc/TODO
doc/*.txt
###
# gets included "too early" in gcc calls if also set during "make"
#SetCFLAGS: -I%p/include
###
ConfigureParams: --mandir=%p/share/man --enable-shared --enable-gpl --enable-pp
--enable-swscaler --enable-pthreads --enable-x11grab --enable-liba52
--enable-libamr-nb --enable-libfaac --enable-libfaad --enable-libgsm
--enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264
--enable-libxvid --disable-mmx --disable-iwmmxt (%m = powerpc)
--enable-powerpc-perf (%m = i386) --disable-altivec (%m = x86_64)
--disable-altivec (%m = x86_64) --arch=x86_64 (%m = i386) --arch=x86_32
###
CompileScript: <<
CFLAGS=-I%p/include ./configure %c
make
<<
###
InstallScript: <<
make install DESTDIR=%d
install -d %i/etc
install -m 664 doc/ffserver.conf %i/etc
mkdir %i/lib/vhook/vhook
mv %i/lib/vhook/*.dylib %i/lib/vhook/vhook
### make the unversioned libraries point to libfoo.N.dylib, not to the
libfoo.N.Y.Z.dylib versions.
### libfoo.N.dylib is the install_name and for upgrading, it is best to point
the unversioned dylib to install_name.
### NOTE: this only applies to the libraries that kept install_name the same
between ffmpeg-0.4 and -0.6
### libavcodec and libavutil do NOT need this hack, since their install_name
was increased.
rm -f %i/lib/{libavdevice,libavformat,libpostproc,libswscale}.dylib
ln -s libavdevice.52.dylib %i/lib/libavdevice.dylib
ln -s libavformat.52.dylib %i/lib/libavformat.dylib
ln -s libpostproc.51.dylib %i/lib/libpostproc.dylib
ln -s libswscale.0.dylib %i/lib/libswscale.dylib
<<
###
Shlibs: <<
!%p/lib/vhook/vhook/drawtext.dylib
!%p/lib/vhook/vhook/fish.dylib
!%p/lib/vhook/vhook/imlib2.dylib
!%p/lib/vhook/vhook/null.dylib
!%p/lib/vhook/vhook/ppm.dylib
!%p/lib/vhook/vhook/watermark.dylib
<<
###
SplitOff: <<
Package: libavcodec51-shlibs
Depends: a52dec-shlibs, amrnb-shlibs, faac-shlibs, lame-shlibs,
libavutil49-shlibs, libfaad1-shlibs, libogg-shlibs, libtheora0-shlibs,
libvorbis0-shlibs, libx264-57-shlibs, xvidcore-shlibs
Files: <<
lib/libavcodec.*.dylib
<<
Shlibs: <<
%p/lib/libavcodec.51.dylib 51.1.0 %n (>= 0.4.20071021-1)
<<
DocFiles: COPYING.LGPL
Description: Audio/video encoders and decoders libs
<<
SplitOff2: <<
Package: libavcodec-dev
Depends: libavcodec51-shlibs (= %v-%r)
# Provides breaks build of transcode e.g. (undeclared symbols ac3_encoder and
mp2_encoder)
# Provides: libavcodec1-dev
Conflicts: ffmpeg (<< 0.4.6-1), libavcodec-dev, libavcodec1-dev,
libavcodec52-dev, libavcodec53-dev
Replaces: ffmpeg (<< 0.4.6-1), libavcodec-dev, libavcodec1-dev,
libavcodec52-dev, libavcodec53-dev
BuildDependsOnly: true
Files: <<
include/ffmpeg/avcodec.h
lib/libavcodec.dylib
lib/libavcodec.a
lib/pkgconfig/libavcodec.pc
<<
DocFiles: COPYING.LGPL
Description: Audio/video encoders and decoders dev files
<<
SplitOff3: <<
Package: libavformat52-shlibs
Depends: a52dec-shlibs, amrnb-shlibs, faac-shlibs, lame-shlibs,
libavcodec51-shlibs, libavutil49-shlibs, libfaad1-shlibs, libogg-shlibs,
libtheora0-shlibs, libvorbis0-shlibs, libx264-57-shlibs, xvidcore-shlibs
Files: <<
lib/libavformat.*.dylib
<<
Shlibs: <<
%p/lib/libavformat.52.dylib 51.1.0 %n (>= 0.4.20071021-1)
<<
DocFiles: COPYING.LGPL
Description: Parsers and generators for all common audio/video formats libs
<<
SplitOff4: <<
Package: libavformat-dev
# remove also by precaution :
# Provides: libavformat1-dev
Depends: libavformat52-shlibs (>= %v-%r)
Conflicts: libavformat-dev, libavformat1-dev, libavformat52-dev,
libavformat53-dev
Replaces: libavformat-dev, libavformat1-dev, libavformat52-dev,
libavformat53-dev
BuildDependsOnly: true
Files: <<
include/ffmpeg/avformat.h
lib/libavformat.dylib
lib/libavformat.a
lib/pkgconfig/libavformat.pc
<<
DocFiles: COPYING.LGPL
Description: Parsers and generators for all common audio/video formats dev
<<
SplitOff5: <<
Package: libavutil49-shlibs
Depends: a52dec-shlibs, amrnb-shlibs, faac-shlibs, lame-shlibs,
libfaad1-shlibs, libogg-shlibs, libtheora0-shlibs, libvorbis0-shlibs,
libx264-57-shlibs, xvidcore-shlibs
Files: <<
lib/libavutil.*.dylib
<<
Shlibs: <<
%p/lib/libavutil.49.dylib 51.1.0 %n (>= 0.4.20071021-1)
<<
DocFiles: COPYING.LGPL
Description: Audio/video utils libs
<<
SplitOff6: <<
Package: libavutil-dev
Depends: libavutil49-shlibs (= %v-%r)
Conflicts: libavutil-dev, libavutil50-dev, libavutil51-dev
Replaces: libavutil-dev, libavutil50-dev, libavutil51-dev
BuildDependsOnly: true
Files: <<
include/ffmpeg/avutil.h
lib/libavutil.dylib
lib/libavutil.a
lib/pkgconfig/libavutil.pc
<<
DocFiles: COPYING.LGPL
Description: Audio/video utils dev
<<
SplitOff7: <<
Package: libpostproc51-shlibs
Depends: a52dec-shlibs, amrnb-shlibs, faac-shlibs, lame-shlibs,
libavutil49-shlibs, libfaad1-shlibs, libogg-shlibs, libtheora0-shlibs,
libvorbis0-shlibs, libx264-57-shlibs, xvidcore-shlibs
Files: <<
lib/libpostproc.*.dylib
<<
Shlibs: <<
%p/lib/libpostproc.51.dylib 51.1.0 %n (>= 0.4.20071021-1)
<<
DocFiles: COPYING.LGPL
Description: Audio/video post process libs
<<
SplitOff8: <<
Package: libpostproc-dev
Depends: libpostproc51-shlibs (>= %v-%r)
Conflicts: libpostproc-dev, libpostproc1, libpostproc51-dev
Replaces: libpostproc-dev, libpostproc1, libpostproc51-dev
BuildDependsOnly: true
Files: <<
include/postproc
lib/libpostproc.dylib
lib/libpostproc.a
lib/pkgconfig/libpostproc.pc
<<
DocFiles: COPYING.LGPL
Description: Audio/video post process dev
<<
SplitOff9: <<
Package: libswscale0-shlibs
Depends: a52dec-shlibs, amrnb-shlibs, faac-shlibs, lame-shlibs,
libavutil49-shlibs, libfaad1-shlibs, libogg-shlibs, libtheora0-shlibs,
libvorbis0-shlibs, libx264-57-shlibs, xvidcore-shlibs
Files: <<
lib/libswscale.*.dylib
<<
Shlibs: <<
%p/lib/libswscale.0.dylib 51.1.0 %n (>= 0.4.20071021-1)
<<
DocFiles: COPYING.LGPL
Description: Audio/video scaling libs
<<
SplitOff10: <<
Package: libswscale-dev
Depends: libswscale0-shlibs (>= %v-%r)
Conflicts: libswscale-dev, libswscale0-dev, libswscale2-dev
Replaces: libswscale-dev, libswscale0-dev, libswscale2-dev
BuildDependsOnly: true
Files: <<
include/ffmpeg/swscale.h
lib/libswscale.dylib
lib/libswscale.a
lib/pkgconfig/libswscale.pc
<<
DocFiles: COPYING.LGPL
Description: Audio/video scaling dev
<<
SplitOff11: <<
Package: libavdevice52-shlibs
Replaces: %N (<< 0.4.20071217-6), %N-dev (<< 0.4.20071217-6)
Depends: xvidcore-shlibs, libx264-57-shlibs, libvorbis0-shlibs,
libogg-shlibs, libtheora0-shlibs, lame-shlibs, libfaad1-shlibs, faac-shlibs,
amrnb-shlibs, a52dec-shlibs, libavformat52-shlibs, libavcodec51-shlibs,
libavutil49-shlibs
Files: <<
lib/libavdevice.*.dylib
<<
Shlibs: <<
%p/lib/libavdevice.52.dylib 51.1.0 %n (>= 0.4.20071217-6)
<<
DocFiles: COPYING.LGPL
Description: Audio/video device libs
<<
SplitOff12: <<
Package: libavdevice-dev
Depends: libavdevice52-shlibs (>= %v-%r)
Conflicts: %N (<< 0.4.20071217-6), %N-dev (<< 0.4.20071217-6),
libavdevice-dev, libavdevice52-dev, libavdevice53-dev
Replaces: %N (<< 0.4.20071217-6), %N-dev (<< 0.4.20071217-6),
libavdevice-dev, libavdevice52-dev, libavdevice53-dev
BuildDependsOnly: true
Files: <<
include/ffmpeg/avdevice.h
lib/libavdevice.dylib
lib/libavdevice.a
lib/pkgconfig/libavdevice.pc
<<
DocFiles: COPYING.LGPL
Description: Audio/video device dev files
<<
SplitOff13: <<
Package: %N-dev
BuildDependsOnly: true
Files: <<
include
<<
DocFiles: COPYING.GPL COPYING.LGPL CREDITS Changelog INSTALL README doc/TODO
doc/*.txt
Description: FFmpeg developement files
<<
SplitOff14: <<
Package: %N-server
Depends: %N, daemonic, a52dec, amrnb, faac, faad, lame, a52dec-shlibs,
amrnb-shlibs, faac-shlibs, lame-shlibs, libavcodec51-shlibs,
libavformat52-shlibs, libavutil49-shlibs, libfaad1-shlibs, libogg-shlibs,
libswscale0-shlibs, libtheora0-shlibs, libvorbis0-shlibs, libx264-57-shlibs,
xvidcore-shlibs
Conflicts: ffmpeg (<< 0.4.6-1)
Replaces: ffmpeg (<< 0.4.6-1)
ConfFiles: %p/etc/ffserver.conf
Files: <<
bin/ffserver
etc/ffserver.conf
share/man/man1/ffserver.1
<<
DocFiles: COPYING.GPL COPYING.LGPL CREDITS Changelog INSTALL README doc/TODO
doc/*.txt
Description: Multimedia streaming server for live broadcasts
PostInstScript: <<
# update init script if necessary
daemonic update ffserver
<<
PreRmScript: <<
# clean up
[ -f %p/var/run/ffserver.pid ] && kill `cat %p/var/run/%n.pid`
if [ $1 != "upgrade" ]; then
daemonic remove ffserver
fi
<<
###
DaemonicName: ffserver
DaemonicFile: <<
<service>
<description>FFmpeg Live Broadcast Streaming Server</description>
<message>FFmpeg Live Broadcast Streaming Server</message>
<daemon name="ffserver">
<executable background="yes">%p/bin/ffserver</executable>
<parameters> -f %p/etc/ffserver.conf</parameters>
<configfile>%p/etc/ffserver.conf</configfile>
<pidfile>%p/var/run/ffserver.pid</pidfile>
</daemon>
</service>
<<
<<
###
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
real time in many formats including MPEG1 audio and video, MPEG4, h263,
ac3, asf, avi, real, mjpeg, and flash.
sudo daemonic enable ffserver
ffplay, currently broken, SDL crash
<<
###
License: GPL
Maintainer: Justin F. Hallett <[email protected]>
Homepage: http://ffmpeg.mplayerhq.hu/
--- ffmpeg.patch DELETED ---
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
