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

janholzh at users.sourceforge.net janholzh at users.sourceforge.net
Fri Jul 15 09:23:22 CEST 2011


Revision: 15060
          http://gar.svn.sourceforge.net/gar/?rev=15060&view=rev
Author:   janholzh
Date:     2011-07-15 07:23:22 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
ffmpeg: get build going further, now fails with section .rela.debug_line has invalid type [ SHT_RELA ]

Modified Paths:
--------------
    csw/mgar/pkg/ffmpeg/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch

Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/Makefile	2011-07-15 07:13:10 UTC (rev 15059)
+++ csw/mgar/pkg/ffmpeg/trunk/Makefile	2011-07-15 07:23:22 UTC (rev 15060)
@@ -16,6 +16,7 @@
 DISTFILES  = $(DISTNAME).tar.bz2
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+PATCHFILES = 0001-fix-version.sh.patch
 
 BUILD64 = 1
 
@@ -32,6 +33,8 @@
 CONFIGURE_ARGS += --shlibdir=$(libdir)
 CONFIGURE_ARGS += --incdir=$(includedir)
 CONFIGURE_ARGS += --mandir=$(mandir)
+CONFIGURE_ARGS += --enable-shared
+CONFIGURE_ARGS += --disable-static
 
 GARCOMPILER = GNU
 

Added: csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch	                        (rev 0)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch	2011-07-15 07:23:22 UTC (rev 15060)
@@ -0,0 +1,22 @@
+From 203595cdab30aea5661fbe8be7cea2143b0f6507 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Fri, 15 Jul 2011 08:44:12 +0200
+Subject: [PATCH] fix-version.sh
+
+---
+ version.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/version.sh b/version.sh
+index 41ae520..a83a539 100755
+--- a/version.sh
++++ b/version.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ 
+ # check for git short hash
+ if ! test "$revision"; then
+-- 
+1.7.6
+


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