[87914] trunk/dports/graphics/gimp-gap

[devans at macports.org]

Revision: 87914
          http://trac.macports.org/changeset/87914
Author:   devans at macports.org
Date:     2011-12-11 20:48:06 -0800 (Sun, 11 Dec 2011)
Log Message:
-----------
gimp-gap: update embedded ffmpeg to 0.5.6, disable non-free options, correct license.

Modified Paths:
--------------
    trunk/dports/graphics/gimp-gap/Portfile
    trunk/dports/graphics/gimp-gap/files/patch-extern_libs-configure_options_ffmpeg.txt.diff
    trunk/dports/graphics/gimp-gap/files/patch-ffmpeg-Makefile.diff

Modified: trunk/dports/graphics/gimp-gap/Portfile
===================================================================
--- trunk/dports/graphics/gimp-gap/Portfile	2011-12-12 02:27:22 UTC (rev 87913)
+++ trunk/dports/graphics/gimp-gap/Portfile	2011-12-12 04:48:06 UTC (rev 87914)
@@ -6,10 +6,10 @@
 name            gimp-gap
 conflicts       gimp-gap-devel
 version         2.6.0
-revision        4
-license         {GPL-3 LGPL}
+revision        5
+license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
-set ffmpeg-vers 0.5.2
+set ffmpeg-vers 0.5.6
 set ffmpeg-name ffmpeg-${ffmpeg-vers}
 categories      graphics
 maintainers     devans
@@ -40,9 +40,9 @@
                     sha1    5ce9b73de4c992bd2a527197847033e15eb2c346 \
                     rmd160  2121eae37bd02f8e784cd377d1a48515221a97e8 \
                 ${ffmpeg-name}${extract.suffix} \
-                    md5     451eb428ca97a72c00555d50944cdb24 \
-                    sha1    47baf6a95602e1a0120d2864816b13066c5c3973 \
-                    rmd160  c884f92ead5e5e2e781a1046727d78a041786b35
+                    md5     4dc369e19df67f0e67a87a389a7dafbd \
+                    sha1    1187f2d7dd45c1f72a0eadd47058568b94349a00 \
+                    rmd160  814720c3adbb85053e528783a11b18904dc87f40
 
 patch.dir       ${workpath}
 patchfiles      patch-extern_libs-configure_options_ffmpeg.txt.diff \
@@ -63,8 +63,6 @@
                 port:yasm
 
 depends_lib     path:lib/pkgconfig/gimp-2.0.pc:gimp2 \
-                port:faac \
-                port:faad2 \
                 port:lame \
                 port:XviD \
                 port:bzip2 \
@@ -74,6 +72,8 @@
 
 configure.args  --disable-audio-support \
                 --disable-libmpeg3 \
+                --disable-ff-libfaac \
+                --disable-ff-libfaad \
                 --disable-ff-libx264 \
                 --enable-gdkpixbuf-pview \
                 --with-ffmpegsrcdir=${workpath}/${ffmpeg-name} \

Modified: trunk/dports/graphics/gimp-gap/files/patch-extern_libs-configure_options_ffmpeg.txt.diff
===================================================================
--- trunk/dports/graphics/gimp-gap/files/patch-extern_libs-configure_options_ffmpeg.txt.diff	2011-12-12 02:27:22 UTC (rev 87913)
+++ trunk/dports/graphics/gimp-gap/files/patch-extern_libs-configure_options_ffmpeg.txt.diff	2011-12-12 04:48:06 UTC (rev 87914)
@@ -2,7 +2,7 @@
 +++ gimp-gap-2.6.0/extern_libs/configure_options_ffmpeg.txt	2010-08-04 12:13:36.000000000 -0700
 @@ -1,4 +1,4 @@
 ---enable-shared --enable-static --disable-mmx --enable-gpl 
-+--enable-shared --enable-static --disable-amd3dnow --disable-amd3dnowext --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --enable-nonfree --enable-gpl --disable-ffmpeg --disable-ffplay --disable-ffserver MP_FFMPEG_EXTRAS
++--enable-shared --enable-static --disable-amd3dnow --disable-amd3dnowext --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --enable-gpl --disable-ffmpeg --disable-ffplay --disable-ffserver MP_FFMPEG_EXTRAS
  # recent ffmpeg releases does no longer support --enable-liba52
  # for audio /mp3 encoding ffmpeg recommands to link with the external libraries.
  #

Modified: trunk/dports/graphics/gimp-gap/files/patch-ffmpeg-Makefile.diff
===================================================================
--- trunk/dports/graphics/gimp-gap/files/patch-ffmpeg-Makefile.diff	2011-12-12 02:27:22 UTC (rev 87913)
+++ trunk/dports/graphics/gimp-gap/files/patch-ffmpeg-Makefile.diff	2011-12-12 04:48:06 UTC (rev 87914)
@@ -1,5 +1,5 @@
---- ffmpeg-0.5.2/Makefile.orig	2010-08-04 19:25:32.000000000 -0700
-+++ ffmpeg-0.5.2/Makefile	2010-08-04 19:27:27.000000000 -0700
+--- ffmpeg-0.5.6/Makefile.orig	2010-08-04 19:25:32.000000000 -0700
++++ ffmpeg-0.5.6/Makefile	2010-08-04 19:27:27.000000000 -0700
 @@ -113,9 +113,10 @@
  VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d)
  depend dep: $(VHOOK_DEPS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111211/95e00786/attachment.html>