[35128] trunk/dports/multimedia/ffmpeg

[reiffert at macports.org]

Revision: 35128
          http://trac.macosforge.org/projects/macports/changeset/35128
Author:   reiffert at macports.org
Date:     2008-03-17 19:08:50 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Fix missing versioning information for libavfilter and libswscale within ffmpeg. That allows the two libraries to get installed correctly.

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile
    trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff

Added Paths:
-----------
    trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-Makefile.diff

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2008-03-18 01:00:59 UTC (rev 35127)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2008-03-18 02:08:50 UTC (rev 35128)
@@ -124,7 +124,8 @@
 	}
 }
 variant avfilter requires gpl description {video filter support (replaces vhook)} {
-	patchfiles-append patch-libswscale-Makefile.diff
+	patchfiles-append patch-libswscale-Makefile.diff \
+		patch-Makefile.diff patch-libavfilter-Makefile.diff
 	configure.args-append --enable-swscaler --enable-avfilter
 
 	# keep vhook as long as avfilter isnt working fully

Added: trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-Makefile.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-Makefile.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-Makefile.diff	2008-03-18 02:08:50 UTC (rev 35128)
@@ -0,0 +1,12 @@
+--- libavfilter/Makefile.orig	2008-03-18 02:54:41.000000000 +0100
++++ libavfilter/Makefile	2008-03-18 02:54:57.000000000 +0100
+@@ -20,7 +20,7 @@
+ endif
+ 
+ NAME=avfilter
+-LIBVERSION=$(LAVFILTERVERSION)
+-LIBMAJOR=$(LAVFILTERMAJOR)
++LIBVERSION=$(LAVFIVERSION)
++LIBMAJOR=$(LAVFIMAJOR)
+ 
+ include ../common.mak

Modified: trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff	2008-03-18 01:00:59 UTC (rev 35127)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff	2008-03-18 02:08:50 UTC (rev 35128)
@@ -1,9 +1,12 @@
---- libswscale/Makefile.orig	2008-03-16 15:10:09.000000000 +0100
-+++ libswscale/Makefile	2008-03-16 15:10:34.000000000 +0100
-@@ -1,5 +1,5 @@
+--- libswscale/Makefile.orig	2008-03-18 03:02:36.000000000 +0100
++++ libswscale/Makefile	2008-03-18 03:03:06.000000000 +0100
+@@ -1,5 +1,9 @@
  include ../config.mak
--
+ 
 +EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
++LIBVERSION=$(SWSVERSION)
++LIBMAJOR=$(SWSMAJOR)
++
  NAME = swscale
  FFLIBS = avutil
  

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080317/fccf42e6/attachment.html