[147843] trunk/dports/multimedia/gpac

[ryandesign at macports.org]

Revision: 147843
          https://trac.macports.org/changeset/147843
Author:   ryandesign at macports.org
Date:     2016-04-17 12:30:10 -0700 (Sun, 17 Apr 2016)
Log Message:
-----------
gpac: update to 0.6.1

Modified Paths:
--------------
    trunk/dports/multimedia/gpac/Portfile
    trunk/dports/multimedia/gpac/files/patch-configure.diff

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

Modified: trunk/dports/multimedia/gpac/Portfile
===================================================================
--- trunk/dports/multimedia/gpac/Portfile	2016-04-17 18:55:35 UTC (rev 147842)
+++ trunk/dports/multimedia/gpac/Portfile	2016-04-17 19:30:10 UTC (rev 147843)
@@ -2,10 +2,10 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           conflicts_build 1.0
 PortGroup           github 1.0
 
-github.setup        gpac gpac 0.6.0 v
-revision            1
+github.setup        gpac gpac 0.6.1 v
 categories          multimedia
 platforms           darwin
 maintainers         nomaintainer
@@ -21,8 +21,8 @@
 
 homepage            http://gpac.wp.mines-telecom.fr/
 
-checksums           rmd160  b4ef2467f983dba561f7aa9d59ad59d50cd18208 \
-                    sha256  cd9c83e347a3f1323121ea68a816a26c9c7709f41ebf09e31b118a55692cfced
+checksums           rmd160  d0974957588167f2401fbe7e789fce1479558a4f \
+                    sha256  7e91530a925b7d2e1dbf02c767755b40669f6bdd413e6f60dbdcf0aaa76f6671
 
 depends_build       port:pkgconfig \
                     port:zlib
@@ -46,13 +46,15 @@
                     port:mesa \
                     port:xorg-libXv
 
-patchfiles          patch-configure.diff \
-                    patch-Makefile.diff
+patchfiles          patch-configure.diff
 
 post-patch {
     reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/configure
 }
 
+# https://github.com/gpac/gpac/issues/432
+conflicts_build     ${name}
+
 # 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

Deleted: trunk/dports/multimedia/gpac/files/patch-Makefile.diff
===================================================================
--- trunk/dports/multimedia/gpac/files/patch-Makefile.diff	2016-04-17 18:55:35 UTC (rev 147842)
+++ trunk/dports/multimedia/gpac/files/patch-Makefile.diff	2016-04-17 19:30:10 UTC (rev 147843)
@@ -1,12 +0,0 @@
-/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 \

Modified: trunk/dports/multimedia/gpac/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/gpac/files/patch-configure.diff	2016-04-17 18:55:35 UTC (rev 147842)
+++ trunk/dports/multimedia/gpac/files/patch-configure.diff	2016-04-17 19:30:10 UTC (rev 147843)
@@ -1,6 +1,6 @@
---- configure.orig	2016-02-19 07:01:44.000000000 -0600
-+++ configure	2016-02-23 10:40:59.000000000 -0600
-@@ -546,17 +546,7 @@
+--- configure.orig	2016-03-04 10:03:40.000000000 -0600
++++ configure	2016-04-17 14:20:52.000000000 -0500
+@@ -546,16 +546,7 @@
          xul_flags=-DXP_MAC
          CFLAGS_DIR="-I$prefix/include"
          LDFLAGS="-L$prefix/lib"
@@ -13,7 +13,6 @@
 -            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"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160417/f2c13976/attachment.html>