[82642] trunk/dports/multimedia/XviD

ryandesign at macports.org ryandesign at macports.org
Wed Aug 17 03:57:33 PDT 2011


Revision: 82642
          http://trac.macports.org/changeset/82642
Author:   ryandesign at macports.org
Date:     2011-08-17 03:57:33 -0700 (Wed, 17 Aug 2011)
Log Message:
-----------
XviD:

 * enable universal variant
 * fix build on non-default build_arch
 * enable recommended performance-enhancing optimizations
 * enable verbose build log to assist in future troubleshooting

Modified Paths:
--------------
    trunk/dports/multimedia/XviD/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/XviD/files/
    trunk/dports/multimedia/XviD/files/patch-CFLAGS.diff
    trunk/dports/multimedia/XviD/files/patch-LDFLAGS.diff
    trunk/dports/multimedia/XviD/files/patch-Makefile.diff

Modified: trunk/dports/multimedia/XviD/Portfile
===================================================================
--- trunk/dports/multimedia/XviD/Portfile	2011-08-17 10:32:57 UTC (rev 82641)
+++ trunk/dports/multimedia/XviD/Portfile	2011-08-17 10:57:33 UTC (rev 82642)
@@ -3,8 +3,12 @@
 
 PortSystem          1.0
 
+# The configure script checks endianness and bitness.
+PortGroup           muniversal 1.0
+
 name                XviD
 version             1.3.2
+revision            1
 categories          multimedia devel
 platforms           darwin sunos
 maintainers         nomaintainer
@@ -28,11 +32,31 @@
 checksums           sha1    74f9ce9c1bebcc9806bf21cb53274b8102700309 \
                     rmd160  968493d5813cbc30630532a1a64011e5572a5017
 
-# Universal can't possibly work right; the configure script checks for endianness
-universal_variant   no
-
 worksrcdir          xvidcore/build/generic
 
+patchfiles          patch-Makefile.diff \
+                    patch-CFLAGS.diff \
+                    patch-LDFLAGS.diff
+
+use_autoreconf      yes
+
+configure.universal_args-delete --disable-dependency-tracking
+
+set my_targets(ppc)     powerpc
+set my_targets(ppc64)   powerpc
+set my_targets(i386)    i386
+set my_targets(x86_64)  x86_64
+
+platform darwin {
+    if {[variant_isset universal]} {
+        foreach arch ${configure.universal_archs} {
+            set merger_configure_args(${arch}) --build=$my_targets(${arch})-apple-darwin${os.major}
+        }
+    } else {
+        configure.args-append --build=$my_targets(${configure.build_arch})-apple-darwin${os.major}
+    }
+}
+
 post-destroot {
     set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}

Added: trunk/dports/multimedia/XviD/files/patch-CFLAGS.diff
===================================================================
--- trunk/dports/multimedia/XviD/files/patch-CFLAGS.diff	                        (rev 0)
+++ trunk/dports/multimedia/XviD/files/patch-CFLAGS.diff	2011-08-17 10:57:33 UTC (rev 82642)
@@ -0,0 +1,21 @@
+# Append default CFLAGS to the ones MacPorts sets; increases performance.
+--- configure.in.orig	2011-05-18 02:59:28.000000000 -0500
++++ configure.in	2011-08-17 05:28:39.000000000 -0500
+@@ -119,7 +119,7 @@
+ dnl line
+ dnl
+ AC_MSG_CHECKING(whether to use default CFLAGS)
+-if test  x"$CFLAGS" = x"" ; then
++if test  x"" = x"" ; then
+    force_default_cc_options="yes"
+    AC_MSG_RESULT([yes])
+ else
+@@ -626,7 +626,7 @@
+ dnl ==========================================================================
+ 
+ if test "$force_default_cc_options" = "yes" ; then
+-   CFLAGS="$our_cflags_defaults"
++   CFLAGS+=" $our_cflags_defaults"
+ fi
+ 
+ dnl ==========================================================================

Added: trunk/dports/multimedia/XviD/files/patch-LDFLAGS.diff
===================================================================
--- trunk/dports/multimedia/XviD/files/patch-LDFLAGS.diff	                        (rev 0)
+++ trunk/dports/multimedia/XviD/files/patch-LDFLAGS.diff	2011-08-17 10:57:33 UTC (rev 82642)
@@ -0,0 +1,21 @@
+# Use the LDFLAGS passed at configure time; needed to get MacPorts -arch flags.
+--- configure.in.orig	2011-05-18 02:59:28.000000000 -0500
++++ configure.in	2011-08-17 05:12:47.000000000 -0500
+@@ -707,6 +707,7 @@
+ AC_SUBST(ASSEMBLY_SOURCES)
+ AC_SUBST(CC)
+ AC_SUBST(CFLAGS)
++AC_SUBST(LDFLAGS)
+ AC_SUBST(SPECIFIC_LDFLAGS)
+ AC_SUBST(SPECIFIC_CFLAGS)
+ AC_SUBST(DCT_IA64_SOURCES)
+--- platform.inc.in.orig	2011-01-11 05:39:13.000000000 -0600
++++ platform.inc.in	2011-08-17 05:10:02.000000000 -0500
+@@ -33,6 +33,7 @@
+ SPECIFIC_CFLAGS=@SPECIFIC_CFLAGS@
+ ALTIVEC_CFLAGS=@ALTIVEC_CFLAGS@
+ CFLAGS=@CFLAGS@
++LDFLAGS=@LDFLAGS@
+ 
+ # ============================================================================
+ # Assembler

Added: trunk/dports/multimedia/XviD/files/patch-Makefile.diff
===================================================================
--- trunk/dports/multimedia/XviD/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/multimedia/XviD/files/patch-Makefile.diff	2011-08-17 10:57:33 UTC (rev 82642)
@@ -0,0 +1,39 @@
+# Display the compile, assemble and link commands, to assist debugging.
+--- Makefile.orig	2011-05-19 03:27:26.000000000 -0500
++++ Makefile	2011-08-17 05:00:27.000000000 -0500
+@@ -94,7 +94,7 @@
+ .$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION):
+ 	@echo "  A: $(@D)/$(<F)"
+ 	@$(INSTALL) -d $(BUILD_DIR)/$(@D)
+-	@$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
++	$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
+ 
+ #-----------------------------------------------------------------------------
+ # Generic C rule
+@@ -105,7 +105,7 @@
+ .c.$(OBJECT_EXTENSION):
+ 	@echo "  C: $(@D)/$(<F)"
+ 	@$(INSTALL) -d $(BUILD_DIR)/$(@D)
+-	@$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
++	$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
+ 
+ #-----------------------------------------------------------------------------
+ # Static Library
+@@ -113,7 +113,7 @@
+ 
+ $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)
+ 	@echo "  L: $(@F)"
+-	@cd $(BUILD_DIR) && $(AR) rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)
++	cd $(BUILD_DIR) && $(AR) rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)
+ 
+ #-----------------------------------------------------------------------------
+ # Shared Library
+@@ -134,7 +134,7 @@
+ 	@echo "  L: $(@F)"
+ 	@$(INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
+ 	@$(INSTALL) -m 644 libxvidcore.ld $(BUILD_DIR)/libxvidcore.ld
+-	@cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
++	cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
+ 
+ #-----------------------------------------------------------------------------
+ # Installation
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110817/a1b95434/attachment-0001.html>


More information about the macports-changes mailing list