From 07f9e1cce6a373863a7f541bc15ad68668a0e476 Mon Sep 17 00:00:00 2001 From: "Juergen \"George\" Sawinski" Date: Sun, 18 Apr 2004 00:56:37 +0000 Subject: [PATCH] Juergen Sawinski: rene/avifile: update to version 0.7.38 (also fixes gcc-33 build problems) [X] COMPILES (w/ gcc33) [2004032711392527613] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2759 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/rene/avifile/avifile.desc | 5 +-- package/rene/avifile/configure.patch | 59 ++++++++++++---------------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/package/rene/avifile/avifile.desc b/package/rene/avifile/avifile.desc index db7eea6cb..c9f94d637 100644 --- a/package/rene/avifile/avifile.desc +++ b/package/rene/avifile/avifile.desc @@ -39,8 +39,7 @@ [L] GPL [S] Beta -[V] 0.7.29-20030204 +[V] 0.7.38 [P] X -----5---9 563.000 -[D] 2735906129 avifile-0.7.29-20030204.tgz http://avifile.sourceforge.net/ - +[D] 1721001046 avifile-0.7-0.7.38.tar.gz http://dl.sourceforge.net/sourceforge/avifile/ diff --git a/package/rene/avifile/configure.patch b/package/rene/avifile/configure.patch index 18b4f5b64..878abfda1 100644 --- a/package/rene/avifile/configure.patch +++ b/package/rene/avifile/configure.patch @@ -1,33 +1,26 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/avifile/configure.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./configure 2003-02-04 20:58:52.000000000 +0100 -+++ ./configure.new 2003-03-28 22:50:33.000000000 +0100 -@@ -20496,7 +20496,7 @@ - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= -- for ac_arg in $ac_configure_args; do -+ for ac_arg in `echo $ac_configure_args | egrep -v "CC=|CXX="`; do - if test -n "$ac_prev"; then - ac_prev= - continue +--- avifile-0.7-0.7.38/configure.orig 2004-03-27 11:10:46.000000000 +0100 ++++ avifile-0.7-0.7.38/configure 2004-03-27 11:11:38.000000000 +0100 +@@ -5364,7 +5364,6 @@ + #endif + + #ifdef __cplusplus +-extern "C" void exit (int); + #endif + + void fnord() { int i=42;} +@@ -5458,7 +5457,6 @@ + #endif + + #ifdef __cplusplus +-extern "C" void exit (int); + #endif + + void fnord() { int i=42;} +@@ -10230,7 +10228,6 @@ + #line 10231 "configure" + #include "confdefs.h" + #ifdef __cplusplus +-extern "C" void exit(int); + #endif + + /*#include */