mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-11 22:49:06 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
116 lines
3.0 KiB
Diff
116 lines
3.0 KiB
Diff
Incldue properly FFmpeg headers.
|
|
https://bugs.gentoo.org/show_bug.cgi?id=461438
|
|
|
|
Index: php5.3/config.m4
|
|
===================================================================
|
|
--- php5.3.orig/config.m4
|
|
+++ php5.3/config.m4
|
|
@@ -31,15 +31,8 @@ if test "$PHP_FFMPEG" != "no"; then
|
|
FFMPEG_INC_FOUND=$i/include
|
|
break
|
|
elif test -f $i/include/libavcodec/avcodec.h; then
|
|
- dnl ffmpeg svn revision 12194 and newer put each header in its own dir
|
|
- dnl so we have to include them all.
|
|
- PHP_ADD_INCLUDE($i/include/libavcodec/)
|
|
- PHP_ADD_INCLUDE($i/include/libavformat/)
|
|
- PHP_ADD_INCLUDE($i/include/libavutil/)
|
|
- PHP_ADD_INCLUDE($i/include/libswscale/)
|
|
- PHP_ADD_INCLUDE($i/include/libavfilter/)
|
|
- PHP_ADD_INCLUDE($i/include/libavdevice/)
|
|
- FFMPEG_INC_FOUND=$i/include/libavcodec
|
|
+ PHP_ADD_INCLUDE($i/include)
|
|
+ FFMPEG_INC_FOUND=$i/include
|
|
break
|
|
fi
|
|
done
|
|
Index: php5.3/ffmpeg-php.c
|
|
===================================================================
|
|
--- php5.3.orig/ffmpeg-php.c
|
|
+++ php5.3/ffmpeg-php.c
|
|
@@ -39,11 +39,11 @@
|
|
|
|
#include "php.h"
|
|
|
|
-#include <avcodec.h>
|
|
-#include <avformat.h>
|
|
+#include <libavcodec/avcodec.h>
|
|
+#include <libavformat/avformat.h>
|
|
|
|
#if HAVE_SWSCALER
|
|
-#include <swscale.h>
|
|
+#include <libswscale/swscale.h>
|
|
#endif
|
|
|
|
#include "php_ini.h"
|
|
Index: php5.3/ffmpeg_errorhandler.c
|
|
===================================================================
|
|
--- php5.3.orig/ffmpeg_errorhandler.c
|
|
+++ php5.3/ffmpeg_errorhandler.c
|
|
@@ -34,7 +34,7 @@
|
|
*/
|
|
|
|
#include "php.h"
|
|
-#include <avcodec.h>
|
|
+#include <libavcodec/avcodec.h>
|
|
|
|
/* {{{ ffmpeg_errorhandler()
|
|
*/
|
|
Index: php5.3/ffmpeg_frame.h
|
|
===================================================================
|
|
--- php5.3.orig/ffmpeg_frame.h
|
|
+++ php5.3/ffmpeg_frame.h
|
|
@@ -38,8 +38,8 @@
|
|
|
|
#include "php_version.h"
|
|
|
|
-#include <avcodec.h>
|
|
-#include <avformat.h>
|
|
+#include <libavcodec/avcodec.h>
|
|
+#include <libavformat/avformat.h>
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
Index: php5.3/ffmpeg_movie.c
|
|
===================================================================
|
|
--- php5.3.orig/ffmpeg_movie.c
|
|
+++ php5.3/ffmpeg_movie.c
|
|
@@ -34,9 +34,9 @@
|
|
#include "php_globals.h"
|
|
#include "ext/standard/info.h"
|
|
|
|
-#include <avcodec.h>
|
|
-#include <avformat.h>
|
|
-#include <pixdesc.h>
|
|
+#include <libavcodec/avcodec.h>
|
|
+#include <libavformat/avformat.h>
|
|
+#include <libavutil/pixdesc.h>
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
Index: php5.3/ffmpeg_tools.c
|
|
===================================================================
|
|
--- php5.3.orig/ffmpeg_tools.c
|
|
+++ php5.3/ffmpeg_tools.c
|
|
@@ -42,7 +42,7 @@
|
|
#include "ffmpeg_tools.h"
|
|
|
|
#ifdef HAVE_SWSCALER
|
|
-#include <swscale.h>
|
|
+#include <libswscale/swscale.h>
|
|
#endif
|
|
|
|
/* {{{ ffmpeg_img_convert()
|
|
Index: php5.3/ffmpeg_tools.h
|
|
===================================================================
|
|
--- php5.3.orig/ffmpeg_tools.h
|
|
+++ php5.3/ffmpeg_tools.h
|
|
@@ -36,7 +36,7 @@
|
|
#ifndef FFMPEG_TOOLS_H
|
|
#define FFMPEG_TOOLS_H
|
|
|
|
-#include <avcodec.h>
|
|
+#include <libavcodec/avcodec.h>
|
|
|
|
int ffmpeg_img_convert(
|
|
AVPicture *dst, int dst_pix_fmt,
|