From d4c9f2236f3faf1fcd9cfb2229036045fd4f955c Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Wed, 27 Oct 2004 12:03:28 +0000 Subject: [PATCH] Stefan Fiedler: update avifile (0.7.41) let avifile autodetect freetype (again) set LD_LIBRARY_PATH so artsc.so is found Index: package/rene/avifile/configure.patch =================================================================== [2004102518320132188] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4633 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/rene/avifile/avifile.conf | 5 ++-- package/rene/avifile/avifile.desc | 4 +-- package/rene/avifile/configure.patch | 45 ---------------------------- package/rene/avifile/head-tail.patch | 44 +++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 50 deletions(-) delete mode 100644 package/rene/avifile/configure.patch create mode 100644 package/rene/avifile/head-tail.patch diff --git a/package/rene/avifile/avifile.conf b/package/rene/avifile/avifile.conf index 8a1062c24..25dd33796 100644 --- a/package/rene/avifile/avifile.conf +++ b/package/rene/avifile/avifile.conf @@ -25,9 +25,8 @@ pkginstalled divx4linux && var_append extraconfopt " " "--with-divx4-prefix=/usr" pkginstalled mad && var_append extraconfopt " " "--enable-libmad" -# avifile 0.7.38 currently tries to but is not able to use the stand-alone -# freetype package (2.1.5) so we use the one included in XFree86. -pkginstalled freetype && var_append extraconfopt " " "--with-ft-prefix=/usr/X11" +# so artsc.so is found +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/$ROCKCFG_PKG_KDE3_CORE_PREFIX/lib" # other packages expect headers in /usr/include/avifile postinstall="rm -f $root/usr/include/avifile; ln -s avifile-${ver%.*} $root/usr/include/avifile" diff --git a/package/rene/avifile/avifile.desc b/package/rene/avifile/avifile.desc index 934f1ad1d..01bc76efb 100644 --- a/package/rene/avifile/avifile.desc +++ b/package/rene/avifile/avifile.desc @@ -39,7 +39,7 @@ [L] GPL [S] Beta -[V] 0.7.38 +[V] 0.7.41 [P] X -?---5---9 159.100 -[D] 1721001046 avifile-0.7-0.7.38.tar.gz http://dl.sourceforge.net/sourceforge/avifile/ +[D] 2073226332 avifile-0.7-0.7.41.tar.gz http://dl.sourceforge.net/sourceforge/avifile/ diff --git a/package/rene/avifile/configure.patch b/package/rene/avifile/configure.patch deleted file mode 100644 index d761108d8..000000000 --- a/package/rene/avifile/configure.patch +++ /dev/null @@ -1,45 +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/configure.patch -# ROCK Linux is Copyright (C) 1998 - 2004 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 --- - ---- 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 */ diff --git a/package/rene/avifile/head-tail.patch b/package/rene/avifile/head-tail.patch new file mode 100644 index 000000000..4ecaf6294 --- /dev/null +++ b/package/rene/avifile/head-tail.patch @@ -0,0 +1,44 @@ +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~.