Revision: 17053
http://gar.svn.sourceforge.net/gar/?rev=17053&view=rev
Author: janholzh
Date: 2012-02-14 15:52:14 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
ffmpeg/trunk: Update to 0.9.1 and get asm on x86 to work.
Modified Paths:
--------------
csw/mgar/pkg/ffmpeg/trunk/Makefile
csw/mgar/pkg/ffmpeg/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ffmpeg/trunk/files/0003-fix_a_few_shells.patch
Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-14 12:30:16 UTC (rev 17052)
+++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-14 15:52:14 UTC (rev 17053)
@@ -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.8.6
+VERSION = 0.9.1
CATEGORIES = lib
GARTYPE = v2
@@ -23,7 +23,7 @@
PATCHFILES += 0001-fix-version.sh.patch
PATCHFILES += 0002-change-linker-flags.patch
-PATCHFILES += 0003-fix-testsuite-shells.patch
+PATCHFILES += 0003-fix_a_few_shells.patch
LICENSE = COPYING.GPLv3
@@ -38,10 +38,11 @@
RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibvorbisenc2
RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibavfilter2
+RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibogg0
-RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibvorbis0
RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibmp3lame0
RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibtheoradec1
@@ -55,7 +56,7 @@
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibvorbisenc2
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibogg0
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibavcodec53
@@ -63,7 +64,7 @@
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibmp3lame0
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibtheoradec1
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibtheoraenc1
-RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibspeex1
PACKAGES += CSWlibavfilter2
@@ -74,12 +75,12 @@
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibvorbisenc2
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswscale2
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibogg0
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavcodec53
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibvorbis0
-RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibmp3lame0
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoradec1
RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibspeex1
@@ -92,10 +93,10 @@
RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibvorbisenc2
RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibvorbis0
RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibogg0
-RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibavcodec53
RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibmp3lame0
RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibtheoradec1
@@ -107,11 +108,11 @@
PKGFILES_CSWlibavutil51 += $(call pkgfiles_lib,libavutil.so.51)
RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibvorbisenc2
-RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibogg0
RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibvorbis0
-RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibmp3lame0
RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoradec1
RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibspeex1
@@ -123,10 +124,10 @@
RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibvorbisenc2
RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibogg0
-RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibvorbis0
RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibmp3lame0
RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibtheoradec1
@@ -139,16 +140,33 @@
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibvorbisenc2
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibogg0
-RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibvorbis0
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibmp3lame0
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoradec1
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoraenc1
RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibspeex1
+PACKAGES += CSWlibswresample0
+SPKG_DESC_CSWlibswresample0 = FFMPEG library libswresample.so.0
+PKGFILES_CSWlibswresample0 += $(call pkgfiles_lib,libswresample.so.0)
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibvorbisenc2
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibavutil51
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibvorbis0
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibmp3lame0
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoradec1
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoraenc1
+RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibspeex1
+
+
PACKAGES += CSWffmpeg-dev
SPKG_DESC_CSWffmpeg-dev = Development files for several FFMPEG shared libraries
PKGFILES_CSWffmpeg-dev += $(PKGFILES_DEVEL)
@@ -159,7 +177,9 @@
RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil51
RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc51
RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswscale2
+RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswresample0
+
PACKAGES += CSWffmpeg
SPKG_DESC_CSWffmpeg = Very fast video and audio converter
# PKGFILES is catchall
@@ -168,12 +188,13 @@
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbisenc2
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswscale2
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavutil51
-RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibz1
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibogg0
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavcodec53
-RUNTIME_DEP_PKGS_CSWffmpeg += CSWftype2
+RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice53
+RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswresample0
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbis0
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibmp3lame0
RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibtheoradec1
@@ -202,11 +223,11 @@
NODIRPATHS += --sharedstatedir
#EXTRA_CFLAGS-64 += -xcode=pic32
-EXTRA_CFLAGS-64 += -fPIC
-EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(MEMORYMODEL))
+#EXTRA_CFLAGS-64 += -fPIC
+#EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(MEMORYMODEL))
-EXTRA_CXXFLAGS-64 += -fPIC
-EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(MEMORYMODEL))
+#EXTRA_CXXFLAGS-64 += -fPIC
+#EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(MEMORYMODEL))
CONFIGURE_ARGS += --prefix=$(prefix)
CONFIGURE_ARGS += --bindir=$(bindir)
@@ -220,10 +241,15 @@
CONFIGURE_ARGS += --enable-version3
CONFIGURE_ARGS += --enable-runtime-cpudetect
-# All ASM code is broke no clue if it yasm that breaks it or solaris in
gerneral. As it is disabled in pkgsrc too probably a global problem.
-CONFIGURE_ARGS += --disable-asm
+#Needs sse to get asm stuff to work on x86
+CONFIGURE_ARGS_i386 += --extra-cflags="-mfpmath=sse -msse"
+CONFIGURE_ARGS_i386 += --extra-cxxflags="-mfpmath=sse -msse"
+#no asm on sparc
+CONFIGURE_ARGS_sparc = --disable-asm
-# Needs two builds one shared one static
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
+
+# Needs two builds one shared one static maybe in the future
#CONFIGURE_ARGS-SHARED-yes += --enable-shared
#CONFIGURE_ARGS += $(CONFIGURE_ARGS-SHARED-$(SHARED))
@@ -238,6 +264,7 @@
# No libtheora
CONFIGURE_ARGS += --enable-libtheora
CONFIGURE_ARGS += --enable-libvorbis
+#CONFIGURE_ARGS += --enable-libx264
# Tests only work with static build
#SKIPTEST-SHARED-yes = 1
Modified: csw/mgar/pkg/ffmpeg/trunk/checksums
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/checksums 2012-02-14 12:30:16 UTC (rev 17052)
+++ csw/mgar/pkg/ffmpeg/trunk/checksums 2012-02-14 15:52:14 UTC (rev 17053)
@@ -1 +1 @@
-b4ef1fa6506750569fdb64a0f0a646a8 ffmpeg-0.8.6.tar.bz2
+41ae6cfdef81a54835b914f523e575cf ffmpeg-0.9.1.tar.bz2
Added: csw/mgar/pkg/ffmpeg/trunk/files/0003-fix_a_few_shells.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0003-fix_a_few_shells.patch
(rev 0)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0003-fix_a_few_shells.patch 2012-02-14
15:52:14 UTC (rev 17053)
@@ -0,0 +1,121 @@
+From 1ce453bb7c5c0814c90a8dbc5addf2b1d2aa8f60 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <j...@opencsw.org>
+Date: Tue, 14 Feb 2012 11:09:15 +0100
+Subject: [PATCH] fix_a_few_shells
+
+---
+ libavcodec/codec_names.sh | 2 +-
+ tests/codec-regression.sh | 2 +-
+ tests/copycooker.sh | 2 +-
+ tests/fate-run.sh | 2 +-
+ tests/fate-update.sh | 2 +-
+ tests/fate.sh | 2 +-
+ tests/ffserver-regression.sh | 2 +-
+ tests/lavf-regression.sh | 2 +-
+ tests/lavfi-regression.sh | 2 +-
+ tests/regression-funcs.sh | 2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/libavcodec/codec_names.sh b/libavcodec/codec_names.sh
+index 0e499c9..89ccd45 100755
+--- a/libavcodec/codec_names.sh
++++ b/libavcodec/codec_names.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ # Copyright (c) 2011 Nicolas George
+ #
+diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
+index 7676074..8362677 100755
+--- a/tests/codec-regression.sh
++++ b/tests/codec-regression.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # automatic regression test for avconv
+ #
+diff --git a/tests/copycooker.sh b/tests/copycooker.sh
+index 4b5811d..9b0f125 100755
+--- a/tests/copycooker.sh
++++ b/tests/copycooker.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ LC_ALL=C
+ export LC_ALL
+diff --git a/tests/fate-run.sh b/tests/fate-run.sh
+index 350ff57..ae5be45 100755
+--- a/tests/fate-run.sh
++++ b/tests/fate-run.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+
+ export LC_ALL=C
+
+diff --git a/tests/fate-update.sh b/tests/fate-update.sh
+index 6b4668f..bc356fe 100755
+--- a/tests/fate-update.sh
++++ b/tests/fate-update.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+
+ set -e
+
+diff --git a/tests/fate.sh b/tests/fate.sh
+index e04c871..2a75ef5 100755
+--- a/tests/fate.sh
++++ b/tests/fate.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+
+ config=$1
+
+diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh
+index 11e4a54..2e1c474 100755
+--- a/tests/ffserver-regression.sh
++++ b/tests/ffserver-regression.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile
$wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >>
tests/data/ffserver.conf
+ #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream
$_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >>
tests/data/ffserver.conf
+diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
+index f2b2624..d2b6168 100755
+--- a/tests/lavf-regression.sh
++++ b/tests/lavf-regression.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # automatic regression test for libavformat
+ #
+diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
+index 74e5373..8d3a660 100755
+--- a/tests/lavfi-regression.sh
++++ b/tests/lavfi-regression.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # automatic regression test for libavfilter
+ #
+diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
+index b0a9b85..c7d59e3 100755
+--- a/tests/regression-funcs.sh
++++ b/tests/regression-funcs.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # common regression functions for avconv
+ #
+--
+1.7.9
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
