Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 19 years ago
parent
commit
ec644e0f09
3 changed files with 22 additions and 63 deletions
  1. +3
    -0
      package/public/avifile/avifile.conf
  2. +19
    -0
      package/public/avifile/ff_eval_dup.patch
  3. +0
    -63
      package/public/avifile/head-tail.patch

+ 3
- 0
package/public/avifile/avifile.conf

@ -34,3 +34,6 @@ postinstall="rm -f $root/usr/include/avifile; ln -s avifile-${ver%.*} $root/usr/
# There is a -lz missing so the package builds fine
var_append CXX_WRAPPER_APPEND " " -lz
# first create configure script..
autogen=1

+ 19
- 0
package/public/avifile/ff_eval_dup.patch

@ -0,0 +1,19 @@
--- ./ffmpeg/libavutil/eval.c.orig 2005-12-07 16:09:07.000000000 +0100
+++ ./ffmpeg/libavutil/eval.c 2005-12-07 16:11:59.000000000 +0100
@@ -182,6 +182,8 @@
return ret;
}
+#if 0
+// this is already defined in ffmpeg/libavcodec/eval.c
double ff_eval(char *s, double *const_value, const char **const_name,
double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name,
@@ -200,6 +202,7 @@
return evalExpression(&p);
}
+#endif
#ifdef TEST
#undef printf

+ 0
- 63
package/public/avifile/head-tail.patch

@ -1,63 +0,0 @@
# --- 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/head-tail.patch
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -dur avifile-0.7-0.7.41/configure avifile-0.7-0.7.41-patch/configure
--- avifile-0.7-0.7.41/configure 2004-10-01 15:26:36.000000000 +0200
+++ avifile-0.7-0.7.41-patch/configure 2004-10-12 18:59:04.029448800 +0200
@@ -31755,7 +31755,7 @@
WIN32_CFLAGS=`echo $CFLAGS | sed s/-fomit-frame-pointer//g`
-lt_major_version=`libtool --version 2>&1 | head -1 | sed 's/\(.*\ \)\([0-9]*\.[0-9]*\.[0-9]*\)\(.*\)/\2/'`
+lt_major_version=`libtool --version 2>&1 | head -n1 | sed 's/\(.*\ \)\([0-9]*\.[0-9]*\.[0-9]*\)\(.*\)/\2/'`
lt_minor_version=`echo $lt_major_version | cut -d . -f 2`
lt_micro_version=`echo $lt_major_version | cut -d . -f 3`
lt_major_version=`echo $lt_major_version | cut -d . -f 1`
@@ -32118,7 +32118,7 @@
AMM_USE_ARTSC_FALSE=
fi
-last_cvs_update=`find . -name Entries -printf '%Ty%Tm%Td-%TH:%TM\n' | sort | tail -1`
+last_cvs_update=`find . -name Entries -printf '%Ty%Tm%Td-%TH:%TM\n' | sort | tail -n1`
if test $? -ne 0 -o -z "$last_cvs_update" ; then
# probably no gnu date installed(?), use current date
# or this is release
Nur in avifile-0.7-0.7.41-patch/: configure~.
diff -dur avifile-0.7-0.7.41/configure.in avifile-0.7-0.7.41-patch/configure.in
--- avifile-0.7-0.7.41/configure.in 2004-10-01 15:17:36.000000000 +0200
+++ avifile-0.7-0.7.41-patch/configure.in 2004-10-12 18:58:29.528693712 +0200
@@ -913,7 +913,7 @@
WIN32_CFLAGS=`echo $CFLAGS | sed s/-fomit-frame-pointer//g`
AC_SUBST(WIN32_CFLAGS)
-lt_major_version=`libtool --version 2>&1 | head -1 | sed 's/\(.*\ \)\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)\(.*\)/\2/'`
+lt_major_version=`libtool --version 2>&1 | head -n1 | sed 's/\(.*\ \)\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)\(.*\)/\2/'`
lt_minor_version=`echo $lt_major_version | cut -d . -f 2`
lt_micro_version=`echo $lt_major_version | cut -d . -f 3`
lt_major_version=`echo $lt_major_version | cut -d . -f 1`
@@ -988,7 +988,7 @@
dnl fi
AM_CONDITIONAL(AMM_USE_ARTSC, test x$kde_artscplug_compiles = xyes)
-last_cvs_update=`find . -name Entries -printf '%Ty%Tm%Td-%TH:%TM\n' | sort | tail -1`
+last_cvs_update=`find . -name Entries -printf '%Ty%Tm%Td-%TH:%TM\n' | sort | tail -n1`
if test $? -ne 0 -o -z "$last_cvs_update" ; then
# probably no gnu date installed(?), use current date
# or this is release
Nur in avifile-0.7-0.7.41-patch/: configure.in~.

Loading…
Cancel
Save