[43550] trunk/dports/multimedia/ffmpeg

[devans at macports.org]

Revision: 43550
          http://trac.macports.org/changeset/43550
Author:   devans at macports.org
Date:     2008-12-11 16:00:32 -0800 (Thu, 11 Dec 2008)
Log Message:
-----------
ffmpeg: for libavfilter and libswscale, increment library major revision from 0 to 1 to avoid link problems due to -current_version, -compatibility_version less than 1.  Remove previous patch to configure that disabled all library versioning when +avfilter variant selected.

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

Added Paths:
-----------
    trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff
    trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2008-12-11 23:50:00 UTC (rev 43549)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2008-12-12 00:00:32 UTC (rev 43550)
@@ -35,7 +35,10 @@
 homepage        http://ffmpeg.mplayerhq.hu/
 master_sites
 distfiles
-patchfiles      patch-libavcodec_ppc_check_altivec.c.diff
+patchfiles      patch-libavcodec_ppc_check_altivec.c.diff \
+                patch-libavfilter-avfilter.h.diff \
+                patch-libswscale-swscale.h.diff
+
 use_parallel_build  yes
 worksrcdir     trunk
 depends_build  bin:svn:subversion port:gmake
@@ -164,8 +167,6 @@
 }
 
 variant avfilter requires gpl description {video filter support (replaces vhook)} {
-	patchfiles-append patch-libswscale-Makefile.diff \
-		patch-configure.diff
 	configure.args-append --enable-swscale --enable-avfilter
 
 	# keep vhook as long as avfilter isnt working fully

Deleted: trunk/dports/multimedia/ffmpeg/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-configure.diff	2008-12-11 23:50:00 UTC (rev 43549)
+++ trunk/dports/multimedia/ffmpeg/files/patch-configure.diff	2008-12-12 00:00:32 UTC (rev 43550)
@@ -1,11 +0,0 @@
---- 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"

Added: trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff	2008-12-12 00:00:32 UTC (rev 43550)
@@ -0,0 +1,11 @@
+--- libavfilter/avfilter.h.orig	2008-12-11 14:10:03.000000000 -0800
++++ libavfilter/avfilter.h	2008-12-11 14:19:01.000000000 -0800
+@@ -22,7 +22,7 @@
+ #ifndef AVFILTER_AVFILTER_H
+ #define AVFILTER_AVFILTER_H
+ 
+-#define LIBAVFILTER_VERSION_MAJOR  0
++#define LIBAVFILTER_VERSION_MAJOR  1
+ #define LIBAVFILTER_VERSION_MINOR  1
+ #define LIBAVFILTER_VERSION_MICRO  0
+ 

Deleted: trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff	2008-12-11 23:50:00 UTC (rev 43549)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff	2008-12-12 00:00:32 UTC (rev 43550)
@@ -1,10 +0,0 @@
---- libswscale/Makefile	(revision 27347)
-+++ libswscale/Makefile	(working copy)
-@@ -1,5 +1,7 @@
- include $(SUBDIR)../config.mak
- 
-+EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
-+
- NAME = swscale
- FFLIBS = avutil
- 

Added: trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff	2008-12-12 00:00:32 UTC (rev 43550)
@@ -0,0 +1,11 @@
+--- libswscale/swscale.h.orig	2008-12-11 14:15:54.000000000 -0800
++++ libswscale/swscale.h	2008-12-11 14:18:22.000000000 -0800
+@@ -29,7 +29,7 @@
+ 
+ #include "libavutil/avutil.h"
+ 
+-#define LIBSWSCALE_VERSION_MAJOR 0
++#define LIBSWSCALE_VERSION_MAJOR 1
+ #define LIBSWSCALE_VERSION_MINOR 6
+ #define LIBSWSCALE_VERSION_MICRO 1
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081211/f42d0916/attachment.html>