[21883] trunk/dports/devel/liboil

source_changes at macosforge.org source_changes at macosforge.org
Sat Feb 10 15:48:14 PST 2007


Revision: 21883
          http://trac.macosforge.org/projects/macports/changeset/21883
Author:   rhwood at macports.org
Date:     2007-02-10 15:48:14 -0800 (Sat, 10 Feb 2007)

Log Message:
-----------
Nasty hack and patchfiles to make liboil work on powerpc systems

Modified Paths:
--------------
    trunk/dports/devel/liboil/Portfile
    trunk/dports/devel/liboil/files/patch-liboil_liboilcpu.c.diff

Added Paths:
-----------
    trunk/dports/devel/liboil/files/patch-liboil_powerpc_Makefile.in.diff

Modified: trunk/dports/devel/liboil/Portfile
===================================================================
--- trunk/dports/devel/liboil/Portfile	2007-02-10 23:18:44 UTC (rev 21882)
+++ trunk/dports/devel/liboil/Portfile	2007-02-10 23:48:14 UTC (rev 21883)
@@ -2,7 +2,7 @@
 PortSystem 1.0
 name		liboil
 version		0.3.10
-revision	1
+revision	2
 description	A library of simple functions that are optimized for various CPUs.
 long_description	${description}
 maintainers	landonf at macports.org
@@ -16,9 +16,24 @@
 
 patchfiles	\
 	patch-liboiltmp.c \
-	patch-liboil_liboilcpu.c.diff
+	patch-liboil_liboilcpu.c.diff \
+	patch-liboil_powerpc_Makefile.in.diff
 
 configure.args	--mandir=${prefix}/share/man 
 configure.env   CPPFLAGS="-I${prefix}/include -L${prefix}/lib" \
                 CFLAGS="-L${prefix}/lib"
-# here could be a ton'o'variants
+
+platform darwin powerpc {
+    # download version 0.3.6, the last known version to build and run correctly
+    # on powerpc, since no version is known to build and run on both powerpc
+    # and intel Mac OS X boxes, until such time as this can be fixed
+    distname    liboil-0.3.6
+    checksums \
+        md5 a36b2d9cc71d75d814d7bdca2263290f \
+        sha1 43cfdfeace05006bfeaacc30f1feeece657595a2 \
+        rmd160 f86830c0c9101e8fbe22879f930fb61d23b0139a
+    patchfiles-delete \
+        patch-liboiltmp.c \
+        patch-liboil_liboilcpu.c.diff \
+        patch-liboil_powerpc_Makefile.in.diff
+}

Modified: trunk/dports/devel/liboil/files/patch-liboil_liboilcpu.c.diff
===================================================================
--- trunk/dports/devel/liboil/files/patch-liboil_liboilcpu.c.diff	2007-02-10 23:18:44 UTC (rev 21882)
+++ trunk/dports/devel/liboil/files/patch-liboil_liboilcpu.c.diff	2007-02-10 23:48:14 UTC (rev 21883)
@@ -1,5 +1,5 @@
---- liboil/liboilcpu.c~	2007-02-03 12:06:32.000000000 -0500
-+++ liboil/liboilcpu.c	2007-02-03 12:43:36.000000000 -0500
+--- /Users/rhwood/Developer/MacPorts/Repository/dports/devel/liboil/liboilcpu.c.unpatched	2007-02-06 06:28:37.000000000 -0500
++++ liboil/liboilcpu.c	2007-02-07 06:45:02.000000000 -0500
 @@ -42,7 +42,7 @@
  #include <sys/time.h>
  #include <time.h>
@@ -9,6 +9,24 @@
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #endif
+@@ -531,7 +531,7 @@
+ static void
+ oil_cpu_detect_kernel_support (void)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__APPLE__)
+   int ret, enabled;
+   size_t len;
+ 
+@@ -542,7 +542,7 @@
+ 		       OIL_IMPL_FLAG_MMXEXT | OIL_IMPL_FLAG_SSE3);
+   }
+ #endif
+-#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__)
+   /* If we don't know that the operating system supports SSE, don't trust that
+    * it will properly support it.
+    */
 @@ -587,25 +587,17 @@
  }
  

Added: trunk/dports/devel/liboil/files/patch-liboil_powerpc_Makefile.in.diff
===================================================================
--- trunk/dports/devel/liboil/files/patch-liboil_powerpc_Makefile.in.diff	                        (rev 0)
+++ trunk/dports/devel/liboil/files/patch-liboil_powerpc_Makefile.in.diff	2007-02-10 23:48:14 UTC (rev 21883)
@@ -0,0 +1,41 @@
+--- /Users/rhwood/Developer/MacPorts/Repository/dports/devel/liboil/Makefile.in.unpatched	2007-02-07 06:46:38.000000000 -0500
++++ liboil/powerpc/Makefile.in	2007-02-07 06:47:46.000000000 -0500
+@@ -56,7 +56,7 @@
+ libpowerpc_la_LIBADD =
+ am__objects_1 = libpowerpc_la-abs.lo libpowerpc_la-clip.lo \
+ 	libpowerpc_la-conv.lo libpowerpc_la-copy.lo \
+-	libpowerpc_la-md5.lo libpowerpc_la-mix.lo \
++	libpowerpc_la-mix.lo \
+ 	libpowerpc_la-multsum.lo libpowerpc_la-resample.lo \
+ 	libpowerpc_la-rgb2bgr.lo libpowerpc_la-rgb2rgba.lo \
+ 	libpowerpc_la-sad8x8.lo libpowerpc_la-splat.lo \
+@@ -251,7 +251,6 @@
+ 	clip.c \
+ 	conv.c \
+ 	copy.c \
+-	md5.c \
+ 	mix.c \
+ 	multsum.c \
+ 	resample.c \
+@@ -320,7 +319,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpowerpc_la-clip.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpowerpc_la-conv.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpowerpc_la-copy.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpowerpc_la-md5.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpowerpc_la-mix.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpowerpc_la-multsum.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpowerpc_la-resample.Plo at am__quote@
+@@ -379,13 +377,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpowerpc_la_CFLAGS) $(CFLAGS) -c -o libpowerpc_la-copy.lo `test -f 'copy.c' || echo '$(srcdir)/'`copy.c
+ 
+-libpowerpc_la-md5.lo: md5.c
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpowerpc_la_CFLAGS) $(CFLAGS) -MT libpowerpc_la-md5.lo -MD -MP -MF "$(DEPDIR)/libpowerpc_la-md5.Tpo" -c -o libpowerpc_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libpowerpc_la-md5.Tpo" "$(DEPDIR)/libpowerpc_la-md5.Plo"; else rm -f "$(DEPDIR)/libpowerpc_la-md5.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5.c' object='libpowerpc_la-md5.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpowerpc_la_CFLAGS) $(CFLAGS) -c -o libpowerpc_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
+-
+ libpowerpc_la-mix.lo: mix.c
+ @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpowerpc_la_CFLAGS) $(CFLAGS) -MT libpowerpc_la-mix.lo -MD -MP -MF "$(DEPDIR)/libpowerpc_la-mix.Tpo" -c -o libpowerpc_la-mix.lo `test -f 'mix.c' || echo '$(srcdir)/'`mix.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libpowerpc_la-mix.Tpo" "$(DEPDIR)/libpowerpc_la-mix.Plo"; else rm -f "$(DEPDIR)/libpowerpc_la-mix.Tpo"; exit 1; fi

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070210/4f275f24/attachment.html


More information about the macports-changes mailing list