Control: tags -1 patch
Hi,
Sorry for not noticing this earlier (my build chroot was unclean...).
On 21.07.2015 11:05, Sebastian Ramacher wrote:
> dvbcut failed to build on the buildds for the libav->ffmpeg transition:
> | g++ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wall
> -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\"
> -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\"
> -DHAVE_LIB_SWSCALE=1 -DHAVE_LIB_MAD=1 -DHAVE_LIB_A52=1 -DHAVE_LIB_AO=1
> -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1
> -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1
> -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_AO_AO_H=1 -DHAVE_MAD_H=1
> -DHAVE_STDINT_H=1 -DHAVE_A52DEC_A52_H=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1
> -DHAVE_SYS_PARAM_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1
> -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1 -D_FILE_OFFSET_BITS=64
> -D_FORTIFY_SOURCE=2 -I/usr/include -I/usr/include/ffmpeg -I/include
> -DQT_SHARED -DQT3_SUPPORT -DQT_SHARED -I/usr/include/qt4
> -I/usr/include/qt4/Qt3Support -I/usr/include/qt4 -I/usr/include/qt4/QtNetwork
> -I/usr/include/qt4 -I/usr/include/qt4/QtSql -I/usr/include/qt4
> -I/usr/include/qt4/QtGui
-
I/usr/include/qt4 -I/usr/include/qt4/QtXml -I/usr/include/qt4
-I/usr/include/qt4/QtCore -I. -D_FORTIFY_SOURCE=2 -I/usr/include
-I/usr/include/ffmpeg -I/include -DQT_SHARED -DQT3_SUPPORT -DQT_SHARED
-I/usr/include/qt4 -I/usr/include/qt4/Qt3Support -I/usr/include/qt4
-I/usr/include/qt4/QtNetwork -I/usr/include/qt4 -I/usr/include/qt4/QtSql
-I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4
-I/usr/include/qt4/QtXml -I/usr/include/qt4 -I/usr/include/qt4/QtCore -I. -c
-o differenceimageprovider.o differenceimageprovider.cpp
> | In file included from differenceimageprovider.cpp:24:0:
> | avframe.h:28:21: fatal error: swscale.h: No such file or directory
> | #include <swscale.h>
> | ^
> | compilation terminated.
This is caused by the headers now being installed in the multi-arch locations.
Attached is a patch fixing this by using the full <libswscale/swscale.h> path.
Best regards,
Andreas
--- /dev/null
+++ b/debian/patches/fix_ffmpeg_includes.patch
@@ -0,0 +1,62 @@
+Description: Use full include path for FFmpeg libraries
+
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-07-21>
+
+--- dvbcut-0.5.4+svn178.orig/src/avframe.h
++++ dvbcut-0.5.4+svn178/src/avframe.h
+@@ -25,7 +25,7 @@ extern "C" {
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/mem.h>
+ #ifdef HAVE_LIB_SWSCALE
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ }
+
+--- dvbcut-0.5.4+svn178.orig/src/lavfmuxer.cpp
++++ dvbcut-0.5.4+svn178/src/lavfmuxer.cpp
+@@ -19,8 +19,8 @@
+ /* $Id$ */
+
+ extern "C" {
+-#include <avformat.h>
+-#include <avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
+ }
+ #include <cstring>
+ #include <utility>
+--- dvbcut-0.5.4+svn178.orig/src/lavfmuxer.h
++++ dvbcut-0.5.4+svn178/src/lavfmuxer.h
+@@ -22,7 +22,7 @@
+ #define _DVBCUT_LAVFMUXER_H
+
+ extern "C" {
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ }
+
+ #include "mpgfile.h"
+--- dvbcut-0.5.4+svn178.orig/src/main.cpp
++++ dvbcut-0.5.4+svn178/src/main.cpp
+@@ -33,7 +33,7 @@
+
+ #include <qapplication.h>
+ extern "C" {
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ }
+ #include <qimage.h>
+ #include <qsettings.h>
+--- dvbcut-0.5.4+svn178.orig/src/streamdata.h
++++ dvbcut-0.5.4+svn178/src/streamdata.h
+@@ -24,7 +24,7 @@
+ #include <string>
+ #include <list>
+ extern "C" {
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ }
+
+ #include "port.h"
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ bug753347_initialize-pkt-variable-in-mpgfile__recodevideo-to-avoid-crash.patch
715843_do-not-access-argv-beyond-last-item.patch
753369_mplayer2-uses-different-indices-for-audio-streams.patch
avoid-PATH_MAX-macro.patch
+fix_ffmpeg_includes.patch
