From: <rb...@fr...> - 2005-10-24 13:51:54
|
CVS Root: /cvs/gstreamer Module: mirror Changes by: rbultje Date: Mon Oct 24 2005 06:51:44 PDT Log message: Fix altivec detection on G3 Apples (#319482), and fix make dist (#319471) because the docs would sometimes be missing from the dist. Modified files: ffmpeg : configure.ac ffmpeg/doc : Makefile.am ffmpeg/patches : autotools.patch memalign.patch Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/mirror/ffmpeg/configure.ac.diff?r1=1.14&r2=1.15 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/mirror/ffmpeg/doc/Makefile.am.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/mirror/ffmpeg/patches/autotools.patch.diff?r1=1.22&r2=1.23 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/mirror/ffmpeg/patches/memalign.patch.diff?r1=1.6&r2=1.7 ====Begin Diffs==== Index: configure.ac =================================================================== RCS file: /cvs/gstreamer/mirror/ffmpeg/configure.ac,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- configure.ac 21 Oct 2005 14:30:27 -0000 1.14 +++ configure.ac 24 Oct 2005 13:51:31 -0000 1.15 @@ -277,9 +277,11 @@ dnl MMI if test x$TARGET_ARCH = xmips; then AC_MSG_CHECKING(for MMI instruction set) - AC_TRY_COMPILE([],[ - __asm__ ("lq \$2, 0(\$2)"); - return 0; + AC_TRY_RUN([ + int main () { + __asm__ ("lq \$2, 0(\$2)"); + return 0; + } ],[ HAVE_MMI=yes && AC_MSG_RESULT(yes) ],[ HAVE_MMI=no && AC_MSG_RESULT(no) ]) else @@ -304,10 +306,15 @@ HAVE_ALTIVEC_H=yes ], ALT_H="" HAVE_ALTIVEC_H=no) # See does our compiler support Motorola AltiVec C API AC_MSG_CHECKING(for support of Motorola Altivec API) - AC_TRY_COMPILE($ALT_H,[ - vector signed int v1, v2, v3; - v1 = vec_add(v2,v3); - return 0; + AC_TRY_RUN([ + $ALT_H + int main () { + union { vector signed int v; + signed int i; + } vi; + vi.v = vec_splat_s32(0); + return vi.i; + } ],[ HAVE_ALTIVEC=yes && AC_MSG_RESULT(yes) ],[ HAVE_ALTIVEC=no && AC_MSG_RESULT(no) ]) if test x$HAVE_ALTIVEC = xyes; then @@ -327,9 +334,11 @@ AC_FF_ALLOW_DISABLE(HAVE_IWMMXT, iwmmxt, use ARM/IWMMXT optimizations,[ if test x$TARGET_ARCH = xarmv4l; then AC_MSG_CHECKING(for support of IWMMXT optimizations) - AC_TRY_COMPILE(,[ - __asm__ __volatile__ ("wunpckelub wr6, wr4"); + __asm__ __volatile__ ("wunpckelub wr6, wr4"); + return 0; ],[ HAVE_IWMMXT=yes && AC_MSG_RESULT(yes) ],[ HAVE_IWMMXT=no && AC_MSG_RESULT(no) ]) else Index: Makefile.am RCS file: /cvs/gstreamer/mirror/ffmpeg/doc/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 21 Oct 2005 14:30:27 -0000 1.2 +++ Makefile.am 24 Oct 2005 13:51:31 -0000 1.3 @@ -1,19 +1,21 @@ htmldir = $(pkgdatadir)/html -if HAVE_TEXI2HTML -html_pages = \ +html_sources = \ ffmpeg-doc.html \ faq.html \ ffserver-doc.html \ ffplay-doc.html \ hooks.html +if HAVE_TEXI2HTML +html_pages = $(html_sources) endif html_DATA = $(html_pages) -if HAVE_POD2MAN -man_pages = \ +man_sources = \ ffmpeg.1 \ ffserver.1 \ ffplay.1 +if HAVE_POD2MAN +man_pages = $(man_sources) man_MANS = $(man_pages) @@ -28,8 +30,8 @@ optimization.txt \ texi2pod.pl \ TODO \ - $(html_DATA:.html=.texi) \ - $(man_MANS:.1=-doc.texi) + $(html_sources:.html=.texi) \ + $(man_sources:.1=-doc.texi) %.html: %.texi $(TEXI2HTML) -monolithic -number $< Index: autotools.patch RCS file: /cvs/gstreamer/mirror/ffmpeg/patches/autotools.patch,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- autotools.patch 21 Oct 2005 14:30:31 -0000 1.22 +++ autotools.patch 24 Oct 2005 13:51:32 -0000 1.23 @@ -601,7 +601,7 @@ =================================================================== --- /dev/null +++ ffmpeg/configure.ac -@@ -0,0 +1,810 @@ +@@ -0,0 +1,819 @@ +dnl Replaces old FFMpeg build system +dnl Note: PPC, Darwin, CPU tuning and mingw32 has been removed. That +dnl does not belong in a configure.ac file. The BeOS stuff seems a @@ -881,9 +881,11 @@ +dnl MMI +if test x$TARGET_ARCH = xmips; then + AC_MSG_CHECKING(for MMI instruction set) -+ AC_TRY_COMPILE([],[ -+ __asm__ ("lq \$2, 0(\$2)"); -+ return 0; ++ AC_TRY_RUN([ ++ int main () { ++ __asm__ ("lq \$2, 0(\$2)"); ++ return 0; ++ } + ],[ HAVE_MMI=yes && AC_MSG_RESULT(yes) ],[ + HAVE_MMI=no && AC_MSG_RESULT(no) ]) +else @@ -908,10 +910,15 @@ + HAVE_ALTIVEC_H=yes ], ALT_H="" HAVE_ALTIVEC_H=no) + # See does our compiler support Motorola AltiVec C API + AC_MSG_CHECKING(for support of Motorola Altivec API) -+ AC_TRY_COMPILE($ALT_H,[ -+ vector signed int v1, v2, v3; -+ v1 = vec_add(v2,v3); -+ return 0; ++ AC_TRY_RUN([ ++ $ALT_H ++ int main () { ++ union { vector signed int v; ++ signed int i; ++ } vi; ++ vi.v = vec_splat_s32(0); ++ return vi.i; ++ } + ],[ HAVE_ALTIVEC=yes && AC_MSG_RESULT(yes) ],[ + HAVE_ALTIVEC=no && AC_MSG_RESULT(no) ]) + if test x$HAVE_ALTIVEC = xyes; then @@ -931,9 +938,11 @@ +AC_FF_ALLOW_DISABLE(HAVE_IWMMXT, iwmmxt, use ARM/IWMMXT optimizations,[ + if test x$TARGET_ARCH = xarmv4l; then + AC_MSG_CHECKING(for support of IWMMXT optimizations) -+ AC_TRY_COMPILE(,[ -+ __asm__ __volatile__ ("wunpckelub wr6, wr4"); ++ __asm__ __volatile__ ("wunpckelub wr6, wr4"); ++ return 0; + ],[ HAVE_IWMMXT=yes && AC_MSG_RESULT(yes) ],[ + HAVE_IWMMXT=no && AC_MSG_RESULT(no) ]) + else @@ -1416,23 +1425,25 @@ +++ ffmpeg/doc/Makefile.am -@@ -0,0 +1,41 @@ +@@ -0,0 +1,43 @@ +htmldir = $(pkgdatadir)/html -+if HAVE_TEXI2HTML -+html_pages = \ ++html_sources = \ + ffmpeg-doc.html \ + faq.html \ + ffserver-doc.html \ + ffplay-doc.html \ + hooks.html ++if HAVE_TEXI2HTML ++html_pages = $(html_sources) +endif +html_DATA = $(html_pages) + -+if HAVE_POD2MAN -+man_pages = \ ++man_sources = \ + ffmpeg.1 \ + ffserver.1 \ + ffplay.1 ++if HAVE_POD2MAN ++man_pages = $(man_sources) +man_MANS = $(man_pages) @@ -1447,8 +1458,8 @@ + optimization.txt \ + texi2pod.pl \ + TODO \ -+ $(html_DATA:.html=.texi) \ -+ $(man_MANS:.1=-doc.texi) ++ $(html_sources:.html=.texi) \ ++ $(man_sources:.1=-doc.texi) +%.html: %.texi + $(TEXI2HTML) -monolithic -number $< Index: memalign.patch RCS file: /cvs/gstreamer/mirror/ffmpeg/patches/memalign.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- memalign.patch 21 Oct 2005 14:30:31 -0000 1.6 +++ memalign.patch 24 Oct 2005 13:51:32 -0000 1.7 @@ -2,7 +2,7 @@ --- ffmpeg.orig/configure.ac -@@ -373,8 +373,8 @@ AC_CHECK_HEADER(malloc.h,[ +@@ -382,8 +382,8 @@ AC_CHECK_HEADER(malloc.h,[ ]) dnl Check for memalign |