[csw-devel] SF.net SVN: gar:[19345] csw/mgar/pkg/ffmpeg/trunk

[janholzh at users.sourceforge.net]

Revision: 19345
          http://gar.svn.sourceforge.net/gar/?rev=19345&view=rev
Author:   janholzh
Date:     2012-10-01 13:19:53 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
ffmpeg/trunk: update to 1.0

Modified Paths:
--------------
    csw/mgar/pkg/ffmpeg/trunk/Makefile
    csw/mgar/pkg/ffmpeg/trunk/checksums
    csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch

Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/Makefile	2012-10-01 10:01:51 UTC (rev 19344)
+++ csw/mgar/pkg/ffmpeg/trunk/Makefile	2012-10-01 13:19:53 UTC (rev 19345)
@@ -8,7 +8,7 @@
 # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common
 
 NAME = ffmpeg
-VERSION = 0.11.2
+VERSION = 1.0
 CATEGORIES = lib
 GARTYPE = v2
 
@@ -23,7 +23,7 @@
 
 PATCHFILES += 0001-fix-version.sh.patch
 PATCHFILES += 0003-change-linker-flags.patch
-PATCHFILES += 0003-fix_a_few_shells.patch
+#PATCHFILES += 0003-fix_a_few_shells.patch
 PATCHFILES += 0004-remove-GNU-ld-specific-options.patch
 
 LICENSE = COPYING.GPLv3
@@ -39,7 +39,7 @@
 PKGFILES_CSWlibavcodec54 += $(call pkgfiles_lib,libavcodec.so.54)
 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbisenc2
 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavfilter2
+RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavfilter3
 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbis0
 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibmp3lame0
@@ -67,16 +67,16 @@
 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibspeex1
 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-125
 
-PACKAGES += CSWlibavfilter2
-SPKG_DESC_CSWlibavfilter2 = FFMPEG library libavfilter.so.2
-PKGFILES_CSWlibavfilter2 += $(call pkgfiles_lib,libavfilter.so.2)
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavformat54
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswscale2
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavcodec54
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswresample0
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibpostproc52
+PACKAGES += CSWlibavfilter3
+SPKG_DESC_CSWlibavfilter3 = FFMPEG library libavfilter.so.3
+PKGFILES_CSWlibavfilter3 += $(call pkgfiles_lib,libavfilter.so.3)
+RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavformat54
+RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswscale2
+RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavutil51
+RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavcodec54
+RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswresample0
+RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibpostproc52
 
 PACKAGES += CSWlibavformat54
 SPKG_DESC_CSWlibavformat54 = FFMPEG library libavformat.so.54
@@ -110,7 +110,7 @@
 PKGFILES_CSWffmpeg-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavcodec54
 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavdevice54
-RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavfilter2
+RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavfilter3
 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavformat54
 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil51
 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc52
@@ -128,7 +128,7 @@
 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavcodec54
 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice54
 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswresample0
-RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter2
+RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter3
 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc52
 
 # These are all examples

Modified: csw/mgar/pkg/ffmpeg/trunk/checksums
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/checksums	2012-10-01 10:01:51 UTC (rev 19344)
+++ csw/mgar/pkg/ffmpeg/trunk/checksums	2012-10-01 13:19:53 UTC (rev 19345)
@@ -1 +1 @@
-93c1908022567b321df74db7214da6ac  ffmpeg-0.11.2.tar.bz2
+3ed526cea20c1bffb5a37f7730f710bd  ffmpeg-1.0.tar.bz2

Modified: csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch	2012-10-01 10:01:51 UTC (rev 19344)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch	2012-10-01 13:19:53 UTC (rev 19345)
@@ -1,24 +1,24 @@
-From 38f1e7dee2711117bc6f9cde25ab2a31531cb5e6 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sat, 29 Sep 2012 17:19:27 +0200
-Subject: [PATCH] Remove GNU ld specific options
+From 14fb2a6aa9fc69358b7d0148da0674279fdcdf1c Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Mon, 1 Oct 2012 14:47:53 +0200
+Subject: [PATCH] remove-linkerflags
 
 ---
  configure | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/configure b/configure
-index fa6e845..505508e 100755
+index ac429ef..03992c4 100755
 --- a/configure
 +++ b/configure
-@@ -3372,7 +3372,6 @@ enabled extra_warnings && check_cflags -Winline
+@@ -3813,7 +3813,6 @@ enabled extra_warnings && check_cflags -Winline
  
  # add some linker flags
  check_ldflags -Wl,--warn-common
 -check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
- enabled xmm_clobber_test &&                             \
+ enabled xmm_clobber_test &&
 -- 
 1.7.12
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.