Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 20 years ago
parent
commit
d4c9f2236f
4 changed files with 48 additions and 50 deletions
  1. +2
    -3
      package/rene/avifile/avifile.conf
  2. +2
    -2
      package/rene/avifile/avifile.desc
  3. +0
    -45
      package/rene/avifile/configure.patch
  4. +44
    -0
      package/rene/avifile/head-tail.patch

+ 2
- 3
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"

+ 2
- 2
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/

+ 0
- 45
package/rene/avifile/configure.patch

@ -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 <qapplication.h>*/

+ 44
- 0
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~.

Loading…
Cancel
Save