Commit a57f81be authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files

ffmpeg contribs:

    .pc hqve been fixed upstream
    delete empty win32 patch
    temporarly disable install patch. it works fine without on debian and macOSX. FC4 to be investigated
parent 4a32026b
......@@ -8,7 +8,7 @@
# Derk-Jan Hartman <hartman at videolan dot org>
# Eric Petit <titer@m0k.org>
# Felix Kühne <fkuehne@users.sourceforge.net>
# Christophe Mutricy <xtophe@nxtelevision.com>
# Christophe Mutricy <xtophe AT xtelevision.com>
# Gildas Bazin <gbazin at videolan dot org>
#
# This program is free software; you can redistribute it and/or modify
......@@ -895,20 +895,16 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg
patch -p 0 < Patches/ffmpeg-svn.patch
ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
endif
ifdef HAVE_WIN32
patch -p 0 < Patches/ffmpeg-svn-win32.patch
endif
ifdef HAVE_WINCE
patch -p 1 < Patches/ffmpeg-svn-wince.patch
endif
ifeq ($(HOST),i686-apple-darwin8)
(cd $@;patch -p 0 < ../Patches/ffmpeg-svn-mactel.patch)
endif
(cd $@; patch -p0 < ../Patches/ffmpeg-install.patch)
# (cd $@; patch -p0 < ../Patches/ffmpeg-install.patch)
ffmpeg-$(FFMPEG_VERSION).tar.gz:
$(WGET) $(FFMPEG_URL)
......
Index: configure
===================================================================
--- ffmpeg/configure (revision 5823)
+++ ffmpeg/configure (working copy)
@@ -2118,7 +2118,7 @@
# build pkg-config files libav*.pc and libpostproc.pc
# libavutil.pc
cat <<EOF >libavutil.pc
-prefix=$PREFIX
+PREFIX=$PREFIX
exec_prefix=\${PREFIX}
libdir=\${exec_prefix}/lib
includedir=\${PREFIX}/include
@@ -2133,7 +2133,7 @@
EOF
cat <<EOF >libavutil-uninstalled.pc
-prefix=
+PREFIX=
exec_prefix=
libdir=\${pcfiledir}/libavutil
includedir=\${pcfiledir}/libavutil
@@ -2149,7 +2149,7 @@
# libavcodec.pc
cat <<EOF >libavcodec.pc
-prefix=$PREFIX
+PREFIX=$PREFIX
exec_prefix=\${PREFIX}
libdir=\${exec_prefix}/lib
includedir=\${PREFIX}/include
@@ -2164,7 +2164,7 @@
EOF
cat <<EOF >libavcodec-uninstalled.pc
-prefix=
+PREFIX=
exec_prefix=
libdir=\${pcfiledir}/libavcodec
includedir=\${pcfiledir}/libavcodec
@@ -2180,7 +2180,7 @@
# libavformat.pc
cat <<EOF >libavformat.pc
-prefix=$PREFIX
+PREFIX=$PREFIX
exec_prefix=\${PREFIX}
libdir=\${exec_prefix}/lib
includedir=\${PREFIX}/include
@@ -2195,7 +2195,7 @@
EOF
cat <<EOF >libavformat-uninstalled.pc
-prefix=
+PREFIX=
exec_prefix=
libdir=\${pcfiledir}/libavformat
includedir=\${pcfiledir}/libavformat
@@ -2212,7 +2212,7 @@
# libpostproc.pc
cat <<EOF >libpostproc.pc
-prefix=$PREFIX
+PREFIX=$PREFIX
exec_prefix=\${PREFIX}
libdir=\${exec_prefix}/lib
includedir=\${PREFIX}/include
@@ -2227,7 +2227,7 @@
EOF
cat <<EOF >libpostproc-uninstalled.pc
-prefix=
+PREFIX=
exec_prefix=
libdir=\${pcfiledir}/libpostproc
includedir=\${pcfiledir}/libpostproc
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment