[csw-devel] SF.net SVN: gar:[15056] csw/mgar/pkg/ffmpeg/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Jul 14 16:03:14 CEST 2011
Revision: 15056
http://gar.svn.sourceforge.net/gar/?rev=15056&view=rev
Author: dmichelsen
Date: 2011-07-14 14:03:13 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
ffmpeg: Some routine update, does not compile
Modified Paths:
--------------
csw/mgar/pkg/ffmpeg/trunk/Makefile
csw/mgar/pkg/ffmpeg/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch
Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-13 17:57:48 UTC (rev 15055)
+++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-14 14:03:13 UTC (rev 15056)
@@ -3,7 +3,7 @@
# $Id$
NAME = ffmpeg
-VERSION = 0.5
+VERSION = 0.8
CATEGORIES = lib
DESCRIPTION = Very fast video and audio converter (includes libavcodec)
@@ -15,18 +15,27 @@
MASTER_SITES = http://ffmpeg.org/releases/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = gnu-grep.patch
-PATCHFILES += 0001-Use-inttypes-instead-of-stdint.patch
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
BUILD64 = 1
-NOISAEXEC = 1
-FFMPEG_CONFIGURE_ARGS_1 = $(filter-out --exec_%,$(DIRPATHS))
-FFMPEG_CONFIGURE_ARGS_2 = $(filter-out --sbindir%,$(FFMPEG_CONFIGURE_ARGS_1))
-CONFIGURE_ARGS = $(FFMPEG_CONFIGURE_ARGS)
+NODIRPATHS += --exec_prefix
+NODIRPATHS += --sbindir
+NODIRPATHS += --libexecdir
+NODIRPATHS += --sysconfdir
+NODIRPATHS += --sharedstatedir
+CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --bindir=$(bindir)
+CONFIGURE_ARGS += --datadir=$(datadir)
+CONFIGURE_ARGS += --libdir=$(libdir)
+CONFIGURE_ARGS += --shlibdir=$(libdir)
+CONFIGURE_ARGS += --incdir=$(includedir)
+CONFIGURE_ARGS += --mandir=$(mandir)
+
GARCOMPILER = GNU
include gar/category.mk
+
+# For 'grep -q'
+PATH := /opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/ffmpeg/trunk/checksums
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/checksums 2011-07-13 17:57:48 UTC (rev 15055)
+++ csw/mgar/pkg/ffmpeg/trunk/checksums 2011-07-14 14:03:13 UTC (rev 15056)
@@ -1,3 +1 @@
-bd1248747b96e9fc36c64c02a1f5f191 0001-Use-inttypes-instead-of-stdint.patch
-be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2
-aa4573b73656b4105abb209eab474680 gnu-grep.patch
+7e9b8c8a6952de0c477027e48249f3ed ffmpeg-0.8.tar.bz2
Added: csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch (rev 0)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch 2011-07-14 14:03:13 UTC (rev 15056)
@@ -0,0 +1,131 @@
+From a0c9edcc57bf41962cd3385baa61d418487e36f7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 2 Aug 2010 16:30:29 +0200
+Subject: [PATCH] Use ggrep in configure
+
+---
+ configure | 28 ++++++++++++++--------------
+ 1 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/configure b/configure
+index 0166829..f5c9ea7 100755
+--- a/configure
++++ b/configure
+@@ -1532,7 +1532,7 @@ if test -f configure; then
+ disable source_path_used
+ else
+ source_path="$(cd "$source_path"; pwd)"
+- echo "$source_path" | grep -q '[[:blank:]]' &&
++ echo "$source_path" | ggrep -q '[[:blank:]]' &&
+ die "Out of tree builds are impossible with whitespace in source path."
+ test -e "$source_path/config.h" &&
+ die "Out of tree builds are impossible with config.h in source dir."
+@@ -1726,16 +1726,16 @@ filter_cflags=echo
+ filter_cppflags=echo
+ filter_asflags=echo
+
+-if $cc -v 2>&1 | grep -qi ^gcc; then
++if $cc -v 2>&1 | ggrep -qi ^gcc; then
+ cc_type=gcc
+ cc_version=__VERSION__
+- if ! $cc -dumpversion | grep -q '^2\.'; then
++ if ! $cc -dumpversion | ggrep -q '^2\.'; then
+ CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
+ AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
+ fi
+ speed_cflags='-O3'
+ size_cflags='-Os'
+-elif $cc --version 2>/dev/null | grep -q Intel; then
++elif $cc --version 2>/dev/null | ggrep -q Intel; then
+ cc_type=icc
+ cc_version="AV_STRINGIFY(__INTEL_COMPILER)"
+ CC_DEPFLAGS='-MMD'
+@@ -1743,12 +1743,12 @@ elif $cc --version 2>/dev/null | grep -q Intel; then
+ speed_cflags='-O3'
+ size_cflags='-Os'
+ noopt_cflags='-O1'
+-elif $cc -v 2>&1 | grep -q xlc; then
++elif $cc -v 2>&1 | ggrep -q xlc; then
+ cc_type=xlc
+ cc_version="AV_STRINGIFY(__IBMC__)"
+ speed_cflags='-O5'
+ size_cflags='-O5 -qcompact'
+-elif $cc -V 2>/dev/null | grep -q Compaq; then
++elif $cc -V 2>/dev/null | ggrep -q Compaq; then
+ cc_type=ccc
+ cc_version="AV_STRINGIFY(__DECC_VER)"
+ DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -M'
+@@ -1756,7 +1756,7 @@ elif $cc -V 2>/dev/null | grep -q Compaq; then
+ add_ldflags -Wl,-z,now # calls to libots crash without this
+ speed_cflags='-fast'
+ size_cflags='-O1'
+-elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then
++elif $cc --vsn 2>/dev/null | ggrep -q "ARM C/C++ Compiler"; then
+ test -d "$sysroot" || die "No valid sysroot specified."
+ cc_type=armcc
+ cc_version="AV_STRINGIFY(__ARMCC_VERSION)"
+@@ -1772,7 +1772,7 @@ elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then
+ AS_DEPFLAGS='-MMD'
+ speed_cflags='-O3'
+ size_cflags='-Os'
+-elif $cc -version 2>/dev/null | grep -q TMS470; then
++elif $cc -version 2>/dev/null | ggrep -q TMS470; then
+ cc_type=tms470
+ cc_version="AV_STRINGIFY(__TI_COMPILER_VERSION__)"
+ cc="$cc --gcc --abi=eabi -eo=.o -mc -me"
+@@ -1811,14 +1811,14 @@ elif $cc -version 2>/dev/null | grep -q TMS470; then
+ esac
+ done
+ }
+-elif $cc -v 2>&1 | grep -q clang; then
++elif $cc -v 2>&1 | ggrep -q clang; then
+ cc_type=clang
+ cc_version=__VERSION__
+ CC_DEPFLAGS='-MMD'
+ AS_DEPFLAGS='-MMD'
+ speed_cflags='-O3'
+ size_cflags='-Os'
+-elif $cc -V 2>&1 | grep -q Sun; then
++elif $cc -V 2>&1 | ggrep -q Sun; then
+ cc_type=suncc
+ cc_version="AV_STRINGIFY(__SUNPRO_C)"
+ DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "1s,^.*: ,$@: ," -e "\$$!s,\$$, \\\," -e "1!s,^.*: , ," > $(@:.o=.d)'
+@@ -2130,7 +2130,7 @@ case $target_os in
+ beos|haiku|zeta)
+ prefix_default="$HOME/config"
+ # 3 gcc releases known for BeOS, each with ugly bugs
+- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
++ gcc_version="$($cc -v 2>&1 | ggrep version | cut -d ' ' -f3-)"
+ case "$gcc_version" in
+ 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
+ disable mmx
+@@ -2145,7 +2145,7 @@ case $target_os in
+ # no need for libm, but the inet stuff
+ # Check for BONE
+ # XXX: actually should check for NOT net_server
+- if echo $BEINCLUDES | grep -q 'headers/be/bone'; then
++ if echo $BEINCLUDES | ggrep -q 'headers/be/bone'; then
+ network_extralibs="-lbind -lsocket"
+ else
+ enable beos_netserver
+@@ -2390,7 +2390,7 @@ EOF
+ check_cc <<EOF || die "endian test failed"
+ unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
+ EOF
+-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
++od -t x1 $TMPO | ggrep -q '42 *49 *47 *45' && enable bigendian
+
+ if enabled alpha; then
+
+@@ -3046,7 +3046,7 @@ EOF
+ get_version(){
+ name=$1
+ file=$source_path/$2
+- eval $(grep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
++ eval $(ggrep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
+ eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
+ lcname=$(tolower $name)
+ eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
+--
+1.7.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list