[87372] trunk/dports/multimedia

[ryandesign at macports.org]

Revision: 87372
          http://trac.macports.org/changeset/87372
Author:   ryandesign at macports.org
Date:     2011-11-18 17:15:32 -0800 (Fri, 18 Nov 2011)
Log Message:
-----------
ffmpeg, ffmpeg-devel: fix '-dylib_compatibility_version must be greater than zero' compile error on Tiger; see #24704

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile
    trunk/dports/multimedia/ffmpeg-devel/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/ffmpeg/files/
    trunk/dports/multimedia/ffmpeg/files/patch-configure.diff
    trunk/dports/multimedia/ffmpeg-devel/files/
    trunk/dports/multimedia/ffmpeg-devel/files/patch-configure.diff

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2011-11-19 01:01:14 UTC (rev 87371)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2011-11-19 01:15:32 UTC (rev 87372)
@@ -73,6 +73,8 @@
                 port:bzip2 \
                 port:zlib
 
+patchfiles      patch-configure.diff
+
 build.cmd       ${prefix}/bin/gmake
 build.env-append V=1
 

Added: trunk/dports/multimedia/ffmpeg/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-configure.diff	2011-11-19 01:15:32 UTC (rev 87372)
@@ -0,0 +1,16 @@
+--- configure.orig	2011-11-04 16:30:00.000000000 -0500
++++ configure	2011-11-18 18:21:44.000000000 -0600
+@@ -2443,7 +2443,12 @@
+         enable malloc_aligned
+         gas="gas-preprocessor.pl $cc"
+         enabled ppc && add_asflags -force_cpusubtype_ALL
+-        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
++        build_os_ver=$(uname -r)
++        if test ${build_os_ver:0:1} = 8; then
++        	SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION)'
++        else
++        	SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
++        fi
+         enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
+         strip="${strip} -x"
+         add_ldflags -Wl,-dynamic,-search_paths_first

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2011-11-19 01:01:14 UTC (rev 87371)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2011-11-19 01:15:32 UTC (rev 87372)
@@ -78,6 +78,8 @@
 
 checksums       rmd160  2b5f175b9681a3456d3c2081a2b89b7b3918732d
 
+patchfiles      patch-configure.diff
+
 build.cmd       ${prefix}/bin/gmake
 build.env-append V=1
 

Added: trunk/dports/multimedia/ffmpeg-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg-devel/files/patch-configure.diff	2011-11-19 01:15:32 UTC (rev 87372)
@@ -0,0 +1,16 @@
+--- configure.orig	2011-11-04 15:38:40.000000000 -0500
++++ configure	2011-11-18 18:28:18.000000000 -0600
+@@ -2550,7 +2550,12 @@
+         enable malloc_aligned
+         gas="gas-preprocessor.pl $cc"
+         enabled ppc && add_asflags -force_cpusubtype_ALL
+-        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
++        build_os_ver=$(uname -r)
++        if test ${build_os_ver:0:1} = 8; then
++        	SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION)'
++        else
++        	SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
++        fi
+         enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
+         strip="${strip} -x"
+         add_ldflags -Wl,-dynamic,-search_paths_first
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111118/22c0e848/attachment-0001.html>