[39897] trunk/dports/multimedia/ffmpeg

Wed Sep 10 14:53:14 PDT 2008

Revision: 39897
          http://trac.macports.org/changeset/39897
Author:   ryandesign at macports.org
Date:     2008-09-10 14:53:13 -0700 (Wed, 10 Sep 2008)
Log Message:
-----------
ffmpeg: update and fix avfilter variant; closes #16101.

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

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================

--- trunk/dports/multimedia/ffmpeg/Portfile	2008-09-10 21:50:41 UTC (rev 39896)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2008-09-10 21:53:13 UTC (rev 39897)
@@ -4,7 +4,7 @@
 
 name		ffmpeg
 version		0.4.9-pre1
-revision	10
+revision	11
 categories	multimedia
 maintainers	acho at macports.org openmaintainer
 description	Digital VCR and streaming server
@@ -47,7 +47,7 @@
     if {![file isdirectory ${distpath}/${svn_rev}]} {
         file mkdir ${distpath}/${svn_rev}
         system "svn export -r${svn_rev} --ignore-externals svn://svn.mplayerhq.hu/ffmpeg/trunk ${distpath}/${svn_rev}/trunk"
-        system "svn export -r27347 svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ${distpath}/${svn_rev}/trunk/libswscale"
+        system "svn export -r27349 svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ${distpath}/${svn_rev}/trunk/libswscale"
     }
 }
 
@@ -149,8 +149,8 @@
 }
 variant avfilter requires gpl description {video filter support (replaces vhook)} {
 	patchfiles-append patch-libswscale-Makefile.diff \
-		patch-Makefile.diff patch-libavfilter-Makefile.diff
-	configure.args-append --enable-swscaler --enable-avfilter
+		patch-configure.diff
+	configure.args-append --enable-swscale --enable-avfilter
 
 	# keep vhook as long as avfilter isnt working fully
 	configure.args-delete --disable-vhook

Deleted: trunk/dports/multimedia/ffmpeg/files/patch-Makefile.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-Makefile.diff	2008-09-10 21:50:41 UTC (rev 39896)
+++ trunk/dports/multimedia/ffmpeg/files/patch-Makefile.diff	2008-09-10 21:53:13 UTC (rev 39897)
@@ -1,10 +0,0 @@
---- Makefile.orig	2008-03-18 02:16:56.000000000 +0100
-+++ Makefile	2008-03-18 02:17:41.000000000 +0100
-@@ -172,6 +172,7 @@
- 	$(MAKE)                    -C libavdevice install-libs
- 	$(MAKE-$(CONFIG_PP))       -C libpostproc install-libs
- 	$(MAKE-$(CONFIG_SWSCALER)) -C libswscale  install-libs
-+	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter  install-libs
- 
- install-headers:
- 	$(MAKE)              -C libavutil   install-headers

Modified: trunk/dports/multimedia/ffmpeg/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-configure.diff	2008-09-10 21:50:41 UTC (rev 39896)
+++ trunk/dports/multimedia/ffmpeg/files/patch-configure.diff	2008-09-10 21:53:13 UTC (rev 39897)
@@ -1,27 +1,11 @@
---- configure	Sun Sep 28 17:26:39 2003
-+++ configure.diff	Wed Jan 14 10:59:52 2004
-@@ -163,6 +163,7 @@
- make="gmake"
- ;;
- Darwin)
-+SLIBSUF=".dylib"
- cc="cc"
- v4l="no"
- audio_oss="no"
-@@ -177,13 +178,13 @@
- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
- case "$gcc_version" in
- *2.95*) 
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
- ;;
- *3.3*) 
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
- ;;
- *) 
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
- ;;
- esac
- ;;
+--- configure.orig	2008-08-04 15:43:25.000000000 -0700
++++ configure	2008-08-04 15:44:07.000000000 -0700
+@@ -1234,7 +1234,7 @@
+         ;;
+     darwin)
+         disable need_memalign
+-        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'
++        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME) -Wl,-read_only_relocs,suppress'
+         VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$$(@F)'
+         strip="strip -x"
+         FFLDFLAGS="-Wl,-dynamic,-search_paths_first"

Deleted: trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-Makefile.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-Makefile.diff	2008-09-10 21:50:41 UTC (rev 39896)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-Makefile.diff	2008-09-10 21:53:13 UTC (rev 39897)
@@ -1,12 +0,0 @@
---- 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-09-10 21:50:41 UTC (rev 39896)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff	2008-09-10 21:53:13 UTC (rev 39897)
@@ -1,13 +1,10 @@
---- libswscale/Makefile	(revision 26183)
+--- libswscale/Makefile	(revision 27347)
 +++ libswscale/Makefile	(working copy)
-@@ -1,6 +1,10 @@
+@@ -1,5 +1,7 @@
+ include $(SUBDIR)../config.mak
  
- include ../config.mak
- 
 +EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
-+LIBVERSION=$(SWSVERSION)
-+LIBMAJOR=$(SWSMAJOR)
 +
- NAME=swscale
- LIBVERSION=$(SWSVERSION)
- LIBMAJOR=$(SWSMAJOR)
+ NAME = swscale
+ FFLIBS = avutil
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080910/345daf1b/attachment.html 
