Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13719
Modified Files:
ffmpeg.info
Log Message:
patch to use <mach/semaphore.h> over <semaphore.h>, it actually links!
Snaggle: try this
Index: ffmpeg.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/ffmpeg.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ffmpeg.info 16 Nov 2010 22:29:30 -0000 1.7
+++ ffmpeg.info 18 Nov 2010 18:05:29 -0000 1.8
@@ -1,6 +1,6 @@
Package: ffmpeg
Version: 0.6.1
-Revision: 2
+Revision: 3
###
BuildDepends: <<
bzip2,
@@ -74,6 +74,21 @@
perl -pi -e 's,^enabled libx264.*$,enabled libx264 \&\& require2 x264
"stdint.h x264.h" x264_encoder_open -lx264,' configure
### look for gsm.h in upstream's (and Fink's) declared <gsm.h> rather than
Debian's <gsm/gsm.h>
perl -pi -e 's,gsm\/gsm.h,gsm.h,g' configure libavcodec/libgsm.c
+ ### use API from <mach/semaphore.h> instead of <sys/semaphore.h> -- fangism
+ sed -i.orig -e '/semaphore.h/i \
+#include <mach/task.h>' \
+ -e '/#include/s|semaphore\.h|mach/&|' \
+ -e 's|\<sem_t\>|semaphore_t|g' \
+ -e 's|struct timespec|mach_timespec_t|g' \
+ -e 's|sem_init(|semaphore_create(TASK_NULL, |g' \
+ -e '/sem_destroy/s|\&self|self|' \
+ -e 's|sem_destroy(|semaphore_destroy(TASK_NULL, |g' \
+ -e '/sem_post/s|\&self|self|' \
+ -e 's|sem_post|semaphore_signal|g' \
+ -e 's|sem_timedwait|semaphore_timedwait|g' \
+ -e '/timedwait/s|\&self|self|' \
+ -e '/timedwait/s|\&timeout|timeout|' \
+ libavdevice/jack_audio.c
<<
###
DocFiles: COPYING.GPLv3 COPYING.LGPLv3 CREDITS Changelog INSTALL README
doc/TODO doc/*.txt
@@ -118,6 +133,9 @@
###
CompileScript: <<
#!/bin/sh -ev
+ ### Patch libswscale to have a temporary compat_version/install name of 1 to
make 10.4 happy
+ ### This will get returned to the final value later in the build
+ /usr/bin/perl -pi -e 's,LIBSWSCALE_VERSION_MAJOR 0,LIBSWSCALE_VERSION_MAJOR
1,g' libswscale/swscale.h
mkdir build
cd build
../configure %c
@@ -137,6 +155,9 @@
%p/bin/make -w V=1
cd ..
### clean libswscale
+ # return swscale_LIBMAJOR to 0
+ /usr/bin/perl -pi -e 's,LIBSWSCALE_VERSION_MAJOR 0,LIBSWSCALE_VERSION_MAJOR
1,g' ../libswscale/swscale.h
+ /usr/bin/perl -pi -e
's,libswscale_VERSION=1\.11\.0,libswscale_VERSION=0\.11\.0,g;
s,libswscale_VERSION_MAJOR=1,libswscale_VERSION_MAJOR=0,g' config.mak
cd libswscale
%p/bin/make clean
%p/bin/make -w V=1
@@ -165,7 +186,7 @@
libfaad2-shlibs (>= 2.7-1014),
libogg-shlibs,
libopencore-amr0-shlibs,
- libopenjpeg-shlibs,
+ libopenjpeg-shlibs (>=1.3-2),
libspeex1-shlibs (>= 1.2-0.0rc1.1),
libtheoradec1-shlibs,
libtheoraenc1-shlibs,
@@ -207,7 +228,7 @@
libfaad2-shlibs (>= 2.7-1014),
libogg-shlibs,
libopencore-amr0-shlibs,
- libopenjpeg-shlibs,
+ libopenjpeg-shlibs (>=1.3-2),
libspeex1-shlibs (>= 1.2-0.0rc1.1),
libtheoradec1-shlibs,
libtheoraenc1-shlibs,
@@ -247,7 +268,7 @@
libfaad2-shlibs (>= 2.7-1014),
libogg-shlibs,
libopencore-amr0-shlibs,
- libopenjpeg-shlibs,
+ libopenjpeg-shlibs (>=1.3-2),
libspeex1-shlibs (>= 1.2-0.0rc1.1),
libtheoradec1-shlibs,
libtheoraenc1-shlibs,
@@ -289,8 +310,8 @@
libfaad2-shlibs (>= 2.7-1014),
libogg-shlibs,
libopencore-amr0-shlibs,
- libopenjpeg-shlibs,
- libspeex1-shlibs,
+ libopenjpeg-shlibs (>=1.3-2),
+ libspeex1-shlibs (>= 1.2-0.0rc1.1),
libtheoradec1-shlibs,
libtheoraenc1-shlibs,
libvorbis0-shlibs,
@@ -331,8 +352,8 @@
libfaad2-shlibs (>= 2.7-1014),
libogg-shlibs,
libopencore-amr0-shlibs,
- libopenjpeg-shlibs,
- libspeex1-shlibs,
+ libopenjpeg-shlibs (>=1.3-2),
+ libspeex1-shlibs (>= 1.2-0.0rc1.1),
libtheoradec1-shlibs,
libtheoraenc1-shlibs,
libvorbis0-shlibs,
@@ -376,7 +397,7 @@
libfaad2-shlibs (>= 2.7-1014),
libogg-shlibs,
libopencore-amr0-shlibs,
- libopenjpeg-shlibs,
+ libopenjpeg-shlibs (>=1.3-2),
libspeex1-shlibs (>= 1.2-0.0rc1.1),
libtheoradec1-shlibs,
libtheoraenc1-shlibs,
@@ -420,7 +441,7 @@
libfaad2-shlibs (>= 2.7-1014),
libogg-shlibs,
libopencore-amr0-shlibs,
- libopenjpeg-shlibs,
+ libopenjpeg-shlibs (>=1.3-2),
libspeex1-shlibs (>= 1.2-0.0rc1.1),
libswscale0-shlibs (= %v-%r),
libtheoradec1-shlibs,
@@ -466,7 +487,7 @@
libfaad2-shlibs (>= 2.7-1014),
libogg-shlibs,
libopencore-amr0-shlibs,
- libopenjpeg-shlibs,
+ libopenjpeg-shlibs (>=1.3-2),
libpostproc51-shlibs (= %v-%r),
libswscale0-shlibs (= %v-%r),
libtheora0-shlibs,
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
