Author: ranger Date: Fri Sep 11 15:50:33 2009 New Revision: 1610 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1610&repname=user%3a+ranger> Log: testing gstreamer update
Modified: trunk/experimental/common/main/finkinfo/gnome/gstreamer.info trunk/experimental/common/main/finkinfo/gnome/gstreamer.patch Modified: trunk/experimental/common/main/finkinfo/gnome/gstreamer.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/gnome/gstreamer.info&rev=1610&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/gnome/gstreamer.info (original) +++ trunk/experimental/common/main/finkinfo/gnome/gstreamer.info Fri Sep 11 15:50:33 2009 @@ -1,6 +1,6 @@ Package: gstreamer Version: 0.8.12 -Revision: 1028 +Revision: 1029 Description: Streaming-media framework License: GPL Maintainer: Benjamin Reed <gstrea...@fink.sourceforge.net> @@ -47,19 +47,20 @@ Source: http://gstreamer.freedesktop.org/src/%n/%n-%v.tar.bz2 Source-MD5: 80f3c4957ab3e254cc90016f87ba5482 PatchFile: %n.patch -PatchFile-MD5: 5767ec62861ff6db605517512d2f25fb +PatchFile-MD5: ed95cb3f0fbeb9217e9d42fe954cbfbe PatchScript: << patch -p1 < %{PatchFile} sed -i.bak -e '/WARNING.*sgml-build.log/d' docs/gst/Makefile.in << -SetCFLAGS: -Os -funroll-loops -fstrict-aliasing -fno-common -SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I%p/lib/pango-ft219/include -I%p/include +SetCFLAGS: -Os -funroll-loops -fstrict-aliasing -fno-common -D_XOPEN_SOURCE +SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I%p/lib/pango-ft219/include -I%p/include -D_XOPEN_SOURCE SetMAKEFLAGS: -j1 NoSetMAKEFLAGS: true ConfigureParams: --libexecdir=%p/lib/%n --mandir=%p/share/man --disable-tests --disable-examples --disable-dependency-tracking PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config CompileScript: << #!/bin/sh -ev + echo CFLAGS=$CFLAGS CPPFLAGS=$CPPFLAGS ./configure %c make << Modified: trunk/experimental/common/main/finkinfo/gnome/gstreamer.patch URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/gnome/gstreamer.patch&rev=1610&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/gnome/gstreamer.patch (original) +++ trunk/experimental/common/main/finkinfo/gnome/gstreamer.patch Fri Sep 11 15:50:33 2009 @@ -1,6 +1,56 @@ - +diff -Nurd gstreamer-0.8.12/gst/cothreads.c gstreamer-0.8.12-new/gst/cothreads.c +--- gstreamer-0.8.12/gst/cothreads.c 2004-11-02 10:02:11.000000000 -0500 ++++ gstreamer-0.8.12-new/gst/cothreads.c 2009-09-11 09:44:54.000000000 -0400 +@@ -651,7 +651,7 @@ + makecontext (&ucp, cothread_stub, 0); + setcontext (&ucp); + #else +- GST_ARCH_SETUP_STACK ((char *) cothread->sp); ++ GST_ARCH_SETUP_STACK (char *cothread->sp); + GST_ARCH_SET_SP (cothread->sp); + /* start it */ + GST_ARCH_CALL (cothread_stub); +diff -Nurd gstreamer-0.8.12/gst/gstarch.h gstreamer-0.8.12-new/gst/gstarch.h +--- gstreamer-0.8.12/gst/gstarch.h 2004-03-15 09:43:21.000000000 -0500 ++++ gstreamer-0.8.12-new/gst/gstarch.h 2009-09-11 09:32:20.000000000 -0400 +@@ -31,8 +31,13 @@ + + /***** Intel x86 *****/ + #if defined(HAVE_CPU_I386) && defined(__GNUC__) ++#ifdef __x86_64__ ++#define GST_ARCH_SET_SP(stackpointer) \ ++ __asm__( "movq %0, %%rsp\n" : : "r"(stackpointer) ); ++#else + #define GST_ARCH_SET_SP(stackpointer) \ + __asm__( "movl %0, %%esp\n" : : "r"(stackpointer) ); ++#endif + + #define GST_ARCH_CALL(target) \ + __asm__("call *%0" : : "r"(target) ); +diff -Nurd gstreamer-0.8.12/gst/gstcpu.c gstreamer-0.8.12-new/gst/gstcpu.c +--- gstreamer-0.8.12/gst/gstcpu.c 2005-03-25 19:13:34.000000000 -0500 ++++ gstreamer-0.8.12-new/gst/gstcpu.c 2009-09-11 09:30:52.000000000 -0400 +@@ -32,7 +32,7 @@ + + static guint32 _gst_cpu_flags = 0; + +-#if defined(HAVE_CPU_I386) && defined(__GNUC__) ++#if defined(HAVE_CPU_I386) && defined(__GNUC__) && (!defined(__APPLE__) || (defined(__APPLE__) && !defined(__x86_64__))) + #define _gst_cpu_initialize_arch _gst_cpu_initialize_i386 + gboolean _gst_cpu_initialize_i386 (gulong * flags, GString * featurelist); + #else +@@ -64,7 +64,7 @@ + return FALSE; + } + +-#if defined(HAVE_CPU_I386) && defined(__GNUC__) ++#if defined(HAVE_CPU_I386) && defined(__GNUC__) && (!defined(__APPLE__) || (defined(__APPLE__) && !defined(__x86_64__))) + + /* From liboil */ + +diff -Nurd gstreamer-0.8.12/libs/gst/getbits/Makefile.in gstreamer-0.8.12-new/libs/gst/getbits/Makefile.in --- gstreamer-0.8.12/libs/gst/getbits/Makefile.in 2006-02-09 08:07:52.000000000 -0500 -+++ gstreamer-0.8.12-new/libs/gst/getbits/Makefile.in 2006-03-15 11:20:57.000000000 -0500 ++++ gstreamer-0.8.12-new/libs/gst/getbits/Makefile.in 2009-09-11 09:30:52.000000000 -0400 @@ -91,7 +91,7 @@ libgstgetbits_la_LIBADD = am__libgstgetbits_la_SOURCES_DIST = getbits.c gstgetbits_inl.h \ ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs