[145978] trunk/dports/multimedia/gpac

[ryandesign at macports.org]

Revision: 145978
          https://trac.macports.org/changeset/145978
Author:   ryandesign at macports.org
Date:     2016-02-23 09:08:08 -0800 (Tue, 23 Feb 2016)
Log Message:
-----------
gpac: use the right compiler, even during the configure phase; do not look explicitly in /sw nor /opt/local; fix syntax error in Makefile; set the right applications dir (not that it's used); remove outdated comments

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

Added Paths:
-----------
    trunk/dports/multimedia/gpac/files/
    trunk/dports/multimedia/gpac/files/patch-Makefile.diff
    trunk/dports/multimedia/gpac/files/patch-configure.diff

Modified: trunk/dports/multimedia/gpac/Portfile
===================================================================
--- trunk/dports/multimedia/gpac/Portfile	2016-02-23 17:07:43 UTC (rev 145977)
+++ trunk/dports/multimedia/gpac/Portfile	2016-02-23 17:08:08 UTC (rev 145978)
@@ -45,17 +45,19 @@
                     port:mesa \
                     port:xorg-libXv
 
-# This project's build system misuses the prefix "cpp" to refer to the C++ compiler instead of the C preprocessor.
-# https://sourceforge.net/p/gpac/bugs/287/
-# Unfortunately setting cc and cpp doesn't actually do anything.
-# https://sourceforge.net/p/gpac/bugs/286/
+patchfiles          patch-configure.diff \
+                    patch-Makefile.diff
 
+post-patch {
+    reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/configure
+}
+
 # external spidermonkey (--use-js=no) is not recognized because it doesn't provide a pkg-config file and build fails with local copy
 # pulseaudio is recognized if installed but build fails
 # builds with openjpeg15 if include path is added, build fails using openjpeg 2.1
 
 configure.args      --cc="${configure.cc}" \
-                    --cpp="${configure.cxx}" \
+                    --cxx="${configure.cxx}" \
                     --extra-cflags="-I${prefix}/include/openjpeg-1.5 ${configure.cc_archflags}" \
                     --extra-ldflags="${configure.ld_archflags}" \
                     --mandir=${prefix}/share/man \
@@ -63,10 +65,6 @@
                     --disable-pulseaudio \
                     --use-js=no
 
-# use the RightCompiler
-
-build.args-append    CC="${configure.cc}"
-
 # This project's build system detects CPU and endianness at configure time.
 # muniversal is worth a try.
 universal_variant   no

Added: trunk/dports/multimedia/gpac/files/patch-Makefile.diff
===================================================================
--- trunk/dports/multimedia/gpac/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/multimedia/gpac/files/patch-Makefile.diff	2016-02-23 17:08:08 UTC (rev 145978)
@@ -0,0 +1,12 @@
+/bin/sh:  echo: command not found
+--- Makefile.orig	2016-02-19 07:01:44.000000000 -0600
++++ Makefile	2016-02-23 10:57:17.000000000 -0600
+@@ -15,7 +15,7 @@
+ GITREV_PATH:=$(SRC_PATH)/include/gpac/revision.h
+ TAG:=$(shell git --git-dir=$(SRC_PATH)/.git describe --tags --abbrev=0 2> /dev/null)
+ VERSION:=$(shell echo `git --git-dir=$(SRC_PATH)/.git describe --tags --long  || echo "UNKNOWN"` | sed "s/^$(TAG)-//")
+-BRANCH:=$(shell git --git-dir=$(SRC_PATH)/.git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
++BRANCH:=$(shell git --git-dir=$(SRC_PATH)/.git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
+ 
+ version:
+ 	@if [ -d $(SRC_PATH)/".git" ]; then \

Added: trunk/dports/multimedia/gpac/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/gpac/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/multimedia/gpac/files/patch-configure.diff	2016-02-23 17:08:08 UTC (rev 145978)
@@ -0,0 +1,21 @@
+--- configure.orig	2016-02-19 07:01:44.000000000 -0600
++++ configure	2016-02-23 10:40:59.000000000 -0600
+@@ -546,17 +546,7 @@
+         xul_flags=-DXP_MAC
+         CFLAGS_DIR="-I$prefix/include"
+         LDFLAGS="-L$prefix/lib"
+-        if test -d /sw/bin ; then
+-            alt_macosx_dir="/sw"
+-            CFLAGS_DIR="-I/sw/include $CFLAGS_DIR"
+-            LDFLAGS="-L/sw/lib $LDFLAGS"
+-        elif test -d /opt/local/bin ; then
+-            alt_macosx_dir="/opt/local"
+-            CFLAGS_DIR="-I/opt/local/include $CFLAGS_DIR"
+-            LDFLAGS="-L/opt/local/lib $LDFLAGS"
+-        fi
+-        cc="cc"
+-        Mac_Applications="/Applications"
++        Mac_Applications="@APPLICATIONS_DIR@"
+         SHFLAGS="-dynamiclib"
+         DYN_LIB_SUFFIX=".dylib"
+         extralibs=""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160223/16bdc2a4/attachment.html>